The FreeBSD KDE team is pleased to announce Qt-4.6.1 for FreeBSD.

3 files changed, 33 insertions, 24 deletions

diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index e863c816651f..f5fb5df3341f 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	dbus
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
@@ -22,6 +21,7 @@ QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_UNSAFE=	yes
+
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
 
@@ -31,33 +31,37 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
-		src/network src/opengl src/phonon \
-		src/qt3support src/script src/sql src/svg src/testlib \
-		src/tools src/xmlpatterns src/3rdparty/clucene \
-		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
+		src/activeqt src/gui src/multimedia src/network src/opengl \
+		src/openvg src/phonon src/qt3support src/s60installs \
+		src/s60main src/script src/scripttools src/sql src/svg \
+		src/testlib src/tools src/winmain src/xmlpatterns \
+		src/3rdparty/clucene src/3rdparty/freetype \
+		src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \
+		src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 .for dne in ${DO_NOT_EXTRACT}
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/tools/qdbus
-CONFIGURE_WRKSRC=${WRKSRC}/../../
+BUILD_WRKSRC=	${WRKSRC}/tools/qdbus
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
 pre-configure:
-	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${REINPLACE_CMD} -e 's|qdbusviewer||g' ${WRKSRC}/qdbus.pro
-	${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/dbus qdbus|g' ${WRKSRC}/qdbus.pro
+	${REINPLACE_CMD} -e 's|qdbusviewer||g' ${BUILD_WRKSRC}/qdbus.pro
+	${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/${PORTNAME} qdbus|g' ${BUILD_WRKSRC}/qdbus.pro
 	${REINPLACE_CMD} -e 's|"/moc"|"/moc-qt4"|' \
-		${WRKSRC}/../qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-	${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
+		${BUILD_WRKSRC}/qdbuscpp2xml/qdbuscpp2xml.cpp
+	${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/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/../../src/dbus/Makefile
+	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/src/${PORTNAME}/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' \
-		${WRKSRC}/../../lib/pkgconfig/QtDBus.pc
+		${WRKSRC}/lib/pkgconfig/QtDBus.pc
 
 .include <bsd.port.mk>
diff --git a/devel/dbus-qt4/pkg-descr b/devel/dbus-qt4/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/devel/dbus-qt4/pkg-descr
+++ b/devel/dbus-qt4/pkg-descr
@@ -9,4 +9,4 @@ the application programmer with a single, common API for all operating systems.
 The native C APIs are encapsulated in a set of well-designed, fully
 object-oriented C++ classes. 
 
-WWW: http://www.trolltech.com/products/qt/index.html
+WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist
index e2d6b09d304e..8ad0cb30264b 100644
--- a/devel/dbus-qt4/pkg-plist
+++ b/devel/dbus-qt4/pkg-plist
@@ -17,12 +17,14 @@ include/qt4/Qt/qdbusinterface.h
 include/qt4/Qt/qdbusmacros.h
 include/qt4/Qt/qdbusmessage.h
 include/qt4/Qt/qdbusmetatype.h
-include/qt4/Qt/qdbusreply.h
-include/qt4/Qt/qdbusserver.h
 include/qt4/Qt/qdbuspendingcall.h
 include/qt4/Qt/qdbuspendingreply.h
+include/qt4/Qt/qdbusreply.h
+include/qt4/Qt/qdbusserver.h
+include/qt4/Qt/qdbusservicewatcher.h
 include/qt4/QtDBus/QDBusAbstractAdaptor
 include/qt4/QtDBus/QDBusAbstractInterface
+include/qt4/QtDBus/QDBusAbstractInterfaceBase
 include/qt4/QtDBus/QDBusArgument
 include/qt4/QtDBus/QDBusConnection
 include/qt4/QtDBus/QDBusConnectionInterface
@@ -32,15 +34,16 @@ include/qt4/QtDBus/QDBusInterface
 include/qt4/QtDBus/QDBusMessage
 include/qt4/QtDBus/QDBusMetaType
 include/qt4/QtDBus/QDBusObjectPath
+include/qt4/QtDBus/QDBusPendingCall
+include/qt4/QtDBus/QDBusPendingCallWatcher
+include/qt4/QtDBus/QDBusPendingReply
+include/qt4/QtDBus/QDBusPendingReplyData
 include/qt4/QtDBus/QDBusReply
 include/qt4/QtDBus/QDBusServer
+include/qt4/QtDBus/QDBusServiceWatcher
 include/qt4/QtDBus/QDBusSignature
 include/qt4/QtDBus/QDBusVariant
 include/qt4/QtDBus/QtDBus
-include/qt4/QtDBus/QDBusPendingCall
-include/qt4/QtDBus/QDBusPendingCallWatcher
-include/qt4/QtDBus/QDBusPendingReplyData
-include/qt4/QtDBus/QDBusPendingReply
 include/qt4/QtDBus/qdbusabstractadaptor.h
 include/qt4/QtDBus/qdbusabstractinterface.h
 include/qt4/QtDBus/qdbusargument.h
@@ -57,6 +60,7 @@ include/qt4/QtDBus/qdbuspendingcall.h
 include/qt4/QtDBus/qdbuspendingreply.h
 include/qt4/QtDBus/qdbusreply.h
 include/qt4/QtDBus/qdbusserver.h
+include/qt4/QtDBus/qdbusservicewatcher.h
 lib/qt4/libQtDBus.la
 lib/qt4/libQtDBus.prl
 lib/qt4/libQtDBus.so
@@ -65,6 +69,7 @@ lib/qt4/libQtDBus.so.%%SHLIB_SHVER%%
 lib/qt4/libQtDBus.so.%%SHLIB_VER%%
 %%DEBUG%%lib/qt4/libQtDBus.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtDBus.pc
+@dirrmtry lib/qt4
 @dirrm include/qt4/QtDBus
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4