pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www * Use apache.mk to be compatible with the new apac...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d80acfbcc58e
branches: trunk
changeset: 522411:d80acfbcc58e
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Fri Dec 08 23:34:10 2006 +0000
description:
* Use apache.mk to be compatible with the new apache22 pkg.
* Use PKG_APACHE_ACCEPTED.
diffstat:
www/ap2-auth-ldap/Makefile | 6 ++++--
www/ap2-auth-mysql/Makefile | 6 ++++--
www/ap2-auth-pgsql/Makefile | 7 ++++---
www/ap2-auth-radius/Makefile | 6 ++++--
www/ap2-auth-xradius/Makefile | 6 ++++--
www/ap2-bw/Makefile | 6 ++++--
www/ap2-chroot/Makefile | 6 ++++--
www/ap2-fastcgi/Makefile | 6 +++---
www/ap2-jk/Makefile | 6 ++++--
www/ap2-perl/Makefile | 6 ++++--
www/ap2-python/Makefile | 7 ++++---
www/ap2-ruby/Makefile | 8 +++++---
www/ap2-subversion/Makefile | 5 +++--
www/ap2-suphp/Makefile | 8 +++++---
www/ap2-transform/Makefile | 6 ++++--
www/ap2-xslt2/Makefile | 6 ++++--
16 files changed, 64 insertions(+), 37 deletions(-)
diffs (truncated from 395 to 300 lines):
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-auth-ldap/Makefile
--- a/www/ap2-auth-ldap/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-auth-ldap/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/31 18:22:26 ghen Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/08 23:34:10 xtraeme Exp $
DISTNAME= mod_auth_ldap3.05
PKGNAME= ap2-auth-ldap-3.05
@@ -16,6 +16,8 @@
USE_LIBTOOL= YES
CPPFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber
+PKG_APACHE_ACCEPTED= apache2 apache22
+
BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47
CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
@@ -35,6 +37,6 @@
.include "../../databases/openldap-client/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-auth-mysql/Makefile
--- a/www/ap2-auth-mysql/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-auth-mysql/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 22:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/08 23:34:10 xtraeme Exp $
#
DISTNAME= mod_auth_mysql.c
@@ -23,6 +23,8 @@
APACHE_MODULE_NAME= mod_auth_mysql
DOC_DIR= ${PREFIX}/share/doc/${APACHE_MODULE_NAME}
+PKG_APACHE_ACCEPTED= apache2 apache22
+
post-extract:
${MKDIR} ${WRKSRC}
${MV} ${WRKDIR}/${DISTNAME} ${WRKSRC}
@@ -42,7 +44,7 @@
${INSTALL_DATA_DIR} ${DOC_DIR}
${INSTALL_DATA} ${WRKSRC}/mysql-group-auth.txt ${DOC_DIR}
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/mysql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-auth-pgsql/Makefile
--- a/www/ap2-auth-pgsql/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-auth-pgsql/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/10/07 21:02:43 reed Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/08 23:34:10 xtraeme Exp $
DISTNAME= mod_auth_pgsql-2.0.3
PKGNAME= ap2-auth-pgsql-2.0.3
@@ -15,6 +15,8 @@
APACHE_MODULE= yes
APACHE_MODULE_NAME= ap2-auth-pgsql
+PKG_APACHE_ACCEPTED= apache2 apache22
+
do-build:
cd ${WRKSRC} && \
${APXS} -c -n ${APACHE_MODULE_NAME} \
@@ -28,7 +30,6 @@
#${MKDIR} ${DOCSDIR}
#${INSTALL_DATA} ${WRKSRC}/mod_auth_pgsql.html ${DOCSDIR}
-.include "../../www/apache2/buildlink3.mk"
-
+.include "../../mk/apache.mk"
.include "../../mk/pgsql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-auth-radius/Makefile
--- a/www/ap2-auth-radius/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-auth-radius/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/08/15 13:47:37 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/08 23:34:11 xtraeme Exp $
DISTNAME= mod_auth_radius
PKGNAME= ap2-auth-radius-1.5.7
@@ -19,6 +19,8 @@
BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47
+PKG_APACHE_ACCEPTED= apache2 apache22
+
.include "../../security/openssl/buildlink3.mk"
post-extract:
@@ -43,5 +45,5 @@
${INSTALL_DATA} ${WRKSRC}/httpd.conf \
${PREFIX}/share/examples/mod_auth_radius
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-auth-xradius/Makefile
--- a/www/ap2-auth-xradius/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-auth-xradius/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/13 17:34:16 adrianp Exp $
+# $NetBSD: Makefile,v 1.2 2006/12/08 23:34:11 xtraeme Exp $
DISTNAME= mod_auth_xradius-0.4.6
PKGNAME= ap2-auth-xradius-0.4.6
@@ -13,9 +13,11 @@
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+PKG_APACHE_ACCEPTED= apache2 apache22
+
CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs
BUILDLINK_API_DEPENDS.apache+= apache>=2.0.42
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-bw/Makefile
--- a/www/ap2-bw/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-bw/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/22 22:50:33 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/12/08 23:34:11 xtraeme Exp $
#
DISTNAME= bw_mod-0.6
@@ -15,6 +15,8 @@
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
@@ -23,5 +25,5 @@
cd ${WRKSRC} && ${APXS} -n bw_module -i mod_bw.la
${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.txt ${PREFIX}/share/doc/apache_mod_bw.txt
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-chroot/Makefile
--- a/www/ap2-chroot/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-chroot/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/12/08 23:34:11 xtraeme Exp $
DISTNAME= mod_chroot-0.3
PKGNAME= ap2-chroot-0.3
@@ -13,6 +13,8 @@
APACHE_MODULE= # defined
NO_CONFIGURE= yes
+PKG_APACHE_ACCEPTED= apache2 apache22
+
do-build:
cd ${WRKSRC} && ${APXS} -c mod_chroot.c
@@ -21,5 +23,5 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_chroot
cd ${WRKSRC} && ${INSTALL_DATA} [A-Z]* ${PREFIX}/share/doc/mod_chroot/
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-fastcgi/Makefile
--- a/www/ap2-fastcgi/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-fastcgi/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/08 23:34:11 xtraeme Exp $
.include "../../www/ap-fastcgi/Makefile.common"
PKGNAME= ${DISTNAME:S/mod_/ap2-/}
PKGREVISION= 3
-PKG_APACHE_ACCEPTED= apache2
+PKG_APACHE_ACCEPTED= apache2 apache22
APACHE_MANUAL= manual
APACHE_MODULE= # defined
USE_LIBTOOL= YES
@@ -19,5 +19,5 @@
post-patch:
${CP} ${WRKSRC}/Makefile.AP2 ${WRKSRC}/Makefile
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-jk/Makefile
--- a/www/ap2-jk/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-jk/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/15 11:04:04 abs Exp $
+# $NetBSD: Makefile,v 1.3 2006/12/08 23:34:11 xtraeme Exp $
DISTNAME= tomcat-connectors-${JK_VERSION}-src
PKGNAME= ap2-jk-${JK_VERSION}
@@ -6,6 +6,8 @@
MAKE_PARAMS+= USE_APXS=1
MAKE_PARAMS+= WITH_APXS=${APXS}
+PKG_APACHE_ACCEPTED= apache2 apache22
+
.include "../../www/ap-jk/Makefile.common"
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-perl/Makefile
--- a/www/ap2-perl/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-perl/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/12/07 02:57:05 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/08 23:34:11 xtraeme Exp $
DISTNAME= mod_perl-2.0.3
PKGNAME= ${DISTNAME:S/mod_/ap2-/}
@@ -11,6 +11,8 @@
CONFLICTS= ap-perl-[0-9]* p5-Apache-Test-[0-9]*
+PKG_APACHE_ACCEPTED= apache2 apache22
+
APACHE_MODULE= # defined
PERL5_PACKLIST= auto/mod_perl2/.packlist
@@ -23,5 +25,5 @@
${CP} -R ${WRKSRC}/docs/* ${MODPERLDOCSDIR}
.include "../../lang/perl5/module.mk"
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-python/Makefile
--- a/www/ap2-python/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-python/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/11/18 18:43:00 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/08 23:34:11 xtraeme Exp $
DISTNAME= mod_python-${VERSION}
PKGNAME= ap2-${PYPKGPREFIX}-python-${VERSION}
@@ -21,7 +21,8 @@
PYTHON_VERSIONS_ACCEPTED= 24 23
PY_PATCHPLIST= YES
+PKG_APACHE_ACCEPTED= apache2 apache22
+
.include "../../lang/python/extension.mk"
-.include "../../www/apache2/buildlink3.mk"
-
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-ruby/Makefile
--- a/www/ap2-ruby/Makefile Fri Dec 08 23:33:15 2006 +0000
+++ b/www/ap2-ruby/Makefile Fri Dec 08 23:34:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/08 23:34:11 xtraeme Exp $
DISTNAME= mod_ruby-${VERSION}
PKGNAME= ap2-${RUBY_PKGPREFIX}-${VERSION}
@@ -14,6 +14,7 @@
RUBY_HAS_ARCHLIB= yes
APACHE_MODULE= yes
+USE_APR= yes
VERSION= 1.2.4
HAS_CONFIGURE= yes
INSTALL_TARGET= site-install
@@ -25,6 +26,8 @@
DOCS= ChangeLog NOTICE README.en README.ja
REPLACE_RUBY+= install-rb
+PKG_APACHE_ACCEPTED= apache2 apache22
+
.include "../../mk/bsd.prefs.mk"
PKG_SYSCONFVAR= apache
@@ -52,6 +55,5 @@
.include "../../lang/ruby/modules.mk"
.include "../../textproc/ruby-eruby/buildlink3.mk"
.include "../../textproc/ruby-rdtool/buildlink3.mk"
-.include "../../www/apache2/buildlink3.mk"
-.include "../../devel/apr/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 457736a6a828 -r d80acfbcc58e www/ap2-subversion/Makefile
--- a/www/ap2-subversion/Makefile Fri Dec 08 23:33:15 2006 +0000
Home |
Main Index |
Thread Index |
Old Index