2 files changed, 74 insertions, 60 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 19870ebadff5..fc13d8138eda 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -11,8 +11,7 @@ PORTNAME=	apache
 PORTVERSION=	2.2.6
 PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
-		${MASTER_SITE_LOCAL:S/%SUBDIR%\//clement\/:aprmysql/}
+MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.bz2
 DIST_SUBDIR=	apache22
@@ -22,12 +21,6 @@ COMMENT?=	Version 2.2 of Apache web server with ${WITH_MPM:L} MPM.
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-# When using apr_mysql_db we _must_ rebuild makefiles
-.if defined(WITH_FULLBUILD) || defined(WITH_MYSQL)
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-SCRIPTS_ENV+=	FULLBUILD=on
-.endif
-
 LATEST_LINK=	apache22
 
 CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \
@@ -64,10 +57,6 @@ OPTIONS= \
 .include "${.CURDIR}/Makefile.options"
 .endif
 
-.if !defined(WITH_APR_FROM_PORTS)
-USE_LDCONFIG=	yes
-.endif
-
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL5} \
@@ -89,21 +78,6 @@ WITH_MPM?=	prefork # or worker, event, itk
 
 WITH_HTTP_PORT?=	80
 
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--disable-ipv6
-.else
-CATEGORIES+=		ipv6
-.   if defined(WITH_IPV6_V6ONLY) || defined(WITHOUT_V4MAPPED)
-CONFIGURE_ARGS+=	--disable-v4-mapped
-.   else
-CONFIGURE_ARGS+=	--enable-v4-mapped
-.   endif
-.endif
-
-.if !defined(WITHOUT_SSL_MODULES)
-USE_OPENSSL=	yes
-.endif
-
 .if defined(WITH_STATIC_SUPPORT)
 CONFIGURE_ARGS+=	--enable-static-support
 .endif
@@ -127,16 +101,18 @@ APACHEDIR=	${.CURDIR}
 APACHEDIR=	${MASTERDIR}
 .endif
 
-.if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES)
-USE_OPENLDAP=		YES
-CONFIGURE_ARGS+=	--with-ldap \
-			--with-ldap-lib="${LOCALBASE}/lib" \
-			--with-ldap-include="${LOCALBASE}/include"
-.endif
 
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 .include <bsd.port.pre.mk>
+.include "${APACHEDIR}/Makefile.modules"
+
+.if (defined(WITH_SSL)|| !defined(WITHOUT_SSL_MODULES))
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
+
+.endif
 
 .if defined(WITH_APR_FROM_PORTS)
 PLIST_SUB+=	APR_PORTS="@comment "
@@ -145,16 +121,41 @@ CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-1-config
 CONFIGURE_ENV+=		LTFLAGS="--tag=CXX"
 .else
+USE_LDCONFIG=	yes
 PLIST_SUB+=	APR_PORTS=""
 CONFLICTS+=	apr-1.*
 CONFIGURE_ENV+=	USE_BUNDLED_APR=YES
 .endif
 
+# When using apr_mysql_db we _must_ rebuild makefiles
+.if defined(WITH_FULLBUILD) || defined(WITH_MYSQL)
+BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+SCRIPTS_ENV+=	FULLBUILD=on
+.endif
+
 .if defined(WITH_PCRE_FROM_PORTS)
 CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
 LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 .endif
 
+.if defined (WITH_LDAP) || defined (WITH_LDAP_MODULES)
+USE_OPENLDAP=		YES
+CONFIGURE_ARGS+=	--with-ldap \
+			--with-ldap-lib="${LOCALBASE}/lib" \
+			--with-ldap-include="${LOCALBASE}/include"
+.endif
+
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.else
+CATEGORIES+=		ipv6
+.   if defined(WITH_IPV6_V6ONLY) || defined(WITHOUT_V4MAPPED)
+CONFIGURE_ARGS+=	--disable-v4-mapped
+.   else
+CONFIGURE_ARGS+=	--enable-v4-mapped
+.   endif
+.endif
+
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
 .   if ${OSVERSION} > 500023
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index f6c44045e00b..5932e5645195 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -12,6 +12,39 @@
 # $FreeBSD$
 #
 
