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.

5 files changed, 29 insertions, 4 deletions

diff --git a/net/py-qt4-network/distinfo b/net/py-qt4-network/distinfo
index 9a0976bb9c38..6c04995bffe2 100644
--- a/net/py-qt4-network/distinfo
+++ b/net/py-qt4-network/distinfo
@@ -1,3 +1,2 @@
-MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50
-SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
-SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557
+SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370
+SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175
diff --git a/net/py-qt4-network/pkg-plist b/net/py-qt4-network/pkg-plist
index 85b2311a7201..d94fd1f29fb8 100644
--- a/net/py-qt4-network/pkg-plist
+++ b/net/py-qt4-network/pkg-plist
@@ -9,6 +9,8 @@
 %%SIP%%share/py-sip/QtNetwork/qhttp.sip
 %%SIP%%share/py-sip/QtNetwork/qlocalserver.sip
 %%SIP%%share/py-sip/QtNetwork/qlocalsocket.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkconfigmanager.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworkconfiguration.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkaccessmanager.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkcookie.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkcookiejar.sip
@@ -17,6 +19,7 @@
 %%SIP%%share/py-sip/QtNetwork/qnetworkproxy.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkreply.sip
 %%SIP%%share/py-sip/QtNetwork/qnetworkrequest.sip
+%%SIP%%share/py-sip/QtNetwork/qnetworksession.sip
 %%SIP%%share/py-sip/QtNetwork/qssl.sip
 %%SIP%%share/py-sip/QtNetwork/qsslcertificate.sip
 %%SIP%%share/py-sip/QtNetwork/qsslcipher.sip
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index baf7bb802238..083e3bad88f9 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -7,13 +7,15 @@
 #
 
 PORTNAME=	network
-PORTVERSION=	${QT4_VERSION}
+DISTVERSION=	${QT4_VERSION}
 CATEGORIES?=	net ipv6
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt network library
 
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build corelib
 QT_NONSTANDARD=	yes
@@ -60,5 +62,7 @@ post-configure:
 			-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
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp
 
 .include <bsd.port.mk>
diff --git a/net/qt4-network/files/patch-src__network__ssl__qsslsocket_openssl.cpp b/net/qt4-network/files/patch-src__network__ssl__qsslsocket_openssl.cpp
new file mode 100644
index 000000000000..a387b3ed2be2
--- /dev/null
+++ b/net/qt4-network/files/patch-src__network__ssl__qsslsocket_openssl.cpp
@@ -0,0 +1,10 @@
+--- ./src/network/ssl/qsslsocket_openssl.cpp.orig	2010-11-06 04:55:18.000000000 +0300
++++ ./src/network/ssl/qsslsocket_openssl.cpp	2010-11-12 00:05:19.726416792 +0300
+@@ -777,6 +777,7 @@
+     systemCerts.append(QSslCertificate::fromPath(QLatin1String("/opt/openssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // HP-UX
+     systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // (K)ubuntu, OpenSUSE, Mandriva, ...
+     systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora
++    systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss
+     systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/lib/ssl/certs/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Gentoo, Mandrake
+     systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/share/ssl/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Centos, Redhat, SuSE
+     systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/ssl/*.pem"), QSsl::Pem, QRegExp::Wildcard)); // Normal OpenSSL Tarball
diff --git a/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist
index e077ccfdacc8..3aa7db5b336e 100644
--- a/net/qt4-network/pkg-plist
+++ b/net/qt4-network/pkg-plist
@@ -9,6 +9,8 @@ include/qt4/Qt/qhttp.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
@@ -16,6 +18,7 @@ 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
@@ -43,6 +46,8 @@ 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
@@ -52,6 +57,7 @@ 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
@@ -75,6 +81,8 @@ include/qt4/QtNetwork/qhttp.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
@@ -82,6 +90,7 @@ 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