summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorhubertf <hubertf>1999-02-20 22:48:24 +0000
committerhubertf <hubertf>1999-02-20 22:48:24 +0000
commita4cbe4cb0445443d02c5d3c6f788d17367537b92 (patch)
treef0ac98b899382f539e1e39385f1316edd18626bd /x11
parent878b71762a717be3626e0baac746b75c52f812b6 (diff)
downloadpkgsrc-a4cbe4cb0445443d02c5d3c6f788d17367537b92.tar.gz
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'x11')
-rw-r--r--x11/XF86Setup/Makefile4
-rw-r--r--x11/Xaw-Xpm/Makefile4
-rw-r--r--x11/Xaw3d/Makefile4
-rw-r--r--x11/afterstep/Makefile4
-rw-r--r--x11/asclock/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gtk/Makefile4
-rw-r--r--x11/lesstif/Makefile4
-rw-r--r--x11/qt/Makefile4
-rw-r--r--x11/windowmaker/Makefile4
-rw-r--r--x11/wmthemes/Makefile4
-rw-r--r--x11/xlockmore/Makefile5
-rw-r--r--x11/xscreensaver/Makefile4
-rw-r--r--x11/xwrits/Makefile4
14 files changed, 16 insertions, 41 deletions
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index 78a3b3a8ddb..1a7810b379a 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/01/22 21:10:01 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:46 hubertf Exp $
DISTNAME= XF86Setup-3.3.3.1
CATEGORIES= x11
@@ -11,8 +11,6 @@ HOMEPAGE= http://www.xfree86.org/
BUILD_DEPENDS+= ${TCLLIB}:../../lang/tcl80 \
${TKLIB}:../../x11/tk80
-CONFLICTS= XF86Setup-*
-
TCLLIB= ${LOCALBASE}/lib/libtcl80.a
TKLIB= ${LOCALBASE}/lib/libtk80.a
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 690cb351429..661ca7b51e6 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/09/13 19:35:05 garbled Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:46 hubertf Exp $
#
DISTNAME= Xaw-Xpm-1.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.zip.com.au/~bb/XawXpm/
DEPENDS+= xpm-3.4k:../../graphics/xpm
-CONFLICTS= Xaw3d-1.3 Xaw3d-1.5
+CONFLICTS= Xaw3d-*
USE_IMAKE= yes
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index ce5b488244c..fe8f4e6320b 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/07/15 10:45:35 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/02/20 22:48:46 hubertf Exp $
#
DISTNAME= Xaw3d-1.5
@@ -8,7 +8,7 @@ MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.3
MAINTAINER= tron@netbsd.org
-CONFLICTS= Xaw-Xpm-1.1 Xaw3d-1.3
+CONFLICTS= Xaw-Xpm-*
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/xc/lib/Xaw3d
diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index d081114f606..91b1e63cdc9 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:55 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:46 hubertf Exp $
DISTNAME= AfterStep-1.6.0
PKGNAME= afterstep-1.6.0
@@ -15,8 +15,6 @@ DEPENDS+= png-1.0.2:../../graphics/png
DEPENDS+= rplay-3.2.0b6:../../audio/rplay
DEPENDS+= asclock-11:../../x11/asclock
-CONFLICTS= afterstep-*
-
USE_X11BASE= yes
GNU_CONFIGURE= yes
diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile
index 4e48b457485..86f73a1c2c6 100644
--- a/x11/asclock/Makefile
+++ b/x11/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/01/30 23:18:55 agc Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:47 hubertf Exp $
#
DISTNAME= asclock
@@ -11,8 +11,6 @@ MAINTAINER= hubertf@netbsd.org
DEPENDS+= xpm-3.4k:../../graphics/xpm
-CONFLICTS= asclock-10
-
# Choose language from:
# 1) english [DEFAULT]
# 2) german
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 95514700f6a..256ea3b225a 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/01/30 23:18:56 agc Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:47 hubertf Exp $
#
DISTNAME= gnome-libs-0.99.3
@@ -15,8 +15,6 @@ DEPENDS+= ORBit-0.3.90:../../corba/ORBit
NOT_FOR_ARCHS= alpha # problems with gtk
-CONFLICTS= gnome-libs-*
-
GNU_CONFIGURE= yes
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 3f3b97afca3..b7fb96ec06b 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 1999/01/30 23:18:56 agc Exp $
+# $NetBSD: Makefile,v 1.27 1999/02/20 22:48:47 hubertf Exp $
DISTNAME= gtk+-1.1.12
CATEGORIES= x11
@@ -14,8 +14,6 @@ DEPENDS+= gettext-0.10.35:../../devel/gettext
DEPENDS+= glib-1.1.12:../../devel/glib
BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5
-CONFLICTS= gtk+-*
-
USE_LIBTOOL= yes
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 9353e33aa22..14a6a4454d3 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 1999/01/30 23:18:57 agc Exp $
+# $NetBSD: Makefile,v 1.37 1999/02/20 22:48:47 hubertf Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
#
@@ -10,8 +10,6 @@ MASTER_SITES= ftp://linux.gt.ed.net/pub/linux/libs/lesstif/srcdist/ \
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.lesstif.org/
-CONFLICTS= lesstif-*
-
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_X11BASE= yes
diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index b36a4073e8b..e79e905b5e3 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 1999/01/30 23:18:57 agc Exp $
+# $NetBSD: Makefile,v 1.24 1999/02/20 22:48:47 hubertf Exp $
#
DISTNAME= qt-1.42
@@ -9,8 +9,6 @@ MASTER_SITES= ftp://ftp.troll.no/qt/source/ \
MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.troll.no/products/qt.html
-CONFLICTS= qt-*
-
USE_X11BASE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index da8ce013b37..16fdc662da6 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/02/15 19:30:33 tron Exp $
+# $NetBSD: Makefile,v 1.23 1999/02/20 22:48:47 hubertf Exp $
DISTNAME= WindowMaker-0.51.0
PKGNAME= windowmaker-0.51.0
@@ -18,8 +18,6 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png-1.0.2:../../graphics/png
DEPENDS+= tiff-3.4:../../graphics/tiff
-CONFLICTS= windowmaker-*
-
USE_LIBTOOL= yes
USE_X11BASE= yes
GNU_CONFIGURE= yes
diff --git a/x11/wmthemes/Makefile b/x11/wmthemes/Makefile
index b6a153e9b8f..0c74c6e90e7 100644
--- a/x11/wmthemes/Makefile
+++ b/x11/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/02 10:27:55 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/20 22:48:48 hubertf Exp $
DISTNAME= wmthemes-0.51.x
CATEGORIES= x11
@@ -11,8 +11,6 @@ HOMEPAGE= http://wm.themes.org/
DEPENDS+= windowmaker-0.51.0:../../x11/windowmaker
-CONFLICTS= wm-themes-* wmthemes-*
-
USE_X11BASE= yes
NO_BUILD= yes
NO_CONFIGURE= yes
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index e80c151915e..7d8276c0ce6 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/01/30 23:18:58 agc Exp $
+# $NetBSD: Makefile,v 1.23 1999/02/20 22:48:48 hubertf Exp $
# FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
#
@@ -12,9 +12,6 @@ HOMEPAGE= http://www.tux.org/~bagleyd/xlockmore.html
DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= Mesa-3.0:../../graphics/Mesa
-CONFLICTS= xlockmore-4.07 xlockmore-4.08 xlockmore-4.09 xlockmore-4.10 \
- xlockmore-4.11
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \
--without-editres --without-dtsaver --without-rplay \
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 364c5e6a316..07c8b6657d9 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 1999/01/30 23:18:58 agc Exp $
+# $NetBSD: Makefile,v 1.20 1999/02/20 22:48:48 hubertf Exp $
#
DISTNAME= xscreensaver-3.07
@@ -12,8 +12,6 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
DEPENDS+= Xaw3d-1.5:../../x11/Xaw3d
DEPENDS+= Mesa-3.0:../../graphics/Mesa
-CONFLICTS= xscreensaver-*
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-shadow --with-zippy=/usr/games/fortune \
--enable-subdir=${PREFIX}/libexec/xscreensaver
diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile
index a09c5b45583..0a8496d6daa 100644
--- a/x11/xwrits/Makefile
+++ b/x11/xwrits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:58 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:48 hubertf Exp $
DISTNAME= xwrits-2.7.3
CATEGORIES= x11
@@ -7,8 +7,6 @@ MASTER_SITES= http://www.lcdf.org/~eddietwo/xwrits/
MAINTAINER= mcmahill@alum.mit.edu
HOMEPAGE= http://www.lcdf.org/~eddietwo/xwrits/
-CONFLICTS= xwrits-*
-
USE_X11BASE= YES
GNU_CONFIGURE= YES
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 23:38:17 +0000