3 files changed, 65 insertions, 80 deletions

diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile
index 9da2e372aa43..e878a0f1d91e 100644
--- a/textproc/qt4-xmlpatterns/Makefile
+++ b/textproc/qt4-xmlpatterns/Makefile
@@ -3,18 +3,17 @@
 
 PORTNAME=	xmlpatterns
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	textproc
+CATEGORIES=	textproc
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	XQuery 1.0 and XPath 2.0 support for Qt4
+COMMENT=	Qt support for XPath, XQuery, XSLT and XML Schema
 
 USE_QT4=	qmake_build moc_build rcc_build corelib network
-QT_NONSTANDARD=	yes
 QT_DIST=	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
@@ -36,22 +35,20 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 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
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc
 
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+		-e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		-e 's|.*$$(QMAKE).*||g' \
 		-e 's|-fno-exceptions ||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=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \
 		${WRKSRC}/lib/pkgconfig/QtXmlPatterns.pc
 
 .include <bsd.port.mk>
diff --git a/textproc/qt4-xmlpatterns/pkg-descr b/textproc/qt4-xmlpatterns/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/textproc/qt4-xmlpatterns/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt is a C++ toolkit for application development.  It lets application
-developers target all major operating systems with a single application
-source code.
-
-Qt provides a platform-independent API to all central platform functionality:
-GUI, database access, networking, file handling, etc.  The Qt library
-encapsulates the different APIs of different operating systems, providing
-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://qt.nokia.com/products/qt/index.html
diff --git a/textproc/qt4-xmlpatterns/pkg-plist b/textproc/qt4-xmlpatterns/pkg-plist
index 5208eaa1668b..35883fdd9d5f 100644
--- a/textproc/qt4-xmlpatterns/pkg-plist
+++ b/textproc/qt4-xmlpatterns/pkg-plist
@@ -1,58 +1,58 @@
-include/qt4/Qt/QtXmlPatterns
-include/qt4/Qt/qabstractmessagehandler.h
-include/qt4/Qt/qabstracturiresolver.h
-include/qt4/Qt/qabstractxmlnodemodel.h
-include/qt4/Qt/qabstractxmlreceiver.h
-include/qt4/Qt/qsimplexmlnodemodel.h
-include/qt4/Qt/qsourcelocation.h
-include/qt4/Qt/qxmlformatter.h
-include/qt4/Qt/qxmlname.h
-include/qt4/Qt/qxmlnamepool.h
-include/qt4/Qt/qxmlquery.h
-include/qt4/Qt/qxmlresultitems.h
-include/qt4/Qt/qxmlschema.h
-include/qt4/Qt/qxmlschemavalidator.h
-include/qt4/Qt/qxmlserializer.h
-include/qt4/QtXmlPatterns/QAbstractMessageHandler
-include/qt4/QtXmlPatterns/QAbstractUriResolver
-include/qt4/QtXmlPatterns/QAbstractXmlNodeModel
-include/qt4/QtXmlPatterns/QAbstractXmlReceiver
-include/qt4/QtXmlPatterns/QSimpleXmlNodeModel
-include/qt4/QtXmlPatterns/QSourceLocation
-include/qt4/QtXmlPatterns/QXmlFormatter
-include/qt4/QtXmlPatterns/QXmlItem
-include/qt4/QtXmlPatterns/QXmlName
-include/qt4/QtXmlPatterns/QXmlNamePool
-include/qt4/QtXmlPatterns/QXmlNodeModelIndex
-include/qt4/QtXmlPatterns/QXmlQuery
-include/qt4/QtXmlPatterns/QXmlResultItems
-include/qt4/QtXmlPatterns/QXmlSchema
-include/qt4/QtXmlPatterns/QXmlSchemaValidator
-include/qt4/QtXmlPatterns/QXmlSerializer
-include/qt4/QtXmlPatterns/QtXmlPatterns
-include/qt4/QtXmlPatterns/qabstractmessagehandler.h
-include/qt4/QtXmlPatterns/qabstracturiresolver.h
-include/qt4/QtXmlPatterns/qabstractxmlnodemodel.h
-include/qt4/QtXmlPatterns/qabstractxmlreceiver.h
-include/qt4/QtXmlPatterns/qsimplexmlnodemodel.h
-include/qt4/QtXmlPatterns/qsourcelocation.h
-include/qt4/QtXmlPatterns/qxmlformatter.h
-include/qt4/QtXmlPatterns/qxmlname.h
-include/qt4/QtXmlPatterns/qxmlnamepool.h
-include/qt4/QtXmlPatterns/qxmlquery.h
-include/qt4/QtXmlPatterns/qxmlresultitems.h
-include/qt4/QtXmlPatterns/qxmlschema.h
-include/qt4/QtXmlPatterns/qxmlschemavalidator.h
-include/qt4/QtXmlPatterns/qxmlserializer.h
-lib/qt4/libQtXmlPatterns.la
-lib/qt4/libQtXmlPatterns.prl
-lib/qt4/libQtXmlPatterns.so
-lib/qt4/libQtXmlPatterns.so.4
-lib/qt4/libQtXmlPatterns.so.%%SHLIB_SHVER%%
-lib/qt4/libQtXmlPatterns.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtXmlPatterns.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtXmlPatterns
+%%QT_INCDIR%%/Qt/qabstractmessagehandler.h
+%%QT_INCDIR%%/Qt/qabstracturiresolver.h
+%%QT_INCDIR%%/Qt/qabstractxmlnodemodel.h
+%%QT_INCDIR%%/Qt/qabstractxmlreceiver.h
+%%QT_INCDIR%%/Qt/qsimplexmlnodemodel.h
+%%QT_INCDIR%%/Qt/qsourcelocation.h
+%%QT_INCDIR%%/Qt/qxmlformatter.h
+%%QT_INCDIR%%/Qt/qxmlname.h
+%%QT_INCDIR%%/Qt/qxmlnamepool.h
+%%QT_INCDIR%%/Qt/qxmlquery.h
+%%QT_INCDIR%%/Qt/qxmlresultitems.h
+%%QT_INCDIR%%/Qt/qxmlschema.h
+%%QT_INCDIR%%/Qt/qxmlschemavalidator.h
+%%QT_INCDIR%%/Qt/qxmlserializer.h
+%%QT_INCDIR%%/QtXmlPatterns/QAbstractMessageHandler
+%%QT_INCDIR%%/QtXmlPatterns/QAbstractUriResolver
+%%QT_INCDIR%%/QtXmlPatterns/QAbstractXmlNodeModel
+%%QT_INCDIR%%/QtXmlPatterns/QAbstractXmlReceiver
+%%QT_INCDIR%%/QtXmlPatterns/QSimpleXmlNodeModel
+%%QT_INCDIR%%/QtXmlPatterns/QSourceLocation
+%%QT_INCDIR%%/QtXmlPatterns/QXmlFormatter
+%%QT_INCDIR%%/QtXmlPatterns/QXmlItem
+%%QT_INCDIR%%/QtXmlPatterns/QXmlName
+%%QT_INCDIR%%/QtXmlPatterns/QXmlNamePool
+%%QT_INCDIR%%/QtXmlPatterns/QXmlNodeModelIndex
+%%QT_INCDIR%%/QtXmlPatterns/QXmlQuery
+%%QT_INCDIR%%/QtXmlPatterns/QXmlResultItems
+%%QT_INCDIR%%/QtXmlPatterns/QXmlSchema
+%%QT_INCDIR%%/QtXmlPatterns/QXmlSchemaValidator
+%%QT_INCDIR%%/QtXmlPatterns/QXmlSerializer
+%%QT_INCDIR%%/QtXmlPatterns/QtXmlPatterns
+%%QT_INCDIR%%/QtXmlPatterns/qabstractmessagehandler.h
+%%QT_INCDIR%%/QtXmlPatterns/qabstracturiresolver.h
+%%QT_INCDIR%%/QtXmlPatterns/qabstractxmlnodemodel.h
+%%QT_INCDIR%%/QtXmlPatterns/qabstractxmlreceiver.h
+%%QT_INCDIR%%/QtXmlPatterns/qsimplexmlnodemodel.h
+%%QT_INCDIR%%/QtXmlPatterns/qsourcelocation.h
+%%QT_INCDIR%%/QtXmlPatterns/qxmlformatter.h
+%%QT_INCDIR%%/QtXmlPatterns/qxmlname.h
+%%QT_INCDIR%%/QtXmlPatterns/qxmlnamepool.h
+%%QT_INCDIR%%/QtXmlPatterns/qxmlquery.h
+%%QT_INCDIR%%/QtXmlPatterns/qxmlresultitems.h
+%%QT_INCDIR%%/QtXmlPatterns/qxmlschema.h
+%%QT_INCDIR%%/QtXmlPatterns/qxmlschemavalidator.h
+%%QT_INCDIR%%/QtXmlPatterns/qxmlserializer.h
+%%QT_LIBDIR%%/libQtXmlPatterns.la
+%%QT_LIBDIR%%/libQtXmlPatterns.prl
+%%QT_LIBDIR%%/libQtXmlPatterns.so
+%%QT_LIBDIR%%/libQtXmlPatterns.so.4
+%%QT_LIBDIR%%/libQtXmlPatterns.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtXmlPatterns.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtXmlPatterns.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtXmlPatterns.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtXmlPatterns
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtXmlPatterns
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%