- Fix some suexec CONFIGURE_ARGS for 1.3.x

- add show-categories and show-modules targets, for server ports.
  Remove these targets from www/apache22/Makefile

1 files changed, 3 insertions, 24 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index c63c80b3ebff..5ea3b946fd10 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -127,6 +127,9 @@ CONFIGURE_ARGS+=	--with-ldap \
 			--with-ldap-include="${LOCALBASE}/include"
 .endif
 
+.include "${APACHEDIR}/Makefile.doc"
+.include "${APACHEDIR}/Makefile.modules"
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_APR_FROM_PORTS)
@@ -144,35 +147,11 @@ CONFIGURE_ENV+=	USE_BUNDLED_APR=YES
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//:S/-//}
 WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 
-.include "${APACHEDIR}/Makefile.doc"
-.include "${APACHEDIR}/Makefile.modules"
-
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
 
 show-options:
 	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
 
-show-categories:
-.for category in ${ALL_MODULES_CATEGORIES}
-	@${ECHO_MSG} "${category} contains these modules:"
-	@${ECHO_MSG} "  ${${category}_MODULES}"
-.endfor
-
-show-modules:
-	@for module in ${AVAILABLE_MODULES} ; do \
-	${ECHO_MSG} -n "$${module}: ";\
-	if ${ECHO_CMD} ${APACHE_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
-			${ECHO_CMD} -n "enabled "; \
-				if ${ECHO_CMD} ${WITH_STATIC_MODULES} | ${GREP} -wq $${module} 2> /dev/null ; then \
-					${ECHO_CMD} "(static)" ; \
-				else \
-					${ECHO_CMD} "(shared)" ;\
-				fi;\
-			else\
-			${ECHO_CMD} disabled ;\
-		fi;\
-	done
-
 pre-everything::
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	" To enable a module category: WITH_<CATEGORY>_MODULES"