4 files changed, 36 insertions, 11 deletions

diff --git a/graphics/py-poppler-qt4/Makefile b/graphics/py-poppler-qt4/Makefile
index d93580f1298d..37489383015f 100644
--- a/graphics/py-poppler-qt4/Makefile
+++ b/graphics/py-poppler-qt4/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	poppler-qt4
-PORTVERSION=	0.16.2
+PORTVERSION=	0.16.3
 CATEGORIES=	graphics python
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	python-poppler-qt4
@@ -11,16 +11,19 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Python bindings for poppler-qt4
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip \
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml
+LICENSE=	LGPL21 LGPL3
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	sip:${PORTSDIR}/devel/py-sip \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
 LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_EGGINFO=	python_poppler_qt4-${PORTVERSION}-py${PYTHON_VER}.egg-info
-
-PLIST_FILES=	${PYTHON_SITELIBDIR:S;${PREFIX}/;;}/popplerqt4.so
+USE_PYDISTUTILS=	easy_install
+PYEASYINSTALL_ARCHDEP=	yes
+PYDISTUTILS_PKGNAME=	python_poppler_qt4
 
 .include <bsd.port.mk>
diff --git a/graphics/py-poppler-qt4/distinfo b/graphics/py-poppler-qt4/distinfo
index af966e7e213f..f9e7f8435a8f 100644
--- a/graphics/py-poppler-qt4/distinfo
+++ b/graphics/py-poppler-qt4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python-poppler-qt4-0.16.2.tar.gz) = a37cf5f946633cf1d513d9f3c96d40fbc7e069f8d0ffe191e09196fb774efca5
-SIZE (python-poppler-qt4-0.16.2.tar.gz) = 13513
+SHA256 (python-poppler-qt4-0.16.3.tar.gz) = 52232383b273038027a881db7e46879b73cccf690d393f677e7496e19cfb59aa
+SIZE (python-poppler-qt4-0.16.3.tar.gz) = 15345
diff --git a/graphics/py-poppler-qt4/files/patch-setup.py b/graphics/py-poppler-qt4/files/patch-setup.py
new file mode 100644
index 000000000000..330fa5a1bdce
--- /dev/null
+++ b/graphics/py-poppler-qt4/files/patch-setup.py
@@ -0,0 +1,10 @@
+--- ./setup.py.orig	2012-11-09 13:58:09.000000000 -0500
++++ ./setup.py	2012-12-12 07:47:48.000000000 -0500
+@@ -21,6 +21,7 @@
+         'Programming Language :: Python',
+         'Topic :: Multimedia :: Graphics :: Viewers',
+     ],
++    zip_safe = False,
+    cmdclass={}
+ )
+ 
diff --git a/graphics/py-poppler-qt4/pkg-plist b/graphics/py-poppler-qt4/pkg-plist
new file mode 100644
index 000000000000..859675db2c81
--- /dev/null
+++ b/graphics/py-poppler-qt4/pkg-plist
@@ -0,0 +1,12 @@
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/popplerqt4.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/popplerqt4.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/popplerqt4.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/popplerqt4.so
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%