The KDE/FreeBSD team is pleased to announce KDE Software Compilation

4.7.2. The official release notes can be found at:
http://kde.org/announcements/announce-4.7.2.php
This release ships with many improvements. Read more about them here:
http://FreeBSD.kde.org/news.php#itemKDESC472availableinports

We'd like to say thanks to all testers and contributors, especially to
lwhsu@ for his effort on hosting our test packages.

PR:		156293 [1]
		159219 [2]
		160164 [3]
Submitted by:	Oleg Sidorkin <osidorkin@gmail.com> [1]
		Alvaro Castillo <gobledb@gmail.com> [2]
		dkeav04@gmail.com [3]
Tested by:	exp-run via pav

5 files changed, 61 insertions, 31 deletions

diff --git a/devel/kdebindings4-python-pykde4/Makefile b/devel/kdebindings4-python-pykde4/Makefile
index 5c8cd8c2b586..d6679fb8d22c 100644
--- a/devel/kdebindings4-python-pykde4/Makefile
+++ b/devel/kdebindings4-python-pykde4/Makefile
@@ -5,54 +5,61 @@
 # $FreeBSD$
 #
 
-PORTNAME=	kdebindings
+PORTNAME=	pykde4
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	devel kde python
-PKGNAMESUFFIX=	-kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}kdebindings-
+DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for KDE
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:${PORTSDIR}/devel/py-qt4-declarative \
+LIB_DEPENDS=	okularcore.1:${PORTSDIR}/graphics/okular \
+		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
+		soprano.4:${PORTSDIR}/textproc/soprano
+
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer \
+		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
+		${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:${PORTSDIR}/x11/py-qt4-opengl \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \
+		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
 		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
 		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
-		${PYTHON_SITELIBDIR}/PyQt4/phonon.so:${PORTSDIR}/multimedia/py-qt4-phonon
-LIB_DEPENDS=	okularcore.1:${PORTSDIR}/graphics/kdegraphics4 \
-		qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+		${PYTHON_SITELIBDIR}/PyQt4/phonon.so:${PORTSDIR}/multimedia/py-qt4-phonon \
+		${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:${PORTSDIR}/devel/py-qt4-declarative
+
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
 
-BINDLANG=	python
-BINDMODULE=	pykde4
-
-USE_KDE4=	akonadi kdelibs pimlibs
+USE_KDE4=	kdehier kdelibs kdeprefix pimlibs akonadi automoc4
 USE_PYTHON=	2.5+
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib qmake_build moc_build uic_build rcc_build
+USE_BZIP2=	yes
+USE_CMAKE=	yes
 CMAKE_ARGS+=	-DWITH_PolkitQt:BOOL=FALSE
 MAKE_JOBS_SAFE=	yes
 
 SUB_FILES=	kdebindings4.pth
 SUB_LIST=	PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
 
-EXAMPLESDIR=		${PREFIX}/share/examples/pykde4
-
-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
 .include <bsd.port.pre.mk>
 
 post-patch:
 .if ${OSVERSION} < 800069
-	${REINPLACE_CMD} -e '/dlopen("kpythonpluginfactory.so"/s,RTLD_NOLOAD |,,' \
-		${PATCH_WRKSRC}/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
+	${REINPLACE_CMD} -e '/dlopen("kpythonpluginfactory.so"/ s,RTLD_NOLOAD |,,' \
+		${PATCH_WRKSRC}/kpythonpluginfactory/kpythonpluginfactory.cpp
 .endif
-	${FIND} -d ${PATCH_WRKSRC}/python/pykde4/sip -name "*.orig" -delete
+	${FIND} -d ${PATCH_WRKSRC}/sip -name "*.orig" -delete
 
 pre-configure:
-	${REINPLACE_CMD} -e 's,$${SIP_DEFAULT_SIP_DIR},${PREFIX}/${SIPDIR_REL},g' \
+	${REINPLACE_CMD} -e 's,$${SIP_DEFAULT_SIP_DIR},${PREFIX}/share/py-sip,g' \
 		${BUILD_WRKSRC}/CMakeLists.txt
-	${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(examples)/d' \
-		-e '/ADD_SUBDIRECTORY(tools)/d' \
+	${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(examples)/ d' \
+		-e '/ADD_SUBDIRECTORY(tools)/ d' \
 		${BUILD_WRKSRC}/CMakeLists.txt
 	${RM} ${BUILD_WRKSRC}/examples/CMakeLists.txt
 
diff --git a/devel/kdebindings4-python-pykde4/distinfo b/devel/kdebindings4-python-pykde4/distinfo
index a151a6d05c49..1d48b30389bb 100644
--- a/devel/kdebindings4-python-pykde4/distinfo
+++ b/devel/kdebindings4-python-pykde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
+SHA256 (KDE/pykde4-4.7.2.tar.bz2) = 4ec71a9e3fc799118742ce7eec14ffab5ea94a008126bb0ab5878836890557e1
+SIZE (KDE/pykde4-4.7.2.tar.bz2) = 2106075
diff --git a/devel/kdebindings4-python-pykde4/files/patch-python__pykde4____init__.py b/devel/kdebindings4-python-pykde4/files/patch-__init__.py
index 886d3d832997..aad9e5904c5b 100644
--- a/devel/kdebindings4-python-pykde4/files/patch-python__pykde4____init__.py
+++ b/devel/kdebindings4-python-pykde4/files/patch-__init__.py
@@ -1,5 +1,5 @@
---- ./python/pykde4/__init__.py.orig	2008-07-22 04:00:52.000000000 +0400
-+++ ./python/pykde4/__init__.py	2009-05-03 23:18:43.000000000 +0400
+--- ./__init__.py.orig	2011-05-20 22:33:41.000000000 +0200
++++ ./__init__.py	2011-09-01 16:43:57.371033306 +0200
 @@ -1,4 +1,3 @@
 -import sys,DLFCN
 +import sys, ctypes
diff --git a/devel/kdebindings4-python-pykde4/files/patch-python_pykde4_kpythonpluginfactory_kpythonpluginfactory.cpp b/devel/kdebindings4-python-pykde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp
index 7b3574f56007..d1dddd936268 100644
--- a/devel/kdebindings4-python-pykde4/files/patch-python_pykde4_kpythonpluginfactory_kpythonpluginfactory.cpp
+++ b/devel/kdebindings4-python-pykde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp
@@ -1,5 +1,5 @@
---- python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp~	2009-10-31 16:30:02.000000000 +0200
-+++ python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp	2009-10-31 16:35:50.000000000 +0200
+--- ./kpythonpluginfactory/kpythonpluginfactory.cpp.orig	2011-05-20 22:33:41.000000000 +0200
++++ ./kpythonpluginfactory/kpythonpluginfactory.cpp	2011-09-01 16:43:57.371033306 +0200
 @@ -18,6 +18,8 @@
     Boston, MA 02111-1307, USA.
  */
@@ -9,7 +9,7 @@
  #include <QtCore/QCoreApplication>
  #include <QFileInfo>
  #include <QDir>
-@@ -295,6 +297,8 @@
+@@ -305,6 +307,8 @@
  // symbols global and available for later loaded libraries/module.
  QLibrary *LoadPythonLibrary()
  {
diff --git a/devel/kdebindings4-python-pykde4/pkg-plist b/devel/kdebindings4-python-pykde4/pkg-plist
index 5d83e0223ef9..a54c4084344a 100644
--- a/devel/kdebindings4-python-pykde4/pkg-plist
+++ b/devel/kdebindings4-python-pykde4/pkg-plist
@@ -10,6 +10,7 @@ lib/kde4/kpythonpluginfactory.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/kio.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/knewstuff.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/kparts.so
+%%PYTHON_SITELIBDIR%%/PyKDE4/kterminal.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/ktexteditor.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/kutils.so
 %%PYTHON_SITELIBDIR%%/PyKDE4/nepomuk.so
@@ -44,6 +45,7 @@ lib/kde4/kpythonpluginfactory.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kioExamples/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/katepart.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/konsolepart.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/kutilsExamples/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/polkitqtExamples/PkExampleUi.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/polkitqtExamples/README
@@ -334,8 +336,10 @@ share/py-sip/PyKDE4/kdeui/kconfigdialogmanager.sip
 share/py-sip/PyKDE4/kdeui/kconfigskeleton.sip
 share/py-sip/PyKDE4/kdeui/kcrash.sip
 share/py-sip/PyKDE4/kdeui/kcursor.sip
+share/py-sip/PyKDE4/kdeui/kdatecombobox.sip
 share/py-sip/PyKDE4/kdeui/kdatepicker.sip
 share/py-sip/PyKDE4/kdeui/kdatetable.sip
+share/py-sip/PyKDE4/kdeui/kdatetimeedit.sip
 share/py-sip/PyKDE4/kdeui/kdatetimewidget.sip
 share/py-sip/PyKDE4/kdeui/kdatewidget.sip
 share/py-sip/PyKDE4/kdeui/kdeprintdialog.sip
@@ -359,6 +363,7 @@ share/py-sip/PyKDE4/kdeui/kfontcombobox.sip
 share/py-sip/PyKDE4/kdeui/kfontdialog.sip
 share/py-sip/PyKDE4/kdeui/kfontrequester.sip
 share/py-sip/PyKDE4/kdeui/kfontsizeaction.sip
+share/py-sip/PyKDE4/kdeui/kfontutils.sip
 share/py-sip/PyKDE4/kdeui/kgesture.sip
 share/py-sip/PyKDE4/kdeui/kglobalaccel.sip
 share/py-sip/PyKDE4/kdeui/kglobalsettings.sip
@@ -390,6 +395,7 @@ share/py-sip/PyKDE4/kdeui/kmenu.sip
 share/py-sip/PyKDE4/kdeui/kmenubar.sip
 share/py-sip/PyKDE4/kdeui/kmessagebox.sip
 share/py-sip/PyKDE4/kdeui/kmessageboxmessagehandler.sip
+share/py-sip/PyKDE4/kdeui/kmessagewidget.sip
 share/py-sip/PyKDE4/kdeui/kmodelindexproxymapper.sip
 share/py-sip/PyKDE4/kdeui/kmodifierkeyinfo.sip
 share/py-sip/PyKDE4/kdeui/kmultitabbar.sip
@@ -403,7 +409,6 @@ share/py-sip/PyKDE4/kdeui/kpagemodel.sip
 share/py-sip/PyKDE4/kdeui/kpageview.sip
 share/py-sip/PyKDE4/kdeui/kpagewidget.sip
 share/py-sip/PyKDE4/kdeui/kpagewidgetmodel.sip
-share/py-sip/PyKDE4/kdeui/kpalette.sip
 share/py-sip/PyKDE4/kdeui/kpassivepopup.sip
 share/py-sip/PyKDE4/kdeui/kpassivepopupmessagehandler.sip
 share/py-sip/PyKDE4/kdeui/kpassworddialog.sip
@@ -458,7 +463,7 @@ share/py-sip/PyKDE4/kdeui/ktabbar.sip
 share/py-sip/PyKDE4/kdeui/ktabwidget.sip
 share/py-sip/PyKDE4/kdeui/ktextbrowser.sip
 share/py-sip/PyKDE4/kdeui/ktextedit.sip
-share/py-sip/PyKDE4/kdeui/ktimezone.sip
+share/py-sip/PyKDE4/kdeui/ktimecombobox.sip
 share/py-sip/PyKDE4/kdeui/ktimezonewidget.sip
 share/py-sip/PyKDE4/kdeui/ktip.sip
 share/py-sip/PyKDE4/kdeui/ktitlewidget.sip
@@ -556,6 +561,7 @@ share/py-sip/PyKDE4/kio/global.sip
 share/py-sip/PyKDE4/kio/job.sip
 share/py-sip/PyKDE4/kio/jobclasses.sip
 share/py-sip/PyKDE4/kio/jobuidelegate.sip
+share/py-sip/PyKDE4/kio/kabstractfileitemactionplugin.sip
 share/py-sip/PyKDE4/kio/kabstractfilemodule.sip
 share/py-sip/PyKDE4/kio/kabstractfilewidget.sip
 share/py-sip/PyKDE4/kio/kacl.sip
@@ -580,7 +586,6 @@ share/py-sip/PyKDE4/kio/kdesktopfileactions.sip
 share/py-sip/PyKDE4/kio/kdevicelistmodel.sip
 share/py-sip/PyKDE4/kio/kdirlister.sip
 share/py-sip/PyKDE4/kio/kdirmodel.sip
-share/py-sip/PyKDE4/kio/kdirnotify.sip
 share/py-sip/PyKDE4/kio/kdiroperator.sip
 share/py-sip/PyKDE4/kio/kdirselectdialog.sip
 share/py-sip/PyKDE4/kio/kdirsortfilterproxymodel.sip
@@ -622,10 +627,12 @@ share/py-sip/PyKDE4/kio/kopenwithdialog.sip
 share/py-sip/PyKDE4/kio/kpreviewwidgetbase.sip
 share/py-sip/PyKDE4/kio/kpropertiesdialog.sip
 share/py-sip/PyKDE4/kio/kprotocolmanager.sip
+share/py-sip/PyKDE4/kio/krecentdirs.sip
 share/py-sip/PyKDE4/kio/krecentdocument.sip
 share/py-sip/PyKDE4/kio/kremoteencoding.sip
 share/py-sip/PyKDE4/kio/krun.sip
 share/py-sip/PyKDE4/kio/ksambashare.sip
+share/py-sip/PyKDE4/kio/ksambasharedata.sip
 share/py-sip/PyKDE4/kio/kscan.sip
 share/py-sip/PyKDE4/kio/kservicegroup.sip
 share/py-sip/PyKDE4/kio/kshellcompletion.sip
@@ -721,6 +728,19 @@ share/py-sip/PyKDE4/kparts/sipkpartspart6.cpp
 share/py-sip/PyKDE4/kparts/sipkpartspart7.cpp
 share/py-sip/PyKDE4/kparts/statusbarextension.sip
 share/py-sip/PyKDE4/kparts/textextension.sip
+share/py-sip/PyKDE4/kterminal/kterminal.sip
+share/py-sip/PyKDE4/kterminal/kterminalmod.sip
+share/py-sip/PyKDE4/kterminal/sipAPIkterminal.h
+share/py-sip/PyKDE4/kterminal/sipkterminalpart0.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart1.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart2.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart3.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart4.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart5.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart6.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart7.cpp
+share/py-sip/PyKDE4/kterminal/terminal_interface.sip
+share/py-sip/PyKDE4/kterminal/terminal_interface_v2.sip
 share/py-sip/PyKDE4/ktexteditor/attribute.sip
 share/py-sip/PyKDE4/ktexteditor/codecompletioninterface.sip
 share/py-sip/PyKDE4/ktexteditor/codecompletionmodel.sip
@@ -857,6 +877,7 @@ share/py-sip/PyKDE4/phonon/mediacontroller.sip
 share/py-sip/PyKDE4/phonon/medianode.sip
 share/py-sip/PyKDE4/phonon/mediaobject.sip
 share/py-sip/PyKDE4/phonon/mediasource.sip
+share/py-sip/PyKDE4/phonon/mrl.sip
 share/py-sip/PyKDE4/phonon/objectdescription.sip
 share/py-sip/PyKDE4/phonon/objectdescriptionmodel.sip
 share/py-sip/PyKDE4/phonon/packet.sip
@@ -1002,6 +1023,7 @@ share/py-sip/PyKDE4/solid/genericinterface.sip
 share/py-sip/PyKDE4/solid/internetgateway.sip
 share/py-sip/PyKDE4/solid/networking.sip
 share/py-sip/PyKDE4/solid/networkinterface.sip
+share/py-sip/PyKDE4/solid/networkshare.sip
 share/py-sip/PyKDE4/solid/opticaldisc.sip
 share/py-sip/PyKDE4/solid/opticaldrive.sip
 share/py-sip/PyKDE4/solid/portablemediaplayer.sip
@@ -1103,6 +1125,7 @@ share/py-sip/PyKDE4/soprano/xsd.sip
 @dirrm share/py-sip/PyKDE4/nepomuk
 @dirrm share/py-sip/PyKDE4/kutils
 @dirrm share/py-sip/PyKDE4/ktexteditor
+@dirrm share/py-sip/PyKDE4/kterminal
 @dirrm share/py-sip/PyKDE4/kparts
 @dirrm share/py-sip/PyKDE4/knewstuff
 @dirrm share/py-sip/PyKDE4/kio