[Midnightbsd-cvs] mports: mports/Mk: Begin work to isolate the system from the local

[ctriv at midnightbsd.org]

Log Message:
-----------
Begin work to isolate the system from the local preferences when INDEXING is
set.

Modified Files:
--------------
    mports/Mk:
        bsd.apache.mk (r1.3 -> r1.4)
        bsd.database.mk (r1.7 -> r1.8)

-------------- next part --------------
Index: bsd.apache.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.apache.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -L Mk/bsd.apache.mk -L Mk/bsd.apache.mk -u -r1.3 -r1.4
--- Mk/bsd.apache.mk
+++ Mk/bsd.apache.mk
@@ -226,7 +226,7 @@
 OVERRIDABLE_VARS=	SRC_FILE MODULENAME SHORTMODNAME WRKSRC \
 					PKGNAMESUFFIX
 
-.if exists(${HTTPD})
+.if exists(${HTTPD}) && !defined(INDEXING)
 AP_CUR_VERSION!=	${HTTPD} -V | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p'
 .   if ${AP_CUR_VERSION} > 13
 APACHE_MPM!=		${APXS} -q MPM_NAME
@@ -249,7 +249,7 @@
 .   endif
 .endif
 
-.if exists(${APXS})
+.if exists(${APXS}) && !defined(INDEXING)
 APXS_PREFIX!=	${APXS} -q prefix 2> /dev/null || echo NULL
 .   if ${APXS_PREFIX} == NULL
 IGNORE=	: Your apache does not support DSO modules
Index: bsd.database.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.database.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -L Mk/bsd.database.mk -L Mk/bsd.database.mk -u -r1.7 -r1.8
--- Mk/bsd.database.mk
+++ Mk/bsd.database.mk
@@ -88,7 +88,7 @@
 MYSQL51_LIBVER=		16
 
 # Setting/finding MySQL version we want.
-.if exists(${LOCALBASE}/bin/mysql)
+.if exists(${LOCALBASE}/bin/mysql) && !defined(INDEXING)
 _MYSQL_VER!=	${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\)\.\([0-9]*\).*/\1\2/'
 .endif
 
@@ -139,7 +139,7 @@
 PGSQL83_LIBVER=		5
 
 # Setting/finding PostgreSQL version we want.
-.if exists(${LOCALBASE}/bin/pg_config)
+.if exists(${LOCALBASE}/bin/pg_config) && !defined(INDEXING)
 _PGSQL_VER!=	${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)[^0-9].*/\1\2/p'
 .endif