diff options
| author | xtraeme <xtraeme> | 2006-12-09 00:51:21 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2006-12-09 00:51:21 +0000 |
| commit | 83d93fe950fea013def659e6e62d1296832b6c9c (patch) | |
| tree | 9ba57e1dfa5566e7a4d7fc42ad5a1e07d6a6d0f6 /www | |
| parent | d4aafecc0df60a3422066b357f1b635623d6f4b4 (diff) | |
| download | pkgsrc-83d93fe950fea013def659e6e62d1296832b6c9c.tar.gz | |
There's no need for CONFLICT between apache2 and apache22,
cube said so.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 4 | ||||
| -rw-r--r-- | www/apache22/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index cd18c4dcee1..29481e6a097 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2006/12/08 23:51:37 xtraeme Exp $ +# $NetBSD: Makefile,v 1.108 2006/12/09 00:51:21 xtraeme Exp $ .include "Makefile.common" @@ -9,7 +9,7 @@ CATEGORIES= www HOMEPAGE= http://httpd.apache.org/ COMMENT= Apache HTTP (Web) server, version 2 -CONFLICTS= apache-*ssl-[0-9]* apache>=2.2 apache6-[0-9]* +CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]* BUILD_DEFS+= USE_INET6 BUILD_DEFS+= VARBASE diff --git a/www/apache22/Makefile b/www/apache22/Makefile index af30fef877c..35026e4f376 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2006/12/09 00:51:21 xtraeme Exp $ .include "Makefile.common" @@ -9,7 +9,7 @@ CATEGORIES= www HOMEPAGE= http://httpd.apache.org/ COMMENT= Apache HTTP (Web) server, version 2 -CONFLICTS= apache-{,*ssl}-[0-9]* apache-[0-9]* apache6-[0-9]* +CONFLICTS= apache-{,*ssl}-[0-9]* apache6-[0-9]* BUILD_DEFS+= USE_INET6 BUILD_DEFS+= VARBASE |