diff options
| author | frueauf <frueauf> | 1998-06-05 12:06:11 +0000 |
|---|---|---|
| committer | frueauf <frueauf> | 1998-06-05 12:06:11 +0000 |
| commit | df39e583495c007d873ac7e7aa01bc2e89261304 (patch) | |
| tree | b5309e9550391eb83be51460baa80e2ac97f5c5d /devel | |
| parent | 4f5ed66b4b1e18a32f26d696c150481491e88212 (diff) | |
| download | pkgsrc-df39e583495c007d873ac7e7aa01bc2e89261304.tar.gz | |
Add CONFLICTS where its needed so far.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/Makefile | 6 | ||||
| -rw-r--r-- | devel/cvs/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/devel/Makefile b/devel/Makefile index 10ba2986019..13fb92cbc1c 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 1998/06/02 11:30:42 agc Exp $ +# $NetBSD: Makefile,v 1.25 1998/06/05 12:06:11 frueauf Exp $ # FreeBSD Id: Makefile,v 1.78 1997/10/01 08:32:59 cracauer Exp # @@ -17,9 +17,7 @@ # SUBDIR += cs # SUBDIR += cutils SUBDIR += cvs -# SUBDIR += cvs-current # don't enable this by default unless we -# have a CONFLICTS feature (installs same -# files like cvs). +# SUBDIR += cvs-current # SUBDIR += cxref SUBDIR += ddd # SUBDIR += dmake diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index 79b86786bff..ac4ecd00bee 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/04/22 11:05:02 agc Exp $ +# $NetBSD: Makefile,v 1.11 1998/06/05 12:06:11 frueauf Exp $ # DISTNAME= cvs-1.9 @@ -9,6 +9,8 @@ MAINTAINER= lamj@stat.cmu.edu GNU_CONFIGURE= yes +CONFLICTS= cvs-1.9.26 cvs-1.9.27 cvs-1.9.28 + .if exists(/usr/lib/libkrb.a) CONFIGURE_ARGS+= --with-krb4=/usr --enable-encryption .endif |