summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorfrueauf <frueauf>1998-05-05 13:12:16 +0000
committerfrueauf <frueauf>1998-05-05 13:12:16 +0000
commitdde3db2717fadcc7361a423ddc862f9f4e08de79 (patch)
tree03028897e44b65b697cb90b34dc6b485bf913cdf /devel
parent1ce3418f3054064b17233a8b7a1056ae5834ca14 (diff)
downloadpkgsrc-dde3db2717fadcc7361a423ddc862f9f4e08de79.tar.gz
Comment out SUBDIR+=cvs-current until we have a CONFLICTS feature.
This way cvs and cvs-current don't conflict by default.
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/devel/Makefile b/devel/Makefile
index c3f8940b985..aa7fed7c8d7 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1998/05/03 21:25:59 frueauf Exp $
+# $NetBSD: Makefile,v 1.21 1998/05/05 13:12:16 frueauf Exp $
# FreeBSD Id: Makefile,v 1.78 1997/10/01 08:32:59 cracauer Exp
#
@@ -17,7 +17,9 @@
# SUBDIR += cs
# SUBDIR += cutils
SUBDIR += cvs
- SUBDIR += cvs-current
+# SUBDIR += cvs-current # don't enable this by default unless we
+ # have a CONFLICTS feature (installs same
+ # files like cvs).
# SUBDIR += cxref
# SUBDIR += ddd
# SUBDIR += dmake