diff options
author | tron <tron> | 1999-02-19 21:55:24 +0000 |
---|---|---|
committer | tron <tron> | 1999-02-19 21:55:24 +0000 |
commit | 7625ddd9badcae3629b960b8a32791e157844fad (patch) | |
tree | 74122f755633ca63e84eb486638cfe64d4b00e79 /x11 | |
parent | 175093583c70ee9f7dc40bd372d233e7109353a7 (diff) | |
download | pkgsrc-7625ddd9badcae3629b960b8a32791e157844fad.tar.gz |
Remove unnecessary conflict list.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kde/Makefile | 4 | ||||
-rw-r--r-- | x11/kdelibs/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/x11/kde/Makefile b/x11/kde/Makefile index 41a19fa6b8b..e32019d08b2 100644 --- a/x11/kde/Makefile +++ b/x11/kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/02/18 23:40:25 tron Exp $ +# $NetBSD: Makefile,v 1.18 1999/02/19 21:55:42 tron Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp # @@ -15,8 +15,6 @@ DEPENDS+= kdenetwork-1.1:../../net/kdenetwork DEPENDS+= kdegraphics-1.1:../../graphics/kdegraphics #DEPENDS+= kdegames-1.1:../../games/kdegames -CONFLICTS= kde-* - EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_PATCH= yes diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index 9182b2ce19b..82700304402 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 1999/02/17 21:55:17 tron Exp $ +# $NetBSD: Makefile,v 1.27 1999/02/19 21:55:24 tron Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -16,8 +16,6 @@ DEPENDS+= png-1.0.2:../../graphics/png DEPENDS+= qt-1.42:../../x11/qt DEPENDS+= tiff-3.4:../../graphics/tiff -CONFLICTS= kdelibs-* - USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes |