drochner noted that patch-ac is wrong (the original is correct for

Python 3) and suggested not installing the .pyc files.

Follow his advice and bump PKGREVISION.

4 files changed, 4 insertions, 107 deletions

diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 47c73e67226..dbfa7d6f01e 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2010/02/25 17:03:13 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/27 21:37:47 wiz Exp $
 #
 
 PKGNAME=		${PYPKGPREFIX}-qt4-${PYQT_VERSION}
 PYQT_VERSION=		4.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 
@@ -56,64 +56,11 @@ PLIST_SRC+=		${PKGDIR}/PLIST.X11
 PLIST_SRC+=		${PKGDIR}/PLIST.elementtree
 .endif
 
-PYCFILES=		port_v2/__init__.pyc
-PYCFILES+=		port_v2/ascii_upper.pyc
-PYCFILES+=		port_v2/encode_utf8.pyc
-PYCFILES+=		port_v2/invoke.pyc
-PYCFILES+=		port_v2/load_plugin.pyc
-PYCFILES+=		port_v2/proxy_base.pyc
-PYCFILES+=		port_v2/string_io.pyc
-PYCFILES+=		Loader/__init__.pyc
-PYCFILES+=		Loader/loader.pyc
-PYCFILES+=		Loader/qobjectcreator.pyc
-PYCFILES+=		widget-plugins/phonon.pyc
-PYCFILES+=		widget-plugins/qaxcontainer.pyc
-PYCFILES+=		widget-plugins/qscintilla.pyc
-PYCFILES+=		widget-plugins/qtwebkit.pyc
-PYCFILES+=		Compiler/__init__.pyc
-PYCFILES+=		Compiler/compiler.pyc
-PYCFILES+=		Compiler/indenter.pyc
-PYCFILES+=		Compiler/misc.pyc
-PYCFILES+=		Compiler/proxy_type.pyc
-PYCFILES+=		Compiler/qobjectcreator.pyc
-PYCFILES+=		Compiler/qtproxies.pyc
-PYCFILES+=		port_v3/__init__.pyc
-PYCFILES+=		port_v3/ascii_upper.pyc
-PYCFILES+=		port_v3/encode_utf8.pyc
-PYCFILES+=		port_v3/invoke.pyc
-PYCFILES+=		port_v3/load_plugin.pyc
-PYCFILES+=		port_v3/proxy_base.pyc
-PYCFILES+=		port_v3/string_io.pyc
-PYCFILES+=		__init__.pyc
-PYCFILES+=		driver.pyc
-PYCFILES+=		exceptions.pyc
-PYCFILES+=		icon_cache.pyc
-PYCFILES+=		objcreator.pyc
-PYCFILES+=		properties.pyc
-PYCFILES+=		pyuic.pyc
-PYCFILES+=		uiparser.pyc
-
 CONFIGURE_ARGS+=	--verbose
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
-post-build:
-	cd ${WRKSRC}/pyuic/uic && ${PY_COMPILE_ALL} .
-	cd ${WRKSRC} && ${PYTHONBIN} ${PREFIX}/lib/python${PYVERSSUFFIX}/py_compile.py  __init__.py
-	cd ${WRKSRC} && ${PYTHONBIN} ${PREFIX}/lib/python${PYVERSSUFFIX}/py_compile.py pyqtconfig.py
-
-post-install:
-	${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt4/uic/port_v3/proxy_base.py.orig
-	for file in ${PYCFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/pyuic/uic/$$file \
-			${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt4/uic/$$file; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/__init__.pyc \
-		${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt4
-	${INSTALL_DATA} ${WRKSRC}/pyqtconfig.pyc \
-		${DESTDIR}${PREFIX}/${PYSITELIB}/PyQt4
-
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
diff --git a/x11/py-qt4/PLIST.common b/x11/py-qt4/PLIST.common
index 6d6f7b8334b..8a852be51a1 100644
--- a/x11/py-qt4/PLIST.common
+++ b/x11/py-qt4/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2010/02/25 17:03:13 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2010/02/27 21:37:47 wiz Exp $
 bin/pylupdate4
 bin/pyrcc4
 bin/pyuic4
@@ -21,79 +21,42 @@ ${PYSITELIB}/PyQt4/QtXml.so
 ${PYSITELIB}/PyQt4/QtXmlPatterns.so
 ${PYSITELIB}/PyQt4/__init__.py
 ${PYSITELIB}/PyQt4/pyqtconfig.py
-${PYSITELIB}/PyQt4/pyqtconfig.pyc
 ${PYSITELIB}/PyQt4/uic/Compiler/__init__.py
-${PYSITELIB}/PyQt4/uic/Compiler/__init__.pyc
 ${PYSITELIB}/PyQt4/uic/Compiler/compiler.py
-${PYSITELIB}/PyQt4/uic/Compiler/compiler.pyc
 ${PYSITELIB}/PyQt4/uic/Compiler/indenter.py
-${PYSITELIB}/PyQt4/uic/Compiler/indenter.pyc
 ${PYSITELIB}/PyQt4/uic/Compiler/misc.py
-${PYSITELIB}/PyQt4/uic/Compiler/misc.pyc
 ${PYSITELIB}/PyQt4/uic/Compiler/proxy_type.py
-${PYSITELIB}/PyQt4/uic/Compiler/proxy_type.pyc
 ${PYSITELIB}/PyQt4/uic/Compiler/qobjectcreator.py
-${PYSITELIB}/PyQt4/uic/Compiler/qobjectcreator.pyc
 ${PYSITELIB}/PyQt4/uic/Compiler/qtproxies.py
-${PYSITELIB}/PyQt4/uic/Compiler/qtproxies.pyc
 ${PYSITELIB}/PyQt4/uic/Loader/__init__.py
-${PYSITELIB}/PyQt4/uic/Loader/__init__.pyc
 ${PYSITELIB}/PyQt4/uic/Loader/loader.py
-${PYSITELIB}/PyQt4/uic/Loader/loader.pyc
 ${PYSITELIB}/PyQt4/uic/Loader/qobjectcreator.py
-${PYSITELIB}/PyQt4/uic/Loader/qobjectcreator.pyc
 ${PYSITELIB}/PyQt4/uic/__init__.py
-${PYSITELIB}/PyQt4/uic/__init__.pyc
 ${PYSITELIB}/PyQt4/uic/driver.py
-${PYSITELIB}/PyQt4/uic/driver.pyc
 ${PYSITELIB}/PyQt4/uic/exceptions.py
-${PYSITELIB}/PyQt4/uic/exceptions.pyc
 ${PYSITELIB}/PyQt4/uic/icon_cache.py
-${PYSITELIB}/PyQt4/uic/icon_cache.pyc
 ${PYSITELIB}/PyQt4/uic/objcreator.py
-${PYSITELIB}/PyQt4/uic/objcreator.pyc
 ${PYSITELIB}/PyQt4/uic/port_v2/__init__.py
-${PYSITELIB}/PyQt4/uic/port_v2/__init__.pyc
 ${PYSITELIB}/PyQt4/uic/port_v2/ascii_upper.py
-${PYSITELIB}/PyQt4/uic/port_v2/ascii_upper.pyc
 ${PYSITELIB}/PyQt4/uic/port_v2/encode_utf8.py
-${PYSITELIB}/PyQt4/uic/port_v2/encode_utf8.pyc
 ${PYSITELIB}/PyQt4/uic/port_v2/invoke.py
-${PYSITELIB}/PyQt4/uic/port_v2/invoke.pyc
 ${PYSITELIB}/PyQt4/uic/port_v2/load_plugin.py
-${PYSITELIB}/PyQt4/uic/port_v2/load_plugin.pyc
 ${PYSITELIB}/PyQt4/uic/port_v2/proxy_base.py
-${PYSITELIB}/PyQt4/uic/port_v2/proxy_base.pyc
 ${PYSITELIB}/PyQt4/uic/port_v2/string_io.py
-${PYSITELIB}/PyQt4/uic/port_v2/string_io.pyc
 ${PYSITELIB}/PyQt4/uic/port_v3/__init__.py
-${PYSITELIB}/PyQt4/uic/port_v3/__init__.pyc
 ${PYSITELIB}/PyQt4/uic/port_v3/ascii_upper.py
-${PYSITELIB}/PyQt4/uic/port_v3/ascii_upper.pyc
 ${PYSITELIB}/PyQt4/uic/port_v3/encode_utf8.py
-${PYSITELIB}/PyQt4/uic/port_v3/encode_utf8.pyc
 ${PYSITELIB}/PyQt4/uic/port_v3/invoke.py
-${PYSITELIB}/PyQt4/uic/port_v3/invoke.pyc
 ${PYSITELIB}/PyQt4/uic/port_v3/load_plugin.py
-${PYSITELIB}/PyQt4/uic/port_v3/load_plugin.pyc
 ${PYSITELIB}/PyQt4/uic/port_v3/proxy_base.py
-${PYSITELIB}/PyQt4/uic/port_v3/proxy_base.pyc
 ${PYSITELIB}/PyQt4/uic/port_v3/string_io.py
-${PYSITELIB}/PyQt4/uic/port_v3/string_io.pyc
 ${PYSITELIB}/PyQt4/uic/properties.py
-${PYSITELIB}/PyQt4/uic/properties.pyc
 ${PYSITELIB}/PyQt4/uic/pyuic.py
-${PYSITELIB}/PyQt4/uic/pyuic.pyc
 ${PYSITELIB}/PyQt4/uic/uiparser.py
-${PYSITELIB}/PyQt4/uic/uiparser.pyc
 ${PYSITELIB}/PyQt4/uic/widget-plugins/phonon.py
-${PYSITELIB}/PyQt4/uic/widget-plugins/phonon.pyc
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qaxcontainer.py
-${PYSITELIB}/PyQt4/uic/widget-plugins/qaxcontainer.pyc
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qscintilla.py
-${PYSITELIB}/PyQt4/uic/widget-plugins/qscintilla.pyc
 ${PYSITELIB}/PyQt4/uic/widget-plugins/qtwebkit.py
-${PYSITELIB}/PyQt4/uic/widget-plugins/qtwebkit.pyc
 ${PYSITELIB}/dbus/mainloop/qt.so
 qt4/plugins/designer/libpythonplugin.la
 share/sip${PYVERSSUFFIX}/Qt/Qtmod.sip
diff --git a/x11/py-qt4/distinfo b/x11/py-qt4/distinfo
index ca10dc513ee..f000309b535 100644
--- a/x11/py-qt4/distinfo
+++ b/x11/py-qt4/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2010/02/25 17:03:13 wiz Exp $
+$NetBSD: distinfo,v 1.10 2010/02/27 21:37:47 wiz Exp $
 
 SHA1 (PyQt-x11-gpl-4.7.tar.gz) = 3cc46c8cc9c83ac111cd171ee594b2d34a4133dc
 RMD160 (PyQt-x11-gpl-4.7.tar.gz) = bddf2b4d668733a7a6bbb179dd986b5f82752198
 Size (PyQt-x11-gpl-4.7.tar.gz) = 7888435 bytes
 SHA1 (patch-aa) = ff6010dec03d1e17e2023d2f6d4418a03bf21bcc
-SHA1 (patch-ac) = 66e8fc73f8d8b407afac1c4273448ebbed9bc8ba
diff --git a/x11/py-qt4/patches/patch-ac b/x11/py-qt4/patches/patch-ac
deleted file mode 100644
index a090a35bc3a..00000000000
--- a/x11/py-qt4/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/02/25 17:03:13 wiz Exp $
-
---- pyuic/uic/port_v3/proxy_base.py.orig	2010-01-14 14:36:26.000000000 +0000
-+++ pyuic/uic/port_v3/proxy_base.py
-@@ -1,5 +1,5 @@
- from PyQt4.uic.Compiler.proxy_type import ProxyType
- 
- 
--class ProxyBase(metaclass=ProxyType):
--    pass
-+class ProxyBase:
-+    __metaclass__=ProxyType