Upgrade py-qt to 3.4, and take over maintainership due to bounces from

previous maintainer address.

5 files changed, 105 insertions, 63 deletions

diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index d30617bef68d..fd237e717518 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -4,33 +4,41 @@
 #
 # $FreeBSD$
 
-PORTNAME=	py-qt
-PORTVERSION=	2.5
+PORTNAME=	qt
+PORTVERSION=	3.4
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	ftp://ftp.rygannon.com/pub/PyQt/
-DISTNAME=	PyQt-${PORTVERSION}
+MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyQt/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
-MAINTAINER=	adsharma@sharmas.dhs.org
+MAINTAINER=	nbm@FreeBSD.org
 
-LIB_DEPENDS=	sip.6:${PORTSDIR}/devel/sip
+LIB_DEPENDS=	sip.9:${PORTSDIR}/devel/sip
 
-USE_QT_VER=	2
+USE_QT_VER=	3
 USE_PYTHON=	yes
-USE_LIBTOOL=	yes
-USE_GMAKE=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --disable-static
-CONFIGURE_ENV=	LDFLAGS=-lgcc \
-		SIP_MOC="${X11BASE}/bin/moc2"
+USE_REINPLACE=	yes
 
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | \
-		xargs ${PERL} -pi -e 's|-lqt[^2]|-lqt2 |g'
+ALL_TARGET=	all install install-eric
 
