3 files changed, 29 insertions, 23 deletions

diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index 76084b845d39..a30935f5ba2c 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	network
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
 CATEGORIES?=	net ipv6
 PKGNAMEPREFIX=	qt4-
 
@@ -31,31 +30,35 @@ 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/opengl src/phonon \
-		src/qt3support src/script src/sql src/svg src/testlib \
-		src/tools src/xml src/xmlpatterns src/3rdparty/clucene \
-		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
+		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
 
-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
 
 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
-	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc
+	${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
 
 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/QtNetwork.pc
+		${WRKSRC}/lib/pkgconfig/QtNetwork.pc
 
 .include <bsd.port.mk>
diff --git a/net/qt4-network/pkg-descr b/net/qt4-network/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/net/qt4-network/pkg-descr
+++ b/net/qt4-network/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/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist
index c24b20bb9480..e077ccfdacc8 100644
--- a/net/qt4-network/pkg-plist
+++ b/net/qt4-network/pkg-plist
@@ -1,6 +1,6 @@
 include/qt4/Qt/QtNetwork
-include/qt4/Qt/qabstractsocket.h
 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
@@ -10,6 +10,7 @@ include/qt4/Qt/qlocalserver.h
 include/qt4/Qt/qlocalsocket.h
 include/qt4/Qt/qnetworkaccessmanager.h
 include/qt4/Qt/qnetworkcookie.h
+include/qt4/Qt/qnetworkcookiejar.h
 include/qt4/Qt/qnetworkdiskcache.h
 include/qt4/Qt/qnetworkinterface.h
 include/qt4/Qt/qnetworkproxy.h
@@ -26,8 +27,8 @@ include/qt4/Qt/qtcpserver.h
 include/qt4/Qt/qtcpsocket.h
 include/qt4/Qt/qudpsocket.h
 include/qt4/Qt/qurlinfo.h
-include/qt4/QtNetwork/QAbstractSocket
 include/qt4/QtNetwork/QAbstractNetworkCache
+include/qt4/QtNetwork/QAbstractSocket
 include/qt4/QtNetwork/QAuthenticator
 include/qt4/QtNetwork/QFtp
 include/qt4/QtNetwork/QHostAddress
@@ -41,15 +42,15 @@ include/qt4/QtNetwork/QLocalServer
 include/qt4/QtNetwork/QLocalSocket
 include/qt4/QtNetwork/QNetworkAccessManager
 include/qt4/QtNetwork/QNetworkAddressEntry
+include/qt4/QtNetwork/QNetworkCacheMetaData
 include/qt4/QtNetwork/QNetworkCookie
 include/qt4/QtNetwork/QNetworkCookieJar
+include/qt4/QtNetwork/QNetworkDiskCache
 include/qt4/QtNetwork/QNetworkInterface
 include/qt4/QtNetwork/QNetworkProxy
-include/qt4/QtNetwork/QNetworkReply
-include/qt4/QtNetwork/QNetworkDiskCache
-include/qt4/QtNetwork/QNetworkProxyQuery
 include/qt4/QtNetwork/QNetworkProxyFactory
-include/qt4/QtNetwork/QNetworkCacheMetaData
+include/qt4/QtNetwork/QNetworkProxyQuery
+include/qt4/QtNetwork/QNetworkReply
 include/qt4/QtNetwork/QNetworkRequest
 include/qt4/QtNetwork/QSsl
 include/qt4/QtNetwork/QSslCertificate
@@ -64,8 +65,8 @@ include/qt4/QtNetwork/QUdpSocket
 include/qt4/QtNetwork/QUrlInfo
 include/qt4/QtNetwork/Q_IPV6ADDR
 include/qt4/QtNetwork/QtNetwork
-include/qt4/QtNetwork/qabstractsocket.h
 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
@@ -75,6 +76,7 @@ include/qt4/QtNetwork/qlocalserver.h
 include/qt4/QtNetwork/qlocalsocket.h
 include/qt4/QtNetwork/qnetworkaccessmanager.h
 include/qt4/QtNetwork/qnetworkcookie.h
+include/qt4/QtNetwork/qnetworkcookiejar.h
 include/qt4/QtNetwork/qnetworkdiskcache.h
 include/qt4/QtNetwork/qnetworkinterface.h
 include/qt4/QtNetwork/qnetworkproxy.h
@@ -94,11 +96,12 @@ include/qt4/QtNetwork/qurlinfo.h
 lib/qt4/libQtNetwork.la
 lib/qt4/libQtNetwork.prl
 lib/qt4/libQtNetwork.so
-%%DEBUG%%lib/qt4/libQtNetwork.so.%%SHLIB_VER%%.debug
 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
 libdata/pkgconfig/QtNetwork.pc
+@dirrmtry lib/qt4
 @dirrm include/qt4/QtNetwork
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4