[Midnightbsd-cvs] mports: mports/Mk: INDEXING is dead.

[ctriv at midnightbsd.org]

Log Message:
-----------
INDEXING is dead.  Long live PACKAGE_BUILDING.
Cleanup bsd.java.mk, don't shotgun variables, fix logic so that system
doesn't check for installed jdk when PACKAGE_BUILDING is set.

Modified Files:
--------------
    mports/Mk:
        bsd.apache.mk (r1.4 -> r1.5)
        bsd.database.mk (r1.9 -> r1.10)
        bsd.java.mk (r1.16 -> r1.17)
        bsd.mport.mk (r1.96 -> r1.97)

-------------- next part --------------
Index: bsd.apache.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.apache.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -L Mk/bsd.apache.mk -L Mk/bsd.apache.mk -u -r1.4 -r1.5
--- Mk/bsd.apache.mk
+++ Mk/bsd.apache.mk
@@ -226,7 +226,7 @@
 OVERRIDABLE_VARS=	SRC_FILE MODULENAME SHORTMODNAME WRKSRC \
 					PKGNAMESUFFIX
 
-.if exists(${HTTPD}) && !defined(INDEXING)
+.if exists(${HTTPD}) && !defined(PACKAGE_BUILDING)
 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}) && !defined(INDEXING)
+.if exists(${APXS}) && !defined(PACKAGE_BUILDING)
 APXS_PREFIX!=	${APXS} -q prefix 2> /dev/null || echo NULL
 .   if ${APXS_PREFIX} == NULL
 IGNORE=	: Your apache does not support DSO modules
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.96
retrieving revision 1.97
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.96 -r1.97
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -1031,16 +1031,6 @@
 # Most port authors should not need to understand anything after this point.
 ############################################################################
 
-# A few variables that are useful to things like magus or mport system 
-# maintaince...
-#
-# INDEXING 		- Set when a index of the system is being built. Turns
-#				  off the inclusion of options.  Sadly by the time this 
-#				  variable exists, /etc/make.conf has already been included.
-#				  You'll need to turn this off by settting __MAKE_CONF to 
-#				  /dev/null when you invoke 'make'.
-#
-
 
 # These need to be absolute since we don't know how deep in the ports
 # tree we are and thus can't go relative.  They can, of course, be overridden
@@ -1237,7 +1227,7 @@
 .	undef RO
 .	undef REALOPTIONS
 .	endif
-.if !defined(INDEXING)
+.if !defined(PACKAGE_BUILDING)
 .	if exists(${_OPTIONSFILE}) && !make(rmconfig)
 .	include "${_OPTIONSFILE}"
 .	endif
Index: bsd.java.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.java.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -L Mk/bsd.java.mk -L Mk/bsd.java.mk -u -r1.16 -r1.17
--- Mk/bsd.java.mk
+++ Mk/bsd.java.mk
@@ -199,7 +199,7 @@
 
 # Enforce preferred Java ports according to OS
 .		if (${ARCH} == "amd64") || (${ARCH} == "i386")
-.			if defined(MAGUS) || defined(PACKAGE_BUILDING) || defined(BATCH) || defined(INDEXING)
+.			if defined(PACKAGE_BUILDING) 
 _JAVA_PREFERRED_PORTS+= JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4
 .			else
 _JAVA_PREFERRED_PORTS+=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_5
@@ -342,7 +342,7 @@
 .		endfor
 _JAVA_PORTS_INSTALLED_POSSIBLE=		${__JAVA_PORTS_INSTALLED_POSSIBLE:C/ [ ]+/ /g}
 
-.		if ${_JAVA_PORTS_INSTALLED_POSSIBLE} != ""
+.		if !defined(PACKAGE_BUILDING) && ${_JAVA_PORTS_INSTALLED_POSSIBLE} != ""
 _JAVA_PORT!=	${ECHO_CMD} "${_JAVA_PORTS_INSTALLED_POSSIBLE}" \
 				| ${AWK} '{ print $$1 }'
 
Index: bsd.database.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.database.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -L Mk/bsd.database.mk -L Mk/bsd.database.mk -u -r1.9 -r1.10
--- 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) && !defined(INDEXING)
+.if exists(${LOCALBASE}/bin/mysql) && !defined(PACKAGE_BUILDING)
 _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) && !defined(INDEXING)
+.if exists(${LOCALBASE}/bin/pg_config) && !defined(PACKAGE_BUILDING)
 _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
 
@@ -253,7 +253,7 @@
 .else
 # USE_BDB is specified as VER+
 .  for dbx in ${_DB_${_MATCHED_DB_VER}P}
-.   if exists(${db${dbx}_FIND}) && !defined(INDEXING)
+.   if exists(${db${dbx}_FIND}) && !defined(PACKAGE_BUILDING)
 _BRKDB=	no
 # Skip versions we are incompatible with
 .    if defined(INVALID_BDB_VER)