+.if !defined(Module_inc)
+Module_inc=		done
+
+AUTH_MODULES=		auth_basic auth_digest
+AUTHN_MODULES=		authn_file authn_dbd authn_dbm authn_anon authn_default \
+			authn_alias
+AUTHZ_MODULES=		authz_host authz_groupfile authz_user authz_dbm \
+			authz_owner authz_default
+CACHE_MODULES=		cache disk_cache file_cache mem_cache
+DAV_MODULES=		dav dav_fs
+EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter \
+			log_forensic optional_hook_export optional_hook_import \
+			optional_fn_import optional_fn_export 
+LDAP_MODULES=		ldap authnz_ldap
+MISC_MODULES+=		actions alias asis autoindex cern_meta \
+			cgi charset_lite dbd deflate dir dumpio env expires \
+			headers imagemap include info log_config logio mime \
+			mime_magic negotiation rewrite setenvif speling status \
+			unique_id userdir usertrack vhost_alias filter version
+PROXY_MODULES=		proxy proxy_connect proxy_ftp proxy_http proxy_ajp proxy_balancer
+SSL_MODULES=		ssl
+SUEXEC_MODULES=		suexec
+THREADS_MODULES=	cgid
+
+DEFAULT_MODULES_CATEGORIES= \
+			AUTH AUTHN AUTHZ DAV CACHE MISC
+
+ALL_MODULES_CATEGORIES=	AUTH AUTHN AUTHZ CACHE DAV EXPERIMENTAL LDAP \
+			MISC PROXY SSL SUEXEC THREADS
+
+.endif
+
+.if defined(_PREMKINCLUDED)
 # MPM section:
 # << TO BE WRITTEN >>
 .if defined (SLAVE_PORT_MPM)
@@ -130,6 +163,9 @@ CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 
 .if !defined(WITH_THREADS)
 WITHOUT_MODULES+=	mem_cache
+.if !defined(WITHOUT_APACHE_OPTIONS) && defined(WITH_MEM_CACHE)
+IGNORE+=	mod_mem_cache requires WITH_THREADS
+.endif
 .else
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -137,31 +173,8 @@ LDFLAGS+=	${PTHREAD_LIBS}
 
 .if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE)
 WITHOUT_MODULES+=	authn_dbd dbd
+.if !defined(WITHOUT_APACHE_OPTIONS) && (defined(WITH_DBD) || defined(WITH_AUTHN_DBD))
+IGNORE+=	You need to enable at least one DBD backend
+.endif
+.endif
 .endif
-
-AUTH_MODULES=		auth_basic auth_digest
-AUTHN_MODULES=		authn_file authn_dbd authn_dbm authn_anon authn_default \
-			authn_alias
-AUTHZ_MODULES=		authz_host authz_groupfile authz_user authz_dbm \
-			authz_owner authz_default
-CACHE_MODULES=		cache disk_cache file_cache mem_cache
-DAV_MODULES=		dav dav_fs
-EXPERIMENTAL_MODULES=	bucketeer case_filter case_filter_in ext_filter \
-			log_forensic optional_hook_export optional_hook_import \
-			optional_fn_import optional_fn_export 
-LDAP_MODULES=		ldap authnz_ldap
-MISC_MODULES+=		actions alias asis autoindex cern_meta \
-			cgi charset_lite dbd deflate dir dumpio env expires \
-			headers imagemap include info log_config logio mime \
-			mime_magic negotiation rewrite setenvif speling status \
-			unique_id userdir usertrack vhost_alias filter version
-PROXY_MODULES=		proxy proxy_connect proxy_ftp proxy_http proxy_ajp proxy_balancer
-SSL_MODULES=		ssl
-SUEXEC_MODULES=		suexec
-THREADS_MODULES=	cgid
-
-DEFAULT_MODULES_CATEGORIES= \
-			AUTH AUTHN AUTHZ DAV CACHE MISC
-
-ALL_MODULES_CATEGORIES=	AUTH AUTHN AUTHZ CACHE DAV EXPERIMENTAL LDAP \
-			MISC PROXY SSL SUEXEC THREADS