[Midnightbsd-cvs] mports: kde4.mk: Set KDE4_PREFIX to localbase.

[ctriv at midnightbsd.org]

Log Message:
-----------
Set KDE4_PREFIX to localbase.
Set some sensible conflicts with kde3 automatically when you USE_KDE4.

Modified Files:
--------------
    mports/Mk/extensions:
        kde4.mk (r1.1 -> r1.2)

-------------- next part --------------
Index: kde4.mk
===================================================================
RCS file: /home/cvs/mports/Mk/extensions/kde4.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -L Mk/extensions/kde4.mk -L Mk/extensions/kde4.mk -u -r1.1 -r1.2
--- Mk/extensions/kde4.mk
+++ Mk/extensions/kde4.mk
@@ -5,7 +5,7 @@
 
 # Please make sure all changes to this file are past through the maintainer.
 # Do not commit them yourself (unless of course you're the Port's Wraith ;).
-Kde_Pre_Include=	bsd.kde4.mk
+Kde_Pre_Include=	kde4.mk
 Kde_Include_MAINTAINER=	ports at MidnightBSD.org
 
 #
@@ -42,7 +42,7 @@
 #		with :kde tag. It could be used when port needs multiple
 #		distfiles from different sites. See for details porters-handbook:
 #		http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-distfiles.html
-# KDE4_PREFIX	- The place where KDE4 ports live. Currently it is {LOCALBASE}/kde4,
+# KDE4_PREFIX	- The place where KDE4 ports live. Currently it is ${LOCALBASE},
 #		but this could be changed in a future.
 #
 
@@ -51,7 +51,7 @@
 #
 # KDE4 is installed into its own prefix to not conflict with KDE3
 #
-KDE4_PREFIX?=		${LOCALBASE}/kde4
+KDE4_PREFIX?=		${LOCALBASE}
 
 #
 # Tagged MASTER_SITE_KDE
@@ -98,6 +98,8 @@
 
 Kde_Post_Include=	bsd.kde4.mk
 
+CONFLICTS+= kdelibs-3* kdeutils-3* kdebase-3*
+
 .for component in ${USE_KDE4}
 . if ${_USE_KDE4_ALL:M${component}}!=""
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}