From 7ac9657102da14256725f6ea9a12dfcec4edb900 Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 30 Jun 2007 16:09:07 +0000 Subject: Change naming of Apache 2.2 modules to use ap22 prefix. Allow apache22 in some more case and add a hack to devel/subversion to determine the module by the state of the apache22 option. This comes from www/ap2-subversion and should be fixed to properly use build options or so. OK agc@ --- devel/subversion/Makefile | 8 +++++++- www/ap2-auth-mysql/Makefile | 4 ++-- www/ap2-auth-pgsql/Makefile | 4 ++-- www/ap2-auth-radius/Makefile | 4 ++-- www/ap2-auth-xradius/Makefile | 4 ++-- www/ap2-bw/Makefile | 4 ++-- www/ap2-chroot/Makefile | 4 ++-- www/ap2-fastcgi/Makefile | 4 ++-- www/ap2-fcgid/Makefile | 4 ++-- www/ap2-jk/Makefile | 4 ++-- www/ap2-perl/Makefile | 4 ++-- www/ap2-perl/buildlink3.mk | 8 ++++---- www/ap2-python/Makefile | 4 ++-- www/ap2-subversion/Makefile | 4 ++-- www/ap2-transform/Makefile | 4 ++-- www/ap2-xslt2/Makefile | 4 ++-- www/p5-HTML-Mason/Makefile | 4 ++-- www/p5-libapreq2/Makefile | 11 ++++++----- 18 files changed, 47 insertions(+), 40 deletions(-) diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 6bbe5bf9a38..68d64c9c183 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,13 +1,19 @@ -# $NetBSD: Makefile,v 1.29 2006/11/03 19:34:11 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2007/06/30 16:09:07 joerg Exp $ PKGNAME= subversion-${SVNVER} COMMENT= Version control system, meta-package PKG_DESTDIR_SUPPORT= user-destdir +.include "../../mk/bsd.prefs.mk" + DEPENDS+= subversion-base-${SVNVER}{,nb[0-9]*}:../../devel/subversion-base DEPENDS+= p5-subversion-${SVNVER}{,nb[0-9]*}:../../devel/p5-subversion +.if !empty(PKG_OPTIONS:Mapache22) +DEPENDS+= ap22-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion +.else DEPENDS+= ap2-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion +.endif DEPENDS+= ${PYPKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/py-subversion DEPENDS+= ${RUBY_PKGPREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../devel/ruby-subversion diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile index 1a10a191daa..3f9e43be10b 100644 --- a/www/ap2-auth-mysql/Makefile +++ b/www/ap2-auth-mysql/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2007/02/25 15:51:50 sborrill Exp $ +# $NetBSD: Makefile,v 1.17 2007/06/30 16:09:07 joerg Exp $ # DISTNAME= mod_auth_mysql.c -PKGNAME= ap2-auth-mysql-1.11.12 +PKGNAME= ${APACHE_PKG_PREFIX}-auth-mysql-1.11.12 PKGREVISION= 7 CATEGORIES= www databases MASTER_SITES= ftp://ftp.kcilink.com/pub/ diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile index 9aaa0ce1793..cf5f1f5ccac 100644 --- a/www/ap2-auth-pgsql/Makefile +++ b/www/ap2-auth-pgsql/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2006/12/28 12:12:59 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2007/06/30 16:09:07 joerg Exp $ DISTNAME= mod_auth_pgsql-2.0.3 -PKGNAME= ap2-auth-pgsql-2.0.3 +PKGNAME= ${APACHE_PKG_PREFIX}-auth-pgsql-2.0.3 PKGREVISION= 4 CATEGORIES= www databases MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/ diff --git a/www/ap2-auth-radius/Makefile b/www/ap2-auth-radius/Makefile index bdec8ac270f..393c05190f6 100644 --- a/www/ap2-auth-radius/Makefile +++ b/www/ap2-auth-radius/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2007/06/10 08:41:06 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2007/06/30 16:09:07 joerg Exp $ DISTNAME= mod_auth_radius -PKGNAME= ap2-auth-radius-1.5.7 +PKGNAME= ${APACHE_PKG_PREFIX}-auth-radius-1.5.7 PKGREVISION= 1 CATEGORIES= www databases MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ diff --git a/www/ap2-auth-xradius/Makefile b/www/ap2-auth-xradius/Makefile index b107929e583..db2c5492b01 100644 --- a/www/ap2-auth-xradius/Makefile +++ b/www/ap2-auth-xradius/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2007/06/10 08:42:04 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2007/06/30 16:09:08 joerg Exp $ DISTNAME= mod_auth_xradius-0.4.6 -PKGNAME= ap2-auth-xradius-0.4.6 +PKGNAME= ${APACHE_PKG_PREFIX}-auth-xradius-0.4.6 CATEGORIES= www databases MASTER_SITES= http://www.outoforder.cc/downloads/mod_auth_xradius/ EXTRACT_SUFX= .tar.bz2 diff --git a/www/ap2-bw/Makefile b/www/ap2-bw/Makefile index 0cd0be80971..a9f556f4ddc 100644 --- a/www/ap2-bw/Makefile +++ b/www/ap2-bw/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2007/03/19 16:35:51 tv Exp $ +# $NetBSD: Makefile,v 1.8 2007/06/30 16:09:08 joerg Exp $ # DISTNAME= bw_mod-0.6 -PKGNAME= ${DISTNAME:S/bw_mod/ap2-bw/} +PKGNAME= ${APACHE_PKG_PREFIX}-bw-${DISTNAME:S/bw_mod-//} PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://ivn.cl/apache/ diff --git a/www/ap2-chroot/Makefile b/www/ap2-chroot/Makefile index 675e792a5ce..d4e851f10c0 100644 --- a/www/ap2-chroot/Makefile +++ b/www/ap2-chroot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2006/12/15 14:34:21 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2007/06/30 16:09:08 joerg Exp $ DISTNAME= mod_chroot-0.3 -PKGNAME= ap2-chroot-0.3 +PKGNAME= ${APACHE_PKG_PREFIX}-chroot-0.3 PKGREVISION= 2 CATEGORIES= www security MASTER_SITES= http://core.segfault.pl/~hobbit/mod_chroot/dist/ diff --git a/www/ap2-fastcgi/Makefile b/www/ap2-fastcgi/Makefile index 47663c4e92c..560e44218e3 100644 --- a/www/ap2-fastcgi/Makefile +++ b/www/ap2-fastcgi/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2006/12/08 23:34:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.8 2007/06/30 16:09:08 joerg Exp $ .include "../../www/ap-fastcgi/Makefile.common" -PKGNAME= ${DISTNAME:S/mod_/ap2-/} +PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} PKGREVISION= 3 PKG_APACHE_ACCEPTED= apache2 apache22 APACHE_MANUAL= manual diff --git a/www/ap2-fcgid/Makefile b/www/ap2-fcgid/Makefile index 6634678e656..225145d96e5 100644 --- a/www/ap2-fcgid/Makefile +++ b/www/ap2-fcgid/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/01/25 20:22:54 abs Exp $ +# $NetBSD: Makefile,v 1.2 2007/06/30 16:09:08 joerg Exp $ DISTNAME= mod_fcgid.2.0 -PKGNAME= ap2-fcgid-2.0 +PKGNAME= ${APACHE_PKG_PREFIX}-fcgid-2.0 PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mod-fcgid/} diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile index f94ace6932e..12b65c5c161 100644 --- a/www/ap2-jk/Makefile +++ b/www/ap2-jk/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2006/12/08 23:34:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2007/06/30 16:09:08 joerg Exp $ DISTNAME= tomcat-connectors-${JK_VERSION}-src -PKGNAME= ap2-jk-${JK_VERSION} +PKGNAME= ${APACHE_PKG_PREFIX}-jk-${JK_VERSION} MAKE_PARAMS+= USE_APXS=1 MAKE_PARAMS+= WITH_APXS=${APXS} diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile index ee09bc22056..4d52bda72fd 100644 --- a/www/ap2-perl/Makefile +++ b/www/ap2-perl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2006/12/08 23:34:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.27 2007/06/30 16:09:08 joerg Exp $ DISTNAME= mod_perl-2.0.3 -PKGNAME= ${DISTNAME:S/mod_/ap2-/} +PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} CATEGORIES= www perl5 MASTER_SITES= http://perl.apache.org/dist/ diff --git a/www/ap2-perl/buildlink3.mk b/www/ap2-perl/buildlink3.mk index 3f71f661459..ab550bcdbee 100644 --- a/www/ap2-perl/buildlink3.mk +++ b/www/ap2-perl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/06/08 12:25:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2007/06/30 16:09:09 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AP2_PERL_BUILDLINK3_MK:= ${AP2_PERL_BUILDLINK3_MK}+ @@ -12,11 +12,11 @@ BUILDLINK_PACKAGES+= ap2-perl BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ap2-perl .if !empty(AP2_PERL_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.ap2-perl+= ap2-perl>=2.0.1 -BUILDLINK_ABI_DEPENDS.ap2-perl?= ap2-perl>=2.0.3 +BUILDLINK_API_DEPENDS.ap2-perl+= ${APACHE_PKG_PREFIX}-perl>=2.0.1 +BUILDLINK_ABI_DEPENDS.ap2-perl?= ${APACHE_PKG_PREFIX}-perl>=2.0.3 BUILDLINK_PKGSRCDIR.ap2-perl?= ../../www/ap2-perl .endif # AP2_PERL_BUILDLINK3_MK -.include "../../www/apache2/buildlink3.mk" +.include "../../mk/apache.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile index 9dacae9132e..3701616f423 100644 --- a/www/ap2-python/Makefile +++ b/www/ap2-python/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2006/12/08 23:34:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.21 2007/06/30 16:09:09 joerg Exp $ DISTNAME= mod_python-${VERSION} -PKGNAME= ap2-${PYPKGPREFIX}-python-${VERSION} +PKGNAME= ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-python-${VERSION} CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/modpython/} EXTRACT_SUFX= .tgz diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile index a99da9f3c5e..24db982e296 100644 --- a/www/ap2-subversion/Makefile +++ b/www/ap2-subversion/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2007/06/08 22:49:27 epg Exp $ +# $NetBSD: Makefile,v 1.30 2007/06/30 16:09:09 joerg Exp $ -PKGNAME= ap2-subversion-${SVNVER} +PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER} COMMENT= WebDAV server (Apache module) for Subversion .include "../../devel/subversion/Makefile.common" diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile index c57b86d393e..74415e9b2e1 100644 --- a/www/ap2-transform/Makefile +++ b/www/ap2-transform/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2006/12/08 23:34:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.14 2007/06/30 16:09:09 joerg Exp $ # DISTNAME= mod_transform-0.4.0 -PKGNAME= ${DISTNAME:S/mod_/ap2-/} +PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} PKGREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.outoforder.cc/downloads/mod_transform/ diff --git a/www/ap2-xslt2/Makefile b/www/ap2-xslt2/Makefile index d1308ebbffa..0d63eb8c04a 100644 --- a/www/ap2-xslt2/Makefile +++ b/www/ap2-xslt2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2007/05/22 10:50:59 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2007/06/30 16:09:09 joerg Exp $ # DISTNAME= modxslt-${DIST_VER} -PKGNAME= ap2-xslt2-${DIST_VER} +PKGNAME= ${APACHE_PKG_PREFIX}-xslt2-${DIST_VER} CATEGORIES= www MASTER_SITES= http://www.mod-xslt2.com/software/archive/${DIST_VER}/ diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile index 12cdf690540..6f25fec1ca0 100644 --- a/www/p5-HTML-Mason/Makefile +++ b/www/p5-HTML-Mason/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/06/08 12:25:06 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2007/06/30 16:09:09 joerg Exp $ DISTNAME= HTML-Mason-1.3101 PKGNAME= p5-HTML-Mason-1.31.1 @@ -30,7 +30,7 @@ PKG_SUGGESTED_OPTIONS= modperl . if ${PKG_APACHE} == "apache13" DEPENDS+= p5-libapreq>=0.32:../../www/p5-libapreq .include "../../www/ap-perl/buildlink3.mk" -. elif ${PKG_APACHE} == "apache2" +. elif ${PKG_APACHE} == "apache2" || ${PKG_APACHE} == "apache22" DEPENDS+= p5-libapreq2-[0-9]*:../../www/p5-libapreq2 .include "../../www/ap2-perl/buildlink3.mk" . endif diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile index ede28d02587..3b8853568ae 100644 --- a/www/p5-libapreq2/Makefile +++ b/www/p5-libapreq2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/06/19 21:59:32 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2007/06/30 16:09:09 joerg Exp $ DISTNAME= libapreq2-2.08 PKGNAME= p5-${DISTNAME} @@ -11,9 +11,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://httpd.apache.org/apreq/ COMMENT= Lots of Apache specific httpd handling modules -DEPENDS+= p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder +PKG_APACHE_ACCEPTED= apache2 apache22 -BUILDLINK_API_DEPENDS.ap2-perl+= ap2-perl>=2.0.1 +DEPENDS+= p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder USE_TOOLS+= gmake USE_LIBTOOL= YES @@ -34,11 +34,12 @@ pre-configure: ${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC} ${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC} - #pre-configure: # cd ${WRKSRC} && ./buildconf .include "../../www/ap2-perl/buildlink3.mk" -.include "../../www/apache2/buildlink3.mk" +.include "../../mk/apache.mk" + +BUILDLINK_API_DEPENDS.ap2-perl+= ${APACHE_PKG_PREFIX}-perl>=2.0.1 BUILDLINK_API_DEPENDS.apache+= apache>=2.0.48 .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3