diff options
| -rw-r--r-- | converters/kdesupport/Makefile | 4 | ||||
| -rw-r--r-- | converters/uulib/Makefile | 5 | ||||
| -rw-r--r-- | games/kdegames/Makefile | 4 | ||||
| -rw-r--r-- | graphics/kdegraphics/Makefile | 4 | ||||
| -rw-r--r-- | misc/kdeutils/Makefile | 4 | ||||
| -rw-r--r-- | net/kdenetwork/Makefile | 4 | ||||
| -rw-r--r-- | x11/kde/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdebase/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs/Makefile | 4 |
9 files changed, 28 insertions, 9 deletions
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile index 27b9fc820ad..38e2310dbdc 100644 --- a/converters/kdesupport/Makefile +++ b/converters/kdesupport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/07/14 20:55:28 tron Exp $ +# $NetBSD: Makefile,v 1.9 1998/07/14 22:56:40 tron Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp # @@ -11,6 +11,8 @@ MAINTAINER= tron@netbsd.org DEPENDS+= qt-1.33:../../x11/qt +CONFLICTS= kdesupport-2.1b kdesupport-3.1b kdesupport-4.1b + USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=${PREFIX}" \ diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile index 44e76c97628..a085f2aaefc 100644 --- a/converters/uulib/Makefile +++ b/converters/uulib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/06/20 09:33:13 agc Exp $ +# $NetBSD: Makefile,v 1.8 1998/07/14 22:58:24 tron Exp $ # FreeBSD Id: Makefile,v 1.14 1998/02/18 22:20:02 hoek Exp # @@ -10,6 +10,9 @@ MASTER_SITES= http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \ MAINTAINER= packages@netbsd.org +# "kdesupport-2.1b" included "uu" library. +CONFLICTS= kdesupport-2.1b + GNU_CONFIGURE= yes ALL_TARGET= libuu.a libuu.so.1.0 diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile index 13d066d2a03..d8f00b85107 100644 --- a/games/kdegames/Makefile +++ b/games/kdegames/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1998/07/14 21:21:10 tron Exp $ +# $NetBSD: Makefile,v 1.17 1998/07/14 22:56:52 tron Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp # @@ -16,6 +16,8 @@ DEPENDS+= kdelibs-1.0:../../x11/kdelibs DEPENDS+= kdebase-1.0:../../x11/kdebase DEPENDS+= kdesupport-1.0:../../converters/kdesupport +CONFLICTS= kdegames-2.1b kdegames-3.1b kdegames-4.1b + USE_X11= yes USE_GMAKE= yes HAS_CONFIGURE= yes diff --git a/graphics/kdegraphics/Makefile b/graphics/kdegraphics/Makefile index bdf59ce6940..896f3524033 100644 --- a/graphics/kdegraphics/Makefile +++ b/graphics/kdegraphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/07/14 22:09:33 tron Exp $ +# $NetBSD: Makefile,v 1.5 1998/07/14 22:57:01 tron Exp $ # DISTNAME= kdegraphics-1.0 @@ -14,6 +14,8 @@ DEPENDS+= qt-1.33:../../x11/qt DEPENDS+= kdelibs-1.0:../../x11/kdelibs DEPENDS+= kdebase-1.0:../../x11/kdebase +CONFLICTS= kdegraphics-4.1b + USE_X11= yes USE_GMAKE= yes HAS_CONFIGURE= yes diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile index 5bc2357365e..05166aa5e05 100644 --- a/misc/kdeutils/Makefile +++ b/misc/kdeutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1998/07/14 20:30:58 tron Exp $ +# $NetBSD: Makefile,v 1.16 1998/07/14 22:57:13 tron Exp $ # FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp # @@ -15,6 +15,8 @@ DEPENDS+= qt-1.33:../../x11/qt DEPENDS+= kdelibs-1.0:../../x11/kdelibs DEPENDS+= kdebase-1.0:../../x11/kdebase +CONFLICTS= kdeutils-2.1b kdeutils-3.1b kdeutils-4.1b + USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--x-inc=${PREFX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \ diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index 398f19c0bca..29774e43f3a 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1998/07/14 21:47:15 tron Exp $ +# $NetBSD: Makefile,v 1.15 1998/07/14 22:57:28 tron Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -18,6 +18,8 @@ DEPENDS+= kdelibs-1.0:../../x11/kdelibs DEPENDS+= kdesupport-1.0:../../converters/kdesupport DEPENDS+= kdebase-1.0:../../x11/kdebase +CONFLICTS= kdenetwork-2.1b kdenetwork-3.1b kdenetwork-4.1b + USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \ diff --git a/x11/kde/Makefile b/x11/kde/Makefile index 38e1d7fcfb2..b7b0a8581b6 100644 --- a/x11/kde/Makefile +++ b/x11/kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1998/07/14 22:12:30 tron Exp $ +# $NetBSD: Makefile,v 1.13 1998/07/14 22:57:39 tron Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp # @@ -14,6 +14,8 @@ DEPENDS+= kdegames-1.0:../../games/kdegames DEPENDS+= kdenetwork-1.0:../../net/kdenetwork DEPENDS+= kdegraphics-1.0:../../graphics/kdegraphics +CONFLICTS= kde-2.1b kde-3.1b kde-4.1b + EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_PATCH= yes diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 14d0ffc3ff3..4c27960636f 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1998/07/14 20:28:23 tron Exp $ +# $NetBSD: Makefile,v 1.17 1998/07/14 22:57:56 tron Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp # @@ -15,6 +15,8 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= qt-1.33:../../x11/qt DEPENDS+= kdelibs-1.0:../../x11/kdelibs +CONFLICTS= kdebase-2.1b kdebase-3.1b kdebase-4.1b + USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \ diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index 83617719c2a..01d31779c36 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/07/13 20:33:48 tron Exp $ +# $NetBSD: Makefile,v 1.14 1998/07/14 22:58:13 tron Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -13,6 +13,8 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= qt-1.33:../../x11/qt DEPENDS+= giflib-3.0:../../graphics/giflib +CONFLICTS= kdelibs-2.1b kdelibs-3.1b kdelibs-4.1b + USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=${PREFIX}" \ |