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

3 files changed, 17 insertions, 15 deletions

diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index a4e41f4662f5..8396bfe1a2e5 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	qt3support
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
 CATEGORIES?=	devel x11-toolkits
 PKGNAMEPREFIX=	qt4-
 
@@ -31,29 +30,31 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
-		src/dbus src/opengl src/phonon \
-		src/script src/svg src/testlib \
-		src/tools src/xmlpatterns src/3rdparty/clucene \
-		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
+		src/activeqt src/dbus src/multimedia src/opengl src/openvg \
+		src/phonon src/s60installs src/s60main src/script \
+		src/scripttools 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}/src/${PORTNAME}
-CONFIGURE_WRKSRC=${WRKSRC}/../../
-PATCH_WRKSRC=${CONFIGURE_WRKSRC}
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
 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/moc-qt4 ${WRKSRC}/../../bin/moc
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
+		-e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/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/Qt3Support.pc
+		${WRKSRC}/lib/pkgconfig/Qt3Support.pc
 
 .include <bsd.port.mk>
diff --git a/devel/qt4-qt3support/pkg-descr b/devel/qt4-qt3support/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/devel/qt4-qt3support/pkg-descr
+++ b/devel/qt4-qt3support/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/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist
index 67c5d4fd0a99..f5c8897b5ff3 100644
--- a/devel/qt4-qt3support/pkg-plist
+++ b/devel/qt4-qt3support/pkg-plist
@@ -409,6 +409,7 @@ lib/qt4/libQt3Support.so.%%SHLIB_SHVER%%
 lib/qt4/libQt3Support.so.%%SHLIB_VER%%
 @comment %%DEBUG%%lib/qt4/libQt3Support.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/Qt3Support.pc
+@dirrmtry lib/qt4
 @dirrm include/qt4/Qt3Support
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4