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.

20 files changed, 72 insertions, 61 deletions

diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 93c6321fa800..3680ed40cb83 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 bindings for the D-BUS messaging system
 
-BUILD_DEPENDS=	moc4:${PORTSDIR}/devel/qt4-moc \
+BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
 		qmake-qt4:${PORTSDIR}/devel/qmake4
 LIB_DEPENDS=	QtCore:${PORTSDIR}/devel/qt4-corelib \
 		QtXml:${PORTSDIR}/textproc/qt4-xml \
@@ -66,7 +66,7 @@ pre-configure:
 		${WRKSRC}/src/src.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/moc-qt4 ${WRKSRC}/../../bin/moc
 
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtDBus.pc|${PREFIX}/libdata/pkgconfig/QtDBus.pc|g' \
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index 46496d9d918d..4ba4893d6eb6 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmake
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
@@ -52,8 +53,8 @@ post-patch:
 		-e 's|release|release thread|' \
 		-e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
 		-e 's|-pthread|${PTHREAD_LIBS}|' \
-		-e 's|uic|uic4|' \
-		-e 's|moc|moc4|' \
+		-e 's|uic|uic-qt4|' \
+		-e 's|moc|moc-qt4|' \
 		${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf \
 		${WRKSRC}/../mkspecs/freebsd-g++34/qmake.conf
 	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index 2d6191f82950..5996b53ca788 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	assistant
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,10 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt documentation browser
 
-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 \
 		QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
@@ -64,11 +64,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=assistant-qt4|g' \
 		${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/lib/lib.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/devel/qt4-assistant/pkg-plist b/devel/qt4-assistant/pkg-plist
index 07b9ded3764e..98334ee203db 100644
--- a/devel/qt4-assistant/pkg-plist
+++ b/devel/qt4-assistant/pkg-plist
@@ -1 +1 @@
-bin/assistant
+bin/assistant-qt4
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index 02d4e000cb9b..f80a80eac79c 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 COMMENT?=	Qt core library
 
-BUILD_DEPENDS=	moc4:${PORTSDIR}/devel/qt4-moc \
+BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
 		qmake-qt4:${PORTSDIR}/devel/qmake4
 LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20
 
@@ -74,7 +74,7 @@ pre-configure:
 		${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/../qt_install.pri
 	${MKDIR} ${WRKSRC}/../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtCore.pc|${PREFIX}/libdata/pkgconfig/QtCore.pc|g' \
 		${WRKSRC}/Makefile
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index e2abe8225553..50efbb4a4278 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	designer
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,10 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt ui editor
 
-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 \
 		Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
 		QtCore:${PORTSDIR}/devel/qt4-corelib \
@@ -64,6 +64,7 @@ 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=designer-qt4|g' \
 		${WRKSRC}/src/designer/${PORTNAME}.pro
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins|g' \
 		${WRKSRC}/src/plugins/plugins.pri
@@ -73,8 +74,8 @@ pre-configure:
 		${WRKSRC}/src/lib/lib.pro ${WRKSRC}/src/components/lib/lib.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.post.mk>
diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index 0ef0b8dec4d0..ea84579a1a87 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -1,5 +1,5 @@
-bin/designer
-bin/designer.debug
+bin/designer-qt4
+bin/designer-qt4.debug
 include/QtDesigner/QAbstractExtensionFactory
 include/QtDesigner/QAbstractExtensionManager
 include/QtDesigner/QAbstractFormBuilder
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 54ac7e7a6b49..8bdbef3ea817 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libQtAssistantClient
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,7 +18,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt documentation browser integration library
 
-BUILD_DEPENDS=	moc4:${PORTSDIR}/devel/qt4-moc \
+BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
 		qmake-qt4:${PORTSDIR}/devel/qmake4
 
 LIB_DEPENDS=	QtCore:${PORTSDIR}/devel/qt4-corelib \
@@ -61,8 +61,10 @@ pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
 		${WRKSRC}/lib.pro
+	${REINPLACE_CMD} -E -e 's|"(.*)assistant"|"\1assistant-qt4"|g' \
+		${WRKSRC}/qassistantclient.cpp
 	${MKDIR} ${WRKSRC}/../../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../../bin/moc
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc
 
 .include <bsd.port.mk>
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index 997031e68a79..2fddbbf88975 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	linguist
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -19,10 +19,10 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt localisation tool
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libQtUiTools.a:${PORTSDIR}/devel/qt4-designer \
-		moc4:${PORTSDIR}/devel/qt4-moc \
+		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 \
 		QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
 		QtNetwork:${PORTSDIR}/net/qt4-network \
@@ -62,12 +62,13 @@ pre-configure:
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
 		-e 's|phrasebooks.path.*|phrasebooks.path=${PREFIX}/share/qt4/phrasebooks|g' \
 		-e 's|linguisttranslations.path.*|linguisttranslations.path=${PREFIX}/share/qt4/translations|g' \
+		-E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \
 		${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/${PORTNAME}/${PORTNAME}.pro \
 		${WRKSRC}/lrelease/lrelease.pro ${WRKSRC}/lupdate/lupdate.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/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist
index 36ddd1e30d76..872f2837b35a 100644
--- a/devel/qt4-linguist/pkg-plist
+++ b/devel/qt4-linguist/pkg-plist
@@ -1,9 +1,9 @@
-bin/linguist
-bin/linguist.debug
-bin/lrelease
-bin/lrelease.debug
-bin/lupdate
-bin/lupdate.debug
+bin/linguist-qt4
+bin/linguist-qt4.debug
+bin/lrelease-qt4
+bin/lrelease-qt4.debug
+bin/lupdate-qt4
+bin/lupdate-qt4.debug
 share/qt4/phrasebooks/danish.qph
 share/qt4/phrasebooks/dutch.qph
 share/qt4/phrasebooks/finnish.qph
diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile
index 1de073114619..0e76b1f634f9 100644
--- a/devel/qt4-moc/Makefile
+++ b/devel/qt4-moc/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	moc
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -54,7 +55,7 @@ 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=moc4|g' \
+			-e 's|^TARGET.*|TARGET=moc-qt4|g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${MKDIR} ${WRKSRC}/../../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
diff --git a/devel/qt4-moc/pkg-plist b/devel/qt4-moc/pkg-plist
index 9cde760d39c5..9629ce043147 100644
--- a/devel/qt4-moc/pkg-plist
+++ b/devel/qt4-moc/pkg-plist
@@ -1,2 +1,2 @@
-bin/moc4
-bin/moc4.debug
+bin/moc-qt4
+bin/moc-qt4.debug
diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile
index 5d15ca64302f..31813805ad82 100644
--- a/devel/qt4-porting/Makefile
+++ b/devel/qt4-porting/Makefile
@@ -17,10 +17,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt utility to assist with porting Qt3 applications to Qt4
 
-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=	QtCore:${PORTSDIR}/devel/qt4-corelib \
 		QtXml:${PORTSDIR}/textproc/qt4-xml
 
@@ -63,8 +63,8 @@ pre-configure:
 		${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/src/src.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/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index b97dea4d9c69..6280e90f6b3b 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt3 compatibility library
 
-BUILD_DEPENDS=	moc4:${PORTSDIR}/devel/qt4-moc \
+BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
 		qmake-qt4:${PORTSDIR}/devel/qmake4
 LIB_DEPENDS?=	QtCore:${PORTSDIR}/devel/qt4-corelib \
 		QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
@@ -68,7 +68,7 @@ pre-configure:
 		${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/../qt_install.pri
 	${MKDIR} ${WRKSRC}/../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/Qt3Support.pc|${PREFIX}/libdata/pkgconfig/Qt3Support.pc|g' \
 		${WRKSRC}/Makefile
diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile
index a9f7deb12318..460e18d60d09 100644
--- a/devel/qt4-qtestlib/Makefile
+++ b/devel/qt4-qtestlib/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 COMMENT?=	Qt unit testing library
 
-BUILD_DEPENDS=	moc4:${PORTSDIR}/devel/qt4-moc \
+BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
 		qmake-qt4:${PORTSDIR}/devel/qmake4
 
 LIB_DEPENDS=	QtCore:${PORTSDIR}/devel/qt4-corelib
@@ -64,7 +64,7 @@ pre-configure:
 		${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/moc-qt4 ${WRKSRC}/../../bin/moc
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtTest.pc|${PREFIX}/libdata/pkgconfig/QtTest.pc|g' \
 		${WRKSRC}/src/Makefile
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index afde843a08d2..3033cc85f83d 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qvfb
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,10 +18,10 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt virtual framebuffer 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=	QtCore:${PORTSDIR}/devel/qt4-corelib \
 		QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
 		QtOpenGL:${PORTSDIR}/x11/qt4-opengl
@@ -61,9 +61,11 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${MKDIR} ${WRKSRC}/../../mkspecs
+	${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb-qt4|g' \
+		${WRKSRC}/qvfb.pro
 	${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-install:
diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist
index 919c78fd9357..9da8e06f6cf8 100644
--- a/devel/qt4-qvfb/pkg-plist
+++ b/devel/qt4-qvfb/pkg-plist
@@ -1,5 +1,5 @@
-bin/qvfb
-bin/qvfb.debug
+bin/qvfb-qt4
+bin/qvfb-qt4.debug
 share/qvfb/ClamshellPhone.skin/ClamshellPhone.skin
 share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
 share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png
diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile
index c1ecff6499d3..7cb3777e061f 100644
--- a/devel/qt4-uic/Makefile
+++ b/devel/qt4-uic/Makefile
@@ -1,4 +1,4 @@
-## -*-mode: makefile-*-
+### -*-mode: makefile-*-
 # New ports collection makefile for:	qt40
 # Date created:				Wed Jun 29 11:49:42 CEST 2005
 # Whom:					lofi@freebsd.org
@@ -8,6 +8,7 @@
 
 PORTNAME=	uic
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -53,7 +54,7 @@ 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=uic4|g' \
+			-e 's|^TARGET.*|TARGET=uic-qt4|g' \
 		${WRKSRC}/${PORTNAME}.pro
 	${MKDIR} ${WRKSRC}/../../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
diff --git a/devel/qt4-uic/pkg-plist b/devel/qt4-uic/pkg-plist
index 86ae0aef3e33..9ddcdc2a9202 100644
--- a/devel/qt4-uic/pkg-plist
+++ b/devel/qt4-uic/pkg-plist
@@ -1,2 +1,2 @@
-bin/uic4
-bin/uic4.debug
+bin/uic-qt4
+bin/uic-qt4.debug
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index 097c7d7f58d4..e8bff93b2bdb 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt4
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -23,17 +24,17 @@ RUN_DEPENDS=	${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so
 		${LOCALBASE}/lib/libQtSql.so:${PORTSDIR}/databases/qt4-sql \
 		qdbus:${PORTSDIR}/devel/dbus-qt4 \
 		qmake-qt4:${PORTSDIR}/devel/qmake4 \
-		${LOCALBASE}/bin/assistant:${PORTSDIR}/devel/qt4-assistant \
+		${LOCALBASE}/bin/assistant-qt4:${PORTSDIR}/devel/qt4-assistant \
 		${LOCALBASE}/lib/libQtCore.so:${PORTSDIR}/devel/qt4-corelib \
-		${LOCALBASE}/bin/designer:${PORTSDIR}/devel/qt4-designer \
+		${LOCALBASE}/bin/designer-qt4:${PORTSDIR}/devel/qt4-designer \
 		${LOCALBASE}/lib/libQtAssistantClient.so:${PORTSDIR}/devel/qt4-libqtassistantclient \
-		${LOCALBASE}/bin/linguist:${PORTSDIR}/devel/qt4-linguist \
-		${LOCALBASE}/bin/moc4:${PORTSDIR}/devel/qt4-moc \
+		${LOCALBASE}/bin/linguist-qt4:${PORTSDIR}/devel/qt4-linguist \
+		${LOCALBASE}/bin/moc-qt4:${PORTSDIR}/devel/qt4-moc \
 		${LOCALBASE}/bin/qt3to4:${PORTSDIR}/devel/qt4-porting \
 		${LOCALBASE}/lib/libQt3Support.so:${PORTSDIR}/devel/qt4-qt3support \
 		${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc \
-		${LOCALBASE}/bin/qvfb:${PORTSDIR}/devel/qt4-qvfb \
-		${LOCALBASE}/bin/uic4:${PORTSDIR}/devel/qt4-uic \
+		${LOCALBASE}/bin/qvfb-qt4:${PORTSDIR}/devel/qt4-qvfb \
+		${LOCALBASE}/bin/uic-qt4:${PORTSDIR}/devel/qt4-uic \
 		${LOCALBASE}/bin/uic3:${PORTSDIR}/devel/qt4-uic3 \
 		${LOCALBASE}/lib/libQtTest.so:${PORTSDIR}/devel/qt4-qtestlib \
 		${LOCALBASE}/lib/plugins/imageformats/libqgif.so:${PORTSDIR}/graphics/qt4-imageformats \