From 7aeef3e5194acb6b59e88472be78b4d7f2a7014f Mon Sep 17 00:00:00 2001
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Thu, 19 Apr 2007 17:08:04 +0000
Subject: Rename all binaries in qt4 which conflict with binaries installed by
 qt33 to ($binary)-qt4 and adjust dependencies accordingly. This avoids
 conflicts once X11BASE has been changed to /usr/local and incidentally makes
 the naming scheme of the qt4 executables in ports equal to that of the Fedora
 Core and Debian packages.

---
 misc/qt4-qtconfig/Makefile  | 10 ++++++----
 misc/qt4-qtconfig/pkg-plist |  4 ++--
 misc/qt4-qtdemo/Makefile    |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'misc')

diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index ae84f39916d2..d7da81b85a2b 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	qtconfig
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -17,10 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical configuration utility
 
-BUILD_DEPENDS=	moc4:${PORTSDIR}/devel/qt4-moc \
+BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
 		qmake-qt4:${PORTSDIR}/devel/qmake4 \
 		rcc:${PORTSDIR}/devel/qt4-rcc \
-		uic4:${PORTSDIR}/devel/qt4-uic
+		uic-qt4:${PORTSDIR}/devel/qt4-uic
 LIB_DEPENDS=	Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
 		QtCore:${PORTSDIR}/devel/qt4-corelib
 
@@ -59,11 +60,12 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
+			-e 's|^TARGET.*|TARGET=qtconfig-qt4|g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${MKDIR} ${WRKSRC}/../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc
-	${LN} -sf ${LOCALBASE}/bin/uic4 ${WRKSRC}/../../bin/uic
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
+	${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc
 
 .include <bsd.port.mk>
diff --git a/misc/qt4-qtconfig/pkg-plist b/misc/qt4-qtconfig/pkg-plist
index 0094644f2a03..79798b59b5cd 100644
--- a/misc/qt4-qtconfig/pkg-plist
+++ b/misc/qt4-qtconfig/pkg-plist
@@ -1,2 +1,2 @@
-bin/qtconfig
-bin/qtconfig.debug
+bin/qtconfig-qt4
+bin/qtconfig-qt4.debug
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index b9232ad885cb..318b5244cc2c 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -18,10 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt demonstration and example programs
 
-BUILD_DEPENDS=	moc4:${PORTSDIR}/devel/qt4-moc \
+BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
 		qmake-qt4:${PORTSDIR}/devel/qmake4 \
 		rcc:${PORTSDIR}/devel/qt4-rcc \
-		uic4:${PORTSDIR}/devel/qt4-uic
+		uic-qt4:${PORTSDIR}/devel/qt4-uic
 LIB_DEPENDS=	QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \
 		QtCore:${PORTSDIR}/devel/qt4-corelib \
 		QtDBus:${PORTSDIR}/devel/dbus-qt4 \
@@ -59,8 +59,8 @@ pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${MKDIR} ${WRKSRC}/../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../bin/moc
-	${LN} -sf ${LOCALBASE}/bin/uic4 ${WRKSRC}/../bin/uic
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../bin/moc
+	${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../bin/uic
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../bin/rcc
 
 post-build:
-- 
cgit v1.2.3