4 files changed, 248 insertions, 70 deletions

diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index 68222c7aaa2d..6188fd6eca86 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -5,37 +5,24 @@
 # $FreeBSD$
 
 PORTNAME=	qt
-PORTVERSION=	3.8.1
+PORTVERSION=	3.9
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyQt/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyQt-x11-gpl-${PORTVERSION}
 
 MAINTAINER=	eugos@gmx.net
-COMMENT=	Python Bindings for Qt
+COMMENT=	Python bindings for the Qt toolkit
 
-LIB_DEPENDS=	sip.10:${PORTSDIR}/devel/sip
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libsip.so:${PORTSDIR}/devel/py-sip
+BUILD_DEPENDS=	${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_QT_VER=	3
 USE_PYTHON=	yes
-NO_FILTER_SHLIBS=	yes
-USE_REINPLACE=	yes
-
-ALL_TARGET=	all install
 
 do-configure:
-	@${MKDIR} ${WRKDIR}/binaries
-	@${MKDIR} ${WRKDIR}/modules
-	@(cd ${WRKSRC} && ${ECHO} "yes" | ${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/
-	${CP} -Rf ${WRKDIR}/modules/* ${PYTHONPREFIX_SITELIBDIR}
+	@(cd ${WRKSRC} && ${ECHO} "yes" | ${PYTHON_CMD} configure.py \
+		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
+		-v ${PREFIX}/share/sip)
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt/distinfo b/x11-toolkits/py-qt/distinfo
index 3a5449b6eb09..bd57583e1da3 100644
--- a/x11-toolkits/py-qt/distinfo
+++ b/x11-toolkits/py-qt/distinfo
@@ -1 +1 @@
-MD5 (PyQt-x11-gpl-3.8.1.tar.gz) = bde37288aea521b9981cc8a193707932
+MD5 (PyQt-x11-gpl-3.9.tar.gz) = 52799a4bf10e950a5bde090226eadb4e
diff --git a/x11-toolkits/py-qt/pkg-descr b/x11-toolkits/py-qt/pkg-descr
index a3427c4fe96a..119e72a4ab9c 100644
--- a/x11-toolkits/py-qt/pkg-descr
+++ b/x11-toolkits/py-qt/pkg-descr
@@ -1,3 +1,3 @@
-Python Bindings for Qt.
+Python bindings for the Qt toolkit.
 
 WWW: http://www.riverbankcomputing.co.uk/pyqt/
diff --git a/x11-toolkits/py-qt/pkg-plist b/x11-toolkits/py-qt/pkg-plist
index fdf6602522d4..4ea3fb89716d 100644
--- a/x11-toolkits/py-qt/pkg-plist
+++ b/x11-toolkits/py-qt/pkg-plist
@@ -1,50 +1,241 @@
 bin/pylupdate
 bin/pyuic
-%%PYTHON_SITELIBDIR%%/libqtcanvascmodule.so
-%%PYTHON_SITELIBDIR%%/libqtcanvascmodule.so.1
-%%PYTHON_SITELIBDIR%%/libqtcanvascmodule.so.1.0
-%%PYTHON_SITELIBDIR%%/libqtcanvascmodule.so.1.0.0
-%%PYTHON_SITELIBDIR%%/libqtcmodule.so
-%%PYTHON_SITELIBDIR%%/libqtcmodule.so.1
-%%PYTHON_SITELIBDIR%%/libqtcmodule.so.1.0
-%%PYTHON_SITELIBDIR%%/libqtcmodule.so.1.0.0
-%%PYTHON_SITELIBDIR%%/libqtglcmodule.so
-%%PYTHON_SITELIBDIR%%/libqtglcmodule.so.1
-%%PYTHON_SITELIBDIR%%/libqtglcmodule.so.1.0
-%%PYTHON_SITELIBDIR%%/libqtglcmodule.so.1.0.0
-%%PYTHON_SITELIBDIR%%/libqtnetworkcmodule.so
-%%PYTHON_SITELIBDIR%%/libqtnetworkcmodule.so.1
-%%PYTHON_SITELIBDIR%%/libqtnetworkcmodule.so.1.0
-%%PYTHON_SITELIBDIR%%/libqtnetworkcmodule.so.1.0.0
-%%PYTHON_SITELIBDIR%%/libqtsqlcmodule.so
-%%PYTHON_SITELIBDIR%%/libqtsqlcmodule.so.1
-%%PYTHON_SITELIBDIR%%/libqtsqlcmodule.so.1.0
-%%PYTHON_SITELIBDIR%%/libqtsqlcmodule.so.1.0.0
-%%PYTHON_SITELIBDIR%%/libqttablecmodule.so
-%%PYTHON_SITELIBDIR%%/libqttablecmodule.so.1
-%%PYTHON_SITELIBDIR%%/libqttablecmodule.so.1.0
-%%PYTHON_SITELIBDIR%%/libqttablecmodule.so.1.0.0
-%%PYTHON_SITELIBDIR%%/libqtuicmodule.so
-%%PYTHON_SITELIBDIR%%/libqtuicmodule.so.1
-%%PYTHON_SITELIBDIR%%/libqtuicmodule.so.1.0
-%%PYTHON_SITELIBDIR%%/libqtuicmodule.so.1.0.0
-%%PYTHON_SITELIBDIR%%/libqtxmlcmodule.so
-%%PYTHON_SITELIBDIR%%/libqtxmlcmodule.so.1
-%%PYTHON_SITELIBDIR%%/libqtxmlcmodule.so.1.0
-%%PYTHON_SITELIBDIR%%/libqtxmlcmodule.so.1.0.0
-%%PYTHON_SITELIBDIR%%/qt.py
-%%PYTHON_SITELIBDIR%%/qt.pyc
-%%PYTHON_SITELIBDIR%%/qtcanvas.py
-%%PYTHON_SITELIBDIR%%/qtcanvas.pyc
-%%PYTHON_SITELIBDIR%%/qtgl.py
-%%PYTHON_SITELIBDIR%%/qtgl.pyc
-%%PYTHON_SITELIBDIR%%/qtnetwork.py
-%%PYTHON_SITELIBDIR%%/qtnetwork.pyc
-%%PYTHON_SITELIBDIR%%/qtsql.py
-%%PYTHON_SITELIBDIR%%/qtsql.pyc
-%%PYTHON_SITELIBDIR%%/qttable.py
-%%PYTHON_SITELIBDIR%%/qttable.pyc
-%%PYTHON_SITELIBDIR%%/qtui.py
-%%PYTHON_SITELIBDIR%%/qtui.pyc
-%%PYTHON_SITELIBDIR%%/qtxml.py
-%%PYTHON_SITELIBDIR%%/qtxml.pyc
+%%PYTHON_SITELIBDIR%%/pyqtconfig.py
+%%PYTHON_SITELIBDIR%%/qt.so
+%%PYTHON_SITELIBDIR%%/qtcanvas.so
+%%PYTHON_SITELIBDIR%%/qtgl.so
+%%PYTHON_SITELIBDIR%%/qtnetwork.so
+%%PYTHON_SITELIBDIR%%/qtsql.so
+%%PYTHON_SITELIBDIR%%/qttable.so
+%%PYTHON_SITELIBDIR%%/qtui.so
+%%PYTHON_SITELIBDIR%%/qtxml.so
+share/sip/qt/copying.sip
+share/sip/qt/qaccel.sip
+share/sip/qt/qaction.sip
+share/sip/qt/qapplication.sip
+share/sip/qt/qarray.sip
+share/sip/qt/qassistantclient.sip
+share/sip/qt/qbitmap.sip
+share/sip/qt/qbrush.sip
+share/sip/qt/qbutton.sip
+share/sip/qt/qbuttongroup.sip
+share/sip/qt/qbytearray.sip
+share/sip/qt/qcdestyle.sip
+share/sip/qt/qcheckbox.sip
+share/sip/qt/qclipboard.sip
+share/sip/qt/qcolor.sip
+share/sip/qt/qcolordialog.sip
+share/sip/qt/qcolorgroup.sip
+share/sip/qt/qcombobox.sip
+share/sip/qt/qcommonstyle.sip
+share/sip/qt/qcstring.sip
+share/sip/qt/qcursor.sip
+share/sip/qt/qdatastream.sip
+share/sip/qt/qdatetime.sip
+share/sip/qt/qdatetimeedit.sip
+share/sip/qt/qdesktopwidget.sip
+share/sip/qt/qdial.sip
+share/sip/qt/qdialog.sip
+share/sip/qt/qdir.sip
+share/sip/qt/qdockarea.sip
+share/sip/qt/qdockwindow.sip
+share/sip/qt/qdragobject.sip
+share/sip/qt/qdrawutil.sip
+share/sip/qt/qdropsite.sip
+share/sip/qt/qerrormessage.sip
+share/sip/qt/qevent.sip
+share/sip/qt/qeventloop.sip
+share/sip/qt/qfile.sip
+share/sip/qt/qfiledialog.sip
+share/sip/qt/qfileinfo.sip
+share/sip/qt/qfont.sip
+share/sip/qt/qfontdatabase.sip
+share/sip/qt/qfontdialog.sip
+share/sip/qt/qfontinfo.sip
+share/sip/qt/qfontmetrics.sip
+share/sip/qt/qframe.sip
+share/sip/qt/qglobal.sip
+share/sip/qt/qgmanager.sip
+share/sip/qt/qgrid.sip
+share/sip/qt/qgridview.sip
+share/sip/qt/qgroupbox.sip
+share/sip/qt/qhbox.sip
+share/sip/qt/qhbuttongroup.sip
+share/sip/qt/qheader.sip
+share/sip/qt/qhgroupbox.sip
+share/sip/qt/qiconset.sip
+share/sip/qt/qiconview.sip
+share/sip/qt/qimage.sip
+share/sip/qt/qinputdialog.sip
+share/sip/qt/qinterlacestyle.sip
+share/sip/qt/qiodevice.sip
+share/sip/qt/qkeycode.sip
+share/sip/qt/qkeysequence.sip
+share/sip/qt/qlabel.sip
+share/sip/qt/qlayout.sip
+share/sip/qt/qlcdnumber.sip
+share/sip/qt/qlibrary.sip
+share/sip/qt/qlineedit.sip
+share/sip/qt/qlist.sip
+share/sip/qt/qlistbox.sip
+share/sip/qt/qlistview.sip
+share/sip/qt/qmainwindow.sip
+share/sip/qt/qmemarray.sip
+share/sip/qt/qmenubar.sip
+share/sip/qt/qmenudata.sip
+share/sip/qt/qmessagebox.sip
+share/sip/qt/qmime.sip
+share/sip/qt/qmotifplusstyle.sip
+share/sip/qt/qmotifstyle.sip
+share/sip/qt/qmovie.sip
+share/sip/qt/qmultilinedit.sip
+share/sip/qt/qmutex.sip
+share/sip/qt/qnamespace.sip
+share/sip/qt/qnetworkprotocol.sip
+share/sip/qt/qobject.sip
+share/sip/qt/qobjectcleanuphandler.sip
+share/sip/qt/qobjectlist.sip
+share/sip/qt/qpaintdevice.sip
+share/sip/qt/qpaintdevicemetrics.sip
+share/sip/qt/qpainter.sip
+share/sip/qt/qpair.sip
+share/sip/qt/qpalette.sip
+share/sip/qt/qpen.sip
+share/sip/qt/qpicture.sip
+share/sip/qt/qpixmap.sip
+share/sip/qt/qpixmapcache.sip
+share/sip/qt/qplatinumstyle.sip
+share/sip/qt/qpoint.sip
+share/sip/qt/qpointarray.sip
+share/sip/qt/qpopupmenu.sip
+share/sip/qt/qprintdialog.sip
+share/sip/qt/qprinter.sip
+share/sip/qt/qprocess.sip
+share/sip/qt/qprogressbar.sip
+share/sip/qt/qprogressdialog.sip
+share/sip/qt/qptrlist.sip
+share/sip/qt/qpushbutton.sip
+share/sip/qt/qradiobutton.sip
+share/sip/qt/qrangecontrol.sip
+share/sip/qt/qrect.sip
+share/sip/qt/qregexp.sip
+share/sip/qt/qregion.sip
+share/sip/qt/qscrollbar.sip
+share/sip/qt/qscrollview.sip
+share/sip/qt/qsemaphore.sip
+share/sip/qt/qsemimodal.sip
+share/sip/qt/qsessionmanager.sip
+share/sip/qt/qsettings.sip
+share/sip/qt/qsgistyle.sip
+share/sip/qt/qsignalmapper.sip
+share/sip/qt/qsimplerichtext.sip
+share/sip/qt/qsize.sip
+share/sip/qt/qsizegrip.sip
+share/sip/qt/qsizepolicy.sip
+share/sip/qt/qslider.sip
+share/sip/qt/qsocketnotifier.sip
+share/sip/qt/qsound.sip
+share/sip/qt/qspinbox.sip
+share/sip/qt/qsplashscreen.sip
+share/sip/qt/qsplitter.sip
+share/sip/qt/qstatusbar.sip
+share/sip/qt/qstring.sip
+share/sip/qt/qstringlist.sip
+share/sip/qt/qstrlist.sip
+share/sip/qt/qstyle.sip
+share/sip/qt/qstylefactory.sip
+share/sip/qt/qstylesheet.sip
+share/sip/qt/qsyntaxhighlighter.sip
+share/sip/qt/qtabbar.sip
+share/sip/qt/qtabdialog.sip
+share/sip/qt/qtableview.sip
+share/sip/qt/qtabwidget.sip
+share/sip/qt/qtextbrowser.sip
+share/sip/qt/qtextcodec.sip
+share/sip/qt/qtextedit.sip
+share/sip/qt/qtextstream.sip
+share/sip/qt/qtextview.sip
+share/sip/qt/qthread.sip
+share/sip/qt/qtimer.sip
+share/sip/qt/qtmod.sip
+share/sip/qt/qtoolbar.sip
+share/sip/qt/qtoolbox.sip
+share/sip/qt/qtoolbutton.sip
+share/sip/qt/qtooltip.sip
+share/sip/qt/qtranslator.sip
+share/sip/qt/qurl.sip
+share/sip/qt/qurlinfo.sip
+share/sip/qt/qurloperator.sip
+share/sip/qt/qvalidator.sip
+share/sip/qt/qvaluelist.sip
+share/sip/qt/qvariant.sip
+share/sip/qt/qvbox.sip
+share/sip/qt/qvbuttongroup.sip
+share/sip/qt/qvgroupbox.sip
+share/sip/qt/qwaitcondition.sip
+share/sip/qt/qwhatsthis.sip
+share/sip/qt/qwidget.sip
+share/sip/qt/qwidgetlist.sip
+share/sip/qt/qwidgetstack.sip
+share/sip/qt/qwindow.sip
+share/sip/qt/qwindowdefs.sip
+share/sip/qt/qwindowdefs_qws.sip
+share/sip/qt/qwindowdefs_x11.sip
+share/sip/qt/qwindowsstyle.sip
+share/sip/qt/qwindowsxpstyle.sip
+share/sip/qt/qwizard.sip
+share/sip/qt/qwmatrix.sip
+share/sip/qt/qworkspace.sip
+share/sip/qt/versions.sip
+share/sip/qtcanvas/copying.sip
+share/sip/qtcanvas/qcanvas.sip
+share/sip/qtcanvas/qtcanvasmod.sip
+share/sip/qtgl/copying.sip
+share/sip/qtgl/qgl.sip
+share/sip/qtgl/qglcolormap.sip
+share/sip/qtgl/qtglmod.sip
+share/sip/qtnetwork/copying.sip
+share/sip/qtnetwork/qdns.sip
+share/sip/qtnetwork/qhostaddress.sip
+share/sip/qtnetwork/qnetwork.sip
+share/sip/qtnetwork/qserversocket.sip
+share/sip/qtnetwork/qsocket.sip
+share/sip/qtnetwork/qtnetworkmod.sip
+share/sip/qtsql/copying.sip
+share/sip/qtsql/qdatabrowser.sip
+share/sip/qtsql/qdatatable.sip
+share/sip/qtsql/qdataview.sip
+share/sip/qtsql/qeditorfactory.sip
+share/sip/qtsql/qsql.sip
+share/sip/qtsql/qsqlcursor.sip
+share/sip/qtsql/qsqldatabase.sip
+share/sip/qtsql/qsqldriver.sip
+share/sip/qtsql/qsqleditorfactory.sip
+share/sip/qtsql/qsqlerror.sip
+share/sip/qtsql/qsqlfield.sip
+share/sip/qtsql/qsqlform.sip
+share/sip/qtsql/qsqlindex.sip
+share/sip/qtsql/qsqlpropertymap.sip
+share/sip/qtsql/qsqlquery.sip
+share/sip/qtsql/qsqlrecord.sip
+share/sip/qtsql/qsqlresult.sip
+share/sip/qtsql/qsqlselectcursor.sip
+share/sip/qtsql/qtsqlmod.sip
+share/sip/qttable/copying.sip
+share/sip/qttable/qtable.sip
+share/sip/qttable/qttablemod.sip
+share/sip/qtui/copying.sip
+share/sip/qtui/qtuimod.sip
+share/sip/qtui/qwidgetfactory.sip
+share/sip/qtxml/copying.sip
+share/sip/qtxml/qdom.sip
+share/sip/qtxml/qtxmlmod.sip
+@dirrm share/sip/qt
+@dirrm share/sip/qtcanvas
+@dirrm share/sip/qtgl
+@dirrm share/sip/qtnetwork
+@dirrm share/sip/qtsql
+@dirrm share/sip/qttable
+@dirrm share/sip/qtui
+@dirrm share/sip/qtxml
+@dirrm share/sip