Update py-sip, py-qt, py-kde to versions 4.2, 3.14, 4.0.0 respectively.

PR:     ports/78319 ports/78320 ports/78935
Submitted by:   maintainer

7 files changed, 74 insertions, 62 deletions

diff --git a/x11-toolkits/py-kde/Makefile b/x11-toolkits/py-kde/Makefile
index d6bcc1040e3..0cb2a9efeeb 100644
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	3.11.3
-PORTREVISION=	2
+PORTVERSION=	4.0.0
+PORTREVISION=
 CATEGORIES=	x11-toolkits kde python
-MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyKDE2/
+MASTER_SITES=	http://www.river-bank.demon.co.uk/download/snapshots/PyKDE/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=lofi
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	PyKDE-${PORTVERSION}
+# Tarball is pre-release snapshot ATM
+DISTNAME=	PyKDE-snapshot20050316
 
 MAINTAINER=	danny@ricin.com
-COMMENT=	Python Bindings for KDE3
+COMMENT=	Python bindings for KDE3
 
 BUILD_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
 RUN_DEPENDS=	${BUILD_DEPENDS}
@@ -23,32 +26,24 @@ USE_PYTHON=	yes
 USE_KDELIBS_VER=3
 USE_REINPLACE=	yes
 
-PYQTVERSION=	3.13
+PYQTVERSION=	3.14
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
 
 NO_FILTER_SHLIBS=	yes
 
-MODULES=	kdecore kdefx kdeui kio kfile kparts kspell kdeprint kmdi
-
 .include <bsd.port.pre.mk>
 
+CONFIGURE_ARGS=	-k ${LOCALBASE} -v ${PREFIX}/share/sip -d ${PYTHONPREFIX_SITELIBDIR}
+
+.if ${ARCH} != "i386"
+CONFIGURE_ARGS+=	-j 2
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#/usr/bin/python#${PYTHON_CMD}#' ${WRKSRC}/postproc
-	@( cd ${WRKSRC} && \
-		ver=`${ECHO} ${KDE_VERSION} | ${SED} -e 's/\.//g'` && \
-		if [ "$${ver}" -gt "330" ]; then \
-			( ${MV} extra/kde330 extra/kde$${ver} && \
-			for i in ${MODULES}; do \
-				${MV} sip/$${i}/$${i}-kde330.diff \
-					sip/$${i}/$${i}-kde$${ver}.diff; \
-			done ) \
-		fi )
 
 do-configure:
-	@( cd ${WRKSRC} && ${PYTHON_CMD} configure.py -c \
-		-k ${LOCALBASE} \
-		-v ${PREFIX}/share/sip \
-		-d ${PYTHONPREFIX_SITELIBDIR} )
+	@( cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} )
 
 pre-install:
 	@${REINPLACE_CMD} -e "s,${SETENV} python,${PYTHON_CMD}," \
@@ -56,11 +51,12 @@ pre-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR} ${EXAMPLESDIR}/templates
 	@( cd ${WRKSRC}/examples && ${TAR} -cf - . ) | \
 		( cd ${EXAMPLESDIR} && ${TAR} -xf - )
+	@( cd ${WRKSRC}/templates && ${TAR} -cf - . ) | \
+		( cd ${EXAMPLESDIR}/templates && ${TAR} -xf - )
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${EXAMPLESDIR}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${EXAMPLESDIR}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/kdepyuic ${PREFIX}/bin
diff --git a/x11-toolkits/py-kde/distinfo b/x11-toolkits/py-kde/distinfo
index cb96bc3c4a4..d4832b55fcf 100644
--- a/x11-toolkits/py-kde/distinfo
+++ b/x11-toolkits/py-kde/distinfo
@@ -1,2 +1,2 @@
-MD5 (PyKDE-3.11.3.tar.gz) = 7e0b2df3d5f9718833238501c3a21e96
-SIZE (PyKDE-3.11.3.tar.gz) = 1254776
+MD5 (PyKDE-snapshot20050316.tar.gz) = 9f03610eff2677668390071de79788d0
+SIZE (PyKDE-snapshot20050316.tar.gz) = 1300223
diff --git a/x11-toolkits/py-kde/pkg-plist b/x11-toolkits/py-kde/pkg-plist
index eddcff267b7..a0677f309b8 100644
--- a/x11-toolkits/py-kde/pkg-plist
+++ b/x11-toolkits/py-kde/pkg-plist
@@ -26,62 +26,79 @@ bin/kdepyuic
 %%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
 %%PORTDOCS%%%%EXAMPLESDIR%%/kurldemo.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/kurldemo.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/kurldemo.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/menudemo.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/menudemo.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/menudemo.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/mimetype.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/mimetype.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/mimetype.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/pyKHTMLPart.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/pyKHTMLPart.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/pyKHTMLPart.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/pytestimage.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/qxembed_example.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/qxembedexample.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/qxembedexample.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/qxembedexample.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/qxembedexample.ui
 %%PORTDOCS%%%%EXAMPLESDIR%%/systray.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/systray.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/systray.pyo
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/basicapp.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/basicapp.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/menuapp1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/menuapp1.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/menuapp2.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/menuapp2.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/menuapp3.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/menuapp3.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/menuapp3ui.rc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/minimal.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/minimal.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/panelapplet.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/panelapplet.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/systray.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/systray.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/systray1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/annotated/systray1.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/basicapp.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/basicapp.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/menuapp1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/menuapp1.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/menuapp2.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/menuapp2.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/menuapp3.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/menuapp3.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/menuapp3ui.rc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/minimal.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/minimal.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/panelapplet.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/panelapplet.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/systray.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/systray.pyc
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/systray1.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/templates/basic/systray1.pyc
 %%PORTDOCS%%%%EXAMPLESDIR%%/uikmdi.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/uikmdi.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/uikmdi.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/uikmdi.rc
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uidialogs.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uidialogs.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uidialogs.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uimenus.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uimenus.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uimenus.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uimisc.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uimisc.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uimisc.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uiwidgets.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uiwidgets.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uiwidgets.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uixml.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uixml.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/uimodules/uixml.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/uiqxembed.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/uiqxembed.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/uiqxembed.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/uisampler.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/uisampler.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/uisampler.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/xmlmenudemo.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/xmlmenudemo.pyc
-%%PORTDOCS%%%%EXAMPLESDIR%%/xmlmenudemo.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/xmlmenudemoui.rc
 share/sip/dcop/dcopclient.sip
 share/sip/dcop/dcopmod.sip
@@ -259,6 +276,7 @@ share/sip/kdeui/kfontrequester.sip
 share/sip/kdeui/kguiitem.sip
 share/sip/kdeui/khelpmenu.sip
 share/sip/kdeui/kiconview.sip
+share/sip/kdeui/kiconviewsearchline.sip
 share/sip/kdeui/kinputdialog.sip
 share/sip/kdeui/kjanuswidget.sip
 share/sip/kdeui/kkeybutton.sip
@@ -284,6 +302,8 @@ share/sip/kdeui/kpanelmenu.sip
 share/sip/kdeui/kpassdlg.sip
 share/sip/kdeui/kpassivepopup.sip
 share/sip/kdeui/kpixmapio.sip
+share/sip/kdeui/kpixmapregionselectordialog.sip
+share/sip/kdeui/kpixmapregionselectorwidget.sip
 share/sip/kdeui/kpopupmenu.sip
 share/sip/kdeui/kprogress.sip
 share/sip/kdeui/kpushbutton.sip
@@ -293,6 +313,7 @@ share/sip/kdeui/kruler.sip
 share/sip/kdeui/kselect.sip
 share/sip/kdeui/kseparator.sip
 share/sip/kdeui/ksharedpixmap.sip
+share/sip/kdeui/kshortcutdialog.sip
 share/sip/kdeui/ksplashscreen.sip
 share/sip/kdeui/ksqueezedtextlabel.sip
 share/sip/kdeui/kstatusbar.sip
@@ -312,6 +333,7 @@ share/sip/kdeui/ktip.sip
 share/sip/kdeui/ktmainwindow.sip
 share/sip/kdeui/ktoolbar.sip
 share/sip/kdeui/ktoolbarbutton.sip
+share/sip/kdeui/ktoolbarlabelaction.sip
 share/sip/kdeui/ktoolbarradiogroup.sip
 share/sip/kdeui/kurllabel.sip
 share/sip/kdeui/kwindowinfo.sip
@@ -354,6 +376,7 @@ share/sip/kfile/kopenwith.sip
 share/sip/kfile/kpreviewwidgetbase.sip
 share/sip/kfile/kpropertiesdialog.sip
 share/sip/kfile/kpropsdlg.sip
+share/sip/kfile/krecentdirs.sip
 share/sip/kfile/krecentdocument.sip
 share/sip/kfile/kurlbar.sip
 share/sip/kfile/kurlcombobox.sip
