Update to Qt 4.3.0, introduce bsd.qt.mk.

Approved by: portmgr (bsd.port.mk changes)

3 files changed, 37 insertions, 25 deletions

diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index 585bc27a69b3..6716b5e7e01d 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	network
-PORTVERSION=	4.2.3
-PORTREVISION=	2
+PORTVERSION=	${QT4_VERSION}
+PORTREVISION=0
 CATEGORIES?=	net ipv6
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,23 +18,14 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt network library
 
-BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
-		qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS?=	QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
-		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
-		xfmail-1.5.5_[1-2]
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake moc rcc corelib
+QT_NONSTANDARD=	yes
+QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-
-CONFIGURE_ARGS=	-fast -no-exceptions \
-		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -no-nas-sound -prefix ${PREFIX} \
-		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-		-confirm-license
+USE_OPENSSL=	yes
 
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
@@ -46,7 +37,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 	--exclude '${DISTNAME}/src/gui' --exclude '${DISTNAME}/src/xml' \
 	--exclude '${DISTNAME}/src/opengl' --exclude '${DISTNAME}/src/qt3support' \
 	--exclude '${DISTNAME}/src/sql' --exclude '${DISTNAME}/src/plugins' \
-	--exclude '${DISTNAME}/src/3rdparty' --exclude '${DISTNAME}/src/tools/moc' \
+	--exclude '${DISTNAME}/src/tools/moc' \
 	--exclude '${DISTNAME}/src/tools/rcc' --exclude '${DISTNAME}/src/tools/uic3' \
 	--exclude '${DISTNAME}/tools/assistant' --exclude '${DISTNAME}/tools/designer' \
 	--exclude '${DISTNAME}/tools/linguist' --exclude '${DISTNAME}/tools/porting' \
@@ -65,13 +56,14 @@ 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
 
 post-configure:
-	${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtNetwork.pc|${PREFIX}/libdata/pkgconfig/QtNetwork.pc|g' \
+	${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 			-e 's|.*$$(QMAKE).*||g' ${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/*Qt*
+		${WRKSRC}/../../lib/pkgconfig/*Qt*
 
 .include <bsd.port.post.mk>
diff --git a/net/qt4-network/distinfo b/net/qt4-network/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/net/qt4-network/distinfo
+++ b/net/qt4-network/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist
index eeff48a8d84c..73b29023804a 100644
--- a/net/qt4-network/pkg-plist
+++ b/net/qt4-network/pkg-plist
@@ -1,16 +1,24 @@
 include/Qt/QtNetwork
 include/Qt/qabstractsocket.h
+include/Qt/qauthenticator.h
 include/Qt/qftp.h
 include/Qt/qhostaddress.h
 include/Qt/qhostinfo.h
 include/Qt/qhttp.h
 include/Qt/qnetworkinterface.h
 include/Qt/qnetworkproxy.h
+include/Qt/qssl.h
+include/Qt/qsslcertificate.h
+include/Qt/qsslcipher.h
+include/Qt/qsslerror.h
+include/Qt/qsslkey.h
+include/Qt/qsslsocket.h
 include/Qt/qtcpserver.h
 include/Qt/qtcpsocket.h
 include/Qt/qudpsocket.h
 include/Qt/qurlinfo.h
 include/QtNetwork/QAbstractSocket
+include/QtNetwork/QAuthenticator
 include/QtNetwork/QFtp
 include/QtNetwork/QHostAddress
 include/QtNetwork/QHostInfo
@@ -22,6 +30,11 @@ include/QtNetwork/QIPv6Address
 include/QtNetwork/QNetworkAddressEntry
 include/QtNetwork/QNetworkInterface
 include/QtNetwork/QNetworkProxy
+include/QtNetwork/QSslCertificate
+include/QtNetwork/QSslCipher
+include/QtNetwork/QSslError
+include/QtNetwork/QSslKey
+include/QtNetwork/QSslSocket
 include/QtNetwork/QTcpServer
 include/QtNetwork/QTcpSocket
 include/QtNetwork/QUdpSocket
@@ -29,12 +42,19 @@ include/QtNetwork/QUrlInfo
 include/QtNetwork/Q_IPV6ADDR
 include/QtNetwork/QtNetwork
 include/QtNetwork/qabstractsocket.h
+include/QtNetwork/qauthenticator.h
 include/QtNetwork/qftp.h
 include/QtNetwork/qhostaddress.h
 include/QtNetwork/qhostinfo.h
 include/QtNetwork/qhttp.h
 include/QtNetwork/qnetworkinterface.h
 include/QtNetwork/qnetworkproxy.h
+include/QtNetwork/qssl.h
+include/QtNetwork/qsslcertificate.h
+include/QtNetwork/qsslcipher.h
+include/QtNetwork/qsslerror.h
+include/QtNetwork/qsslkey.h
+include/QtNetwork/qsslsocket.h
 include/QtNetwork/qtcpserver.h
 include/QtNetwork/qtcpsocket.h
 include/QtNetwork/qudpsocket.h
@@ -43,8 +63,8 @@ lib/libQtNetwork.la
 lib/libQtNetwork.prl
 lib/libQtNetwork.so
 lib/libQtNetwork.so.4
-lib/libQtNetwork.so.4.2
-lib/libQtNetwork.so.4.2.3
-lib/libQtNetwork.so.4.2.3.debug
+lib/libQtNetwork.so.4.3
+lib/libQtNetwork.so.4.3.0
+lib/libQtNetwork.so.4.3.0.debug
 libdata/pkgconfig/QtNetwork.pc
 @dirrm include/QtNetwork