-post-configure:
-	@${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
-		${WRKSRC}/libtool
+NO_FILTER_SHLIBS=	yes
+
+do-configure:
+	@${MKDIR} ${WRKDIR}/binaries
+	@${MKDIR} ${WRKDIR}/modules
+	@(cd ${WRKSRC} && ${PYTHON_CMD} build.py -c -e ${LOCALBASE}/include/sip \
+		-s ${LOCALBASE}/lib -q ${X11BASE} -b ${WRKDIR}/binaries \
+		-d ${WRKDIR}/modules )
+
+pre-build:
+	@${REINPLACE_CMD} -e 's#LIBS *= $$(SUBLIBS)#LIBS = $$(SUBLIBS) -L${WRKDIR}/modules -Wl,-rpath,${PYTHONPREFIX_SITELIBDIR}#' ${WRKSRC}/*/Makefile
+
+do-install:
+	@${CP} ${WRKDIR}/binaries/* ${PREFIX}/bin/
+	@( cd ${WRKDIR}/modules/ && ${TAR} -cf - . ) | \
+		( cd ${PYTHONPREFIX_SITELIBDIR} && ${TAR} xf - )
 
 post-install:
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHON_SITELIBDIR}/eric
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PYTHONPREFIX_SITELIBDIR}/eric
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt/distinfo b/x11-toolkits/py-qt/distinfo
index 41db4e02afae..071c9e2a5046 100644
--- a/x11-toolkits/py-qt/distinfo
+++ b/x11-toolkits/py-qt/distinfo
@@ -1 +1 @@
-MD5 (PyQt-2.5.tar.gz) = 4a7314bf51d14093983dbbc471bad904
+MD5 (PyQt-x11-gpl-3.4.tar.gz) = 1a61c55ad716f20f52883740c578c352
diff --git a/x11-toolkits/py-qt/files/patch-configure b/x11-toolkits/py-qt/files/patch-configure
deleted file mode 100644
index 0018c072600e..000000000000
--- a/x11-toolkits/py-qt/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/04/25 10:59:23	1.1
-+++ configure	2002/04/25 10:59:50
-@@ -5274,6 +5274,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/py-qt/files/patch-qt::Makefile.in b/x11-toolkits/py-qt/files/patch-qt::Makefile.in
deleted file mode 100644
index 21bf550afb7b..000000000000
--- a/x11-toolkits/py-qt/files/patch-qt::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- qt/Makefile.in	2002/04/25 14:32:42	1.1
-+++ qt/Makefile.in	2002/04/25 14:36:47
-@@ -109,7 +109,7 @@
- 
- lib_LTLIBRARIES = libqtcmodule.la
- libqtcmodule_la_SOURCES = $(PYQT_SOURCES)
--libqtcmodule_la_LDFLAGS = -release 2.5
-+libqtcmodule_la_LDFLAGS = -module -avoid-version
- libqtcmodule_la_LIBADD = $(SIP_LDLIBDIRS) -lsip -lqt2 $(SIP_LDXFLAGS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/x11-toolkits/py-qt/pkg-plist b/x11-toolkits/py-qt/pkg-plist
index 4b2e56612ddc..5911eb10a3fc 100644
--- a/x11-toolkits/py-qt/pkg-plist
+++ b/x11-toolkits/py-qt/pkg-plist
@@ -1,32 +1,93 @@
-bin/pyuic
 bin/eric
-lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so
-lib/%%PYTHON_VERSION%%/site-packages/qt.py
-lib/%%PYTHON_VERSION%%/site-packages/qt.pyo
-lib/%%PYTHON_VERSION%%/site-packages/eric/eric.py
+bin/helpviewer
+bin/pylupdate
+bin/pyuic
+bin/qtunittest
 lib/%%PYTHON_VERSION%%/site-packages/eric/AsyncIO.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Config.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugClient.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugServer.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/DebugProtocol.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Explorer.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Icons.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Info.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Scanner.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/Shell.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/SourceViewer.py
-lib/%%PYTHON_VERSION%%/site-packages/eric/UserInterface.py
 lib/%%PYTHON_VERSION%%/site-packages/eric/AsyncIO.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/BookmarkDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/BookmarkDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/BookmarkForm.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/BookmarkForm.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/BreakpointDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/BreakpointDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/BreakpointForm.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/BreakpointForm.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/FilterDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/FilterDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/FilterForm.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/FilterForm.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/HelpWindow.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/HelpWindow.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/UnittestDialog.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/UnittestDialog.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/UnittestForm.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/UnittestForm.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/UserInterface.py
 lib/%%PYTHON_VERSION%%/site-packages/eric/UserInterface.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/VariablesViewer.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/VariablesViewer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/eric.py
 lib/%%PYTHON_VERSION%%/site-packages/eric/eric.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/eric_de.qm
+lib/%%PYTHON_VERSION%%/site-packages/eric/helpviewer.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/helpviewer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/eric/qtunittest.py
+lib/%%PYTHON_VERSION%%/site-packages/eric/qtunittest.pyc
+lib/%%PYTHON_VERSION%%/site-packages/libqtcanvascmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/libqtcanvascmodule.so.1
+lib/%%PYTHON_VERSION%%/site-packages/libqtcanvascmodule.so.1.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtcanvascmodule.so.1.0.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so.1
+lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so.1.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtcmodule.so.1.0.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtnetworkcmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/libqtnetworkcmodule.so.1
+lib/%%PYTHON_VERSION%%/site-packages/libqtnetworkcmodule.so.1.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtnetworkcmodule.so.1.0.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtsqlcmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/libqtsqlcmodule.so.1
+lib/%%PYTHON_VERSION%%/site-packages/libqtsqlcmodule.so.1.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtsqlcmodule.so.1.0.0
+lib/%%PYTHON_VERSION%%/site-packages/libqttablecmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/libqttablecmodule.so.1
+lib/%%PYTHON_VERSION%%/site-packages/libqttablecmodule.so.1.0
+lib/%%PYTHON_VERSION%%/site-packages/libqttablecmodule.so.1.0.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtxmlcmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/libqtxmlcmodule.so.1
+lib/%%PYTHON_VERSION%%/site-packages/libqtxmlcmodule.so.1.0
+lib/%%PYTHON_VERSION%%/site-packages/libqtxmlcmodule.so.1.0.0
+lib/%%PYTHON_VERSION%%/site-packages/qt.py
+lib/%%PYTHON_VERSION%%/site-packages/qt.pyc
+lib/%%PYTHON_VERSION%%/site-packages/qtcanvas.py
+lib/%%PYTHON_VERSION%%/site-packages/qtcanvas.pyc
+lib/%%PYTHON_VERSION%%/site-packages/qtnetwork.py
+lib/%%PYTHON_VERSION%%/site-packages/qtnetwork.pyc
+lib/%%PYTHON_VERSION%%/site-packages/qtsql.py
+lib/%%PYTHON_VERSION%%/site-packages/qtsql.pyc
+lib/%%PYTHON_VERSION%%/site-packages/qttable.py
+lib/%%PYTHON_VERSION%%/site-packages/qttable.pyc
+lib/%%PYTHON_VERSION%%/site-packages/qtxml.py
+lib/%%PYTHON_VERSION%%/site-packages/qtxml.pyc
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/eric