Unbreak by upgrading to 3.11.1.

PR:		ports/68053
Submitted by:	danny@ricin.com

5 files changed, 23 insertions, 84 deletions

diff --git a/x11-toolkits/py-kde/Makefile b/x11-toolkits/py-kde/Makefile
index 4569a21ab5b3..096290d392e4 100644
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	3.11.r1
+PORTVERSION=	3.11.1
 CATEGORIES=	x11-toolkits kde python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyKDE2/ \
 		http://www.river-bank.demon.co.uk/download/PyQt/:qt
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	PyKDE-3.11rc1
+DISTNAME=	PyKDE-3.11.1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} PyQt-x11-gpl-${PYQTVERSION}${EXTRACT_SUFX}:qt
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Bindings for KDE
 
 BUILD_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
-
-BROKEN=		Unfetchable
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
 USE_KDELIBS_VER=3
@@ -27,13 +26,14 @@ USE_REINPLACE=	yes
 
 PYQTVERSION=	3.11
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 NO_FILTER_SHLIBS=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on 4.x"
+BROKEN=		"Does not run on 4.x"
 .endif
 
 post-patch:
@@ -46,7 +46,7 @@ do-configure:
 		-d ${PYTHONPREFIX_SITELIBDIR} )
 
 pre-install:
-	@${REINPLACE_CMD} -e "s,/usr/bin/env python,${PYTHON_CMD}," \
+	@${REINPLACE_CMD} -e "s,${SETENV} python,${PYTHON_CMD}," \
 		${WRKSRC}/contrib/kdepyuic
 
 post-install:
@@ -57,6 +57,11 @@ post-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${EXAMPLESDIR}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${EXAMPLESDIR}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	@${SED} -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|" < ${FILESDIR}/pkg-message.in \
+		> ${PKGMESSAGE}
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 .endif
 	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/kdepyuic ${PREFIX}/bin
 
diff --git a/x11-toolkits/py-kde/distinfo b/x11-toolkits/py-kde/distinfo
index 0f7c6bf350e2..a718a90820aa 100644
--- a/x11-toolkits/py-kde/distinfo
+++ b/x11-toolkits/py-kde/distinfo
@@ -1,4 +1,4 @@
-MD5 (PyKDE-3.11rc1.tar.gz) = ad113efa838c79f262212d1795485f22
-SIZE (PyKDE-3.11rc1.tar.gz) = 1019499
+MD5 (PyKDE-3.11.1.tar.gz) = ad689ed02054ea03b7f4d2d0cd84e6b6
+SIZE (PyKDE-3.11.1.tar.gz) = 1185069
 MD5 (PyQt-x11-gpl-3.11.tar.gz) = 78d0ef29f57d7efd1d87f9a24fc25f1e
 SIZE (PyQt-x11-gpl-3.11.tar.gz) = 757652
diff --git a/x11-toolkits/py-kde/files/patch-configure.py b/x11-toolkits/py-kde/files/patch-configure.py
deleted file mode 100644
index eaa1aa938e71..000000000000
--- a/x11-toolkits/py-kde/files/patch-configure.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.py.orig	Sat May  8 11:09:53 2004
-+++ configure.py	Wed May 26 19:47:16 2004
-@@ -700,7 +700,7 @@
-             opt_concat = 1
- 
-         elif opt == "-d":
--            opt_pyqtmoddir = arg
-+            opt_pykdemoddir = arg
-         elif opt == "-g":
-             opt_releasegil = 1
- 
diff --git a/x11-toolkits/py-kde/files/pkg-message.in b/x11-toolkits/py-kde/files/pkg-message.in
new file mode 100644
index 000000000000..20bc95d18e3b
--- /dev/null
+++ b/x11-toolkits/py-kde/files/pkg-message.in
@@ -0,0 +1,3 @@
+To test run:
+
+cd %%EXAMPLESDIR%% && python uisampler.py
diff --git a/x11-toolkits/py-kde/pkg-plist b/x11-toolkits/py-kde/pkg-plist
index 88aaff017572..181adcfa6c18 100644
--- a/x11-toolkits/py-kde/pkg-plist
+++ b/x11-toolkits/py-kde/pkg-plist
@@ -15,6 +15,12 @@ bin/kdepyuic
 %%PORTDOCS%%%%EXAMPLESDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/aboutkde.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/astron.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/example_dcopexport.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/example_dcopexport.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/example_dcopexport.pyo
+%%PORTDOCS%%%%EXAMPLESDIR%%/example_dcopext.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/example_dcopext.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/example_dcopext.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/kdeform1.ui
 %%PORTDOCS%%%%EXAMPLESDIR%%/kdeform1.ui.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/kpartgui.dtd
