summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/ap2-perl/Makefile5
-rw-r--r--www/p5-Apache-Reload/Makefile13
2 files changed, 7 insertions, 11 deletions
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index 71c97fd2a82..6449d4cfc8a 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2011/04/04 09:24:14 adam Exp $
+# $NetBSD: Makefile,v 1.38 2011/04/14 08:40:48 adam Exp $
DISTNAME= mod_perl-2.0.5
PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
+PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= http://perl.apache.org/dist/
@@ -12,7 +13,7 @@ LICENSE= apache-2.0
PKG_DESTDIR_SUPPORT= user-destdir
-CONFLICTS= ap-perl-[0-9]* p5-Apache-Test-[0-9]*
+CONFLICTS= ap-perl-[0-9]* p5-Apache-Reload-[0-9]* p5-Apache-Test-[0-9]*
PKG_APACHE_ACCEPTED= apache2 apache22
diff --git a/www/p5-Apache-Reload/Makefile b/www/p5-Apache-Reload/Makefile
index 8d525313d9b..c10e2a67d1f 100644
--- a/www/p5-Apache-Reload/Makefile
+++ b/www/p5-Apache-Reload/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2011/04/04 09:26:00 adam Exp $
+# $NetBSD: Makefile,v 1.12 2011/04/14 08:40:48 adam Exp $
DISTNAME= Apache-Reload-0.11
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5arl
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/}
@@ -13,19 +14,13 @@ COMMENT= Perl5 module to reload changed modules
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
+PKG_APACHE_ACCEPTED= apache13
+
.include "../../mk/apache.mk"
-.if (${PKG_APACHE} == "apache13")
PERL5_PACKLIST= auto/Apache/Reload/.packlist
-.else
-PERL5_PACKLIST= auto/Apache2/Reload/.packlist
-.endif
-.if (${PKG_APACHE} == "apache13")
.include "../../www/ap-perl/buildlink3.mk"
-.else
-.include "../../www/ap2-perl/buildlink3.mk"
-.endif
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"