diff options
author | tron <tron> | 1999-02-19 21:55:24 +0000 |
---|---|---|
committer | tron <tron> | 1999-02-19 21:55:24 +0000 |
commit | 61152083b722ba6e21b502f9ca6e2d8741dfe249 (patch) | |
tree | 74122f755633ca63e84eb486638cfe64d4b00e79 | |
parent | a6fa2f86e949871a81ec194a0d63827718b3ecd7 (diff) | |
download | pkgsrc-61152083b722ba6e21b502f9ca6e2d8741dfe249.tar.gz |
Remove unnecessary conflict list.
-rw-r--r-- | converters/kdesupport/Makefile | 4 | ||||
-rw-r--r-- | x11/kde/Makefile | 4 | ||||
-rw-r--r-- | x11/kdelibs/Makefile | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile index 95673e8e40b..9acbbad9568 100644 --- a/converters/kdesupport/Makefile +++ b/converters/kdesupport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 1999/02/15 22:34:57 tron Exp $ +# $NetBSD: Makefile,v 1.21 1999/02/19 21:56:25 tron Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp # @@ -13,8 +13,6 @@ HOMEPAGE= http://www.kde.org/ DEPENDS+= qt-1.42:../../x11/qt -CONFLICTS= kdesupport-* - USE_X11BASE= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes 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 |