diff options
| author | itojun <itojun> | 1999-07-23 18:20:04 +0000 |
|---|---|---|
| committer | itojun <itojun> | 1999-07-23 18:20:04 +0000 |
| commit | 30a8b313c3b8c6a5f940339a5f7076e9417080c2 (patch) | |
| tree | dcc31850a46e35fe35da2edea0977e8a5ac33208 /www | |
| parent | 929c1aa761c0f58e814885b9c82fa669e301a16a (diff) | |
| download | pkgsrc-30a8b313c3b8c6a5f940339a5f7076e9417080c2.tar.gz | |
add CONFLICTS+= apache6-*.
Diffstat (limited to 'www')
| -rw-r--r-- | www/ap-ssl/Makefile | 4 | ||||
| -rw-r--r-- | www/apache/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 50a634666d3..194e5828af5 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1999/04/30 23:51:39 tv Exp $ +# $NetBSD: Makefile,v 1.9 1999/07/23 18:20:04 itojun Exp $ # DISTNAME= mod_ssl-2.2.8-1.3.6 @@ -14,7 +14,7 @@ DEPENDS= openssl-0.9.2b:../../security/openssl \ # For "apxs": BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5 -CONFLICTS= apache-1.3.[012] apache-*modssl-* +CONFLICTS= apache-1.3.[012] apache-*modssl-* apache6-* .include "../../mk/bsd.prefs.mk" diff --git a/www/apache/Makefile b/www/apache/Makefile index 45001f239b0..93126249e98 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 1999/06/05 20:32:17 tron Exp $ +# $NetBSD: Makefile,v 1.36 1999/07/23 18:20:04 itojun Exp $ # # The fourth number in the PKGNAME version indicates a NetBSD pkg revision # (to indicate changes in the shipped third party patches such as the mod_ssl @@ -21,7 +21,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= cjs@netbsd.org HOMEPAGE= http://www.apache.org/ -CONFLICTS= apache-*modssl-* +CONFLICTS= apache-*modssl-* apache6-* SSL_DISTNAME= mod_ssl-2.2.8-1.3.6 |