pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www DESTDIR support for various Apache modules.
details: https://anonhg.NetBSD.org/pkgsrc/rev/3b77d5daf178
branches: trunk
changeset: 572143:3b77d5daf178
user: joerg <joerg%pkgsrc.org@localhost>
date: Sat Feb 20 14:58:44 2010 +0000
description:
DESTDIR support for various Apache modules.
diffstat:
www/ap-access-referer/Makefile | 8 +++-----
www/ap-auth-cookie/Makefile | 10 +++-------
www/ap-auth-external/Makefile | 8 +-------
www/ap-auth-ldap/Makefile | 12 +++++++-----
www/ap-auth-ntlm/Makefile | 9 ++++++---
www/ap-auth-pam/Makefile | 14 ++++++++------
www/ap-auth-pgsql/Makefile | 13 ++++++++-----
www/ap-auth-postgresql/Makefile | 20 +++++++++++---------
www/ap-auth-radius/Makefile | 13 ++++++++-----
www/ap-auth-script/Makefile | 4 +++-
www/ap-bandwidth/Makefile | 4 +++-
www/ap-fastcgi/Makefile | 4 +++-
www/ap-fastcgi/Makefile.common | 6 ++++--
www/ap-gzip/Makefile | 17 +++++++++--------
www/ap-layout/Makefile | 12 +++++++-----
www/ap-mp3/Makefile | 9 ++++++---
www/ap-rpaf/Makefile | 25 ++++++++++++++-----------
www/ap-scgi/Makefile | 23 ++++++++++-------------
www/ap-throttle/Makefile | 9 ++++++---
www/ap-xslt/Makefile | 4 +++-
www/ap2-auth-external/Makefile | 7 +------
www/ap2-auth-ntlm/Makefile | 7 +++----
www/ap2-auth-pgsql/Makefile | 22 +++++++++-------------
www/ap2-auth-radius/Makefile | 27 ++++++++++++---------------
www/ap2-bw/Makefile | 16 +++++++++-------
www/ap2-chroot/Makefile | 14 +++++++-------
www/ap22-authn-sasl/Makefile | 4 +++-
www/ap22-authnz-external/Makefile | 17 ++++++++++-------
www/apache/module.mk | 17 +++++++++++++++--
29 files changed, 192 insertions(+), 163 deletions(-)
diffs (truncated from 924 to 300 lines):
diff -r 3687d65dbcdf -r 3b77d5daf178 www/ap-access-referer/Makefile
--- a/www/ap-access-referer/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-access-referer/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-cookie/Makefile
--- a/www/ap-auth-cookie/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-cookie/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 @@
@(${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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-external/Makefile
--- a/www/ap-auth-external/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-external/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-ldap/Makefile
--- a/www/ap-auth-ldap/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-ldap/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 @@
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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-ntlm/Makefile
--- a/www/ap-auth-ntlm/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-ntlm/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 @@
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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-pam/Makefile
--- a/www/ap-auth-pam/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-pam/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 @@
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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-pgsql/Makefile
--- a/www/ap-auth-pgsql/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-pgsql/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 @@
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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-postgresql/Makefile
--- a/www/ap-auth-postgresql/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-postgresql/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 @@
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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-radius/Makefile
--- a/www/ap-auth-radius/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-radius/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
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 @@
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 -r 3687d65dbcdf -r 3b77d5daf178 www/ap-auth-script/Makefile
--- a/www/ap-auth-script/Makefile Sat Feb 20 13:51:12 2010 +0000
+++ b/www/ap-auth-script/Makefile Sat Feb 20 14:58:44 2010 +0000
@@ -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 @@
HOMEPAGE= http://mod-auth-script.sourceforge.net/
Home |
Main Index |
Thread Index |
Old Index