diff options
| author | erh <erh> | 2004-09-28 17:59:55 +0000 |
|---|---|---|
| committer | erh <erh> | 2004-09-28 17:59:55 +0000 |
| commit | 07692e8b164522df13ad183044078bd801ff4266 (patch) | |
| tree | d5485c2b7affbb79594040146b513f0434a17516 /www | |
| parent | cdcc1f308c0cde326a115a8463cff7a1b0c988bd (diff) | |
| download | pkgsrc-07692e8b164522df13ad183044078bd801ff4266.tar.gz | |
Not all ap-* packages are apache1. Some work for either apache so don't force
a conflict.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 9052cc375eb..e50a3ecd548 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2004/09/23 21:07:25 reed Exp $ +# $NetBSD: Makefile,v 1.46 2004/09/28 17:59:55 erh Exp $ PKGNAME= apache-${APACHE_VERSION} PKGREVISION= 1 @@ -8,7 +8,6 @@ HOMEPAGE= http://httpd.apache.org/ 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 BUILD_DEFS+= USE_INET6 |