Use the new Apache bits from bsd.port.mk.

Submitted by: dinoex
author: Joe Marcus Clarke <marcus@FreeBSD.org> 2003-11-07 09:12:58 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2003-11-07 09:12:58 +0000
commit: f4d7c801f854ff4fad4642d62b23bae798962615 (patch)
tree: eee60e8fb7c2a2d1bf0636dd8288df46aee9e9bb
parent: 2e8e10b527cd18511e4bd6a598f05050d4190015 (diff)
download: ports-f4d7c801f854ff4fad4642d62b23bae798962615.tar.gz
ports-f4d7c801f854ff4fad4642d62b23bae798962615.zip
102 files changed, 146 insertions, 405 deletions
diff --git a/databases/mysql-editor/Makefile b/databases/mysql-editor/Makefile
index 6964d9a1df5a..cfe92c916541 100644
--- a/databases/mysql-editor/Makefile
+++ b/databases/mysql-editor/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	CGI scripts in Perl to edit your MySQL tables
 
-RUN_DEPENDS=	${CGI_BIN}:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${CGI_BIN}:${PORTSDIR}/${APACHE_PORT}
 
 NO_BUILD=	True
 
diff --git a/databases/mysqlman/Makefile b/databases/mysqlman/Makefile
index 65ad2ddc4f8c..d47c15ee3a27 100644
--- a/databases/mysqlman/Makefile
+++ b/databases/mysqlman/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	mysqlman
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	MySQLMan is a web based MySQL database manager written in perl
 
-RUN_DEPENDS=	${WWW_DIR}:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${WWW_DIR}:${PORTSDIR}/${APACHE_PORT}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-${PORTVERSION}
 RESTRICTED=	"not redistributable, license agreement required"
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 70f816d31f53..38d186d09a34 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -33,7 +33,6 @@ MANCOMPRESSED=	no
 .include <bsd.port.pre.mk>
 
 SVNREPOS?=	/home/svn/repos
-APXS=		${LOCALBASE}/sbin/apxs
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
@@ -48,9 +47,9 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	${PORTSDIR}/www/apache2
-BUILD_DEPENDS+=	${APXS}:${APACHE2_PORT}
-RUN_DEPENDS+=	${APXS}:${APACHE2_PORT}
+APACHE2_PORT?=	www/apache2
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \
 		--with-apr-util=${LOCALBASE}/lib/apache2/apu-config
 .else
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 70f816d31f53..38d186d09a34 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -33,7 +33,6 @@ MANCOMPRESSED=	no
 .include <bsd.port.pre.mk>
 
 SVNREPOS?=	/home/svn/repos
-APXS=		${LOCALBASE}/sbin/apxs
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
@@ -48,9 +47,9 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	${PORTSDIR}/www/apache2
-BUILD_DEPENDS+=	${APXS}:${APACHE2_PORT}
-RUN_DEPENDS+=	${APXS}:${APACHE2_PORT}
+APACHE2_PORT?=	www/apache2
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \
 		--with-apr-util=${LOCALBASE}/lib/apache2/apu-config
 .else
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 70f816d31f53..38d186d09a34 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -33,7 +33,6 @@ MANCOMPRESSED=	no
 .include <bsd.port.pre.mk>
 
 SVNREPOS?=	/home/svn/repos
-APXS=		${LOCALBASE}/sbin/apxs
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
@@ -48,9 +47,9 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	${PORTSDIR}/www/apache2
-BUILD_DEPENDS+=	${APXS}:${APACHE2_PORT}
-RUN_DEPENDS+=	${APXS}:${APACHE2_PORT}
+APACHE2_PORT?=	www/apache2
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \
 		--with-apr-util=${LOCALBASE}/lib/apache2/apu-config
 .else
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 70f816d31f53..38d186d09a34 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -33,7 +33,6 @@ MANCOMPRESSED=	no
 .include <bsd.port.pre.mk>
 
 SVNREPOS?=	/home/svn/repos
-APXS=		${LOCALBASE}/sbin/apxs
 
 .if defined(WITH_MOD_DAV_SVN)
 WITH_APACHE2_APR=	yes
@@ -48,9 +47,9 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	${PORTSDIR}/www/apache2
-BUILD_DEPENDS+=	${APXS}:${APACHE2_PORT}
-RUN_DEPENDS+=	${APXS}:${APACHE2_PORT}
+APACHE2_PORT?=	www/apache2
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \
 		--with-apr-util=${LOCALBASE}/lib/apache2/apu-config
 .else
