[Midnightbsd-cvs] CVS Commit: bsd.apache.mk: Overhaul on bsd.apache.mk.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Overhaul on bsd.apache.mk.

Remove most of the APACHE 1.3 stuff since we never intend to support that outdated version.  Many people have issues with the newer apache license, but they often switch to lighttpd, bozo or some other webserver.  

The other reasoning is that MidnightBSD is primarily a desktop operating system and so we need to support development which is going to focus on the future i.e. Apache 2.x.  

Worst case this could always be merged back in if someone actually has the energy to port apache 1.3.x.  

We should sweep for apache 1.3+ usages for versions and correct them.

Modified Files:
--------------
    mports/Mk:
        bsd.apache.mk (r1.2 -> r1.3)

-------------- next part --------------
Index: bsd.apache.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.apache.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -LMk/bsd.apache.mk -LMk/bsd.apache.mk -u -r1.2 -r1.3
--- Mk/bsd.apache.mk
+++ Mk/bsd.apache.mk
@@ -13,7 +13,7 @@
 #
 # Variables definition
 # USE_APACHE:	Call this script. Values can be:
-#		<version>: 1.3/13/2.0/20/2.1/2.2/1.3+/2.0+/2.1+/2.2+
+#		<version>:2.0/20/2.2/1.3+/2.0+/2.1+/2.2+
 #		common*: common13, common20, common21 and common22
 #
 #
@@ -24,7 +24,7 @@
 
 # Print warnings
 _ERROR_MSG=	: Error from bsd.apache.mk.
-APACHE_SUPPORTED_VERSION=	13 20 21 22
+APACHE_SUPPORTED_VERSION=	20 22
 .if ${USE_APACHE:Mcommon*} != ""
 AP_PORT_IS_SERVER=	YES
 .elif ${USE_APACHE:L} == apr
@@ -34,11 +34,7 @@
 
 #### for backward compatibility
 .elif ${USE_APACHE:L} == yes
-.   if defined(WITH_APACHE2)
 APACHE_PORT?=	www/apache20
-.   else
-APACHE_PORT?=	www/apache13
-.   endif
 APXS?=			${LOCALBASE}/sbin/apxs
 .if !defined(APACHE_COMPAT)
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
@@ -78,9 +74,7 @@
 
 # Configure
 # dirty hacks to make sure all modules are disabled before we select them
-.if ${USE_APACHE} == common13
-CONFIGURE_ARGS+=	--disable-module="all"
-.elif ${USE_APACHE} == common20
+.if ${USE_APACHE} == common20
 CONFIGURE_ARGS+=	--disable-access --disable-auth \
 			--disable-charset-lite --disable-include \
 			--disable-log-config --disable-env --disable-setenvif \
@@ -88,20 +82,6 @@
 			--disable-asis --disable-cgid --disable-cgi \
 			--disable-negotiation --disable-dir --disable-imap \
 			--disable-actions --disable-userdir --disable-alias
-.elif ${USE_APACHE} == common21
-CONFIGURE_ARGS+=	--disable-authn-file --disable-authn-default \
-			--disable-authz-host --disable-authz-groupfile \
-			--disable-authz-user --disable-authz-default \
-			--disable-auth-basic --disable-charset-lite \
-			--disable-include --disable-log-config --disable-env \
-			--disable-setenvif --disable-mime --disable-status \
-			--disable-autoindex --disable-asis --disable-cgid \
-			--disable-cgi --disable-negotiation --disable-dir \
-			--disable-imagemap --disable-actions --disable-userdir \
-			--disable-alias --disable-filter \
-			--disable-proxy --disable-proxy-connect \
-			--disable-proxy-ftp --disable-proxy-http \
-			--disable-proxy-ajp --disable-proxy-balancer
 .elif ${USE_APACHE} == common22
 CONFIGURE_ARGS+=	--disable-authn-file --disable-authn-default \
 			--disable-authz-host --disable-authz-groupfile \
@@ -152,10 +132,7 @@
 .endif
 
 .if defined(WITH_SUEXEC) || defined(WITH_SUEXEC_MODULES)
-.if ${USE_APACHE} == common13
-SUEXEC_CONFARGS=	suexec
-CONFIGURE_ARGS+=	--enable-suexec
-.elif ${USE_APACHE:Mcommon2*} != ""
+.if ${USE_APACHE:Mcommon2*} != ""
 _APACHE_MODULES+=		${SUEXEC_MODULES}
 SUEXEC_CONFARGS=	with-suexec
 .endif
@@ -195,13 +172,8 @@
 .endif
 
 .if defined(WITH_STATIC_MODULES)
-.   if ${USE_APACHE} ==	common13
-STATIC_MODULE_CONFARG=	--enable-module=$${module}
-DSO_MODULE_CONFARG=		--enable-module=$${module} --enable-shared=$${module}
-.   else
 STATIC_MODULE_CONFARG=	--enable-$${module}
 DSO_MODULE_CONFARG=		--enable-$${module}=shared
-.endif
 _CONFIGURE_ARGS!=	\
 			for module in ${APACHE_MODULES} ; do \
 				${ECHO_CMD} ${WITH_STATIC_MODULES} | \
@@ -214,21 +186,9 @@
 CONFIGURE_ARGS+=	${_CONFIGURE_ARGS}
 .elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
 WITH_STATIC_MODULES=	${APACHE_MODULES}
-.    if ${USE_APACHE} == common13
-.      for module in ${APACHE_MODULES}
-CONFIGURE_ARGS+=	--enable-module=${module}
-.      endfor
-.    else
 CONFIGURE_ARGS+=	--enable-modules="${APACHE_MODULES}"
-.    endif
 .else
-.    if ${USE_APACHE} == common13
-.      for module in ${APACHE_MODULES}
-CONFIGURE_ARGS+=	--enable-module=${module} --enable-shared=${module}
-.      endfor
-.    else
 CONFIGURE_ARGS+=	--enable-mods-shared="${APACHE_MODULES}"
-.    endif
 .endif
 
 .if defined(WITH_STATIC_MODULES)
@@ -304,19 +264,13 @@
 APACHEMODDIR=	libexec/apache2
 APACHEINCLUDEDIR=include/apache2
 APACHEETCDIR=	etc/apache2
-APACHE_PORT=	www/apache${APACHE_VERSION}
-.elif ${APACHE_VERSION} >= 21
+APACHE_PORT?=	www/apache${APACHE_VERSION}
+.else
 AP_BUILDEXT=	la
 APACHEMODDIR=	libexec/apache${APACHE_VERSION}
 APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
 APACHEETCDIR=	etc/apache${APACHE_VERSION}
-APACHE_PORT=	www/apache${APACHE_VERSION}
-.else
-AP_BUILDEXT=	so
-APACHEMODDIR=	libexec/apache
-APACHEINCLUDEDIR=include/apache
-APACHEETCDIR=	etc/apache
-APACHE_PORT?= www/apache13
+APACHE_PORT?=	www/apache${APACHE_VERSION}
 .endif
 
 PLIST_SUB+=	APACHEMODDIR="${APACHEMODDIR}" \