From c1dd38971cb38581b0d24c76c67f75addaef476a Mon Sep 17 00:00:00 2001
From: Alan Eldridge <alane@FreeBSD.org>
Date: Sun, 4 Aug 2002 09:31:42 +0000
Subject: 1. Explicitly added USE_QT_VER and USE_KDELIBS_VER. 2. Unless
 NO_QT_WARNING is defined, and kdelibs is installed, a warning    is printed
 advising the user to delete the kdelibs package. This warning    causes a 10
 sec delay in the make to make sure the user notices it.

PR:		41206
---
 x11/kde3/Makefile | 34 +++++++++++++++++++++++++++++++---
 x11/kde4/Makefile | 34 +++++++++++++++++++++++++++++++---
 2 files changed, 62 insertions(+), 6 deletions(-)

(limited to 'x11')

diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index af2af0cd245c..f4e2ce9e1ca3 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -14,20 +15,47 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
 
-RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames3 \
+RUN_DEPENDS+=	kjumpingcube:${PORTSDIR}/games/kdegames3 \
 		kdessh:${PORTSDIR}/misc/kdeutils3 \
 		kword:${PORTSDIR}/editors/koffice-kde3 \
 		kppp:${PORTSDIR}/net/kdenetwork3 \
 		kview:${PORTSDIR}/graphics/kdegraphics3 \
 		kmidi:${PORTSDIR}/audio/kdemultimedia3
 
+.if make(package)
+DEPENDS_TARGET="package"
+.endif
+
+USE_QT_VER=3
+USE_KDELIBS_VER=3
 USE_KDEBASE_VER=3
+
 NO_BUILD=	yes
 
-.if make(package)
-DEPENDS_TARGET="package"
+.if !defined(NO_QT_WARNING)
+SLEEP?=/bin/sleep
+pre-everything::
+	@if test -e ${LOCALBASE}/bin/dcop; then \
+	    ${ECHO_MSG};\
+	    ${ECHO_MSG} \
+	    "============================================================";\
+	    ${ECHO_MSG} "===> " \
+	    "WARNING!!!";\
+	    ${ECHO_MSG} "===> " \
+	    "If you are upgrading Qt from 3.0.4 or an earlier 3.0.x";\
+	    ${ECHO_MSG} "===> " \
+	    "version, or have just done so, you MUST remove kdelibs";\
+	    ${ECHO_MSG} "===> " \
+	    "using 'pkg_delete -f kdelibs' before making this port.";\
+	    ${ECHO_MSG} \
+	    "============================================================";\
+	    ${ECHO_MSG}; ${SLEEP} 10;\
+	else \
+	    ${TRUE};\
+	fi
 .endif
 
 do-install:	# empty
+	${DO_NADA}
 
 .include <bsd.port.mk>
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index af2af0cd245c..f4e2ce9e1ca3 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -14,20 +15,47 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
 
-RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames3 \
+RUN_DEPENDS+=	kjumpingcube:${PORTSDIR}/games/kdegames3 \
 		kdessh:${PORTSDIR}/misc/kdeutils3 \
 		kword:${PORTSDIR}/editors/koffice-kde3 \
 		kppp:${PORTSDIR}/net/kdenetwork3 \
 		kview:${PORTSDIR}/graphics/kdegraphics3 \
 		kmidi:${PORTSDIR}/audio/kdemultimedia3
 
+.if make(package)
+DEPENDS_TARGET="package"
+.endif
+
+USE_QT_VER=3
+USE_KDELIBS_VER=3
 USE_KDEBASE_VER=3
+
 NO_BUILD=	yes
 
-.if make(package)
-DEPENDS_TARGET="package"
+.if !defined(NO_QT_WARNING)
+SLEEP?=/bin/sleep
+pre-everything::
+	@if test -e ${LOCALBASE}/bin/dcop; then \
+	    ${ECHO_MSG};\
+	    ${ECHO_MSG} \
+	    "============================================================";\
+	    ${ECHO_MSG} "===> " \
+	    "WARNING!!!";\
+	    ${ECHO_MSG} "===> " \
+	    "If you are upgrading Qt from 3.0.4 or an earlier 3.0.x";\
+	    ${ECHO_MSG} "===> " \
+	    "version, or have just done so, you MUST remove kdelibs";\
+	    ${ECHO_MSG} "===> " \
+	    "using 'pkg_delete -f kdelibs' before making this port.";\
+	    ${ECHO_MSG} \
+	    "============================================================";\
+	    ${ECHO_MSG}; ${SLEEP} 10;\
+	else \
+	    ${TRUE};\
+	fi
 .endif
 
 do-install:	# empty
+	${DO_NADA}
 
 .include <bsd.port.mk>
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0