summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrueauf <frueauf@pkgsrc.org>1998-06-05 12:06:11 +0000
committerfrueauf <frueauf@pkgsrc.org>1998-06-05 12:06:11 +0000
commit52dd58ca2a49f35dc73952209925a70e3f379320 (patch)
treeb5309e9550391eb83be51460baa80e2ac97f5c5d
parent72c9f85c48715411f883ee7381e911147de38b8d (diff)
downloadpkgsrc-52dd58ca2a49f35dc73952209925a70e3f379320.tar.gz
Add CONFLICTS where its needed so far.
-rw-r--r--devel/Makefile6
-rw-r--r--devel/cvs/Makefile4
-rw-r--r--x11/Makefile8
-rw-r--r--x11/Xaw-Xpm/Makefile4
-rw-r--r--x11/Xaw3d/Makefile4
-rw-r--r--x11/lesstif-current/Makefile4
-rw-r--r--x11/lesstif/Makefile4
7 files changed, 19 insertions, 15 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
diff --git a/x11/Makefile b/x11/Makefile
index 1523e0a664a..b9a459883f4 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 1998/05/15 21:49:08 tron Exp $
+# $NetBSD: Makefile,v 1.35 1998/06/05 12:06:11 frueauf Exp $
# FreeBSD Id: Makefile,v 1.156 1997/09/30 07:54:42 asami Exp
#
@@ -6,9 +6,7 @@
# SUBDIR += XFree86
# SUBDIR += XFree86-contrib
SUBDIR += Xaw3d
-# SUBDIR += Xaw-Xpm # don't enable this by default unless we
-# have a CONFLICTS feature (installs same
-# files like Xaw3d).
+# SUBDIR += Xaw-Xpm
# SUBDIR += afterstep
SUBDIR += amiwm
SUBDIR += asclock
@@ -41,7 +39,7 @@
SUBDIR += kdebase
SUBDIR += kdelibs
# SUBDIR += lesstif
- SUBDIR += lesstif-current # conflicts with lesstif, above
+ SUBDIR += lesstif-current
# SUBDIR += libdnd
# SUBDIR += libsx
# SUBDIR += lupe
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index e3d9a2e6e7d..9623aeac05b 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 1998/05/05 13:46:31 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1998/06/05 12:06:12 frueauf Exp $
#
-DISTNAME= Xaw-XPM-1.1
+DISTNAME= Xaw-Xpm-1.1
WRKSRC= ${WRKDIR}/XawXpm
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 49527b9d667..25b755dcc10 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:52 agc Exp $
+# $NetBSD: Makefile,v 1.13 1998/06/05 12:06:12 frueauf Exp $
# FreeBSD Id: Makefile,v 1.14 1997/06/19 09:33:26 asami Exp
#
@@ -9,6 +9,8 @@ MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.1
MAINTAINER= tron@netbsd.org
+CONFLICTS= Xaw-Xpm-1.1
+
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/xc/lib/Xaw3d
PLIST_SRC= ${WRKDIR}/PLIST-src
diff --git a/x11/lesstif-current/Makefile b/x11/lesstif-current/Makefile
index fd904933c52..15f8c0fbf70 100644
--- a/x11/lesstif-current/Makefile
+++ b/x11/lesstif-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/05/15 14:52:13 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/06/05 12:06:12 frueauf Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
#
@@ -9,6 +9,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MAINTAINER= packages@netbsd.org
+CONFLICTS= lesstif-0.82 lesstif-0.83 lesstif-0.84
+
GNU_CONFIGURE= yes
USE_X11= yes
# change this for debugging
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 125d12f562d..66bc4f0ae76 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1998/05/23 13:29:36 tron Exp $
+# $NetBSD: Makefile,v 1.19 1998/06/05 12:06:12 frueauf Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
#
@@ -10,6 +10,8 @@ MASTER_SITES= ftp://linux.gt.ed.net/pub/linux/libs/lesstif/srcdist/ \
MAINTAINER= packages@netbsd.org
+CONFLICTS= lesstif-0.82 lesstif-0.83 lesstif-19980510
+
GNU_CONFIGURE= yes
USE_X11= yes
# change this for debugging