@@ -70,11 +76,11 @@ bin/kdepyuic
 %%PORTDOCS%%%%EXAMPLESDIR%%/xmlmenudemoui.rc
 share/sip/dcop/dcopclient.sip
 share/sip/dcop/dcopmod.sip
-share/sip/dcop/dcopmod.sip.in
 share/sip/dcop/dcopobject.sip
 share/sip/dcop/dcopref.sip
 share/sip/dcop/dcopstub.sip
 share/sip/dcop/typedefs.sip
+share/sip/kdecore/bytearray.sip
 share/sip/kdecore/fixx11h.sip
 share/sip/kdecore/kaboutdata.sip
 share/sip/kdecore/kaccel.sip
@@ -101,17 +107,7 @@ share/sip/kdecore/kconfigskeleton.sip
 share/sip/kdecore/kcrash.sip
 share/sip/kdecore/kdcoppropertyproxy.sip
 share/sip/kdecore/kdebug.sip
-share/sip/kdecore/kdecore-kde310.diff
-share/sip/kdecore/kdecore-kde311.diff
-share/sip/kdecore/kdecore-kde312.diff
-share/sip/kdecore/kdecore-kde313.diff
-share/sip/kdecore/kdecore-kde314.diff
-share/sip/kdecore/kdecore-kde315.diff
-share/sip/kdecore/kdecore-kde320.diff
-share/sip/kdecore/kdecore-kde321.diff
-share/sip/kdecore/kdecore-kde322.diff
 share/sip/kdecore/kdecoremod.sip
-share/sip/kdecore/kdecoremod.sip.in
 share/sip/kdecore/kdesktopfile.sip
 share/sip/kdecore/kdesktopwidget.sip
 share/sip/kdecore/kdestyle.sip
@@ -171,11 +167,7 @@ share/sip/kdecore/kxmessages.sip
 share/sip/kdecore/netwm.sip
 share/sip/kdecore/netwm_def.sip
 share/sip/kdefx/kcpuinfo.sip
-share/sip/kdefx/kdefx-kde320.diff
-share/sip/kdefx/kdefx-kde321.diff
-share/sip/kdefx/kdefx-kde322.diff
 share/sip/kdefx/kdefxmod.sip
-share/sip/kdefx/kdefxmod.sip.in
 share/sip/kdefx/kdrawutil.sip
 share/sip/kdefx/kimageeffect.sip
 share/sip/kdefx/kpixmap.sip
@@ -183,17 +175,7 @@ share/sip/kdefx/kpixmapeffect.sip
 share/sip/kdefx/kpixmapsplitter.sip
 share/sip/kdefx/kstyle.sip
 share/sip/kdeprint/driver.sip
-share/sip/kdeprint/kdeprint-kde310.diff
-share/sip/kdeprint/kdeprint-kde311.diff
-share/sip/kdeprint/kdeprint-kde312.diff
-share/sip/kdeprint/kdeprint-kde313.diff
-share/sip/kdeprint/kdeprint-kde314.diff
-share/sip/kdeprint/kdeprint-kde315.diff
-share/sip/kdeprint/kdeprint-kde320.diff
-share/sip/kdeprint/kdeprint-kde321.diff
-share/sip/kdeprint/kdeprint-kde322.diff
 share/sip/kdeprint/kdeprintmod.sip
-share/sip/kdeprint/kdeprintmod.sip.in
 share/sip/kdeprint/kmjob.sip
 share/sip/kdeprint/kmjobmanager.sip
 share/sip/kdeprint/kmmanager.sip
@@ -209,7 +191,6 @@ share/sip/kdesu/defaults.sip
 share/sip/kdesu/kcookie.sip
 share/sip/kdesu/kdesu_pty.sip
 share/sip/kdesu/kdesumod.sip
-share/sip/kdesu/kdesumod.sip.in
 share/sip/kdesu/process.sip
 share/sip/kdesu/ssh.sip
 share/sip/kdesu/stub.sip
@@ -250,17 +231,7 @@ share/sip/kdeui/kdatetimewidget.sip
 share/sip/kdeui/kdatewidget.sip
 share/sip/kdeui/kdbtn.sip
 share/sip/kdeui/kdcopactionproxy.sip
-share/sip/kdeui/kdeui-kde310.diff
-share/sip/kdeui/kdeui-kde311.diff
-share/sip/kdeui/kdeui-kde312.diff
-share/sip/kdeui/kdeui-kde313.diff
-share/sip/kdeui/kdeui-kde314.diff
-share/sip/kdeui/kdeui-kde315.diff
-share/sip/kdeui/kdeui-kde320.diff
-share/sip/kdeui/kdeui-kde321.diff
-share/sip/kdeui/kdeui-kde322.diff
 share/sip/kdeui/kdeuimod.sip
