diff -Nru mod_perl2.orig/Makefile mod_perl2/Makefile
--- mod_perl2.orig/Makefile	Wed Dec  7 16:24:52 2005
+++ mod_perl2/Makefile	Wed Dec  7 16:37:13 2005
@@ -16,8 +16,7 @@
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	Embeds a Perl interpreter in the Apache2 server
 
-USE_APACHE=	yes
-WITH_APACHE2=	yes
+USE_APACHE=	20+
 PERL_CONFIGURE=	yes
 GMAKE=		yes
 
@@ -74,14 +73,14 @@
 .endif
 
 post-install:
-	${MKDIR} ${PREFIX}/include/apache2/modules/perl
+	${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
 	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
-		${PREFIX}/include/apache2/modules/perl
-	${INSTALL_DATA} ${WRKSRC}/xs/*.h ${PREFIX}/include/apache2
-	${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${PREFIX}/include/apache2
+		${PREFIX}/${APACHEINCLUDEDIR}/modules/perl
+	${INSTALL_DATA} ${WRKSRC}/xs/*.h ${PREFIX}/${APACHEINCLUDEDIR}
+	${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${PREFIX}/${APACHEINCLUDEDIR}
 	${MKDIR} ${PREFIX}/libexec/apache2
 	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \
-		${PREFIX}/libexec/apache2/mod_perl.so
+		${PREFIX}/${APACHEMODDIR}/mod_perl.so
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -Nru mod_perl2.orig/pkg-plist mod_perl2/pkg-plist
--- mod_perl2.orig/pkg-plist	Wed Dec  7 16:24:52 2005
+++ mod_perl2/pkg-plist	Wed Dec  7 16:27:44 2005
@@ -1,56 +1,56 @@
 bin/mp2bug
-include/apache2/modperl_apr_perlio.h
-include/apache2/modperl_xs_sv_convert.h
-include/apache2/modperl_xs_typedefs.h
-include/apache2/modperl_xs_util.h
-include/apache2/modules/perl/mod_perl.h
-include/apache2/modules/perl/modperl_apache_compat.h
-include/apache2/modules/perl/modperl_apache_includes.h
-include/apache2/modules/perl/modperl_apr_compat.h
-include/apache2/modules/perl/modperl_apr_includes.h
-include/apache2/modules/perl/modperl_bucket.h
-include/apache2/modules/perl/modperl_callback.h
-include/apache2/modules/perl/modperl_cgi.h
-include/apache2/modules/perl/modperl_cmd.h
-include/apache2/modules/perl/modperl_common_debug.h
-include/apache2/modules/perl/modperl_common_includes.h
-include/apache2/modules/perl/modperl_common_log.h
-include/apache2/modules/perl/modperl_common_types.h
-include/apache2/modules/perl/modperl_common_util.h
-include/apache2/modules/perl/modperl_config.h
-include/apache2/modules/perl/modperl_const.h
-include/apache2/modules/perl/modperl_constants.h
-include/apache2/modules/perl/modperl_debug.h
-include/apache2/modules/perl/modperl_directives.h
-include/apache2/modules/perl/modperl_env.h
-include/apache2/modules/perl/modperl_error.h
-include/apache2/modules/perl/modperl_filter.h
-include/apache2/modules/perl/modperl_flags.h
-include/apache2/modules/perl/modperl_global.h
-include/apache2/modules/perl/modperl_gtop.h
-include/apache2/modules/perl/modperl_handler.h
-include/apache2/modules/perl/modperl_hooks.h
-include/apache2/modules/perl/modperl_interp.h
-include/apache2/modules/perl/modperl_io.h
-include/apache2/modules/perl/modperl_io_apache.h
-include/apache2/modules/perl/modperl_largefiles.h
-include/apache2/modules/perl/modperl_log.h
-include/apache2/modules/perl/modperl_mgv.h
-include/apache2/modules/perl/modperl_module.h
-include/apache2/modules/perl/modperl_options.h
-include/apache2/modules/perl/modperl_pcw.h
-include/apache2/modules/perl/modperl_perl.h
-include/apache2/modules/perl/modperl_perl_global.h
-include/apache2/modules/perl/modperl_perl_includes.h
-include/apache2/modules/perl/modperl_perl_pp.h
-include/apache2/modules/perl/modperl_perl_unembed.h
-include/apache2/modules/perl/modperl_svptr_table.h
-include/apache2/modules/perl/modperl_sys.h
-include/apache2/modules/perl/modperl_time.h
-include/apache2/modules/perl/modperl_tipool.h
-include/apache2/modules/perl/modperl_trace.h
-include/apache2/modules/perl/modperl_types.h
-include/apache2/modules/perl/modperl_util.h
+%%APACHEINCLUDEDIR%%/modperl_apr_perlio.h
+%%APACHEINCLUDEDIR%%/modperl_xs_sv_convert.h
+%%APACHEINCLUDEDIR%%/modperl_xs_typedefs.h
+%%APACHEINCLUDEDIR%%/modperl_xs_util.h
+%%APACHEINCLUDEDIR%%/modules/perl/mod_perl.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_apache_compat.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_apache_includes.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_apr_compat.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_apr_includes.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_bucket.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_callback.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_cgi.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_cmd.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_debug.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_includes.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_log.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_types.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_common_util.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_config.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_const.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_constants.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_debug.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_directives.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_env.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_error.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_filter.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_flags.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_global.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_gtop.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_handler.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_hooks.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_interp.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_io.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_io_apache.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_largefiles.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_log.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_mgv.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_module.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_options.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_pcw.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl_global.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl_includes.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl_pp.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_perl_unembed.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_svptr_table.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_sys.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_time.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_tipool.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_trace.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_types.h
+%%APACHEINCLUDEDIR%%/modules/perl/modperl_util.h
 %%SITE_PERL%%/%%PERL_ARCH%%/APR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/Base64.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/Brigade.pm
@@ -270,7 +270,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util/Util.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/mod_perl2.pm
-libexec/apache2/mod_perl.so
+%%APACHEMODDIR%%/mod_perl.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global
@@ -329,6 +329,6 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR
-@dirrm include/apache2/modules/perl
-@unexec rmdir %D/include/apache2/modules 2>/dev/null || true
-@unexec rmdir %D/include/apache2 2>/dev/null || true
+@dirrm %%APACHEINCLUDEDIR%%/modules/perl
+@unexec rmdir %D/%%APACHEINCLUDEDIR%%/modules 2>/dev/null || true
+@unexec rmdir %D/%%APACHEINCLUDEDIR%% 2>/dev/null || true