diff options
| author | wiz <wiz@pkgsrc.org> | 2002-12-09 20:23:40 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-12-09 20:23:40 +0000 |
| commit | 07ffc79adacf9d4a8165d80432592a6553b2444b (patch) | |
| tree | 4ac41bc74a919b94f8be73ea73433208977f3571 | |
| parent | 437371d4902bbcf379f4610a54b860607290cec9 (diff) | |
| download | pkgsrc-07ffc79adacf9d4a8165d80432592a6553b2444b.tar.gz | |
Note conflict between apr-devel and apache2 packages.
| -rw-r--r-- | devel/apr-devel/Makefile | 4 | ||||
| -rw-r--r-- | www/apache2/Makefile | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/devel/apr-devel/Makefile b/devel/apr-devel/Makefile index f0ca3191dac..1d8e8de50d5 100644 --- a/devel/apr-devel/Makefile +++ b/devel/apr-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/11/25 19:52:43 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2002/12/09 20:23:40 wiz Exp $ DISTNAME= apr_20021123173453 PKGNAME= apr-0.20021123173453 @@ -10,6 +10,8 @@ MAINTAINER= joelw@unix.se HOMEPAGE= http://apr.apache.org/ COMMENT= Apache Portable Run-time, a system portability layer +CONFLICTS+= apache>=2.0 # www/apache2 package + AUTOCONF_REQD= 2.56 GNU_CONFIGURE= yes USE_BUILDLINK2= yes diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 3bb6b42fdd1..118b33d739b 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/10/04 02:35:51 itojun Exp $ +# $NetBSD: Makefile,v 1.17 2002/12/09 20:23:42 wiz Exp $ DISTNAME= httpd-${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} @@ -15,6 +15,7 @@ COMMENT= Apache HTTP (Web) server, version 2 CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]* CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs +CONFLICTS+= apr-[0-9]* # devel/apr-devel package BUILD_DEFS+= USE_INET6 |