Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/rt38/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- Makefile	1 Jan 2012 16:47:41 -0000	1.44
+++ Makefile	5 Jan 2012 16:32:04 -0000
@@ -13,7 +13,7 @@
 
 PORTNAME=	rt
 PORTVERSION=	3.8.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
@@ -30,7 +30,7 @@
 
 OPTIONS=	MYSQL 		"Enable MySQL backend" 		on  \
 		APACHE		"Enable ${APACHE_PORT} server"	on  \
-		MODPERL		"Enable mod_perl support"	on \
+		MODPERL2	"Enable mod_perl support"	on \
 		POSTGRESQL 	"Enable Postgresql backend"	off \
 		ORACLE		"Enable Oracle backend"		off \
 		SQLITE		"Enable SQLite backend" 	off \
@@ -39,6 +39,8 @@
 		FASTCGI		"Enable FastCGI support" 	off \
 		GRAPHVIZ	"Enable GraphViz charts"	on
 
+.include <bsd.port.options.mk>
+
 .include "${.CURDIR}/Makefile.cpan"
 
 BUILD_DEPENDS+=	${CORE_DEPS} \
@@ -51,12 +53,17 @@
 		${MASON_DEPS} \
 		${SMTP_DEPS}
 
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	5.8.3+
 USE_AUTOTOOLS=	autoconf
 
+.if defined(WITH_APACHE) || defined(WITH_FASTCGI) || defined(WITH_MODPERL2)
+USE_APACHE=	20+
+.endif
+
 .include <bsd.port.pre.mk>
+
 .if defined(WITH_DEV)
 BUILD_DEPENDS+=	${DEV_DEPS}
 RUN_DEPENDS+=	${DEV_DEPS}
@@ -67,10 +74,6 @@
 RUN_DEPENDS+=	${STANDALONE_DEPS}
 .endif
 
-.if defined(WITH_APACHE) || defined(WITH_FASTCGI) || defined(WITH_MODPERL)
-USE_APACHE=	20+
-.endif
-
 .if defined(WITH_FASTCGI)
 BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 RUN_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \
@@ -82,15 +85,11 @@
 RUN_DEPENDS+=	${GRAPHVIZ_DEPS}
 .endif
 
-.if defined(WITH_MODPERL)
-WITH_APACHE=	yes
-
-.include "${.CURDIR}/../../Mk/bsd.apache.mk"
-
+.if defined(WITH_MODPERL2)
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \
-	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2
+	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \
-	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI-mp2
+	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
 .endif
 
 .if !defined(WITHOUT_MYSQL)