3 files changed, 230 insertions, 234 deletions

diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index 91cfbfe0676d..a93482baf98d 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	qt
-PORTVERSION=	3.17.2
-PORTREVISION=	2
+PORTVERSION=	3.17.3
+PORTREVISION=	# zero
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/ \
@@ -18,16 +18,14 @@ MAINTAINER=	danny@ricin.com
 COMMENT=	Python bindings for the Qt toolkit
 
 LIB_DEPENDS=	qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla
-RUN_DEPENDS=	${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip
-BUILD_DEPENDS=	${RUN_DEPENDS} \
+BUILD_DEPENDS=	${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip \
 		qmake:${PORTSDIR}/devel/qmake
+RUN_DEPENDS=	${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip
 
 USE_QT_VER=	3
-USE_PYTHON=	2.3+
+USE_PYTHON=	2.5+
 
 OPTIONS=	DEBUG "Enable debugging symbols" off \
-		DOCS "Install documentation" on \
-		EXAMPLES "Install examples" on \
 		OPENGL "Enable OpenGL support" on \
 		TRACING	"Enable tracing in generated code" off
 
@@ -36,65 +34,63 @@ DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 SPEC=		${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
-		-o ${X11BASE}/lib -v ${DATADIR}
+ARGS=		-b ${PREFIX}/bin -d ${PYTHON_SITELIBDIR}\
+		-o ${LOCALBASE}/lib -v ${DATADIR}
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 ARGS+=		-u
 .endif
-.if defined(NOPORTDOCS) || defined(WITHOUT_DOCS)
-PLIST_SUB+=	DOCS="@comment "
-.else
-PLIST_SUB+=	DOCS=""
-.endif
-.if defined(WITHOUT_EXAMPLES)
-PLIST_SUB+=	EXAMPLES="@comment "
-.else
-PLIST_SUB+=	EXAMPLES=""
-.endif
-.if exists(${X11BASE}/include/qgl.h) && !defined(WITHOUT_OPENGL)
+.if exists(${LOCALBASE}/include/qgl.h) && !defined(WITHOUT_OPENGL)
 PLIST_SUB+=	OPENGL=""
 .else
 PLIST_SUB+=	OPENGL="@comment "
 pre-configure:
-	@( ${RM} -r ${WRKSRC}/sip/qtgl && ${ECHO} "OpenGL support is disabled" )
+	@${RM} -r ${WRKSRC}/sip/qtgl && ${ECHO} "OpenGL support is disabled"
 .endif
 .if defined(WITH_TRACING)
 ARGS+=		-r
 .endif
 
 do-configure:
-	( cd ${WRKSRC} && ${ECHO} "yes" | \
-		${SETENV} QTDIR=${QT_PREFIX} QMAKESPEC=${SPEC} \
-		${PYTHON_CMD} configure.py ${ARGS} )
+	cd ${WRKSRC} && ${ECHO} "yes" |\
+		${SETENV} QTDIR=${QT_PREFIX} QMAKESPEC=${SPEC}\
+		${PYTHON_CMD} configure.py ${ARGS}
+
+post-configure:
+	for item in qt qtcanvas qtnetwork qttable qtxml qtgl qtui qtsql qtext ; do\
+		${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt/mkspecs/freebsd-g++|'\
+			-e 's|CC = cc|CC = ${CC}|'\
+			-e 's|CXX = c++|CXX = ${CXX}|'\
+			-e 's|LINK = c++|LINK = ${CXX}|'\
+			${WRKSRC}/$${item}/Makefile ; done
 
 post-build:
-.if !defined(WITHOUT_EXAMPLES)
-	( cd ${WRKSRC} && \
-		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py examples3 )
+.if !defined(NOPORTEXAMPLES)
+	cd ${WRKSRC} &&\
+		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py examples3
 .endif
 
 post-install:
-	( cd ${PYTHONPREFIX_SITELIBDIR} && \
-		${PYTHON_CMD} -c "import pyqtconfig" && \
-		${PYTHON_CMD} -O -c "import pyqtconfig" )
-.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
-	( cd ${WRKSRC} && \
-		${MKDIR} -m 0755 ${DOCSDIR} && \
-		${INSTALL_DATA} ChangeLog NEWS README doc/* ${DOCSDIR} )
+	cd ${PYTHON_SITELIBDIR} &&\
+		${PYTHON_CMD} -c "import pyqtconfig" &&\
+		${PYTHON_CMD} -O -c "import pyqtconfig"
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} &&\
+		${MKDIR} ${DOCSDIR} &&\
+		${INSTALL_DATA} ChangeLog NEWS README doc/* ${DOCSDIR}
 .endif
-.if !defined(WITHOUT_EXAMPLES)
-	( cd ${WRKSRC}/examples3 && \
-		${MKDIR} -m 0755 ${EXAMPLESDIR}/SQL ${EXAMPLESDIR}/canvas \
-			${EXAMPLESDIR}/i18n ${EXAMPLESDIR}/webbrowser && \
-		${INSTALL_DATA} README *.py *.pyc *.png *.gif *.bmp *.xpm \
-			${EXAMPLESDIR} && \
-		${INSTALL_DATA} SQL/* ${EXAMPLESDIR}/SQL && \
-		${INSTALL_DATA} canvas/* ${EXAMPLESDIR}/canvas && \
-		${INSTALL_DATA} i18n/* ${EXAMPLESDIR}/i18n && \
-		${INSTALL_DATA} webbrowser/* ${EXAMPLESDIR}/webbrowser )
+.if !defined(NOPORTEXAMPLES)
+	cd ${WRKSRC}/examples3 &&\
+		${MKDIR} ${EXAMPLESDIR}/SQL ${EXAMPLESDIR}/canvas\
+			${EXAMPLESDIR}/i18n ${EXAMPLESDIR}/webbrowser &&\
+		${INSTALL_DATA} README *.py *.pyc *.png *.gif *.bmp *.xpm\
+			${EXAMPLESDIR} &&\
+		${INSTALL_DATA} SQL/* ${EXAMPLESDIR}/SQL &&\
+		${INSTALL_DATA} canvas/* ${EXAMPLESDIR}/canvas &&\
+		${INSTALL_DATA} i18n/* ${EXAMPLESDIR}/i18n &&\
+		${INSTALL_DATA} webbrowser/* ${EXAMPLESDIR}/webbrowser
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-qt/distinfo b/x11-toolkits/py-qt/distinfo
index 7151131cd2e5..592121617231 100644
--- a/x11-toolkits/py-qt/distinfo
+++ b/x11-toolkits/py-qt/distinfo
@@ -1,3 +1,3 @@
-MD5 (PyQt-x11-gpl-3.17.2.tar.gz) = 1ed22e01dc1d442809c4ce77fe8aba85
-SHA256 (PyQt-x11-gpl-3.17.2.tar.gz) = 09fe5f323aaeeec36508a8cebdd2c6b703d506e781db7398c7ac7a749b89be38
-SIZE (PyQt-x11-gpl-3.17.2.tar.gz) = 803549
+MD5 (PyQt-x11-gpl-3.17.3.tar.gz) = 7a9eb21bb978e7c5df0cf8367b401adb
+SHA256 (PyQt-x11-gpl-3.17.3.tar.gz) = a6431ac734e19581a7a0ab8b796f1779f758735270f949079b25b3c6ecd19214
+SIZE (PyQt-x11-gpl-3.17.3.tar.gz) = 803875
diff --git a/x11-toolkits/py-qt/pkg-plist b/x11-toolkits/py-qt/pkg-plist
index f5383f6bde6e..38946de32841 100644
--- a/x11-toolkits/py-qt/pkg-plist
+++ b/x11-toolkits/py-qt/pkg-plist
@@ -12,187 +12,187 @@ bin/pyuic
 %%PYTHON_SITELIBDIR%%/qttable.so
 %%PYTHON_SITELIBDIR%%/qtui.so
 %%PYTHON_SITELIBDIR%%/qtxml.so
-%%DOCS%%%%DOCSDIR%%/ChangeLog
-%%DOCS%%%%DOCSDIR%%/NEWS
-%%DOCS%%%%DOCSDIR%%/PyQt.html
-%%DOCS%%%%DOCSDIR%%/PyQt.sgml
-%%DOCS%%%%DOCSDIR%%/README
-%%DOCS%%%%DOCSDIR%%/qtdocs.sip
-%%EXAMPLES%%%%EXAMPLESDIR%%/README
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/README
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/connect.ui
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/connect.ui.h
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/dbconnect.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/dbconnect.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/dbpar.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/dbpar.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/form1.ui
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/form2.ui
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/frmconnect.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/frmconnect.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/frmconnect.ui
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/runform1.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/runform1.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/runform2.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/runform2.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/runsqlex.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/runsqlex.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlcustom1.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlcustom1.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlex.ui
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlex.ui.h
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlsubclass5.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlsubclass5.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/sqltable4.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/sqltable4.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/testdb_mysql.sql
-%%EXAMPLES%%%%EXAMPLESDIR%%/SQL/testdb_pg.sql
-%%EXAMPLES%%%%EXAMPLESDIR%%/aclock.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/aclock.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/addressbook.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/addressbook.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/application.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/application.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/biff.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/biff.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/bigtable.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/bigtable.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/buttongroups.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/buttongroups.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/canvas/butterfly.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/canvas/canvas.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/canvas/canvas.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/canvas/qt-trans.xpm
-%%EXAMPLES%%%%EXAMPLESDIR%%/canvas/qtlogo.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/checklists.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/checklists.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/cursor.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/cursor.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/dclock.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/dclock.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/desktop.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/desktop.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/dirview.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/dirview.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/dragdrop.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/dragdrop.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/drawlines.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/drawlines.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/dropsite.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/dropsite.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/fileopen.xpm
-%%EXAMPLES%%%%EXAMPLESDIR%%/fontdisplayer.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/fontdisplayer.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/fonts.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/fonts.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/gears.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/gears.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/i18n.pro
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/i18n.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/i18n.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_cs.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_cs.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_de.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_de.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_el.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_el.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_en.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_en.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_eo.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_eo.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_fr.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_fr.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_it.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_it.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_jp.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_jp.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_ko.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_ko.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_no.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_no.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_ru.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_ru.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_zh.qm
-%%EXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_zh.ts
-%%EXAMPLES%%%%EXAMPLESDIR%%/lineedits.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/lineedits.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/listbox.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/listbox.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/listboxcombo.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/listboxcombo.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/marble.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/mdi.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/mdi.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/menu.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/menu.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/progress.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/progress.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/progressbar.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/progressbar.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/qdir.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/qdir.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/qmag.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/qmag.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/qt.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/qtlogo.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/rangecontrols.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/rangecontrols.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/richtext.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/richtext.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/secret.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/secret.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/semaphore.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/semaphore.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/smalltable.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/smalltable.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/splitter.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/splitter.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tabdialog.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tabdialog.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tablestatistics.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tablestatistics.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tooltip.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tooltip.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/trolltech.bmp
-%%EXAMPLES%%%%EXAMPLESDIR%%/trolltech.gif
-%%EXAMPLES%%%%EXAMPLESDIR%%/tt-logo.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut1.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut1.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut10.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut10.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut11.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut11.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut12.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut12.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut13.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut13.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut14.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut14.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut2.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut2.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut3.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut3.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut4.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut4.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut5.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut5.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut6.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut6.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut7.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut7.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut8.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut8.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut9.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/tut9.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/webbrowser/mainwindow.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/webbrowser/mainwindow.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/webbrowser/mainwindow.ui
-%%EXAMPLES%%%%EXAMPLESDIR%%/webbrowser/webbrowser.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/webbrowser/webbrowser.pyc
-%%EXAMPLES%%%%EXAMPLESDIR%%/widgets.py
-%%EXAMPLES%%%%EXAMPLESDIR%%/widgets.pyc
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PyQt.html
+%%PORTDOCS%%%%DOCSDIR%%/PyQt.sgml
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/qtdocs.sip
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/connect.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/connect.ui.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/dbconnect.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/dbconnect.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/dbpar.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/dbpar.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/form1.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/form2.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/frmconnect.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/frmconnect.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/frmconnect.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/runform1.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/runform1.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/runform2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/runform2.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/runsqlex.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/runsqlex.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlcustom1.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlcustom1.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlex.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlex.ui.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlsubclass5.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/sqlsubclass5.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/sqltable4.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/sqltable4.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/testdb_mysql.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SQL/testdb_pg.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aclock.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aclock.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressbook.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressbook.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/application.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/biff.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/biff.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bigtable.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bigtable.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttongroups.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/buttongroups.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/butterfly.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/canvas.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/canvas.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/qt-trans.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/canvas/qtlogo.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklists.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklists.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dclock.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dclock.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/desktop.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirview.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirview.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragdrop.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragdrop.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawlines.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawlines.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dropsite.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dropsite.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fileopen.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontdisplayer.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontdisplayer.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonts.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonts.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/i18n.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/i18n.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/i18n.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_cs.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_cs.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_de.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_de.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_el.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_el.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_en.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_en.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_eo.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_eo.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_fr.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_fr.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_it.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_it.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_jp.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_jp.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_ko.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_ko.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_no.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_no.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_ru.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_ru.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_zh.qm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18n/mywidget_zh.ts
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lineedits.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lineedits.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listbox.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listbox.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listboxcombo.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listboxcombo.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/marble.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mdi.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mdi.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menu.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menu.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progress.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progress.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressbar.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressbar.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qdir.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qdir.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qmag.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qmag.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qt.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/qtlogo.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rangecontrols.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rangecontrols.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/richtext.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/secret.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/secret.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/semaphore.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/semaphore.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smalltable.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smalltable.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/splitter.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/splitter.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tabdialog.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tabdialog.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tablestatistics.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tablestatistics.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tooltip.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tooltip.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trolltech.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trolltech.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tt-logo.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut1.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut1.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut11.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut11.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut12.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut12.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut13.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut13.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut14.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut14.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut2.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut2.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut3.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut3.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut4.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut4.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut5.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut5.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut6.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut6.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut7.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut7.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut8.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut8.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut9.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut9.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webbrowser/mainwindow.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webbrowser/mainwindow.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webbrowser/mainwindow.ui
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webbrowser/webbrowser.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webbrowser/webbrowser.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/widgets.pyc
 %%DATADIR%%/qt/copying.sip
 %%DATADIR%%/qt/qaccel.sip
 %%DATADIR%%/qt/qaction.sip
@@ -460,9 +460,9 @@ bin/pyuic
 @dirrm %%DATADIR%%/qttable
 @dirrm %%DATADIR%%/qtui
 @dirrm %%DATADIR%%/qtxml
-%%DOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/SQL
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/canvas
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/i18n
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%/webbrowser
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/SQL
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/canvas
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/i18n
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/webbrowser
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%