DESTDIR support for various Apache modules.

29 files changed, 192 insertions, 163 deletions

diff --git a/www/ap-access-referer/Makefile b/www/ap-access-referer/Makefile
index 26b439b6bcf..e70d3684685 100644
--- a/www/ap-access-referer/Makefile
+++ b/www/ap-access-referer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/02/12 20:56:54 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/20 14:58:44 joerg Exp $
 #
 
 DISTNAME=	mod_access_referer-1.0.2
@@ -18,11 +18,9 @@ APACHE_MODULE_NAME=	mod_access_referer.so
 
 DOCDIR=		${PREFIX}/share/doc
 
-INSTALLATION_DIRS+=	lib/httpd ${DOCDIR}/html/mod_access_referer
+INSTALLATION_DIRS+=	${DOCDIR}/html/mod_access_referer
 
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/mod_access_referer.so 			\
-	    ${DESTDIR}${PREFIX}/lib/httpd
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/mod_access_referer.html		\
 	    ${DESTDIR}${DOCDIR}/html/mod_access_referer
 
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 9b810bebf8a..1106fe11665 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2010/02/12 20:58:37 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2010/02/20 14:58:44 joerg Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -14,6 +14,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://raburton.lunarpages.com/apache/mod_auth_cookie/
 COMMENT=	Cookie-based authentication for Apache
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-auth-cookie-[0-9]*
 
 WRKSRC=		${WRKDIR}
@@ -28,11 +30,5 @@ do-extract:
 	@(${ECHO} '#include "ap_compat.h"'; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}) \
 		>${WRKSRC}/${DISTNAME}
 
-INSTALLATION_DIRS+=	lib/httpd
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/mod_auth_cookie.so \
-	    ${DESTDIR}${PREFIX}/lib/httpd
-
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-external/Makefile b/www/ap-auth-external/Makefile
index 258e749659d..1ec2a275908 100644
--- a/www/ap-auth-external/Makefile
+++ b/www/ap-auth-external/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/02/12 21:01:27 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/02/20 14:58:44 joerg Exp $
 #
 
 DISTNAME=	mod_auth_external-${DISTVERS}
@@ -23,11 +23,5 @@ DISTVERS=	2.1.19
 MODULE_EXT=	so
 MESSAGE_SUBST+=	MODULE_NAME=external_auth_module
 
-INSTALLATION_DIRS+=	lib/httpd
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/mod_auth_external.so \
-	    ${DESTDIR}${PREFIX}/lib/httpd
-
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index be6b660ef11..e9c40e62897 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2010/01/17 12:02:47 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/02/20 14:58:44 joerg Exp $
 
 DISTNAME=	auth_ldap-1.6.1
 PKGNAME=	ap13-auth-ldap-1.6.1
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rudedog.org/auth_ldap/
 COMMENT=	Module to allow apache authentication against an LDAP directory
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-auth-ldap-[0-9]*
 
 APACHE_MODULE_NAME=	auth_ldap.so
@@ -18,13 +20,13 @@ CPPFLAGS+=		-DWITH_OPENLDAP
 LDFLAGS+=		-lldap -llber
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_auth_ldap
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mod_auth_ldap
 	${INSTALL_DATA} ${WRKSRC}/FAQ.html				\
-		${PREFIX}/share/doc/mod_auth_ldap
+		${DESTDIR}${PREFIX}/share/doc/mod_auth_ldap
 	${INSTALL_DATA} ${WRKSRC}/auth_ldap.html			\
-		${PREFIX}/share/doc/mod_auth_ldap
+		${DESTDIR}${PREFIX}/share/doc/mod_auth_ldap
 	${INSTALL_DATA} ${WRKSRC}/future-directions.html		\
-		${PREFIX}/share/doc/mod_auth_ldap
+		${DESTDIR}${PREFIX}/share/doc/mod_auth_ldap
 
 .include "../../www/apache/module.mk"
 
diff --git a/www/ap-auth-ntlm/Makefile b/www/ap-auth-ntlm/Makefile
index 58f21223328..2171bc08c5f 100644
--- a/www/ap-auth-ntlm/Makefile
+++ b/www/ap-auth-ntlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/17 19:23:25 sborrill Exp $
+# $NetBSD: Makefile,v 1.2 2010/02/20 14:58:44 joerg Exp $
 #
 
 DISTNAME=	ntlm1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://modntlm.sourceforge.com/
 COMMENT=	Apache module for NTLM authentication
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PKG_APACHE_ACCEPTED=	apache13
 
 .include "../../mk/apache.mk"
