3 files changed, 130 insertions, 145 deletions

diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index bd01c77093b1..874544a28d75 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -3,20 +3,19 @@
 
 PORTNAME=	network
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	net ipv6
+CATEGORIES=	net ipv6
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt network library
+COMMENT=	Qt network module
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 USE_QT4=	qmake_build moc_build rcc_build corelib
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/qt4
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 USE_OPENSSL=	yes
 
 ALL_TARGET=	first
@@ -39,20 +38,18 @@ 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' \
+	${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/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' \
-			-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
+			-E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \
+			-E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \
 		${WRKSRC}/lib/pkgconfig/QtNetwork.pc
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp
diff --git a/net/qt4-network/pkg-descr b/net/qt4-network/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/net/qt4-network/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/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist
index f86f9d38d4b8..35e4bb0938f2 100644
--- a/net/qt4-network/pkg-plist
+++ b/net/qt4-network/pkg-plist
@@ -1,122 +1,122 @@
-include/qt4/Qt/QtNetwork
-include/qt4/Qt/qabstractnetworkcache.h
-include/qt4/Qt/qabstractsocket.h
-include/qt4/Qt/qauthenticator.h
-include/qt4/Qt/qftp.h
-include/qt4/Qt/qhostaddress.h
-include/qt4/Qt/qhostinfo.h
-include/qt4/Qt/qhttp.h
-include/qt4/Qt/qhttpmultipart.h
-include/qt4/Qt/qlocalserver.h
-include/qt4/Qt/qlocalsocket.h
-include/qt4/Qt/qnetworkaccessmanager.h
-include/qt4/Qt/qnetworkconfigmanager.h
-include/qt4/Qt/qnetworkconfiguration.h
-include/qt4/Qt/qnetworkcookie.h
-include/qt4/Qt/qnetworkcookiejar.h
-include/qt4/Qt/qnetworkdiskcache.h
-include/qt4/Qt/qnetworkfunctions_wince.h
-include/qt4/Qt/qnetworkinterface.h
-include/qt4/Qt/qnetworkproxy.h
-include/qt4/Qt/qnetworkreply.h
-include/qt4/Qt/qnetworkrequest.h
-include/qt4/Qt/qnetworksession.h
-include/qt4/Qt/qssl.h
-include/qt4/Qt/qsslcertificate.h
-include/qt4/Qt/qsslcipher.h
-include/qt4/Qt/qsslconfiguration.h
-include/qt4/Qt/qsslerror.h
-include/qt4/Qt/qsslkey.h
-include/qt4/Qt/qsslsocket.h
-include/qt4/Qt/qtcpserver.h
-include/qt4/Qt/qtcpsocket.h
-include/qt4/Qt/qudpsocket.h
-include/qt4/Qt/qurlinfo.h
-include/qt4/QtNetwork/QAbstractNetworkCache
-include/qt4/QtNetwork/QAbstractSocket
-include/qt4/QtNetwork/QAuthenticator
-include/qt4/QtNetwork/QFtp
-include/qt4/QtNetwork/QHostAddress
-include/qt4/QtNetwork/QHostInfo
-include/qt4/QtNetwork/QHttp
-include/qt4/QtNetwork/QHttpHeader
-include/qt4/QtNetwork/QHttpMultiPart
-include/qt4/QtNetwork/QHttpPart
-include/qt4/QtNetwork/QHttpRequestHeader
-include/qt4/QtNetwork/QHttpResponseHeader
-include/qt4/QtNetwork/QIPv6Address
-include/qt4/QtNetwork/QLocalServer
-include/qt4/QtNetwork/QLocalSocket
-include/qt4/QtNetwork/QNetworkAccessManager
-include/qt4/QtNetwork/QNetworkAddressEntry
-include/qt4/QtNetwork/QNetworkCacheMetaData
-include/qt4/QtNetwork/QNetworkConfiguration
-include/qt4/QtNetwork/QNetworkConfigurationManager
-include/qt4/QtNetwork/QNetworkCookie
-include/qt4/QtNetwork/QNetworkCookieJar
-include/qt4/QtNetwork/QNetworkDiskCache
-include/qt4/QtNetwork/QNetworkInterface
-include/qt4/QtNetwork/QNetworkProxy
-include/qt4/QtNetwork/QNetworkProxyFactory
-include/qt4/QtNetwork/QNetworkProxyQuery
-include/qt4/QtNetwork/QNetworkReply
-include/qt4/QtNetwork/QNetworkRequest
-include/qt4/QtNetwork/QNetworkSession
-include/qt4/QtNetwork/QSsl
-include/qt4/QtNetwork/QSslCertificate
-include/qt4/QtNetwork/QSslCipher
-include/qt4/QtNetwork/QSslConfiguration
-include/qt4/QtNetwork/QSslError
-include/qt4/QtNetwork/QSslKey
-include/qt4/QtNetwork/QSslSocket
-include/qt4/QtNetwork/QTcpServer
-include/qt4/QtNetwork/QTcpSocket
-include/qt4/QtNetwork/QUdpSocket
-include/qt4/QtNetwork/QUrlInfo
-include/qt4/QtNetwork/Q_IPV6ADDR
-include/qt4/QtNetwork/QtNetwork
-include/qt4/QtNetwork/qabstractnetworkcache.h
-include/qt4/QtNetwork/qabstractsocket.h
-include/qt4/QtNetwork/qauthenticator.h
-include/qt4/QtNetwork/qftp.h
-include/qt4/QtNetwork/qhostaddress.h
-include/qt4/QtNetwork/qhostinfo.h
-include/qt4/QtNetwork/qhttp.h
-include/qt4/QtNetwork/qhttpmultipart.h
-include/qt4/QtNetwork/qlocalserver.h
-include/qt4/QtNetwork/qlocalsocket.h
-include/qt4/QtNetwork/qnetworkaccessmanager.h
-include/qt4/QtNetwork/qnetworkconfigmanager.h
-include/qt4/QtNetwork/qnetworkconfiguration.h
-include/qt4/QtNetwork/qnetworkcookie.h
-include/qt4/QtNetwork/qnetworkcookiejar.h
-include/qt4/QtNetwork/qnetworkdiskcache.h
-include/qt4/QtNetwork/qnetworkfunctions_wince.h
-include/qt4/QtNetwork/qnetworkinterface.h
-include/qt4/QtNetwork/qnetworkproxy.h
-include/qt4/QtNetwork/qnetworkreply.h
-include/qt4/QtNetwork/qnetworkrequest.h
-include/qt4/QtNetwork/qnetworksession.h
-include/qt4/QtNetwork/qssl.h
-include/qt4/QtNetwork/qsslcertificate.h
-include/qt4/QtNetwork/qsslcipher.h
-include/qt4/QtNetwork/qsslconfiguration.h
-include/qt4/QtNetwork/qsslerror.h
-include/qt4/QtNetwork/qsslkey.h
-include/qt4/QtNetwork/qsslsocket.h
-include/qt4/QtNetwork/qtcpserver.h
-include/qt4/QtNetwork/qtcpsocket.h
-include/qt4/QtNetwork/qudpsocket.h
-include/qt4/QtNetwork/qurlinfo.h
-lib/qt4/libQtNetwork.la
-lib/qt4/libQtNetwork.prl
-lib/qt4/libQtNetwork.so
-lib/qt4/libQtNetwork.so.4
-lib/qt4/libQtNetwork.so.%%SHLIB_SHVER%%
-lib/qt4/libQtNetwork.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtNetwork.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtNetwork
+%%QT_INCDIR%%/Qt/qabstractnetworkcache.h
+%%QT_INCDIR%%/Qt/qabstractsocket.h
+%%QT_INCDIR%%/Qt/qauthenticator.h
+%%QT_INCDIR%%/Qt/qftp.h
+%%QT_INCDIR%%/Qt/qhostaddress.h
+%%QT_INCDIR%%/Qt/qhostinfo.h
+%%QT_INCDIR%%/Qt/qhttp.h
+%%QT_INCDIR%%/Qt/qhttpmultipart.h
+%%QT_INCDIR%%/Qt/qlocalserver.h
+%%QT_INCDIR%%/Qt/qlocalsocket.h
+%%QT_INCDIR%%/Qt/qnetworkaccessmanager.h
+%%QT_INCDIR%%/Qt/qnetworkconfigmanager.h
+%%QT_INCDIR%%/Qt/qnetworkconfiguration.h
+%%QT_INCDIR%%/Qt/qnetworkcookie.h
+%%QT_INCDIR%%/Qt/qnetworkcookiejar.h
+%%QT_INCDIR%%/Qt/qnetworkdiskcache.h
+%%QT_INCDIR%%/Qt/qnetworkfunctions_wince.h
+%%QT_INCDIR%%/Qt/qnetworkinterface.h
+%%QT_INCDIR%%/Qt/qnetworkproxy.h
+%%QT_INCDIR%%/Qt/qnetworkreply.h
+%%QT_INCDIR%%/Qt/qnetworkrequest.h
+%%QT_INCDIR%%/Qt/qnetworksession.h
+%%QT_INCDIR%%/Qt/qssl.h
+%%QT_INCDIR%%/Qt/qsslcertificate.h
+%%QT_INCDIR%%/Qt/qsslcipher.h
+%%QT_INCDIR%%/Qt/qsslconfiguration.h
+%%QT_INCDIR%%/Qt/qsslerror.h
+%%QT_INCDIR%%/Qt/qsslkey.h
+%%QT_INCDIR%%/Qt/qsslsocket.h
+%%QT_INCDIR%%/Qt/qtcpserver.h
+%%QT_INCDIR%%/Qt/qtcpsocket.h
+%%QT_INCDIR%%/Qt/qudpsocket.h
+%%QT_INCDIR%%/Qt/qurlinfo.h
+%%QT_INCDIR%%/QtNetwork/QAbstractNetworkCache
+%%QT_INCDIR%%/QtNetwork/QAbstractSocket
+%%QT_INCDIR%%/QtNetwork/QAuthenticator
+%%QT_INCDIR%%/QtNetwork/QFtp
+%%QT_INCDIR%%/QtNetwork/QHostAddress
+%%QT_INCDIR%%/QtNetwork/QHostInfo
+%%QT_INCDIR%%/QtNetwork/QHttp
+%%QT_INCDIR%%/QtNetwork/QHttpHeader
+%%QT_INCDIR%%/QtNetwork/QHttpMultiPart
+%%QT_INCDIR%%/QtNetwork/QHttpPart
+%%QT_INCDIR%%/QtNetwork/QHttpRequestHeader
+%%QT_INCDIR%%/QtNetwork/QHttpResponseHeader
+%%QT_INCDIR%%/QtNetwork/QIPv6Address
+%%QT_INCDIR%%/QtNetwork/QLocalServer
+%%QT_INCDIR%%/QtNetwork/QLocalSocket
+%%QT_INCDIR%%/QtNetwork/QNetworkAccessManager
+%%QT_INCDIR%%/QtNetwork/QNetworkAddressEntry
+%%QT_INCDIR%%/QtNetwork/QNetworkCacheMetaData
+%%QT_INCDIR%%/QtNetwork/QNetworkConfiguration
+%%QT_INCDIR%%/QtNetwork/QNetworkConfigurationManager
+%%QT_INCDIR%%/QtNetwork/QNetworkCookie
+%%QT_INCDIR%%/QtNetwork/QNetworkCookieJar
+%%QT_INCDIR%%/QtNetwork/QNetworkDiskCache
+%%QT_INCDIR%%/QtNetwork/QNetworkInterface
+%%QT_INCDIR%%/QtNetwork/QNetworkProxy
+%%QT_INCDIR%%/QtNetwork/QNetworkProxyFactory
+%%QT_INCDIR%%/QtNetwork/QNetworkProxyQuery
+%%QT_INCDIR%%/QtNetwork/QNetworkReply
+%%QT_INCDIR%%/QtNetwork/QNetworkRequest
+%%QT_INCDIR%%/QtNetwork/QNetworkSession
+%%QT_INCDIR%%/QtNetwork/QSsl
+%%QT_INCDIR%%/QtNetwork/QSslCertificate
+%%QT_INCDIR%%/QtNetwork/QSslCipher
+%%QT_INCDIR%%/QtNetwork/QSslConfiguration
+%%QT_INCDIR%%/QtNetwork/QSslError
+%%QT_INCDIR%%/QtNetwork/QSslKey
+%%QT_INCDIR%%/QtNetwork/QSslSocket
+%%QT_INCDIR%%/QtNetwork/QTcpServer
+%%QT_INCDIR%%/QtNetwork/QTcpSocket
+%%QT_INCDIR%%/QtNetwork/QUdpSocket
+%%QT_INCDIR%%/QtNetwork/QUrlInfo
+%%QT_INCDIR%%/QtNetwork/Q_IPV6ADDR
+%%QT_INCDIR%%/QtNetwork/QtNetwork
+%%QT_INCDIR%%/QtNetwork/qabstractnetworkcache.h
+%%QT_INCDIR%%/QtNetwork/qabstractsocket.h
+%%QT_INCDIR%%/QtNetwork/qauthenticator.h
+%%QT_INCDIR%%/QtNetwork/qftp.h
+%%QT_INCDIR%%/QtNetwork/qhostaddress.h
+%%QT_INCDIR%%/QtNetwork/qhostinfo.h
+%%QT_INCDIR%%/QtNetwork/qhttp.h
+%%QT_INCDIR%%/QtNetwork/qhttpmultipart.h
+%%QT_INCDIR%%/QtNetwork/qlocalserver.h
+%%QT_INCDIR%%/QtNetwork/qlocalsocket.h
+%%QT_INCDIR%%/QtNetwork/qnetworkaccessmanager.h
+%%QT_INCDIR%%/QtNetwork/qnetworkconfigmanager.h
+%%QT_INCDIR%%/QtNetwork/qnetworkconfiguration.h
+%%QT_INCDIR%%/QtNetwork/qnetworkcookie.h
+%%QT_INCDIR%%/QtNetwork/qnetworkcookiejar.h
+%%QT_INCDIR%%/QtNetwork/qnetworkdiskcache.h
+%%QT_INCDIR%%/QtNetwork/qnetworkfunctions_wince.h
+%%QT_INCDIR%%/QtNetwork/qnetworkinterface.h
+%%QT_INCDIR%%/QtNetwork/qnetworkproxy.h
+%%QT_INCDIR%%/QtNetwork/qnetworkreply.h
+%%QT_INCDIR%%/QtNetwork/qnetworkrequest.h
+%%QT_INCDIR%%/QtNetwork/qnetworksession.h
+%%QT_INCDIR%%/QtNetwork/qssl.h
+%%QT_INCDIR%%/QtNetwork/qsslcertificate.h
+%%QT_INCDIR%%/QtNetwork/qsslcipher.h
+%%QT_INCDIR%%/QtNetwork/qsslconfiguration.h
+%%QT_INCDIR%%/QtNetwork/qsslerror.h
+%%QT_INCDIR%%/QtNetwork/qsslkey.h
+%%QT_INCDIR%%/QtNetwork/qsslsocket.h
+%%QT_INCDIR%%/QtNetwork/qtcpserver.h
+%%QT_INCDIR%%/QtNetwork/qtcpsocket.h
+%%QT_INCDIR%%/QtNetwork/qudpsocket.h
+%%QT_INCDIR%%/QtNetwork/qurlinfo.h
+%%QT_LIBDIR%%/libQtNetwork.la
+%%QT_LIBDIR%%/libQtNetwork.prl
+%%QT_LIBDIR%%/libQtNetwork.so
+%%QT_LIBDIR%%/libQtNetwork.so.4
+%%QT_LIBDIR%%/libQtNetwork.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtNetwork.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtNetwork.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtNetwork.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtNetwork
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtNetwork
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%