summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/ap2-auth-ldap/Makefile6
-rw-r--r--www/ap2-auth-mysql/Makefile6
-rw-r--r--www/ap2-auth-pgsql/Makefile7
-rw-r--r--www/ap2-auth-radius/Makefile6
-rw-r--r--www/ap2-auth-xradius/Makefile6
-rw-r--r--www/ap2-bw/Makefile6
-rw-r--r--www/ap2-chroot/Makefile6
-rw-r--r--www/ap2-fastcgi/Makefile6
-rw-r--r--www/ap2-jk/Makefile6
-rw-r--r--www/ap2-perl/Makefile6
-rw-r--r--www/ap2-python/Makefile7
-rw-r--r--www/ap2-ruby/Makefile8
-rw-r--r--www/ap2-subversion/Makefile5
-rw-r--r--www/ap2-suphp/Makefile8
-rw-r--r--www/ap2-transform/Makefile6
-rw-r--r--www/ap2-xslt2/Makefile6
16 files changed, 64 insertions, 37 deletions
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index c72e404ae71..80193ff32a0 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -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 @@ APACHE_MODULE_NAME= mm_auth_ldap_module
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 @@ do-install:
.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 --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index b485e45bd82..6684d1100c7 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -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 @@ NO_CONFIGURE= yes
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 @@ do-install:
${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 --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile
index d163feb1606..2da9ff3020a 100644
--- a/www/ap2-auth-pgsql/Makefile
+++ b/www/ap2-auth-pgsql/Makefile
@@ -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 @@ CONFLICTS= ap-auth-postgresql-*
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 @@ do-install:
#${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 --git a/www/ap2-auth-radius/Makefile b/www/ap2-auth-radius/Makefile
index fa82c837845..fe1dec53372 100644
--- a/www/ap2-auth-radius/Makefile
+++ b/www/ap2-auth-radius/Makefile
@@ -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 @@ USE_LIBTOOL= YES
BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47
+PKG_APACHE_ACCEPTED= apache2 apache22
+
.include "../../security/openssl/buildlink3.mk"
post-extract:
@@ -43,5 +45,5 @@ do-install:
${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 --git a/www/ap2-auth-xradius/Makefile b/www/ap2-auth-xradius/Makefile
index a71dfb27bdb..2828747c478 100644
--- a/www/ap2-auth-xradius/Makefile
+++ b/www/ap2-auth-xradius/Makefile
@@ -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 @@ COMMENT= Module to allow apache2 authentication against a RADIUS server
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 --git a/www/ap2-bw/Makefile b/www/ap2-bw/Makefile
index f8277d3c32d..34bd716139d 100644
--- a/www/ap2-bw/Makefile
+++ b/www/ap2-bw/Makefile
@@ -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 @@ COMMENT= Class-based bandwidth limiting module for Apache 2
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 @@ do-install:
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 --git a/www/ap2-chroot/Makefile b/www/ap2-chroot/Makefile
index 3483af4df4e..c218c972cfd 100644
--- a/www/ap2-chroot/Makefile
+++ b/www/ap2-chroot/Makefile
@@ -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 @@ COMMENT= Module to easily run Apache in a chroot environment
APACHE_MODULE= # defined
NO_CONFIGURE= yes
+PKG_APACHE_ACCEPTED= apache2 apache22
+
do-build:
cd ${WRKSRC} && ${APXS} -c mod_chroot.c
@@ -21,5 +23,5 @@ do-install:
${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 --git a/www/ap2-fastcgi/Makefile b/www/ap2-fastcgi/Makefile
index 3ec88c99839..47663c4e92c 100644
--- a/www/ap2-fastcgi/Makefile
+++ b/www/ap2-fastcgi/Makefile
@@ -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 @@ SUBST_SED.ap2= -e s,/usr/local/apache2,${PREFIX}/share/httpd,
post-patch:
${CP} ${WRKSRC}/Makefile.AP2 ${WRKSRC}/Makefile
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile
index 062772570cd..f94ace6932e 100644
--- a/www/ap2-jk/Makefile
+++ b/www/ap2-jk/Makefile
@@ -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 @@ PKGNAME= ap2-jk-${JK_VERSION}
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 --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index 92b54ced5a1..ee09bc22056 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -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 @@ COMMENT= Module that embeds a Perl interpreter into Apache
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 @@ post-install:
${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 --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile
index 785747ea80c..9dacae9132e 100644
--- a/www/ap2-python/Makefile
+++ b/www/ap2-python/Makefile
@@ -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 @@ CONFIGURE_ARGS+=--with-python=${PYTHONBIN:Q}
PYTHON_VERSIONS_ACCEPTED= 24 23
PY_PATCHPLIST= YES
-.include "../../lang/python/extension.mk"
-.include "../../www/apache2/buildlink3.mk"
+PKG_APACHE_ACCEPTED= apache2 apache22
+.include "../../lang/python/extension.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-ruby/Makefile b/www/ap2-ruby/Makefile
index 1b727bd3eae..bd0f0bc81d4 100644
--- a/www/ap2-ruby/Makefile
+++ b/www/ap2-ruby/Makefile
@@ -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 @@ CONFLICTS+= ap-ruby*
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 @@ MESSAGE_SUBST+= RUBY_DOCDIR=${RUBY_DOCDIR}
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 @@ post-install:
.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 --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 23c171e8a09..2f18ad10051 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:53 reed Exp $
+# $NetBSD: Makefile,v 1.25 2006/12/08 23:34:11 xtraeme Exp $
PKGNAME= ap2-subversion-${SVNVER}
COMMENT= WebDAV server (Apache module) for Subversion
@@ -9,6 +9,7 @@ CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
CONFIGURE_ARGS+= --disable-mod-activation
APACHE_MODULE= YES
+PKG_APACHE_ACCEPTED= apache2 apache22
BUILD_TARGET= apache-mod
INSTALL_TARGET= install-mods-shared
@@ -20,5 +21,5 @@ post-patch:
${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
.include "../../devel/subversion-base/buildlink3.mk"
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile
index f46b2e267d3..4fde15be7f6 100644
--- a/www/ap2-suphp/Makefile
+++ b/www/ap2-suphp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/25 09:08:01 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/08 23:34:11 xtraeme Exp $
#
DISTNAME= suphp-0.6.0
@@ -26,6 +26,9 @@ CPPFLAGS+= -I${BUILDLINK_DIR}/include/apr-0
EGDIR= ${PREFIX}/share/examples/suphp
CONF_FILES= ${EGDIR}/suphp.conf ${PKG_SYSCONFDIR}/suphp.conf
+USE_APR= yes
+PKG_APACHE_ACCEPTED= apache2 apache22
+
SUBST_CLASSES+= suphp
SUBST_STAGE.suphp= post-configure
SUBST_FILES.suphp= doc/suphp.conf-example
@@ -35,6 +38,5 @@ post-install:
${INSTALL_DATA_DIR} ${EGDIR:Q}
${INSTALL_DATA} ${WRKSRC}/doc/suphp.conf-example ${EGDIR}/suphp.conf
-.include "../../www/apache2/buildlink3.mk"
-.include "../../devel/apr/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile
index df522c988e5..c57b86d393e 100644
--- a/www/ap2-transform/Makefile
+++ b/www/ap2-transform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/08 23:34:11 xtraeme Exp $
#
DISTNAME= mod_transform-0.4.0
@@ -15,8 +15,10 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+PKG_APACHE_ACCEPTED= apache2 apache22
+
CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-xslt2/Makefile b/www/ap2-xslt2/Makefile
index de6d4669308..61728a37877 100644
--- a/www/ap2-xslt2/Makefile
+++ b/www/ap2-xslt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/07 02:34:01 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/12/08 23:34:11 xtraeme Exp $
#
DISTNAME= modxslt-${DIST_VER}
@@ -17,12 +17,14 @@ USE_TOOLS+= gmake
APACHE_MODULE= yes
DIST_VER= 2004112100
+PKG_APACHE_ACCEPTED= apache2 apache22
+
CONFIGURE_ARGS+= --enable-fallback-wraparound
CONFIGURE_ARGS+= --enable-libxslt-hack
.include "../../devel/pcre/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../www/apache2/buildlink3.mk"
+.include "../../mk/apache.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 00:21:59 +0000