@@ -395,6 +418,7 @@ share/sip/kio/chmodjob.sip
 share/sip/kio/connection.sip
 share/sip/kio/davjob.sip
 share/sip/kio/defaultprogress.sip
+share/sip/kio/forwardingslavebase.sip
 share/sip/kio/global.sip
 share/sip/kio/job.sip
 share/sip/kio/jobclasses.sip
@@ -502,6 +526,9 @@ share/sip/kutils/kpluginselector.sip
 share/sip/kutils/kreplace.sip
 share/sip/kutils/kreplacedialog.sip
 share/sip/kutils/kutilsmod.sip
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/templates/annotated
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/templates/basic
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/templates
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/uimodules
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm share/sip/dcop
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index 51faa4e2220..a973e9e5d0d 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -5,12 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	qt
-PORTVERSION=	3.13
-PORTREVISION=	1
+PORTVERSION=	3.14
+PORTREVISION=
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyQt/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=lofi
+MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyQt/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
@@ -34,10 +32,10 @@ PLIST_SUB+=	GL=""
 .endif
 
 do-configure:
-	@(cd ${WRKSRC} && ${ECHO} "yes" | ${PYTHON_CMD} configure.py \
+	@( cd ${WRKSRC} && ${ECHO} "yes" | ${PYTHON_CMD} configure.py \
 		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
 		-n ${X11BASE}/include -o ${X11BASE}/lib \
-		-v ${PREFIX}/share/sip)
+		-v ${PREFIX}/share/sip )
 
 .if ${OSVERSION} < 500000
 post-configure:
diff --git a/x11-toolkits/py-qt/distinfo b/x11-toolkits/py-qt/distinfo
index 754bbfe9605..ed752c812b9 100644
--- a/x11-toolkits/py-qt/distinfo
+++ b/x11-toolkits/py-qt/distinfo
@@ -1,2 +1,2 @@
-MD5 (PyQt-x11-gpl-3.13.tar.gz) = a4145b39742a4d9df9b6bf06495f75f5
-SIZE (PyQt-x11-gpl-3.13.tar.gz) = 763066
+MD5 (PyQt-x11-gpl-3.14.tar.gz) = a63f0a9e2bd84a110ecbaf6cdf1d956f
+SIZE (PyQt-x11-gpl-3.14.tar.gz) = 782085
diff --git a/x11-toolkits/py-qt/files/patch-sip::qt::qstring.sip b/x11-toolkits/py-qt/files/patch-sip::qt::qstring.sip
deleted file mode 100644
index 5e64c89a22e..00000000000
--- a/x11-toolkits/py-qt/files/patch-sip::qt::qstring.sip
+++ /dev/null
@@ -1,11 +0,0 @@
---- sip/qt/qstring.sip.orig	Sun Jan  9 20:06:08 2005
-+++ sip/qt/qstring.sip	Sun Jan  9 20:06:25 2005
-@@ -851,7 +851,7 @@
- 		int len = PyUnicode_GET_SIZE(sipPy);
- 
- 		for (int i = 0; i < len; ++i)
--			qs->ref(i) = ucode[i];
-+			qs->ref(i) = QChar(uint(ucode[i]));
- #else
- 		qs -> setUnicodeCodes((ushort *)PyUnicode_AS_UNICODE(sipPy),PyUnicode_GET_SIZE(sipPy));
- #endif
\ No newline at end of file
diff --git a/x11-toolkits/py-qt/pkg-plist b/x11-toolkits/py-qt/pkg-plist
index 63ab0348106..f99a9453ffc 100644
--- a/x11-toolkits/py-qt/pkg-plist
+++ b/x11-toolkits/py-qt/pkg-plist
@@ -212,8 +212,10 @@ share/sip/qtext/qextscintillalexerhtml.sip
 share/sip/qtext/qextscintillalexeridl.sip
 share/sip/qtext/qextscintillalexerjava.sip
 share/sip/qtext/qextscintillalexerjavascript.sip
+share/sip/qtext/qextscintillalexerlua.sip
 share/sip/qtext/qextscintillalexerperl.sip
 share/sip/qtext/qextscintillalexerpython.sip
+share/sip/qtext/qextscintillalexerruby.sip
 share/sip/qtext/qextscintillalexersql.sip
 share/sip/qtext/qextscintillamacro.sip
 share/sip/qtext/qextscintillaprinter.sip