3 files changed, 22 insertions, 28 deletions

diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index cc6bfa612e10..52768b9b135e 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -7,37 +7,27 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION=	4.2.3
-PORTREVISION=	3
+PORTVERSION=	${QT4_VERSION}
+PORTREVISION=0
 CATEGORIES?=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
-PKGNAMESUFFIX=	-qt4
+PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 bindings for the D-BUS messaging system
 
-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 \
-		dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
 
-CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
-		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
-		xfmail-1.5.5_[1-2]
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake moc rcc corelib gui xml
+QT_NONSTANDARD=	yes
+QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=	-fast -no-exceptions \
-		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -system-nas-sound -prefix ${PREFIX}  \
-		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin -v \
-		-no-nas-sound -confirm-license
-
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -56,7 +46,8 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}	
+	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
+	${REINPLACE_CMD} -e 's|qdbusviewer||g' ${WRKSRC}/tools/tools.pro
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
 		${WRKSRC}/tools/qdbus/qdbus.pro \
 		${WRKSRC}/tools/qdbuscpp2xml/qdbuscpp2xml.pro \
@@ -67,13 +58,14 @@ pre-configure:
 	${MKDIR} ${WRKSRC}/../../mkspecs
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
+	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc
 
 post-configure:
-	${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtDBus.pc|${PREFIX}/libdata/pkgconfig/QtDBus.pc|g' \
+	${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 			-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/Makefile
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
 			-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
-		${WRKSRC}/../../lib/*Qt*
+		${WRKSRC}/../../lib/pkgconfig/*Qt*
 
 .include <bsd.port.post.mk>
diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/devel/dbus-qt4/distinfo
+++ b/devel/dbus-qt4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist
index d1b337562ef0..9575b6c51744 100644
--- a/devel/dbus-qt4/pkg-plist
+++ b/devel/dbus-qt4/pkg-plist
@@ -9,6 +9,7 @@ include/QtDBus/QDBusAbstractInterface
 include/QtDBus/QDBusArgument
 include/QtDBus/QDBusConnection
 include/QtDBus/QDBusConnectionInterface
+include/QtDBus/QDBusContext
 include/QtDBus/QDBusError
 include/QtDBus/QDBusInterface
 include/QtDBus/QDBusMessage
@@ -24,6 +25,7 @@ include/QtDBus/qdbusabstractinterface.h
 include/QtDBus/qdbusargument.h
 include/QtDBus/qdbusconnection.h
 include/QtDBus/qdbusconnectioninterface.h
+include/QtDBus/qdbuscontext.h
 include/QtDBus/qdbuserror.h
 include/QtDBus/qdbusextratypes.h
 include/QtDBus/qdbusinterface.h
@@ -32,12 +34,12 @@ include/QtDBus/qdbusmessage.h
 include/QtDBus/qdbusmetatype.h
 include/QtDBus/qdbusreply.h
 include/QtDBus/qdbusserver.h
-libdata/pkgconfig/QtDBus.pc
 lib/libQtDBus.la
 lib/libQtDBus.prl
 lib/libQtDBus.so
 lib/libQtDBus.so.4
-lib/libQtDBus.so.4.2
-lib/libQtDBus.so.4.2.3
-lib/libQtDBus.so.4.2.3.debug
+lib/libQtDBus.so.4.3
+lib/libQtDBus.so.4.3.0
+lib/libQtDBus.so.4.3.0.debug
+libdata/pkgconfig/QtDBus.pc
 @dirrm include/QtDBus