-share/sip/kdeui/kdeuimod.sip.in
 share/sip/kdeui/kdialog.sip
 share/sip/kdeui/kdialogbase.sip
 share/sip/kdeui/kdocktabctl.sip
@@ -347,15 +318,6 @@ share/sip/kfile/kdirselectdialog.sip
 share/sip/kfile/kdirsize.sip
 share/sip/kfile/kdiskfreesp.sip
 share/sip/kfile/kencodingfiledialog.sip
-share/sip/kfile/kfile-kde310.diff
-share/sip/kfile/kfile-kde311.diff
-share/sip/kfile/kfile-kde312.diff
-share/sip/kfile/kfile-kde313.diff
-share/sip/kfile/kfile-kde314.diff
-share/sip/kfile/kfile-kde315.diff
-share/sip/kfile/kfile-kde320.diff
-share/sip/kfile/kfile-kde321.diff
-share/sip/kfile/kfile-kde322.diff
 share/sip/kfile/kfile.sip
 share/sip/kfile/kfilebookmark.sip
 share/sip/kfile/kfiledetailview.sip
@@ -363,7 +325,6 @@ share/sip/kfile/kfiledialog.sip
 share/sip/kfile/kfilefiltercombo.sip
 share/sip/kfile/kfileiconview.sip
 share/sip/kfile/kfilemod.sip
-share/sip/kfile/kfilemod.sip.in
 share/sip/kfile/kfilepreview.sip
 share/sip/kfile/kfilereader.sip
 share/sip/kfile/kfilesharedlg.sip
@@ -415,7 +376,6 @@ share/sip/khtml/html_table.sip
 share/sip/khtml/khtml_part.sip
 share/sip/khtml/khtml_settings.sip
 share/sip/khtml/khtmlmod.sip
-share/sip/khtml/khtmlmod.sip.in
 share/sip/khtml/khtmlview.sip
 share/sip/kio/authinfo.sip
 share/sip/kio/chmodjob.sip
@@ -441,17 +401,7 @@ share/sip/kio/kfileshare.sip
 share/sip/kio/kfilterbase.sip
 share/sip/kio/kfilterdev.sip
 share/sip/kio/kimageio.sip
-share/sip/kio/kio-kde310.diff
-share/sip/kio/kio-kde311.diff
-share/sip/kio/kio-kde312.diff
-share/sip/kio/kio-kde313.diff
-share/sip/kio/kio-kde314.diff
-share/sip/kio/kio-kde315.diff
-share/sip/kio/kio-kde320.diff
-share/sip/kio/kio-kde321.diff
-share/sip/kio/kio-kde322.diff
 share/sip/kio/kiomod.sip
-share/sip/kio/kiomod.sip.in
 share/sip/kio/kmimemagic.sip
 share/sip/kio/kmimetype.sip
 share/sip/kio/kpac.sip
@@ -494,7 +444,6 @@ share/sip/kio/slaveinterface.sip
 share/sip/kio/statusbarprogress.sip
 share/sip/kio/tcpslavebase.sip
 share/sip/kio/thumbcreator.sip
-share/sip/kmdi/kmdi-kde322.diff
 share/sip/kmdi/kmdichildarea.sip
 share/sip/kmdi/kmdichildfrm.sip
 share/sip/kmdi/kmdichildfrmcaption.sip
@@ -502,7 +451,6 @@ share/sip/kmdi/kmdichildview.sip
 share/sip/kmdi/kmdidefines.sip
 share/sip/kmdi/kmdimainfrm.sip
 share/sip/kmdi/kmdimod.sip
-share/sip/kmdi/kmdimod.sip.in
 share/sip/kmdi/kmditaskbar.sip
 share/sip/kmdi/kmditoolviewaccessor.sip
 share/sip/kparts/browserextension.sip
@@ -513,22 +461,16 @@ share/sip/kparts/event.sip
 share/sip/kparts/factory.sip
 share/sip/kparts/genericfactory.sip
 share/sip/kparts/historyprovider.sip
-share/sip/kparts/kparts-kde320.diff
-share/sip/kparts/kparts-kde321.diff
-share/sip/kparts/kparts-kde322.diff
 share/sip/kparts/kpartsmod.sip
-share/sip/kparts/kpartsmod.sip.in
 share/sip/kparts/mainwindow.sip
 share/sip/kparts/part.sip
 share/sip/kparts/partmanager.sip
 share/sip/kparts/plugin.sip
 share/sip/kparts/statusbarextension.sip
 share/sip/kspell/ksconfig.sip
-share/sip/kspell/kspell-kde320.diff
 share/sip/kspell/kspell.sip
 share/sip/kspell/kspelldlg.sip
 share/sip/kspell/kspellmod.sip
-share/sip/kspell/kspellmod.sip.in
 share/sip/kspell/ksyntaxhighlighter.sip
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/uimodules
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%