Update to 2.2.

Approved by:	maintainer

3 files changed, 52 insertions, 12 deletions

diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index b65ac890655f..5c729dce49b7 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -1,24 +1,36 @@
 # New ports collection makefile for:	PyQt
-# Version required:	0.9
 # Date created:		Sun Oct 17 00:24:28 PDT 1999
 # Whom:			adsharma@sharmas.dhs.org
 #
 # $FreeBSD$
 
 PORTNAME=	py-qt
-PORTVERSION=	0.12
+PORTVERSION=	2.2
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/software/
 DISTNAME=	PyQt-${PORTVERSION}
 
 MAINTAINER=	adsharma@sharmas.dhs.org
 
-LIB_DEPENDS=	sip.3:${PORTSDIR}/devel/sip
+LIB_DEPENDS=	sip.4:${PORTSDIR}/devel/sip
 
-USE_QT=		yes
+USE_QT2=	yes
+USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LDFLAGS=-lgcc
-CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/X11/qt
+CONFIGURE_ENV=	LDFLAGS=-lgcc \
+		SIP_MOC="${X11BASE}/bin/moc2"
+CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2
+
+pre-patch:
+	@find ${WRKSRC} -name Makefile.in | \
+		xargs ${PERL} -pi -e 's|-lqt[^2]|-lqt2 |g'
+
+post-configure:
+	@${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
+		${WRKSRC}/libtool
+
+post-install:
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/eric
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt/distinfo b/x11-toolkits/py-qt/distinfo
index 138a20344d80..9fcc1569cab6 100644
--- a/x11-toolkits/py-qt/distinfo
+++ b/x11-toolkits/py-qt/distinfo
@@ -1 +1 @@
-MD5 (PyQt-0.12.tar.gz) = 2e3ce2c038dde5fa1a71b46924189385
+MD5 (PyQt-2.2.tar.gz) = faf285f786211530a5e12c32ded5a8bd
diff --git a/x11-toolkits/py-qt/pkg-plist b/x11-toolkits/py-qt/pkg-plist
index 2823e3325a91..cee426a494bf 100644
--- a/x11-toolkits/py-qt/pkg-plist
+++ b/x11-toolkits/py-qt/pkg-plist
@@ -1,5 +1,33 @@
-lib/python1.5/lib-dynload/libqtcmodule-0.12.so
-lib/python1.5/lib-dynload/libqtcmodule.so
-lib/python1.5/qt.py
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+bin/eric
+bin/pyuic
+lib/%%PYTHON_VERSION%%/site-packages/eric/AsyncIO.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/AsyncIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/Config.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/Config.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/DebugClient.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/DebugClient.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/DebugProtocol.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/DebugProtocol.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/DebugServer.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/DebugServer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/Explorer.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/Explorer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/Icons.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/Icons.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/Info.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/Info.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/Scanner.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/Scanner.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/Shell.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/Shell.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/SourceViewer.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/SourceViewer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/UserInterface.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/UserInterface.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/eric.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/eric.pyc
+lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so.0
+lib/%%PYTHON_VERSION%%/site-packages/qt.py
+lib/%%PYTHON_VERSION%%/site-packages/qt.pyc
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/eric