Index: ports/Mk/bsd.apache.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.apache.mk,v
retrieving revision 1.6
diff -u -r1.6 bsd.apache.mk
--- ports/Mk/bsd.apache.mk	7 Dec 2005 20:54:41 -0000	1.6
+++ ports/Mk/bsd.apache.mk	10 Dec 2005 16:58:43 -0000
@@ -24,6 +24,7 @@
 # Print warnings
 _ERROR_MSG=	: Error from bsd.apache.mk.
 APACHE_SUPPORTED_VERSION=	13 20 21 22
+
 .if ${USE_APACHE:Mcommon*} != ""
 AP_PORT_IS_SERVER=	YES
 .elif ${USE_APACHE:L} == apr
@@ -111,6 +112,10 @@
 			--disable-alias --disable-filter
 .endif
 
+.if ${USE_APACHE:Mcommon2*} != ""
+APR_PORT?=	www/apache${USE_APACHE:C/common(.*)/\1/}
+.endif
+
 .if defined(WITH_MODULES)
 _APACHE_MODULES+=	${WITH_MODULES}
 .else
@@ -333,6 +338,15 @@
 
 .endif
 
+# APR_PORT
+.if ${APR_PORT:M*apr*} != ""
+CONFIGURE_ENV+=	LTFLAGS="--tag=CXX"
+MAKE_ENV+=	LTFLAGS="--tag=CXX --silent"
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/${APR_PORT}
+.elif ${APR_PORT:M*apache2*} != "" && ${USE_APACHE:Mcommon2*} == ""
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/${APR_PORT}
+.endif
+
 .if defined(AP_PORT_IS_SERVER)
 .elif defined(AP_PORT_IS_MODULE)
 
@@ -354,12 +368,14 @@
 
 .if !target(do-build)
 do-build: ap-gen-plist
-	@cd ${WRKSRC} && ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE}
+	@cd ${WRKSRC} && \
+	${SETENV} ${MAKE_ENV} ${APXS} -c ${AP_EXTRAS} -o ${MODULENAME}.${AP_BUILDEXT} ${SRC_FILE}
 .endif
 
 .if !target(do-install)
 do-install:
-	@${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
+	@${SETENV} ${MAKE_ENV} \
+	${APXS} -i -A -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT}
 .endif
 
 .endif
Index: ports/www/apache22/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache22/Makefile,v
retrieving revision 1.180
diff -u -r1.180 Makefile
--- ports/www/apache22/Makefile	10 Dec 2005 11:53:01 -0000	1.180
+++ ports/www/apache22/Makefile	10 Dec 2005 16:33:25 -0000
@@ -48,9 +48,11 @@
 USE_RC_SUBR=		yes
 USE_REINPLACE=		yes
 LIBTOOLFILES=		configure
-.if !defined(WITH_APR_FROM_PORTS)
+
+.if ${APR_PORT:M*apr*} == ""
 INSTALLS_SHLIB=		yes
 .endif
+
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL5} \
@@ -129,12 +131,10 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_APR_FROM_PORTS)
+.if ${APR_PORT:M*apr} != ""
 PLIST_SUB+=	APR_PORTS="@comment "
-LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
 CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
 			--with-apr-util=${LOCALBASE}/bin/apu-1-config
-CONFIGURE_ENV+=		LTFLAGS="--tag=CXX"
 .else
 PLIST_SUB+=	APR_PORTS=""
 CONFLICTS+=	apr-1.*