summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorkim <kim>2003-07-05 05:10:31 +0000
committerkim <kim>2003-07-05 05:10:31 +0000
commitc98a5f731fbd2d5f2055ef26c999d1f6bae846ca (patch)
tree1309abdcc5e6ce0d57a603c03c8207b5e7f6f0c4 /www
parent205a8c834de069957e4ff8194bc42f8e4c7917d5 (diff)
downloadpkgsrc-c98a5f731fbd2d5f2055ef26c999d1f6bae846ca.tar.gz
ap-perl and ap2-perl are mutually exclusive, so add CONFLICTS
Diffstat (limited to 'www')
-rw-r--r--www/ap-perl/Makefile4
-rw-r--r--www/ap2-perl/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 7cc71396fc5..733ce4c08ac 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/07/05 03:35:23 kim Exp $
+# $NetBSD: Makefile,v 1.27 2003/07/05 05:10:31 kim Exp $
#
# NOTE: Versions 1.27 and 1.28 cause apache to dump core,
# so this packages has been left at version 1.25
@@ -15,6 +15,8 @@ MAINTAINER= tech-pkg@netbsd.org
HOMEPAGE= http://perl.apache.org/
COMMENT= Module that embeds a Perl interpreter into Apache
+CONFLICTS= ap2-perl-[0-9]*
+
DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache
DEPENDS+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl
DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index c0752ed636a..e11d4bf658e 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/02/04 08:54:28 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/07/05 05:10:32 kim Exp $
#
# NOTE: This package is *BETA*. If it doesn't work, then check the
# modperl-2.0 mailing lists for help.
@@ -12,6 +12,8 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://perl.apache.org/
COMMENT= Module that embeds a Perl interpreter into Apache
+CONFLICTS= ap-perl-[0-9]*
+
USE_BUILDLINK2= # defined
APACHE_MODULE= # defined
PERL5_REQD= 5.6.0