KDE FreeBSD team is glad to present Qt 4.7.1 in ports.

Along with Qt4 the following ports are updated:

PyQt4 ports to 4.8.1
devel/py-sip to 4.11.2
devel/qscintilla2 to 2.4.5
PyKDE3 to 3.16.7
PyQt3 tp 3.18.2-snapshot-20091119

New ports added:
devel/qt4-declarative
devel/py-qt4-declarative
x11/qt4-graphicssystems-opengl

This release has been contributed by:
Thomas Abthorpe (tabthorpe)
Max Brazhnikov (makc)
Dima Panov (fluffy)
Alberto Villa (avilla)

We'd like to thank Martin Wilke (miwi) for exp-run.

1 files changed, 28 insertions, 31 deletions

diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index d75aa4b7a112..851ca9ba2e13 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -7,57 +7,54 @@
 #
 
 PORTNAME=	libQtAssistantClient
-PORTVERSION=	${QT4_VERSION}
+PORTVERSION=	4.6.3
 CATEGORIES?=	devel
+MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
+DISTNAME=	qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
+DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt documentation browser integration library
 
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui network
-QT_NONSTANDARD=	yes
-QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
 
-HAS_CONFIGURE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/qt4
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 ALL_TARGET=	first
-CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
-MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
-		PATH=${WRKSRC}/bin:$$PATH
-DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
-		src/activeqt src/dbus src/gui src/multimedia 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/xml 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
-
-BUILD_WRKSRC=	${WRKSRC}/tools/assistant/compat/lib
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
+WRKSRC=		${WRKDIR}/${DISTNAME:C/src/version/}
+BUILD_WRKSRC=	${WRKSRC}/lib
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 pre-configure:
-	${REINPLACE_CMD} -E -e 's|"(.*)assistant"|"\1assistant-qt4"|g' \
-		${BUILD_WRKSRC}/qassistantclient.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
+	${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_HEADERS]|${PREFIX}/${QT_INCDIR_REL}|g' \
+		-e 's|$$$$\[QT_INSTALL_LIBS]|${PREFIX}/${QT_LIBDIR_REL}|g' \
+		${BUILD_WRKSRC}/lib.pro
+
+do-configure:
+	@cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} -spec ${QMAKESPEC} CONFIG+="create_prl link_prl" \
+		VERSION="${PORTVERSION}" ${QMAKEFLAGS}
 
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 			-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/QtAssistantClient.pc
+		${BUILD_WRKSRC}/lib/pkgconfig/QtAssistantClient.pc
+
+pre-build:
+	${MKDIR} ${BUILD_WRKSRC}/QtAssistant
+	${CP} ${BUILD_WRKSRC}/qassistantclient_global.h \
+		${BUILD_WRKSRC}/QtAssistant
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/QAssistantClient ${PREFIX}/${QT_INCDIR_REL}/QtAssistant
+	${INSTALL_DATA} ${FILESDIR}/QtAssistant ${PREFIX}/${QT_INCDIR_REL}/QtAssistant
+	${MKDIR} ${PREFIX}/share/qt4/mkspecs/features
+	${INSTALL_DATA} ${WRKSRC}/features/assistant.prf ${PREFIX}/share/qt4/mkspecs/features
 
 .include <bsd.port.mk>