summaryrefslogtreecommitdiff
path: root/www/apache
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1999-02-20 22:48:24 +0000
committerhubertf <hubertf@pkgsrc.org>1999-02-20 22:48:24 +0000
commit2a95ad9c6be52511880e6ee241b087af70706624 (patch)
treef0ac98b899382f539e1e39385f1316edd18626bd /www/apache
parent2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff)
downloadpkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'www/apache')
-rw-r--r--www/apache/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 55daa8911c6..2c469bb4670 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 1998/12/07 16:20:39 tv Exp $
+# $NetBSD: Makefile,v 1.29 1999/02/20 22:48:44 hubertf 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-1.3.[012] apache-*modssl-* apache-1.3.3.[01]
+CONFLICTS= apache-*modssl-*
SSL_DISTNAME= mod_ssl-2.1.3-1.3.3