Index: Makefile
===================================================================
--- Makefile	(revision 355533)
+++ Makefile	(working copy)
@@ -53,8 +53,17 @@
 ARGS+=		--debug --trace
 .endif
 
+.include <bsd.port.pre.mk>
+
+PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
+.if ${PYTHON_MAJOR_VER} != "3"
+BAD_UIC_PORT_DIR=	port_v3
+.else
+BAD_UIC_PORT_DIR=	port_v2
+.endif
+
 post-patch:
-	${RM} -rf ${WRKSRC}/pyuic/uic/port_v3
+	${RM} -rf ${WRKSRC}/pyuic/uic/${BAD_UIC_PORT_DIR}
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
@@ -75,4 +84,4 @@
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\
 		`ls *.py */*.py */*/*.py`
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 355533)
+++ pkg-plist	(working copy)
@@ -54,27 +54,27 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyo
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.py
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyc
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.py
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.pyc
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.pyo
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.py
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyc
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyo
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.py
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyc
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyo
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.py
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyc
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyo
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.py
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyc
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyo
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.py
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyc
-%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/__init__.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/as_string.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/ascii_upper.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/invoke.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/load_plugin.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/proxy_base.pyo
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.py
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.pyc
+%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%/string_io.pyo
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyo
@@ -200,7 +200,7 @@
 %%API%%share/qt4/qsci/api/python/QtCore.api
 @dirrm share/py-sip/QtCore
 @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins
-@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2
+@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v%%PYTHON_MAJOR_VER%%
 @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader
 @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler
 @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic