diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-02 18:27:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-02 18:27:54 +0000 |
| commit | 9d2fa554c4a3f64b36e9c5e8f78a89ac9dc88ba2 (patch) | |
| tree | b7f585bd5e2d200a0004ced04920ab0be7a7445a /www/ap-perl | |
| parent | 368089b51371f5f00292d0a76010e873c7114bb0 (diff) | |
| download | pkgsrc-9d2fa554c4a3f64b36e9c5e8f78a89ac9dc88ba2.tar.gz | |
Rename all PHP 4 packages to php4-*, all PHP 5 packages to php5-*,
all PEAR packages to php?-pear-* and all Apache packages to ap13-* or
ap2-* respectively. Add new variables to simplify the Makefile
handling. Add CONFLICTS on the old names. Reset revisions of bumped
packages. ap-php will now depend on the default Apache and PHP version.
All programs using it have an implicit option of the Apache version
as well.
OK from jlam@ and adrianp@.
Diffstat (limited to 'www/ap-perl')
| -rw-r--r-- | www/ap-perl/Makefile | 8 | ||||
| -rw-r--r-- | www/ap-perl/buildlink3.mk | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile index 1171d677728..a67fec04354 100644 --- a/www/ap-perl/Makefile +++ b/www/ap-perl/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2006/04/06 06:22:53 reed Exp $ +# $NetBSD: Makefile,v 1.43 2006/06/02 18:27:59 joerg Exp $ # DISTNAME= mod_perl-1.29 -PKGNAME= ap-perl-1.29 -PKGREVISION= 5 +PKGNAME= ap13-perl-1.29 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \ http://perl.apache.org/dist/ @@ -12,7 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://perl.apache.org/ COMMENT= Module that embeds a Perl interpreter into Apache -CONFLICTS= ap2-perl-[0-9]* +CONFLICTS= ap-perl-[0-9]* +CONFLICTS+= ap2-perl-[0-9]* DEPENDS+= ${BUILDLINK_API_DEPENDS.apache}:../../www/apache DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk index 58554677528..3742ab297b8 100644 --- a/www/ap-perl/buildlink3.mk +++ b/www/ap-perl/buildlink3.mk @@ -1,18 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:38 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2006/06/02 18:27:59 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AP_PERL_BUILDLINK3_MK:= ${AP_PERL_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ap-perl +BUILDLINK_DEPENDS+= ap13-perl .endif BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nap-perl} -BUILDLINK_PACKAGES+= ap-perl +BUILDLINK_PACKAGES+= ap13-perl .if !empty(AP_PERL_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.ap-perl+= ap-perl>=1.29nb3 -BUILDLINK_ABI_DEPENDS.ap-perl?= ap-perl>=1.29nb5 +BUILDLINK_API_DEPENDS.ap-perl+= ap13-perl>=1.29nb3 +BUILDLINK_ABI_DEPENDS.ap-perl?= ap13-perl>=1.29nb5 BUILDLINK_PKGSRCDIR.ap-perl?= ../../www/ap-perl BUILDLINK_FILES.ap-perl+= lib/httpd/mod_perl.* |