diff --git a/korean/mod_url/Makefile b/korean/mod_url/Makefile
index 0da5b3cb5a93..5be0466ddde0 100644
--- a/korean/mod_url/Makefile
+++ b/korean/mod_url/Makefile
@@ -14,11 +14,8 @@ MAINTAINER=		cjh@FreeBSD.org
 COMMENT=		Apache module for manipulating euc-kr encoded URL
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
-APXS?=			${LOCALBASE}/sbin/apxs
-APACHE_PORT?=		${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/lang/eperl/Makefile b/lang/eperl/Makefile
index eb7ce49a267c..89e8648f25ba 100644
--- a/lang/eperl/Makefile
+++ b/lang/eperl/Makefile
@@ -22,7 +22,7 @@ COMMENT=	Embedded Perl 5 Language
 #INSTALL_ALSO_AS_SSSL=	yes
 
 .if defined(INSTALL_ALSO_AS_SSSL)
-RUN_DEPENDS=	${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/www/apache
+RUN_DEPENDS=	${PREFIX}/etc/apache/srm.conf:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 USE_PERL5=	yes
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 7223038f6c80..fbcb8abc0cbd 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -522,21 +522,20 @@ CONFIGURE_ARGS+=--with-zlib=yes
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
-APXS?=		${LOCALBASE}/sbin/apxs
 .if exists(${LOCALBASE}/include/apache2/apr.h)
 WITH_APACHE2=	yes
 .endif
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
+APACHE_PORT?=	www/apache2
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp4.so
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp4.so
 .endif
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 13723599a536..9588ecdd0e29 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -513,16 +513,16 @@ APXS?=		${LOCALBASE}/sbin/apxs
 WITH_APACHE2=	yes
 .endif
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
+APACHE_PORT?=	www/apache2
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp5.so
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp5.so
 .endif
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 13723599a536..9588ecdd0e29 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -513,16 +513,16 @@ APXS?=		${LOCALBASE}/sbin/apxs
 WITH_APACHE2=	yes
 .endif
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
+APACHE_PORT?=	www/apache2
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp5.so
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp5.so
 .endif
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index 6bf5a24f0d03..920d033d7390 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -29,11 +29,7 @@ RUN_DEPENDS=	${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd
 RUN_DEPENDS=	${SITE_PERL}/IMAP/Admin.pm:${PORTSDIR}/mail/p5-IMAP-Admin \
 		${SITE_PERL}/IMAP/Sieve.pm:${PORTSDIR}/mail/p5-IMAP-Sieve
 .endif
-.if defined(WITH_APACHE2)
-RUN_DEPENDS+=	${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache2
-.else
-RUN_DEPENDS+=	${LOCALBASE}/www/cgi-bin:${PORTSDIR}/www/apache13
-.endif
+RUN_DEPENDS+=	${LOCALBASE}/www/cgi-bin:${PORTSDIR}/${APACHE_PORT}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/misc/instant-server/Makefile b/misc/instant-server/Makefile
index bd6f1bd73a7f..d6f6ad4c9fac 100644
--- a/misc/instant-server/Makefile
+++ b/misc/instant-server/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/postfix:${PORTSDIR}/mail/postfix \
 		${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba \
 		${LOCALBASE}/sbin/traceroute:${PORTSDIR}/net/traceroute \
 		cnewsdo:${PORTSDIR}/news/cnews \
-		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
+		${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} \
 		${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24
 
 # Don't let stupid programs ask for configuration.
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index f086940755f6..622e121c9fa1 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.htdig.org/files/ \
 MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	A www indexing and searching system
 
-RUN_DEPENDS=	${LOCALBASE}/share/doc/apache:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${LOCALBASE}/share/doc/apache:${PORTSDIR}/${APACHE_PORT}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \
diff --git a/www/apache-contrib/Makefile b/www/apache-contrib/Makefile
index eb6115ff0c58..84fdde251919 100644
--- a/www/apache-contrib/Makefile
+++ b/www/apache-contrib/Makefile
@@ -14,12 +14,8 @@ MASTER_SITE_SUBDIR=	contrib/modules/1.3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Third-party modules contributed to the Apache HTTP server project
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 
-APXS=		${LOCALBASE}/sbin/apxs
-
-AP_PORT?=	apache13
 .if exists(${APXS})
 APXS_WORKS!=	${APXS} -q TARGET 2>/dev/null || echo no
 .endif
diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile
index ffb94c7427b3..a29911530229 100644
--- a/www/apache-jserv/Makefile
+++ b/www/apache-jserv/Makefile
@@ -18,10 +18,10 @@ COMMENT=	Loadable servlet module for apache
 USE_JAVA=	1.1+
 NEED_JAVAC=	yes
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\
 		${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk
 RUN_DEPENDS=	${JAVAVM}:${PORTSDIR}/java/javavmwrapper\
-		${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13\
+		${LOCALBASE}/sbin/apachectl:${PORTSDIR}/${APACHE_PORT}\
 		${LOCALBASE}/share/java/classes/jsdk.jar:${PORTSDIR}/java/jsdk
 
 USE_GMAKE=	yes
@@ -35,7 +35,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}\
 		--libdir=${LOCALBASE}/libexec/apache\
 		--with-logdir=/var/log\
 		--sysconfdir=${PREFIX}/etc/apache\
-		--with-apxs=${LOCALBASE}/sbin/apxs\
+		--with-apxs=${APXS}\
 		--with-jdk-home=${JAVA_HOME}\
 		--with-JSDK=${LOCALBASE}/share/java/classes/jsdk.jar\
 		--with-java=${JAVA}\
diff --git a/www/auth_ldap/Makefile b/www/auth_ldap/Makefile
index 39104ab452fc..4b5d0af37dcd 100644
--- a/www/auth_ldap/Makefile
+++ b/www/auth_ldap/Makefile
@@ -14,10 +14,9 @@ MASTER_SITES=	http://www.rudedog.org/auth_ldap/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module to authenticate against an LDAP directory
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 LIB_DEPENDS=	lber.2:${PORTSDIR}/${LDAP_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
+USE_APACHE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="-llber"
 CONFIGURE_ARGS=	--with-sdk-headers=${LOCALBASE}/include \
@@ -26,8 +25,6 @@ CONFIGURE_ARGS=	--with-sdk-headers=${LOCALBASE}/include \
 		--with-apxs=${APXS}
 USE_GMAKE=	yes
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 LDAP_PORT?=	net/openldap20-client
 
 MAKE_ARGS+=	APXS=${APXS}
diff --git a/www/bk2site/Makefile b/www/bk2site/Makefile
index 972b9109ab03..9cce042987b3 100644
--- a/www/bk2site/Makefile
+++ b/www/bk2site/Makefile
@@ -16,9 +16,8 @@ MAINTAINER=	clive@FreeBSD.org
 COMMENT=	Transforms Netscape bookmarks into a Yahoo-like website
 
 .include <bsd.port.pre.mk>
-APXS=		${LOCALBASE}/sbin/apxs
 .if exists(${APXS})
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
 # Specify these directories in relative paths to ${PREFIX}.
 .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
diff --git a/www/caudium12/Makefile b/www/caudium12/Makefile
index 58243439e951..5f540bd4235e 100644
--- a/www/caudium12/Makefile
+++ b/www/caudium12/Makefile
@@ -33,7 +33,7 @@ PIKEVERSION=	7.2.492
 SH=		${PREFIX}/bin/bash
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS+= --without-debug --with-PiXSL --prefix=${PREFIX} \
-		 --with-pike=/usr/local/bin/pike
+		 --with-pike=${LOCALBASE}/bin/pike
 
 USE_GMAKE=	yes
 
diff --git a/www/caudium14/Makefile b/www/caudium14/Makefile
index 58243439e951..5f540bd4235e 100644
--- a/www/caudium14/Makefile
+++ b/www/caudium14/Makefile
@@ -33,7 +33,7 @@ PIKEVERSION=	7.2.492
 SH=		${PREFIX}/bin/bash
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS+= --without-debug --with-PiXSL --prefix=${PREFIX} \
-		 --with-pike=/usr/local/bin/pike
+		 --with-pike=${LOCALBASE}/bin/pike
 
 USE_GMAKE=	yes
 
diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index a5d4c992b9f4..25336eb97319 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	fcash@bigfoot.com
 COMMENT=	A fast, simple web content filter for Squid proxy servers
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
-		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install
+		${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install
 
 WRKSRC=		${WRKDIR}/DansGuardian-${PORTVERSION:R}
 
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index bdb69189db93..01877e33f967 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	fcash@sd73.bc.ca
 COMMENT=	A fast, featureful web content filter for Squid proxy servers
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
-		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install
+		${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install
 
 WRKSRC=		${WRKDIR}/DansGuardian-${PORTVERSION:R}
 GNU_CONFIGURE=	yes
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index de71f929c8f1..af157344bd57 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=   http://www.mnogosearch.org/Download/
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	Full featured SQL-based hypertext search engine
 
-RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
 APXS?=          ${LOCALBASE}/sbin/apxs
 APACHE_PORT?=   ${PORTSDIR}/www/apache13
diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile
index de71f929c8f1..af157344bd57 100644
--- a/www/mnogosearch31/Makefile
+++ b/www/mnogosearch31/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=   http://www.mnogosearch.org/Download/
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	Full featured SQL-based hypertext search engine
 
-RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
+RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
 APXS?=          ${LOCALBASE}/sbin/apxs
 APACHE_PORT?=   ${PORTSDIR}/www/apache13
diff --git a/www/mod_access_identd/Makefile b/www/mod_access_identd/Makefile
index 8258053d58ff..d916ce8f805c 100644
--- a/www/mod_access_identd/Makefile
+++ b/www/mod_access_identd/Makefile
@@ -13,12 +13,8 @@ MASTER_SITES=	http://MeepZor.Com/packages/mod_access_identd/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module to supply access control based on ident reply
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
+USE_APACHE=	yes
 WRKSRC=		${WRKDIR}/mod_access_identd
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 
 do-build:
 	@cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c
diff --git a/www/mod_access_referer/Makefile b/www/mod_access_referer/Makefile
index 83576f4e91f4..89fa502dad9d 100644
--- a/www/mod_access_referer/Makefile
+++ b/www/mod_access_referer/Makefile
@@ -14,12 +14,7 @@ MASTER_SITE_SUBDIR=	accessreferer
 MAINTAINER=	ports@freebsd.org
 COMMENT=	An Apache module that provides access control based on Referer HTTP header
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 DOCS=		HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html
 
 do-build:
diff --git a/www/mod_accounting/Makefile b/www/mod_accounting/Makefile
index 8c934dc35938..efe3f19ed72b 100644
--- a/www/mod_accounting/Makefile
+++ b/www/mod_accounting/Makefile
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR=	mod-acct
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	An Apache module that records traffic statistics into a database
 
-BUILD_DEPENDS+=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
 MAKE_ARGS+=	APXS="${APXS}"
-APXS?=		${LOCALBASE}/sbin/apxs
 
 .if defined(WITHOUT_PGSQL)
 MAKE_ARGS+=	WITHOUT_PGSQL=YES
diff --git a/www/mod_auth_any/Makefile b/www/mod_auth_any/Makefile
index 71d7b4e61fbb..ad2ee4e8ad70 100644
--- a/www/mod_auth_any/Makefile
+++ b/www/mod_auth_any/Makefile
@@ -13,14 +13,9 @@ MASTER_SITES=	http://www.itlab.musc.edu/webNIS/dist/
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Apache module to use any command line program to authenticate a user
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
+USE_APACHE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-
 do-build:
 	@cd ${WRKSRC}/src && ${APXS} -c ${PORTNAME}.c
 
diff --git a/www/mod_auth_external/Makefile b/www/mod_auth_external/Makefile
index 775c241cf562..b3c49f004ecc 100644
--- a/www/mod_auth_external/Makefile
+++ b/www/mod_auth_external/Makefile
@@ -14,11 +14,7 @@ MASTER_SITES=	http://www.unixpapa.com/software/ \
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Enables the use of external mechanisms for user authentication
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
-APXS?=		${LOCALBASE}/sbin/apxs
-
+USE_APACHE=	yes
 DOCDIR=		${PREFIX}/share/doc/${PORTNAME}
 DOCS=		AUTHENTICATORS CHANGES INSTALL README TODO
 
diff --git a/www/mod_auth_kerb/Makefile b/www/mod_auth_kerb/Makefile
index e7bb9a437928..2ae366ff6a37 100644
--- a/www/mod_auth_kerb/Makefile
+++ b/www/mod_auth_kerb/Makefile
@@ -23,13 +23,11 @@ COMMENT=	An Apache module for authenticating users with Kerberos v5
 # (i.e., HTTP over SSL/TLS).  Thus, we require as a dependency
 # a version of Apache which can do this.
 #
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13-modssl
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13-modssl
 LIB_DEPENDS=	krb5.3:${PORTSDIR}/security/krb5
 
+USE_APACHE=	yes
 WRKSRC=		${WRKDIR}/src/modules/kerberos
 
-APXS?=		${LOCALBASE}/sbin/apxs
 KRB5_HOME?=	${LOCALBASE}
 
 do-build:
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index e7bb9a437928..2ae366ff6a37 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -23,13 +23,11 @@ COMMENT=	An Apache module for authenticating users with Kerberos v5
 # (i.e., HTTP over SSL/TLS).  Thus, we require as a dependency
 # a version of Apache which can do this.
 #
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13-modssl
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13-modssl
 LIB_DEPENDS=	krb5.3:${PORTSDIR}/security/krb5
 
+USE_APACHE=	yes
 WRKSRC=		${WRKDIR}/src/modules/kerberos
 
-APXS?=		${LOCALBASE}/sbin/apxs
 KRB5_HOME?=	${LOCALBASE}
 
 do-build:
diff --git a/www/mod_auth_mysql/Makefile b/www/mod_auth_mysql/Makefile
index 88f54a4e2430..9373e169d6f0 100644
--- a/www/mod_auth_mysql/Makefile
+++ b/www/mod_auth_mysql/Makefile
@@ -14,16 +14,13 @@ MASTER_SITE_SUBDIR=	mod-auth-mysql
 MAINTAINER=	jeh@FreeBSD.org
 COMMENT=	Allows users to use MySQL databases for user authentication
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT}
-RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/www/${AP_PORT}
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT}
 
 USE_MYSQL=	yes
 
 .include <bsd.port.pre.mk>
 
-APXS=		${LOCALBASE}/sbin/apxs
-
-AP_PORT?=	apache13
 .if exists(${APXS})
 APXS_WORKS!=	${APXS} -q TARGET 2>/dev/null || echo no
 .endif
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index d63fcbcf4ae1..91f5cfe4457e 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -31,22 +31,18 @@ LIB_DEPENDS=   mysqlclient.12:${PORTSDIR}/databases/mysql40-client
 WITH_APACHE2=	yes
 .endif
 
-APXS=		${LOCALBASE}/sbin/apxs
-
 .if defined(WITH_APACHE2)
-APACHE_PORT=	${PORTSDIR}/www/apache2
 APACHE_VER=	APACHE2
 PLIST_SUB=	VER="2"
 DSO=		mod_auth_mysql.la
 .else
-APACHE_PORT=	${PORTSDIR}/www/apache13
 APACHE_VER=	APACHE1
 PLIST_SUB=	VER=""
 DSO=		mod_auth_mysql.so
 .endif
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
 post-patch:
 	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g;s|%%APXS%%|${APXS}|g;s|%%APACHE_VER%%|${APACHE_VER}|g;s|%%DSO%%|${DSO}|g' \
diff --git a/www/mod_auth_pam/Makefile b/www/mod_auth_pam/Makefile
index 74163f342e70..7b5d61c3cfa1 100644
--- a/www/mod_auth_pam/Makefile
+++ b/www/mod_auth_pam/Makefile
@@ -14,10 +14,7 @@ MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/ \
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Allows users to use PAM modules for user authentication
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
-APXS?=		${LOCALBASE}/sbin/apxs
+USE_APACHE=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/mod_auth_pgsql/Makefile b/www/mod_auth_pgsql/Makefile
index 5c9d7d18de5e..6ef4d6659b50 100644
--- a/www/mod_auth_pgsql/Makefile
+++ b/www/mod_auth_pgsql/Makefile
@@ -13,17 +13,14 @@ MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${APACHE_PORT}
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT}
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
 
 .include <bsd.port.pre.mk>
 
-APXS?=		${LOCALBASE}/sbin/apxs
-AP_PORT?=	apache13
-APACHE_PORT?=	${PORTSDIR}/www/${AP_PORT}
 POSTGRESQL_PORT?=	databases/postgresql7
 
 .if exists(${APXS})
diff --git a/www/mod_auth_pwcheck/Makefile b/www/mod_auth_pwcheck/Makefile
index f5a0e0d5d3cb..558a35c94bb3 100644
--- a/www/mod_auth_pwcheck/Makefile
+++ b/www/mod_auth_pwcheck/Makefile
@@ -13,15 +13,15 @@ MASTER_SITES=	http://www.chelcom.ru/~anton/projects/files/
 MAINTAINER=	anton@chelcom.ru
 COMMENT=	Apache module for user authentication via Cyrus pwcheck daemon
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT}
-RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} \
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT} \
 		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+APACHE_PORT?=	${AP_CATEGORY}/${AP_PORT}
 
 .include <bsd.port.pre.mk>
 
-APXS?=		${LOCALBASE}/sbin/apxs
 .if exists(${APXS})
 AP_MOD_SSL_SUFFIX!=	${APXS} -q CFLAGS 2>/dev/null \
 		| ${GREP} DMOD_SSL >/dev/null \
diff --git a/www/mod_backhand/Makefile b/www/mod_backhand/Makefile
index b8dadaba69ce..ac630dc54189 100644
--- a/www/mod_backhand/Makefile
+++ b/www/mod_backhand/Makefile
@@ -14,10 +14,7 @@ MASTER_SITES=	http://mirrors.omniti.com/mod_backhand/ \
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	Apache module that allows seamless redirection and load balancing of HTTP requests
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
-APXS?=		${LOCALBASE}/sbin/apxs
+USE_APACHE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apxs="${APXS}"
 
diff --git a/www/mod_bandwidth/Makefile b/www/mod_bandwidth/Makefile
index 1a47118a7722..25c0868cdfdc 100644
--- a/www/mod_bandwidth/Makefile
+++ b/www/mod_bandwidth/Makefile
@@ -17,11 +17,8 @@ DIST_SUBDIR=	apache
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Bandwidth management module for the Apache webserver
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+USE_APACHE=	YES
 USE_PERL5=	YES
-APXS?=		${LOCALBASE}/sbin/apxs
 
 do-build:
 	@(cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c)
diff --git a/www/mod_bf/Makefile b/www/mod_bf/Makefile
index 6aeeae9771d1..50eef2f8793a 100644
--- a/www/mod_bf/Makefile
+++ b/www/mod_bf/Makefile
@@ -14,11 +14,7 @@ MASTER_SITE_SUBDIR=	modbf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A brainf*ck module for Apache
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 
 do-build:
 	@cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c
diff --git a/www/mod_blosxom/Makefile b/www/mod_blosxom/Makefile
index 8eb0f563f4d0..14823ef7856b 100644
--- a/www/mod_blosxom/Makefile
+++ b/www/mod_blosxom/Makefile
@@ -14,12 +14,7 @@ MASTER_SITE_SUBDIR=	mod-blosxom
 MAINTAINER=	gslin@ccca.nctu.edu.tw
 COMMENT=	Apache module to build the extremely lightweight Weblog environment
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+USE_APACHE=	yes
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/www/mod_blowchunks/Makefile b/www/mod_blowchunks/Makefile
index f5958f79cd4c..32868ef9db82 100644
--- a/www/mod_blowchunks/Makefile
+++ b/www/mod_blowchunks/Makefile
@@ -15,13 +15,9 @@ EXTRACT_SUFX=	.c
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module for rejecting and logging chunked requests
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
+USE_APACHE=	yes
 NO_WRKSUBDIR=	YES
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 APXSFLAGS=	-DTRUE=1 -DFALSE=0
 .if !defined(WITHOUT_BLOWCHUNK_LOG)
 APXSFLAGS+=	-DLOG_BLOWCHUNK
diff --git a/www/mod_bunzip2/Makefile b/www/mod_bunzip2/Makefile
index 0e913808dcee..a3ada8e41267 100644
--- a/www/mod_bunzip2/Makefile
+++ b/www/mod_bunzip2/Makefile
@@ -13,13 +13,9 @@ DISTNAME=		${PORTNAME}
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=	Apache module for server-side decompression of bzip2 files
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
+USE_APACHE=		yes
 USE_BZIP2=		yes
 WRKSRC=			${WRKDIR}/${PORTNAME}-2
-APXS?=			${LOCALBASE}/sbin/apxs
-APACHE_PORT?=		${PORTSDIR}/www/apache13
 
 do-build:
 	cd ${WRKSRC}; ${APXS} -c -lbz2 mod_bunzip2.c
diff --git a/www/mod_cgi_debug/Makefile b/www/mod_cgi_debug/Makefile
index 154bf05d1ed3..67f84dae35b7 100644
--- a/www/mod_cgi_debug/Makefile
+++ b/www/mod_cgi_debug/Makefile
@@ -13,11 +13,7 @@ MASTER_SITES=	http://software.tangent.org/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module to make debugging server-side scripts easier
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 
 do-build:
 	@cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c
diff --git a/www/mod_color/Makefile b/www/mod_color/Makefile
index 2f057d1c8b3a..193fb6d3b98d 100644
--- a/www/mod_color/Makefile
+++ b/www/mod_color/Makefile
@@ -16,11 +16,7 @@ EXTRACT_SUFX=	.l
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module that provides syntax coloring for various languages
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 NO_WRKSUBDIR=	yes
 
 do-extract:
diff --git a/www/mod_csacek/Makefile b/www/mod_csacek/Makefile
index 0bbc9ae4405f..e2ca7468cf48 100644
--- a/www/mod_csacek/Makefile
+++ b/www/mod_csacek/Makefile
@@ -14,11 +14,7 @@ DISTNAME=	${PORTNAME:S/mod_//g}-${PORTVERSION}
 MAINTAINER=	ms@vol.cz
 COMMENT=	Charset recoding module for Apache
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-
-APXS?=		${LOCALBASE}/sbin/apxs
-
+USE_APACHE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-target=Apache \
diff --git a/www/mod_cvs/Makefile b/www/mod_cvs/Makefile
index 5a4aa7d87989..4b64eccda49f 100644
--- a/www/mod_cvs/Makefile
+++ b/www/mod_cvs/Makefile
@@ -16,14 +16,10 @@ MASTER_SITE_SUBDIR=	petef
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	A module that makes Apache CVS aware
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 USE_REINPLACE=	yes
 MAKE_ARGS+=	APXS="${APXS}"
 
-APXS?=	${LOCALBASE}/sbin/apxs
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,apxs,${APXS},g' ${WRKSRC}/Makefile
 
diff --git a/www/mod_dav/Makefile b/www/mod_dav/Makefile
index c2b69d002dbf..a6d693920574 100644
--- a/www/mod_dav/Makefile
+++ b/www/mod_dav/Makefile
@@ -14,12 +14,10 @@ DISTNAME=	mod_dav-${PORTVERSION}-${APACHE_VERSION}
 MAINTAINER=	patrick@mindstep.com
 COMMENT=	An Apache module that provides DAV capabilities
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-
 # This port will work with the following version of Apache and anything newer.
 APACHE_VERSION=	1.3.6
 
+USE_APACHE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--bindir=${PREFIX}/bin \
@@ -29,7 +27,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--sysconfdir=${PREFIX}/etc/apache \
 		--datadir=${PREFIX}/share/apache \
 		--includedir=${PREFIX}/include/apache \
-		--with-apxs=${PREFIX}/sbin/apxs
+		--with-apxs=${APXS}
 
 CONFIGURE_ENV=	CFLAGS='${CFLAGS}' \
 		PATH="${PREFIX}/bin:${PREFIX}/sbin:${PATH}"
diff --git a/www/mod_dtcl/Makefile b/www/mod_dtcl/Makefile
index 93e2bf8fac10..c59faba76be8 100644
--- a/www/mod_dtcl/Makefile
+++ b/www/mod_dtcl/Makefile
@@ -13,11 +13,10 @@ MASTER_SITES=	http://tcl.apache.org/mod_dtcl/download/
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Embeds a TCL8 interpreter in the Apache server
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 LIB_DEPENDS=	tcl83:${PORTSDIR}/lang/tcl83
 
 WRKSRC=		${WRKDIR}/mod_dtcl
-
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 do-install:
diff --git a/www/mod_extract_forwarded/Makefile b/www/mod_extract_forwarded/Makefile
index 97667fb55de8..f5c06506c7a0 100644
--- a/www/mod_extract_forwarded/Makefile
+++ b/www/mod_extract_forwarded/Makefile
@@ -14,12 +14,8 @@ MASTER_SITES=	http://web.warhound.org/mod_extract_forwarded/ \
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	An Apache module that can make proxied requests appear with client IP
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-
-APXS?=		${LOCALBASE}/sbin/apxs
 DOCS=		doc.html README
 
 do-build:
diff --git a/www/mod_extract_forwarded_ap13/Makefile b/www/mod_extract_forwarded_ap13/Makefile
index 97667fb55de8..f5c06506c7a0 100644
--- a/www/mod_extract_forwarded_ap13/Makefile
+++ b/www/mod_extract_forwarded_ap13/Makefile
@@ -14,12 +14,8 @@ MASTER_SITES=	http://web.warhound.org/mod_extract_forwarded/ \
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	An Apache module that can make proxied requests appear with client IP
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-
-APXS?=		${LOCALBASE}/sbin/apxs
 DOCS=		doc.html README
 
 do-build:
diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile
index 76b946c1fd14..7c8b22d062bb 100644
--- a/www/mod_fastcgi/Makefile
+++ b/www/mod_fastcgi/Makefile
@@ -14,17 +14,15 @@ MASTER_SITES=	ftp://ftp.holywar.net/pub/FreeBSD/ \
 MAINTAINER=	hollywar@mail.holywar.net
 COMMENT=	A fast-cgi module for Apache
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${APACHE_PORT}
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 MAKEFILE=	Makefile.AP2
 USE_REINPLACE=	YES
 MAKE_ARGS=	INCLUDES=-I${PREFIX}/include/apache2
 INSTALL_TARGET=	install-modules
 PLIST_SUB=	APACHE=2
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 PLIST_SUB=	APACHE=
 .endif
 
diff --git a/www/mod_filter/Makefile b/www/mod_filter/Makefile
index ae96e2345a2e..8932fa9d1f96 100644
--- a/www/mod_filter/Makefile
+++ b/www/mod_filter/Makefile
@@ -13,10 +13,7 @@ MASTER_SITES=		http://software.tangent.org/download/
 MAINTAINER=		svenasse@polaris.ca
 COMMENT=	Filter output from other modules inside of Apache
 
-BUILD_DEPENDS=		${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=		${BUILD_DEPENDS}
-
-APXS=			${LOCALBASE}/sbin/apxs
+USE_APACHE=		yes
 DOCS=			README
 CONTRIB_DOCS=		contrib/README contrib/echo.cgi contrib/eecummings.cgi contrib/head.cgi
 
diff --git a/www/mod_frontpage/Makefile b/www/mod_frontpage/Makefile
index e21ae8c92279..ea17ca1f5139 100644
--- a/www/mod_frontpage/Makefile
+++ b/www/mod_frontpage/Makefile
@@ -14,12 +14,10 @@ MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Improved mod_frontpage for Apache, as APXS installation
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_mirfak-${PORTVERSION}
-AP_PORT?=	apache13
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT}
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT}
 RUN_DEPENDS=	${FPSETPERM}:${PORTSDIR}/www/frontpage
 
+USE_APACHE=	yes
 FP_VER=		5.0
 FP_DIR=		${PREFIX}/frontpage/version${FP_VER}
 FPSETPERM=	${FP_DIR}/set_default_perms.sh
@@ -31,8 +29,6 @@ PKGMESSAGE=	pkg-message
 INSTALL_FILE=	${INSTALL} -c -m 555 -o bin -g bin
 PKG_PREFIX=	${PREFIX}
 
-APXS=		${LOCALBASE}/sbin/apxs
-
 .if exists(${APXS})
 APXS_WORKS!=	${APXS} -q TARGET 2>/dev/null || ${ECHO} no
 .endif
diff --git a/www/mod_geoip/Makefile b/www/mod_geoip/Makefile
index e8c5bbe801f5..dc6416bd0f3d 100644
--- a/www/mod_geoip/Makefile
+++ b/www/mod_geoip/Makefile
@@ -14,14 +14,11 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	An Apache module that provides the country code of the client's IP
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 LIB_DEPENDS=	GeoIP.3:${PORTSDIR}/net/GeoIP
 
-.include <bsd.port.pre.mk>
+USE_APACHE=	yes
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+.include <bsd.port.pre.mk>
 
 DOCS=		Changes INSTALL README README.php
 
diff --git a/www/mod_gzip/Makefile b/www/mod_gzip/Makefile
index ba8df823d11e..ea0ad8eec762 100644
--- a/www/mod_gzip/Makefile
+++ b/www/mod_gzip/Makefile
@@ -15,11 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	An Internet Content Acceleration module for Apache
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 MAKE_ENV+=	"APXS=${APXS}"
 ALL_TARGET=	build
 
diff --git a/www/mod_gzip2/Makefile b/www/mod_gzip2/Makefile
index ba8df823d11e..ea0ad8eec762 100644
--- a/www/mod_gzip2/Makefile
+++ b/www/mod_gzip2/Makefile
@@ -15,11 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	An Internet Content Acceleration module for Apache
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 MAKE_ENV+=	"APXS=${APXS}"
 ALL_TARGET=	build
 
diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile
index 1a57cf2ed0f2..59d625a00fbb 100644
--- a/www/mod_hosts_access/Makefile
+++ b/www/mod_hosts_access/Makefile
@@ -14,11 +14,7 @@ MASTER_SITES=	http://www.klomp.org/mod_hosts_access/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module that makes Apache respect hosts.allow and hosts.deny
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 APXS_FLAGS?=	-S LDFLAGS_SHLIB="-shared -lwrap"
 
 do-build:
diff --git a/www/mod_index_rss/Makefile b/www/mod_index_rss/Makefile
index fc8c7f0ca1f0..6a089190b0c3 100644
--- a/www/mod_index_rss/Makefile
+++ b/www/mod_index_rss/Makefile
@@ -15,11 +15,7 @@ MASTER_SITES=	http://software.tangent.org/download/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module to provides RSS output for directories
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 
 do-build:
 	@cd ${WRKSRC} && ${APXS} -c mod_index_rss.c
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index d49978d80302..0bcbfebb1b86 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -37,10 +37,9 @@ APACHE2=
 PLIST_SUB=	APACHE2=
 .endif
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
-APXS=		${LOCALBASE}/sbin/apxs
 APACHE_CONF=	${LOCALBASE}/etc/apache${APACHE2}
 WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
 
diff --git a/www/mod_jk2/Makefile b/www/mod_jk2/Makefile
index 5882a9360a53..1e905f064e17 100644
--- a/www/mod_jk2/Makefile
+++ b/www/mod_jk2/Makefile
@@ -16,11 +16,8 @@ DISTNAME=	jakarta-tomcat-connectors-jk-${PORTVERSION}-src
 MAINTAINER=	lansil@fuzzynerd.com
 COMMENT=	Apache 2.0 module for Tomcat
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${PREFIX}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache2
+USE_APACHE=	yes
+WITH_APACHE2=	yes
 APACHE_CONF=	${PREFIX}/etc/apache2
 WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
 
diff --git a/www/mod_layout/Makefile b/www/mod_layout/Makefile
index 2dab83192e60..474cb084bc4b 100644
--- a/www/mod_layout/Makefile
+++ b/www/mod_layout/Makefile
@@ -13,9 +13,7 @@ MASTER_SITES=	http://software.tangent.org/download/
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Apache module to wrap served pages with a header and/or footer
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/www/mod_layout2/Makefile b/www/mod_layout2/Makefile
index 16ef44eac3bb..31d475f2e3a2 100644
--- a/www/mod_layout2/Makefile
+++ b/www/mod_layout2/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES=	http://software.tangent.org/download/
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Apache2 module to wrap served pages with a header and/or footer
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
-
+USE_APACHE=	yes
+WITH_APACHE2=	yes
 LATEST_LINK=	mod_layout2
 
 USE_REINPLACE=	yes
diff --git a/www/mod_layout22/Makefile b/www/mod_layout22/Makefile
index 16ef44eac3bb..31d475f2e3a2 100644
--- a/www/mod_layout22/Makefile
+++ b/www/mod_layout22/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES=	http://software.tangent.org/download/
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Apache2 module to wrap served pages with a header and/or footer
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
-
+USE_APACHE=	yes
+WITH_APACHE2=	yes
 LATEST_LINK=	mod_layout2
 
 USE_REINPLACE=	yes
diff --git a/www/mod_limitipconn/Makefile b/www/mod_limitipconn/Makefile
index b1629c31d187..5b4bfede3bb1 100644
--- a/www/mod_limitipconn/Makefile
+++ b/www/mod_limitipconn/Makefile
@@ -14,11 +14,7 @@ MASTER_SITES=	http://dominia.org/djao/limit/
 MAINTAINER=	gslin@ccca.nctu.edu.tw
 COMMENT=	Limit the number of simultaneous connections from a single client IP address
 
-BUILD_DEPENDS?=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS?=	${BUILD_DEPENDS}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-
+USE_APACHE=	yes
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/www/mod_log_sql/Makefile b/www/mod_log_sql/Makefile
index f971ecfe0199..6a8da9c372e3 100644
--- a/www/mod_log_sql/Makefile
+++ b/www/mod_log_sql/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	http://www.grubbybaby.com/mod_log_sql/
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Allows Apache to log to a MySQL database
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT}
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${AP_PORT}
+RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -23,9 +23,6 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
-AP_PORT?=	www/apache13
-APXS?=		${LOCALBASE}/sbin/apxs
-
 ALL_TARGET=	dso
 INSTALL_TARGET=	dsoinstall
 
diff --git a/www/mod_mp3/Makefile b/www/mod_mp3/Makefile
index 2ec1e2bf4e17..cd87242a9bf9 100644
--- a/www/mod_mp3/Makefile
+++ b/www/mod_mp3/Makefile
@@ -15,15 +15,11 @@ MASTER_SITES=	http://software.tangent.org/download/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module to allow MP3 streaming
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
+USE_APACHE=	yes
 HAS_CONFIGURE=	yes
 MAKE_ARGS+=	APXS="${APXS}"
 USE_PERL5=	yes
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 DOCS=		ChangeLog README TODO faq.html CONTRIBUTORS
 
 .if defined(WITH_MYSQL)
diff --git a/www/mod_mylo/Makefile b/www/mod_mylo/Makefile
index d5b419717bb1..54c517e0638e 100644
--- a/www/mod_mylo/Makefile
+++ b/www/mod_mylo/Makefile
@@ -13,12 +13,9 @@ MASTER_SITES=	http://www.pvv.org/~oyving/code/mod_mylo/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Apache module to make Apache log to MySQL
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 USE_MYSQL=	YES
 
-APXS=	${LOCALBASE}/sbin/apxs
 DOCS=	mod_mylo.sql README
 
 do-build:
diff --git a/www/mod_mysqluserdir/Makefile b/www/mod_mysqluserdir/Makefile
index f8ba9c5a7520..d17e605a3405 100644
--- a/www/mod_mysqluserdir/Makefile
+++ b/www/mod_mysqluserdir/Makefile
@@ -14,11 +14,9 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Apache module to make Apache get userdirs from MySQL
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
-APXS=		${LOCALBASE}/sbin/apxs
+USE_APACHE=	yes
 
 do-build:
 	(cd ${WRKSRC} && ${APXS} -c -I${LOCALBASE}/include \
diff --git a/www/mod_pcgi2/Makefile b/www/mod_pcgi2/Makefile
index 6fc295427da2..c80d72f163c8 100644
--- a/www/mod_pcgi2/Makefile
+++ b/www/mod_pcgi2/Makefile
@@ -17,18 +17,17 @@ COMMENT=	Persistent CGI module for Apache and Zope
 RUN_DEPENDS=	${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
 
 .if defined(WITH_APACHE13)
-BUILD_DEPENDS=	${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/www/apache13
+BUILD_DEPENDS=	${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS=	${LOCALBASE}/include/apache/httpd.h:${PORTSDIR}/${APACHE_PORT}
 .else
-BUILD_DEPENDS=	${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2
-RUN_DEPENDS=	${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS=	${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 USE_PYTHON=	yes
 
 # You can change this in the environment if you like.
 SZOPEBASEDIR?=	www/Zope
-APXS?=		${LOCALBASE}/sbin/apxs
 
 # Don't change these
 ZOPEBASEDIR=	${LOCALBASE}/${SZOPEBASEDIR}
@@ -43,6 +42,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .if defined(WITH_APACHE13)
 APACHEVER=	apache
 .else
+WITH_APACHE2=	yes
 APACHEVER=	apache2
 BUILDOPT+=	-DAPACHE2 -Wc,-shared
 .endif
diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile
index 65d0d7d4c163..5afd8e56e3dd 100644
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	Apache
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embeds a Perl interpreter in the Apache server
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${APACHE_PORT} \
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
@@ -36,7 +36,6 @@ MAN3=		Apache.3 Apache::Constants.3  Apache::ExtUtils.3 \
 		mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \
 		mod_perl_tuning.3
 PERLSITEDIR=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 
 .include <bsd.port.pre.mk>
 
@@ -46,7 +45,7 @@ do-configure:
 	    PREFIX=${PREFIX} INSTALLSITELIB=${PERLSITEDIR} \
 	    INSTALLSITEARCH=${PERLSITEDIR}/${PERL_ARCH} \
 	    INSTALLMAN3DIR=${MANPREFIX}/man/man3 \
-	    WITH_APXS=${LOCALBASE}/sbin/apxs \
+	    WITH_APXS=${APXS} \
 	    PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"'
 
 post-install:
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 169cc60d6d72..cd9cd10428d8 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -17,10 +17,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/_/}
 MAINTAINER=	larse@isi.edu
 COMMENT=	Embeds a Perl interpreter in the Apache2 server
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${APACHE2_PORT}
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${APACHE2_PORT}
-
+USE_APACHE=	yes
+WITH_APACHE2=	yes
 PERL_CONFIGURE=	yes
+
 CONFIGURE_ARGS=	MP_APXS=${LOCALBASE}/sbin/apxs \
 		MP_INST_APACHE2=1 PREFIX=${PREFIX}
 
@@ -29,8 +29,6 @@ MAN3=		Apache::TestRequest.3 Apache::TestSmoke.3 Apache::TestRun.3 \
 		Apache::Test.3 Apache::TestUtil.3 Apache::Build.3 \
 		Bundle::Apache2.3 ModPerl::Code.3
 
-APACHE2_PORT?=	${PORTSDIR}/www/apache2
-
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} > 500601
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index d8f7c8e0e6c4..87d61b37e73a 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -24,8 +24,7 @@ MAINTAINER=	dirk@FreeBSD.org
 COMMENT?=	PHP3 module for Apache
 
 .if !defined(STANDALONE)
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
+USE_APACHE=	yes
 .endif
 
 PATCH_DIST_ARGS=	-d ${WRKSRC}/functions
@@ -33,8 +32,6 @@ PATCH_DIST_ARGS=	-d ${WRKSRC}/functions
 PHP_DISTDIR=	distributions
 
 SLAVEDIRS=	lang/php3
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-APXS?=		${LOCALBASE}/sbin/apxs
 
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -47,7 +44,7 @@ IS_INTERACTIVE=	yes
 CONFIGURE_ARGS=	--with-config-file-path=${PREFIX}/etc/php.standalone \
 		--enable-discard-path
 .else
-CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs \
+CONFIGURE_ARGS=	--with-apxs=${APXS} \
 		--with-config-file-path=${PREFIX}/etc
 .endif
 
diff --git a/www/mod_proxy_add_forward/Makefile b/www/mod_proxy_add_forward/Makefile
index d6df0077c91c..1024cd18c7aa 100644
--- a/www/mod_proxy_add_forward/Makefile
+++ b/www/mod_proxy_add_forward/Makefile
@@ -16,13 +16,9 @@ EXTRACT_SUFX=	.c
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Apache module that adds a client IP header to outgoing proxy requests
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 NO_WRKSUBDIR=	YES
 
-APXS?=		${LOCALBASE}/sbin/apxs
-
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${CP} -p ${DISTDIR}/${DISTFILES} ${WRKDIR}/${PORTNAME}.c
diff --git a/www/mod_put/Makefile b/www/mod_put/Makefile
index 538e45f05303..65386294bf07 100644
--- a/www/mod_put/Makefile
+++ b/www/mod_put/Makefile
@@ -14,11 +14,7 @@ DISTFILES=	mod_put.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Apache module that provides PUT and DELETE methods
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 do-build:
diff --git a/www/mod_python/Makefile b/www/mod_python/Makefile
index 5962854a71c6..c97719fb0b80 100644
--- a/www/mod_python/Makefile
+++ b/www/mod_python/Makefile
@@ -16,17 +16,12 @@ DIST_SUBDIR=	python
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module for integrating Python
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
+USE_APACHE=	yes
 NO_PACKAGE=	"Requires Python without threads support"
 USE_PYTHON=	yes
 
 .include <bsd.port.pre.mk>
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 CONFIGURE_ENV=	PYTHON_BIN=${PYTHON_CMD}
diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile
index 72b9f1866a14..20f77f8f250d 100644
--- a/www/mod_python3/Makefile
+++ b/www/mod_python3/Makefile
@@ -15,13 +15,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Apache module that embeds the Python interpreter within the server
 
-BUILD_DEPENDS=	${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2
-RUN_DEPENDS=	${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2
-
+USE_APACHE=	yes
 USE_PYTHON=	yes
 
-APXS?=		${LOCALBASE}/sbin/apxs
-
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
diff --git a/www/mod_roaming/Makefile b/www/mod_roaming/Makefile
index 397fd9e499b8..4c8a4adaadf5 100644
--- a/www/mod_roaming/Makefile
+++ b/www/mod_roaming/Makefile
@@ -14,12 +14,7 @@ MASTER_SITES=	http://www.klomp.org/mod_roaming/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Apache module that works as a Netscape Roaming Access server
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 DOCS=		CHANGES	INSTALL	LICENSE	README
 
 do-build:
diff --git a/www/mod_roaming2/Makefile b/www/mod_roaming2/Makefile
index 56bba8352c5b..81e339485dc6 100644
--- a/www/mod_roaming2/Makefile
+++ b/www/mod_roaming2/Makefile
@@ -16,10 +16,8 @@ DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 MAINTAINER=	vivek@kciLink.com
 COMMENT=	An Apache module that works as a Netscape Roaming Access server
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache2
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache2
-
-APXS=		${LOCALBASE}/sbin/apxs
+USE_APACHE=	yes
+WITH_APACHE2=	yes
 
 DOCS=		CHANGES	INSTALL	LICENSE	README
 
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 15786a04ce86..ca21b2e419af 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -14,16 +14,12 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	An Apache module that embeds Ruby interpreter within
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 LIB_DEPENDS=	eruby.10:${PORTSDIR}/textproc/eruby
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
+USE_APACHE=	yes
 USE_RUBY=	yes
 USE_REINPLACE=	yes
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-
 CONFIGURE_ARGS=	--with-apxs="${APXS}" \
 		--enable-eruby=yes \
 		--with-eruby-includes="${LOCALBASE}/include" \
diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile
index 1324a36a09f9..4e3c7103ca45 100644
--- a/www/mod_scgi/Makefile
+++ b/www/mod_scgi/Makefile
@@ -14,9 +14,7 @@ PKGNAMEPREFIX=	mod_
 MAINTAINER=	nbm@FreeBSD.org
 COMMENT=	Apache module that implements the client side of the SCGI protocol
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
-APXS?=		${PREFIX}/sbin/apxs
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 
 do-build:
 	cd ${WRKSRC} && ${APXS} -c -o mod_scgi.so mod_scgi.c
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index 76f80405fee0..f460bc8463ac 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME:S/_/-/}
 
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	An intrusion detection and prevention engine
+USE_APACHE=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -20,22 +21,16 @@ COMMENT=	An intrusion detection and prevention engine
 WITH_APACHE2=   yes
 .endif
 
-APXS?=          ${LOCALBASE}/sbin/apxs
 .if defined(WITH_APACHE2)
-APACHE_PORT?=   ${PORTSDIR}/www/apache2
 APWRKSRC?=	${WRKSRC}/apache2
 PLIST_SUB=	APACHE=apache2
 SO=		la
 .else
-APACHE_PORT?=   ${PORTSDIR}/www/apache13
 APWRKSRC?=	${WRKSRC}/apache1
 PLIST_SUB=	APACHE=apache
 SO=		so
 .endif
 
-BUILD_DEPENDS+= ${APXS}:${APACHE_PORT}
-RUN_DEPENDS+=   ${APXS}:${APACHE_PORT}
-
 DOCS=		CHANGES INSTALL LICENSE README modsecurity-manual-1.7.pdf
 PLIST_SUB+=	VER=1.7
 
diff --git a/www/mod_sed/Makefile b/www/mod_sed/Makefile
index 4ffca169ac76..480e5fdbfc2c 100644
--- a/www/mod_sed/Makefile
+++ b/www/mod_sed/Makefile
@@ -14,12 +14,7 @@ MASTER_SITES=	http://www.happygiraffe.net/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An apache module that embeds a copy of the sed(1) command
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 MAKE_ARGS=	APXS=${APXS}
 
 .include <bsd.port.mk>
diff --git a/www/mod_sequester/Makefile b/www/mod_sequester/Makefile
index b6f58da39eb7..216ea36ae056 100644
--- a/www/mod_sequester/Makefile
+++ b/www/mod_sequester/Makefile
@@ -14,12 +14,8 @@ DISTNAME=	${PORTNAME}-1.7.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module that controls access to the website using secure info
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
+USE_APACHE=	yes
 WRKSRC=		${WRKDIR}/mod_sequester
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 
 do-build:
 	@cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c
diff --git a/www/mod_snake/Makefile b/www/mod_snake/Makefile
index 4127e384ed03..13a701e9eb61 100644
--- a/www/mod_snake/Makefile
+++ b/www/mod_snake/Makefile
@@ -14,13 +14,11 @@ MASTER_SITE_SUBDIR=	modsnake
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library to easily create flexible Apache modules
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT} \
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${PYTHON_CMD}:${PYTHON_PORTSDIR}
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-apxs="${APXS}"
diff --git a/www/mod_sqlinclude/Makefile b/www/mod_sqlinclude/Makefile
index e3851f10d7ac..6aa242a7051a 100644
--- a/www/mod_sqlinclude/Makefile
+++ b/www/mod_sqlinclude/Makefile
@@ -15,11 +15,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	An Apache module implementing config inclusion from MySQL databases
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 
-APXS?=		${LOCALBASE}/sbin/apxs
+USE_APACHE=	yes
 DOCS=	CHANGES.txt README.txt TODO.txt
 
 do-build:
diff --git a/www/mod_throttle/Makefile b/www/mod_throttle/Makefile
index 2266e493c071..b967c5c89846 100644
--- a/www/mod_throttle/Makefile
+++ b/www/mod_throttle/Makefile
@@ -16,13 +16,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	An Apache module that provides bandwidth & request throttling
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-APXS?=		${LOCALBASE}/sbin/apxs
-
 DOCS=		CHANGES.txt LICENSE.txt index.shtml
 
 do-build:
diff --git a/www/mod_ticket/Makefile b/www/mod_ticket/Makefile
index 228c20d89868..2f48bdb85524 100644
--- a/www/mod_ticket/Makefile
+++ b/www/mod_ticket/Makefile
@@ -16,11 +16,7 @@ EXTRACT_SUFX=	.c
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module for a digitally signed ticket in URL
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
+USE_APACHE=	yes
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/www/mod_trigger/Makefile b/www/mod_trigger/Makefile
index 588b2237e896..670b9c0cfe15 100644
--- a/www/mod_trigger/Makefile
+++ b/www/mod_trigger/Makefile
@@ -14,10 +14,7 @@ MASTER_SITES=	http://software.tangent.org/download/ \
 MAINTAINER=	svenasse@polaris.ca
 COMMENT=	Apache module to launch triggers if certain actions occur
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-APXS?=		${LOCALBASE}/sbin/apxs
+USE_APACHE=	yes
 
 do-build:
 	@cd ${WRKSRC} && ${APXS} -c ${PORTNAME}.c
diff --git a/www/mod_tsunami/Makefile b/www/mod_tsunami/Makefile
index 87bc6e6ac2da..8dfdcf33fd55 100644
--- a/www/mod_tsunami/Makefile
+++ b/www/mod_tsunami/Makefile
@@ -14,11 +14,7 @@ MASTER_SITE_SUBDIR=	mod-tsunami
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	Apache module which dynamically limits a site's slot usage
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
-APXS?=		${LOCALBASE}/sbin/apxs
-
+USE_APACHE=	yes
 DOCS=		AUTHORS Changelog INSTALL LICENSE README
 
 do-build:
diff --git a/www/mod_watch/Makefile b/www/mod_watch/Makefile
index 9e689a1c7695..f2f9cc2cb53f 100644
--- a/www/mod_watch/Makefile
+++ b/www/mod_watch/Makefile
@@ -17,14 +17,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	An Apache module to monitor bandwidth usage, for use with MRTG etc
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-
+USE_APACHE=	yes
 USE_PERL5=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-APXS?=		${LOCALBASE}/sbin/apxs
 MAKE_ARGS+=	APXS="${APXS}"
 
 ALL_TARGET=	build-dynamic
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index f24123644d4c..8974a160aad5 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -16,11 +16,10 @@ DIST_SUBDIR=	mod_webapp
 MAINTAINER=	asachs@uunet.co.za
 COMMENT=	Apache module mounts Tomcat web applications
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \
-		${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \
+BUILD_DEPENDS=	${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \
 		${AUTOCONF}:${PORTSDIR}/devel/autoconf
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
+USE_APACHE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	# none
 USE_GMAKE=	yes
@@ -33,7 +32,6 @@ CONNECTORS_RELEASE=	${PORTVERSION}
 .include <bsd.port.pre.mk>
 
 # Apache locations.
-APXS?=		${LOCALBASE}/sbin/apxs
 APACHECTL?=	${LOCALBASE}/sbin/apachectl
 APR_LIB?=	${LOCALBASE}/lib/
 APR_INCLUDE?=	${LOCALBASE}/include/apr-0/
diff --git a/www/mod_zap/Makefile b/www/mod_zap/Makefile
index 81a4499456a2..eb55bdf12009 100644
--- a/www/mod_zap/Makefile
+++ b/www/mod_zap/Makefile
@@ -14,15 +14,14 @@ DISTNAME=	zap-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	An Apache module that provides Z39.50 access through WWW
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
+BUILD_DEPENDS=	${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
 LIB_DEPENDS=	yaz.2:${PORTSDIR}/net/yaz
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
+RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
 
+USE_APACHE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-yazconfig=${LOCALBASE}/bin \
-		--with-apxs=${LOCALBASE}/sbin/apxs \
+		--with-apxs=${APXS} \
 		--with-tclconfig=${LOCALBASE}/lib/tcl8.4
 
 post-install:
diff --git a/www/neowebscript/Makefile b/www/neowebscript/Makefile
index 44bdcbc24522..4f1022c0a93c 100644
--- a/www/neowebscript/Makefile
+++ b/www/neowebscript/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=nws
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Embeds a TCL8 interpreter in the Apache server
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 LIB_DEPENDS=	neo82:${PORTSDIR}/devel/tcl-neo
 
 MAKEFILE=	${FILESDIR}/Makefile.bsd
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index 51248b9b27de..567ef1d352c7 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -16,10 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A perl module to provide custom forms for reauthentication
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
-		${LOCALBASE}/sbin/apxs:${APACHE_PORT}
+		${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 CURUSER?=	`whoami`
 CURGRP?=	`groups | ${AWK} '{print $$1}'`
 TESTPORT?=	8228
diff --git a/www/rt3/Makefile b/www/rt3/Makefile
index bc982420a286..bb24c5741d77 100644
--- a/www/rt3/Makefile
+++ b/www/rt3/Makefile
@@ -17,7 +17,7 @@ DISTFILES?=	rt-${PORTVERSION:S/./-/g}.tar.gz
 MAINTAINER=	autrijus@autrijus.org
 COMMENT?=	RT is an industrial-grade ticketing system written in Perl
 
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT} \
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
 		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
@@ -70,10 +70,8 @@ CONFIGURE_ARGS=	--prefix=${RT_PATH} \
 
 .if defined(WITH_FASTCGI)
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .endif
 BUILD_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
@@ -81,18 +79,14 @@ DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2
 DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 DEPENDS_ARGS+=	WITH_MODPERL2=yes
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 .endif
 .endif
 
-APXS?=		${LOCALBASE}/sbin/apxs
-
 DB_TYPE?=	mysql
 
 .if ${DB_TYPE} == "Pg"
diff --git a/www/rt32/Makefile b/www/rt32/Makefile
index bc982420a286..bb24c5741d77 100644
--- a/www/rt32/Makefile
+++ b/www/rt32/Makefile
@@ -17,7 +17,7 @@ DISTFILES?=	rt-${PORTVERSION:S/./-/g}.tar.gz
 MAINTAINER=	autrijus@autrijus.org
 COMMENT?=	RT is an industrial-grade ticketing system written in Perl
 
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT} \
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
 		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
@@ -70,10 +70,8 @@ CONFIGURE_ARGS=	--prefix=${RT_PATH} \
 
 .if defined(WITH_FASTCGI)
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .endif
 BUILD_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
@@ -81,18 +79,14 @@ DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2
 DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 DEPENDS_ARGS+=	WITH_MODPERL2=yes
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 .endif
 .endif
 
-APXS?=		${LOCALBASE}/sbin/apxs
-
 DB_TYPE?=	mysql
 
 .if ${DB_TYPE} == "Pg"
diff --git a/www/rt34/Makefile b/www/rt34/Makefile
index bc982420a286..bb24c5741d77 100644
--- a/www/rt34/Makefile
+++ b/www/rt34/Makefile
@@ -17,7 +17,7 @@ DISTFILES?=	rt-${PORTVERSION:S/./-/g}.tar.gz
 MAINTAINER=	autrijus@autrijus.org
 COMMENT?=	RT is an industrial-grade ticketing system written in Perl
 
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT} \
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
 		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
@@ -70,10 +70,8 @@ CONFIGURE_ARGS=	--prefix=${RT_PATH} \
 
 .if defined(WITH_FASTCGI)
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .endif
 BUILD_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
@@ -81,18 +79,14 @@ DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2
 DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 DEPENDS_ARGS+=	WITH_MODPERL2=yes
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 .endif
 .endif
 
-APXS?=		${LOCALBASE}/sbin/apxs
-
 DB_TYPE?=	mysql
 
 .if ${DB_TYPE} == "Pg"
diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index bc982420a286..bb24c5741d77 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -17,7 +17,7 @@ DISTFILES?=	rt-${PORTVERSION:S/./-/g}.tar.gz
 MAINTAINER=	autrijus@autrijus.org
 COMMENT?=	RT is an industrial-grade ticketing system written in Perl
 
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT} \
+BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/Apache/Mason.pm:${PORTSDIR}/www/p5-HTML-Mason \
 		${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \
 		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
@@ -70,10 +70,8 @@ CONFIGURE_ARGS=	--prefix=${RT_PATH} \
 
 .if defined(WITH_FASTCGI)
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .endif
 BUILD_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
@@ -81,18 +79,14 @@ DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2
 DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 DEPENDS_ARGS+=	WITH_MODPERL2=yes
 .else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 .endif
 .endif
 
-APXS?=		${LOCALBASE}/sbin/apxs
-
 DB_TYPE?=	mysql
 
 .if ${DB_TYPE} == "Pg"
diff --git a/www/smb2www/Makefile b/www/smb2www/Makefile
index 8b800bcae840..b975e575a7ac 100644
--- a/www/smb2www/Makefile
+++ b/www/smb2www/Makefile
@@ -20,7 +20,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//g}
 MAINTAINER=	roman@xpert.com
 COMMENT=	Windows Network client that is accessible through a web browser
 
-RUN_DEPENDS=	httpd:${PORTSDIR}/www/apache13 \
+RUN_DEPENDS=	httpd:${PORTSDIR}/${APACHE_PORT} \
 		smbclient:${PORTSDIR}/net/samba \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 057ac49a1b98..f1a40da0463a 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -13,14 +13,13 @@ MASTER_SITES=	http://www.suphp.org/download/
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	A combination which provides a wrapper for PHP
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/www/php4-cgi
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFLICTS=	mod_php4-4*
 
-APXS?=		${LOCALBASE}/sbin/apxs
 LOG_PATH?=	/var/log
 PHP_PATH?=	${LOCALBASE}/bin/php
 APACHE_USER?=	www
diff --git a/www/webglimpse/Makefile b/www/webglimpse/Makefile
index 2ecd8dbe869f..9f16ee4eafca 100644
--- a/www/webglimpse/Makefile
+++ b/www/webglimpse/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PKGNAME}.src
 MAINTAINER=	ports@freebsd.org
 COMMENT=	WWW interface to Glimpse search engine
 
-RUN_DEPENDS+=	${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13
+RUN_DEPENDS+=	${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	glimpse:${PORTSDIR}/textproc/glimpse
 
 WRKSRC=		${WRKDIR}/webglimpse-1.6.edu
diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile
index 7f64edd3270e..0d40f9837889 100644
--- a/www/wwwstat/Makefile
+++ b/www/wwwstat/Makefile
@@ -19,7 +19,7 @@ PATCHFILES=	patch-2.01.txt
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Webserver logfile analysis package
 
-RUN_DEPENDS=	${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT}
 
 USE_PERL5=	yes
 MAKE_ENV+=	PERL5=${PERL5}
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2003-11-07 09:12:58 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2003-11-07 09:12:58 +0000
commit	f4d7c801f854ff4fad4642d62b23bae798962615 (patch)
tree	eee60e8fb7c2a2d1bf0636dd8288df46aee9e9bb
parent	2e8e10b527cd18511e4bd6a598f05050d4190015 (diff)
download	ports-f4d7c801f854ff4fad4642d62b23bae798962615.tar.gz ports-f4d7c801f854ff4fad4642d62b23bae798962615.zip