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

4 files changed, 41 insertions, 14 deletions

diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile
index a7101944e51b..2285b6f33a91 100644
--- a/textproc/qt4-xml/Makefile
+++ b/textproc/qt4-xml/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	xml
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
 CATEGORIES?=	textproc
 PKGNAMEPREFIX=	qt4-
 
@@ -30,30 +29,40 @@ 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/gui 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/dbus 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}/src/${PORTNAME}
-CONFIGURE_WRKSRC=${WRKSRC}/../../
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
+EPATCH=		extrapatch-src-xml-Makefile
+
+SUB_LIST+=	WRKSRC=${WRKSRC:S|//|/|}
 
 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' \
 			-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
-		${WRKSRC}/../../lib/pkgconfig/QtXml.pc
+		${WRKSRC}/lib/pkgconfig/QtXml.pc
+#disable installation of include/Qt/qxmlstream.h, it handled by qt-corelib package
+	@${SED} ${_SUB_LIST_TEMP} ${FILESDIR}/${EPATCH} > ${WRKDIR}/${EPATCH}
+	${PATCH} -d ${WRKSRC} < ${WRKDIR}/${EPATCH}
 
 .include <bsd.port.mk>
diff --git a/textproc/qt4-xml/files/extrapatch-src-xml-Makefile b/textproc/qt4-xml/files/extrapatch-src-xml-Makefile
new file mode 100644
index 000000000000..f47416234370
--- /dev/null
+++ b/textproc/qt4-xml/files/extrapatch-src-xml-Makefile
@@ -0,0 +1,17 @@
+--- src/xml/Makefile.orig	2009-12-04 16:04:02.944271152 +1000
++++ src/xml/Makefile	2009-12-04 16:07:07.986728782 +1000
+@@ -533,14 +533,12 @@
+ 	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ 
+ 	-$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/sax/qxml.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
+ 	-$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/dom/qdom.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
+-	-$(INSTALL_PROGRAM) %%WRKSRC%%/src/xml/stream/qxmlstream.h $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
+ 	-$(INSTALL_PROGRAM) %%WRKSRC%%/include/QtXml/QtXml $(INSTALL_ROOT)/usr/local/include/qt4/Qt/
+ 
+ 
+ uninstall_flat_headers:  FORCE
+ 	-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qxml.h 
+ 	 -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qdom.h 
+-	 -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/qxmlstream.h 
+ 	 -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/qt4/Qt/QtXml
+ 	-$(DEL_DIR) $(INSTALL_ROOT)/usr/local/include/qt4/Qt/ 
+ 
diff --git a/textproc/qt4-xml/pkg-descr b/textproc/qt4-xml/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/textproc/qt4-xml/pkg-descr
+++ b/textproc/qt4-xml/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/textproc/qt4-xml/pkg-plist b/textproc/qt4-xml/pkg-plist
index d6dbd7ec940f..67e88d64dee1 100644
--- a/textproc/qt4-xml/pkg-plist
+++ b/textproc/qt4-xml/pkg-plist
@@ -56,6 +56,7 @@ lib/qt4/libQtXml.so.%%SHLIB_SHVER%%
 lib/qt4/libQtXml.so.%%SHLIB_VER%%
 %%DEBUG%%lib/qt4/libQtXml.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtXml.pc
+@dirrmtry lib/qt4
 @dirrm include/qt4/QtXml
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4