@@ -25,9 +27,10 @@ MESSAGE_SUBST+=	EGDIR=${EGDIR}
 
 EGDIR=		${PREFIX}/share/examples/mod_ntlm
 
+INSTALLATION_DIRS+=	${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${DESTDIR}${EGDIR}
 
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile
index 89712c21c79..41f77711ca1 100644
--- a/www/ap-auth-pam/Makefile
+++ b/www/ap-auth-pam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/20 14:58:44 joerg Exp $
 
 DISTNAME=	mod_auth_pam-1.0a
 PKGNAME=	ap13-auth-pam-1.0a
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pam.sourceforge.net/mod_auth_pam/
 COMMENT=	Module to allow Apache authentication using PAM
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-auth-pam-[0-9]*
 
 APACHE_MODULE_NAME=	mod_auth_pam.so
@@ -17,12 +19,12 @@ LDFLAGS+=		-lpam
 EGDIR=		${PREFIX}/share/examples/mod_auth_pam
 HTMLDIR=	${PREFIX}/share/doc/html/mod_auth_pam
 
+INSTALLATION_DIRS+=	${EGDIR} ${HTMLDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/httpd ${EGDIR}/httpd.pam
-	${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${HTMLDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/httpd ${DESTDIR}${EGDIR}/httpd.pam
+	${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${DESTDIR}${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${DESTDIR}${HTMLDIR}
 
 .include "../../www/apache/module.mk"
 .include "../../mk/pam.buildlink3.mk"
diff --git a/www/ap-auth-pgsql/Makefile b/www/ap-auth-pgsql/Makefile
index f95a0b02851..73235262bf1 100644
--- a/www/ap-auth-pgsql/Makefile
+++ b/www/ap-auth-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 19:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/20 14:58:44 joerg Exp $
 
 DISTNAME=	mod_auth_pgsql-0.9.12
 PKGNAME=	ap13-auth-pgsql-0.9.12
@@ -10,6 +10,8 @@ MAINTAINER=	waddell@caravan-epub.com
 HOMEPAGE=	http://www.giuseppetanzilli.it/mod_auth_pgsql/
 COMMENT=	Apache module for user authentication/logging against a PostgreSQL DB
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-auth-pgsql-[0-9]*
 CONFLICTS+=	ap-auth-postgresql-[0-9]*
 CONFLICTS+=	ap13-auth-postgresql-[0-9]*
@@ -19,11 +21,12 @@ APACHE_MODULE_NAME=	mod_auth_pgsql.so
 CPPFLAGS+=	-I${PGSQL_PREFIX}/include/postgresql
 LDFLAGS+=	-lpq -lcrypt
 
+INSTALLATION_DIRS+=	share/doc/mod_auth_pgsql
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_auth_pgsql
-	${INSTALL_DATA} ${WRKSRC}/mod_auth_pgsql.html ${PREFIX}/share/doc/mod_auth_pgsql
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mod_auth_pgsql
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/mod_auth_pgsql
+	${INSTALL_DATA} ${WRKSRC}/mod_auth_pgsql.html ${DESTDIR}${PREFIX}/share/doc/mod_auth_pgsql
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_auth_pgsql
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/doc/mod_auth_pgsql
 
 .include "../../www/apache/module.mk"
 
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index 270ef3f2500..f93f03518d9 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2010/02/10 19:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2010/02/20 14:58:44 joerg Exp $
 
 DISTNAME=	AuthPG-1.4
 PKGNAME=	ap13-auth-postgresql-1.4
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://authpg.sourceforge.net/
 COMMENT=	Module to allow apache authentication against a Postgresql database
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-auth-postgresql-[0-9]*
 CONFLICTS+=	ap-auth-pgsql-[0-9]*
 CONFLICTS+=	ap13-auth-pgsql-[0-9]*
@@ -22,15 +24,15 @@ LDFLAGS+=	-lpq -lcrypt
 DOCDIR=	${PREFIX}/share/doc/mod_auth_pg
 EGDIR=	${PREFIX}/share/examples/mod_auth_pg
 
+INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/mod_auth_pg.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/mod_auth_pg.ko.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.ko ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample.htaccess ${EGDIR}/mod_auth_pg.htaccess
-	${INSTALL_DATA} ${WRKSRC}/sample.sql ${EGDIR}/mod_auth_pg.sql
+	${INSTALL_DATA} ${WRKSRC}/mod_auth_pg.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/mod_auth_pg.ko.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.ko ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample.htaccess ${DESTDIR}${EGDIR}/mod_auth_pg.htaccess
+	${INSTALL_DATA} ${WRKSRC}/sample.sql ${DESTDIR}${EGDIR}/mod_auth_pg.sql
 
 .include "../../www/apache/module.mk"
 
diff --git a/www/ap-auth-radius/Makefile b/www/ap-auth-radius/Makefile
index a10d604434f..e6e2f3c6499 100644
--- a/www/ap-auth-radius/Makefile
+++ b/www/ap-auth-radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/03/22 04:53:40 manu Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/20 14:58:44 joerg Exp $
 #
 
 DISTNAME=	mod_auth_radius-1.5.7
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freeradius.org/mod_auth_radius/
 COMMENT=	Radius authentication module for Apache
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-auth-radius-[0-9]*
 
 APACHE_MODULE_NAME=	mod_auth_radius.so
@@ -19,11 +21,12 @@ EXAMPLEDIR=		${PREFIX}/share/example/mod_auth_radius
 post-extract:
 		${RM} -f ${WRKSRC}/mod_auth_radius-2.0.c
 
+INSTALLATION_DIRS+=	${EXAMPLEDIR}
+
 post-install:
-		 ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-		 ${INSTALL_DATA} ${WRKSRC}/README ${EXAMPLEDIR}/
-		 ${INSTALL_DATA} ${WRKSRC}/httpd.conf ${EXAMPLEDIR}/
-		 ${INSTALL_DATA} ${WRKSRC}/htaccess ${EXAMPLEDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${EXAMPLEDIR}/
+	${INSTALL_DATA} ${WRKSRC}/httpd.conf ${DESTDIR}${EXAMPLEDIR}/
+	${INSTALL_DATA} ${WRKSRC}/htaccess ${DESTDIR}${EXAMPLEDIR}/
 
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-script/Makefile b/www/ap-auth-script/Makefile
index a39bad28fd0..f4c6df0b936 100644
--- a/www/ap-auth-script/Makefile
+++ b/www/ap-auth-script/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/08/09 10:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/20 14:58:44 joerg Exp $
 #
 
 DISTNAME=	auth_script-alpha1.10
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mod-auth-script.sourceforge.net/
 COMMENT=	Apache module for script-based authentication
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-auth-script-[0-9]*
 
 # XXX: apache2: compilation works, installation fails
diff --git a/www/ap-bandwidth/Makefile b/www/ap-bandwidth/Makefile
index d7f4445e266..54e779f14ce 100644
--- a/www/ap-bandwidth/Makefile
+++ b/www/ap-bandwidth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/20 14:58:44 joerg Exp $
 #
 
 DISTNAME=	mod_bandwidth.c
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cohprog.com/mod_bandwidth.html
 COMMENT=	Apache module for bandwidth management
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-bandwidth-[0-9]*
 
 WRKSRC=		${WRKDIR}
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 55fbbdd28ae..0c9bbf7b123 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2010/02/20 14:58:45 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/mod_/ap13-/}
diff --git a/www/ap-fastcgi/Makefile.common b/www/ap-fastcgi/Makefile.common
index 553c5a231fd..0b02d0c796b 100644
--- a/www/ap-fastcgi/Makefile.common
+++ b/www/ap-fastcgi/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2008/10/01 10:03:11 taca Exp $
+# $NetBSD: Makefile.common,v 1.7 2010/02/20 14:58:45 joerg Exp $
 #
 # used by www/ap-fastcgi/Makefile
 # used by www/ap2-fastcgi/Makefile
@@ -19,6 +19,8 @@ MESSAGE_SRC=	${.CURDIR}/../../www/ap-fastcgi/MESSAGE
 PLIST_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
 MESSAGE_SUBST+=	APACHE_MANUAL=${APACHE_MANUAL:Q}
 
+INSTALLATION_DIRS+=	share/httpd/${APACHE_MANUAL}/mod
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/mod_fastcgi.html	\
-		${PREFIX}/share/httpd/${APACHE_MANUAL}/mod/
+		${DESTDIR}${PREFIX}/share/httpd/${APACHE_MANUAL}/mod/
diff --git a/www/ap-gzip/Makefile b/www/ap-gzip/Makefile
index 02271947d3e..8e7153d2506 100644
--- a/www/ap-gzip/Makefile
+++ b/www/ap-gzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/28 21:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/02/20 14:58:45 joerg Exp $
 #
 
 DISTNAME=	mod_gzip-1.3.26.1a
@@ -11,21 +11,22 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/mod-gzip/
 COMMENT=	On-the-fly GZIP compression for Apache 1.3.x
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-gzip-[0-9]*
 
 APACHE_MODULE_NAME=	mod_gzip.so
 
+INSTALLATION_DIRS+=	share/doc/mod_gzip/de share/doc/mod_gzip/en \
+			share/examples/mod_gzip
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_gzip
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_gzip/de
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_gzip/en
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_gzip
 	${INSTALL_DATA} ${WRKSRC}/docs/manual/deutsch/* \
-		${PREFIX}/share/doc/mod_gzip/de
+	    ${DESTDIR}${PREFIX}/share/doc/mod_gzip/de
 	${INSTALL_DATA} ${WRKSRC}/docs/manual/english/* \
-		${PREFIX}/share/doc/mod_gzip/en
+	    ${DESTDIR}${PREFIX}/share/doc/mod_gzip/en
 	${INSTALL_DATA} ${WRKSRC}/docs/mod_gzip.conf.sample \
-		${PREFIX}/share/examples/mod_gzip/httpd.conf
+	    ${DESTDIR}${PREFIX}/share/examples/mod_gzip/httpd.conf
 
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile
index 2b59564763c..57e7c45ac63 100644
--- a/www/ap-layout/Makefile
+++ b/www/ap-layout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/06/06 22:37:22 zafer Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/20 14:58:45 joerg Exp $
 #
 
 DISTNAME=	mod_layout-3.2
@@ -10,6 +10,8 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://tangent.org/
 COMMENT=	Apache module to wrap static or dynamic content
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	pax
 
 CONFLICTS=	ap-layout-[0-9]*
@@ -18,11 +20,11 @@ APACHE_MODULE_NAME=	mod_layout.so
 
 LAYOUT_DIR=	${PREFIX}/share/httpd/htdocs/manual/mod/mod_layout
 
+INSTALLATION_DIRS+=	${LAYOUT_DIR}/directives
+
 post-install:
-	${INSTALL_DATA_DIR} ${LAYOUT_DIR}
-	${INSTALL_DATA} ${WRKSRC}/faq.html ${LAYOUT_DIR}
-	${INSTALL_DATA_DIR} ${LAYOUT_DIR}/directives
-	cd ${WRKSRC}/directives && pax -rw . ${LAYOUT_DIR}/directives
+	${INSTALL_DATA} ${WRKSRC}/faq.html ${DESTDIR}${LAYOUT_DIR}
+	cd ${WRKSRC}/directives && pax -rw . ${DESTDIR}${LAYOUT_DIR}/directives
 
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-mp3/Makefile b/www/ap-mp3/Makefile
index e30fa51f520..147e6e1d05d 100644
--- a/www/ap-mp3/Makefile
+++ b/www/ap-mp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/08/23 07:47:00 obache Exp $
+# $NetBSD: Makefile,v 1.16 2010/02/20 14:58:45 joerg Exp $
 #
 
 DISTNAME=	mod_mp3-0.35
@@ -10,6 +10,8 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://tangent.org/index.pl?lastnode_id=478&node_id=380
 COMMENT=	Apache module for streaming mp3 files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-mp3-[0-9]*
 
 APACHE_MODULE_NAME=	${DISTNAME:C|-.*||}.so
@@ -20,9 +22,10 @@ APACHE_MODULE_SRC+=	ogg.c shout.c utility.c
 
 DOC_DIR=	${PREFIX}/share/httpd/htdocs/manual/mod/mod_mp3
 
+INSTALLATION_DIRS+=	${DOC_DIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${DOC_DIR}
-	${INSTALL_DATA} ${WRKSRC}/faq.html ${DOC_DIR}
+	${INSTALL_DATA} ${WRKSRC}/faq.html ${DESTDIR}${DOC_DIR}
 
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-rpaf/Makefile b/www/ap-rpaf/Makefile
index 891a272b7b8..00861b311f5 100644
--- a/www/ap-rpaf/Makefile
+++ b/www/ap-rpaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/03/19 16:35:51 tv Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/20 14:58:45 joerg Exp $
 #
 
 DISTNAME=		mod_rpaf-0.5
@@ -10,28 +10,31 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://stderr.net/apache/rpaf/
 COMMENT=		Remaps reverse-proxied connections to "real" requesting IPs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		ap-rpaf-[0-9]*
 
 APACHE_MODULE=		yes
 INSTALLATION_DIRS=	share/doc
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/apache.mk"
 
-do-build:
-	cd ${WRKSRC} && ${APXS} -c mod_rpaf.c
+APACHE_MODULE_NAME=	mod_rpaf.${MODULE_EXT}
+APACHE_MODULE_SRC=	mod_rpaf.c
 
-do-install:
-	cd ${WRKSRC} && ${APXS} -n rpaf_module -i mod_rpaf.${APXS_SUFFIX}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mod_rpaf.txt
+INSTALLATION_DIRS+=	share/doc/mod_rpaf
 
-APXS_SUFFIX?=		so
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_rpaf.txt
 
-.if ${PKG_APACHE} != "apache13"
-APXS_SUFFIX=		la
+.if ${PKG_APACHE} == "apache13"
+MODULE_EXT=	so
+.else
+MODULE_EXT=	la
 do-configure:
 	${RM} -f ${WRKSRC}/mod_rpaf.c
 	${CP} -f ${WRKSRC}/mod_rpaf-2.0.c ${WRKSRC}/mod_rpaf.c
 .endif
 
+.include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-scgi/Makefile b/www/ap-scgi/Makefile
index c43e1ba626e..72b26f1927f 100644
--- a/www/ap-scgi/Makefile
+++ b/www/ap-scgi/Makefile
@@ -1,32 +1,29 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/20 14:58:45 joerg Exp $
 #
 
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME}
 PKGREVISION=	1
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 COMMENT=	Simple Common Gateway Interface for Apache
 
 DEPENDS+=	${PYPKGPREFIX}-scgi-[0-9]*:../../www/py-scgi
 
 APACHE_MODULE= yes
 .include "../../mk/apache.mk"
+.include "../../www/apache/module.mk"
 
 .if ${APACHE_PKG_PREFIX} == "ap13"
-WRKSRC=	${WRKDIR}/${DISTNAME}/apache1
+MODULE_EXT=	so
+APACHE_MODULE_SRCDIR=	${WRKDIR}/${DISTNAME}/apache1
 .else
-WRKSRC=	${WRKDIR}/${DISTNAME}/apache2
+MODULE_EXT=	la
+APACHE_MODULE_SRCDIR=	${WRKDIR}/${DISTNAME}/apache2
 .endif
 
-do-build:
-	cd ${WRKSRC} && ${APXS} -c mod_scgi.c
-
-.if ${APACHE_PKG_PREFIX} == "ap13"
-do-install:
-	cd ${WRKSRC} && ${APXS} -i mod_scgi.so
-.else
-do-install:
-	cd ${WRKSRC} && ${APXS} -i mod_scgi.la
-.endif
+APACHE_MODULE_NAME=	mod_scgi.${MODULE_EXT}
+APACHE_MODULE_SRC=	mod_scgi.c
 
 .include "../../lang/python/pyversion.mk"
 .include "../../www/py-scgi/Makefile.common"
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
index 356aeaf451f..ee6ea5d81a4 100644
--- a/www/ap-throttle/Makefile
+++ b/www/ap-throttle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:18 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/02/20 14:58:45 joerg Exp $
 
 DISTNAME=	mod_throttle312
 PKGNAME=	ap13-throttle-3.1.2
@@ -10,6 +10,8 @@ MAINTAINER=	eric@cirr.com
 HOMEPAGE=	${MASTER_SITES}
 COMMENT=	Apache module for limiting bandwidth usage
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-throttle-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/ap13-/mod_/}
@@ -17,10 +19,11 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/ap13-/mod_/}
 APACHE_MODULE_NAME=	mod_throttle.so
 APACHE_MODULE_SRC=	mod_throttle.c
 
+INSTALLATION_DIRS+=	share/doc/mod_throttle
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_throttle
 	${INSTALL_DATA} ${WRKSRC}/index.shtml \
-			${PREFIX}/share/doc/mod_throttle/index.html
+	    ${DESTDIR}${PREFIX}/share/doc/mod_throttle/index.html
 
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 0d713a83451..5bbde0dafa4 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2010/01/17 12:02:47 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/02/20 14:58:45 joerg Exp $
 
 DISTNAME=	modxslt-1.1
 PKGNAME=	ap13-xslt-1.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mod-xslt2.com/
 COMMENT=	Simple, fast XSLT transformations for apache
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ap-xslt-[0-9]*
 
 WRKSRC=		${WRKDIR}/modxslt
diff --git a/www/ap2-auth-external/Makefile b/www/ap2-auth-external/Makefile
index 3db3f72d43b..b1483f435d1 100644
--- a/www/ap2-auth-external/Makefile
+++ b/www/ap2-auth-external/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/12 21:15:26 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/02/20 14:58:45 joerg Exp $
 #
 
 DISTNAME=	mod_auth_external-${DISTVERS}
@@ -23,10 +23,5 @@ DISTVERS=	2.2.11
 MODULE_EXT=	la
 MESSAGE_SUBST+=	MODULE_NAME=auth_external_module
 
-INSTALLATION_DIRS+=	lib/httpd
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/.libs/mod_auth_external.so ${DESTDIR}${PREFIX}/lib/httpd
-
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-auth-ntlm/Makefile b/www/ap2-auth-ntlm/Makefile
index 32b07b8134a..e91e6ebb02f 100644
--- a/www/ap2-auth-ntlm/Makefile
+++ b/www/ap2-auth-ntlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/12 21:17:22 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/20 14:58:45 joerg Exp $
 #
 
 DISTNAME=	ntlm2
@@ -28,10 +28,9 @@ MESSAGE_SUBST+=	EGDIR=${EGDIR}
 
 EGDIR=		${PREFIX}/share/examples/mod_ntlm
 
-INSTALLATION_DIRS+=	lib/httpd ${EGDIR}
+INSTALLATION_DIRS+=	${EGDIR}
 
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/.libs/mod_ntlm.so ${DESTDIR}${PREFIX}/lib/httpd
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${DESTDIR}${EGDIR}
 
 .include "../../www/apache/module.mk"
diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile
index 4ca26b0ddfa..b6d597eed60 100644
--- a/www/ap2-auth-pgsql/Makefile
+++ b/www/ap2-auth-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/02/10 19:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/20 14:58:45 joerg Exp $
 
 DISTNAME=		mod_auth_pgsql-2.0.3
 PKGNAME=		${APACHE_PKG_PREFIX}-auth-pgsql-2.0.3
@@ -10,25 +10,21 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 COMMENT=		Allows users to use PostgreSQL databases for user authentication
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		ap-auth-postgresql-*
 
 APACHE_MODULE=		yes
-APACHE_MODULE_NAME=	ap2-auth-pgsql
+APACHE_MODULE_NAME=	mod_auth_pgsql.la
 
 PKG_APACHE_ACCEPTED=	apache2 apache22
 
-do-build:
-	cd ${WRKSRC} && \
-		${APXS} -c -n ${APACHE_MODULE_NAME} \
-		-I${PGSQL_PREFIX}/include/postgresql \
-		-L${LOCALBASE}/lib \
-		${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \
-		-lpq ${DISTNAME:C/-[^-]*$//}.c
-
-do-install:
-	(cd ${WRKSRC} && ${APXS} -i ${DISTNAME:C/-[^-]*$//}.la)
-	#${MKDIR} ${DOCSDIR}
-	#${INSTALL_DATA} ${WRKSRC}/mod_auth_pgsql.html ${DOCSDIR}
+.include "../../mk/apache.mk"
+.include "../../www/apache/module.mk"
+
+CPPFLAGS+=	-I${PGSQL_PREFIX}/include/postgresql
+LDFLAGS+=	-L${LOCALBASE}/lib \
+		${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lpq
 
 .include "../../mk/apache.mk"
 .include "../../mk/pgsql.buildlink3.mk"
diff --git a/www/ap2-auth-radius/Makefile b/www/ap2-auth-radius/Makefile
index c58b6a4240e..f5c3f79ef99 100644
--- a/www/ap2-auth-radius/Makefile
+++ b/www/ap2-auth-radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/01/17 12:02:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/20 14:58:45 joerg Exp $
 
 DISTNAME=	mod_auth_radius
 PKGNAME=	${APACHE_PKG_PREFIX}-auth-radius-1.5.7
@@ -10,15 +10,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freeradius.org/mod_auth_radius/
 COMMENT=	Module to allow apache2 authentication against a RADIUS server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${DISTNAME}-1.5.7
 EXTRACT_SUFX=		.tar
 NO_CONFIGURE=		YES
 APACHE_MODULE=		YES
-APACHE_MODULE_NAME=	mod_auth_radius
+APACHE_MODULE_NAME=	mod_auth_radius.la
+APACHE_MODULE_SRC=	mod_auth_radius.c
 USE_LIBTOOL=		YES
 
 PKG_APACHE_ACCEPTED=	apache2 apache22
 .include "../../mk/apache.mk"
+.include "../../www/apache/module.mk"
 BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.47
 
 .include "../../security/openssl/buildlink3.mk"
@@ -27,22 +31,15 @@ post-extract:
 	${MV} ${WRKSRC}/mod_auth_radius.c ${WRKSRC}/mod_auth_radius-1.0.c
 	${MV} ${WRKSRC}/mod_auth_radius-2.0.c ${WRKSRC}/mod_auth_radius.c
 
-do-build:
-	cd ${WRKSRC} && \
-		${APXS} -c -n ${APACHE_MODULE_NAME} ${APACHE_MODULE_NAME}.c
-
-do-install:
-	cd ${WRKSRC} && ${APXS} -i -n ${APACHE_MODULE_NAME} \
-		${APACHE_MODULE_NAME}.la
+INSTALLATION_DIRS+=	share/doc/mod_auth_radius share/examples/mod_auth_radius
 
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_auth_radius
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mod_auth_radius
-	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/doc/mod_auth_radius
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_auth_radius
+	${INSTALL_DATA} ${WRKSRC}/index.html ${DESTDIR}${PREFIX}/share/doc/mod_auth_radius
 
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_auth_radius
 	${INSTALL_DATA} ${WRKSRC}/htaccess \
-		${PREFIX}/share/examples/mod_auth_radius
+	    ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius
 	${INSTALL_DATA} ${WRKSRC}/httpd.conf \
-		${PREFIX}/share/examples/mod_auth_radius
+	    ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-bw/Makefile b/www/ap2-bw/Makefile
index a9f556f4ddc..4e70fc5e3c1 100644
--- a/www/ap2-bw/Makefile
+++ b/www/ap2-bw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/06/30 16:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/02/20 14:58:46 joerg Exp $
 #
 
 DISTNAME=		bw_mod-0.6
@@ -12,18 +12,20 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://ivn.cl/apache/
 COMMENT=		Class-based bandwidth limiting module for Apache 2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 APACHE_MODULE=		# defined
 INSTALLATION_DIRS=	share/doc
 
 PKG_APACHE_ACCEPTED=	apache2 apache22
 
-do-build:
-	@${ECHO} '#include "${DISTNAME}.c"' >${WRKSRC}/mod_bw.c
-	cd ${WRKSRC} && ${APXS} -c mod_bw.c
+APACHE_MODULE_NAME=	mod_bw.la
+
+INSTALLATION_DIRS+=	share/doc
 
-do-install:
-	cd ${WRKSRC} && ${APXS} -n bw_module -i mod_bw.la
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.txt ${PREFIX}/share/doc/apache_mod_bw.txt
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.txt ${DESTDIR}${PREFIX}/share/doc/apache_mod_bw.txt
 
 .include "../../mk/apache.mk"
+.include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-chroot/Makefile b/www/ap2-chroot/Makefile
index 54a0f50606c..ac8a958ce35 100644
--- a/www/ap2-chroot/Makefile
+++ b/www/ap2-chroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/12/17 19:38:14 abs Exp $
+# $NetBSD: Makefile,v 1.9 2010/02/20 14:58:46 joerg Exp $
 
 DISTNAME=	mod_chroot-0.3
 PKGNAME=	${APACHE_PKG_PREFIX}-chroot-0.3
@@ -10,18 +10,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://core.segfault.pl/~hobbit/mod_chroot/
 COMMENT=	Module to easily run Apache in a chroot environment
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 APACHE_MODULE=		yes
+APACHE_MODULE_NAME=	mod_chroot.la
 NO_CONFIGURE=		yes
 
 PKG_APACHE_ACCEPTED=	apache2 apache22
 INSTALLATION_DIRS+=	share/doc/mod_chroot
 
-do-build:
-	cd ${WRKSRC} && ${APXS} -c mod_chroot.c
-
-do-install:
-	cd ${WRKSRC} && ${APXS} -i mod_chroot.la
-	cd ${WRKSRC} && ${INSTALL_DATA} [A-Z]* ${DESTDIR}${PREFIX}/share/doc/mod_chroot/
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/[A-Z]* ${DESTDIR}${PREFIX}/share/doc/mod_chroot/
 
 .include "../../mk/apache.mk"
+.include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap22-authn-sasl/Makefile b/www/ap22-authn-sasl/Makefile
index f49f21671d0..aff35613021 100644
--- a/www/ap22-authn-sasl/Makefile
+++ b/www/ap22-authn-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/12 09:10:00 martti Exp $
+# $NetBSD: Makefile,v 1.2 2010/02/20 14:58:46 joerg Exp $
 
 DISTNAME=	mod_authn_sasl-${DISTVERS}
 #PKGREVISION=	1
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mod-authn-sasl.sourceforge.net/
 COMMENT=	Apache module for SASL authentication
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PKG_APACHE_ACCEPTED=	apache22
 
 .include "../../mk/apache.mk"
diff --git a/www/ap22-authnz-external/Makefile b/www/ap22-authnz-external/Makefile
index 9822ea11ee7..41a6464efe9 100644
--- a/www/ap22-authnz-external/Makefile
+++ b/www/ap22-authnz-external/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/12/24 13:18:31 sborrill Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/20 14:58:46 joerg Exp $
 #
 
 DISTNAME=	mod_authnz_external-${DISTVERS}
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/mod-auth-external/
 COMMENT=	Apache module for external program authentication
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PKG_APACHE_ACCEPTED=	apache22
 
 .include "../../mk/apache.mk"
@@ -21,18 +23,19 @@ DISTVERS=	3.2.3
 MODULE_EXT=	la
 MESSAGE_SUBST+=	MODULE_NAME=authnz_external_module
 
+INSTALLATION_DIRS+=	share/doc/authnz-external
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/authnz-external
 	${INSTALL_DATA} ${WRKSRC}/AUTHENTICATORS \
-		${PREFIX}/share/doc/authnz-external
+		${DESTDIR}${PREFIX}/share/doc/authnz-external
 	${INSTALL_DATA} ${WRKSRC}/INSTALL \
-		${PREFIX}/share/doc/authnz-external
+		${DESTDIR}${PREFIX}/share/doc/authnz-external
 	${INSTALL_DATA} ${WRKSRC}/INSTALL.HARDCODE \
-		${PREFIX}/share/doc/authnz-external
+		${DESTDIR}${PREFIX}/share/doc/authnz-external
 	${INSTALL_DATA} ${WRKSRC}/TODO \
-		${PREFIX}/share/doc/authnz-external
+		${DESTDIR}${PREFIX}/share/doc/authnz-external
 	${INSTALL_DATA} ${WRKSRC}/UPGRADE \
-		${PREFIX}/share/doc/authnz-external
+		${DESTDIR}${PREFIX}/share/doc/authnz-external
 
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/module.mk b/www/apache/module.mk
index a944b5a7b5a..c8e38281b8b 100644
--- a/www/apache/module.mk
+++ b/www/apache/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.12 2007/09/19 17:31:46 rillig Exp $
+# $NetBSD: module.mk,v 1.13 2010/02/20 14:58:46 joerg Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install apache modules.
@@ -29,6 +29,7 @@ APACHE_MODULE=		yes
 
 APACHE_MODULE_SRCDIR?=	${WRKSRC}
 APACHE_MODULE_SRC?=	*.c
+APACHE_MODULE_DESTDIR=	${DESTDIR}${PREFIX}/lib/httpd
 
 .PHONY: apache-module-build
 apache-module-build:
@@ -40,9 +41,21 @@ apache-module-build:
 
 do-build: apache-module-build
 
+.if !defined(PKG_APACHE) || ${PKG_APACHE} == "apache13"
 .PHONY: apache-module-install
 apache-module-install:
-	${RUN} cd ${APACHE_MODULE_SRCDIR} && ${APXS} -i ${APACHE_MODULE_NAME}
+	${INSTALL_LIB_DIR} ${APACHE_MODULE_DESTDIR}
+	${INSTALL_LIB} ${APACHE_MODULE_SRCDIR}/${APACHE_MODULE_NAME} \
+	    ${APACHE_MODULE_DESTDIR}
+.else
+.PHONY: apache-module-install
+apache-module-install:
+	${INSTALL_LIB_DIR} ${APACHE_MODULE_DESTDIR}
+	${PREFIX}/share/httpd/build/instdso.sh \
+	    SH_LIBTOOL=${PREFIX}/share/httpd/build/libtool \
+	    ${APACHE_MODULE_SRCDIR}/${APACHE_MODULE_NAME} \
+	    ${APACHE_MODULE_DESTDIR}
+.endif
 
 do-install: apache-module-install