2 files changed, 70 insertions, 59 deletions

diff --git a/devel/qct/Makefile b/devel/qct/Makefile
index 91a1e592c59f..5832fd632fe2 100644
--- a/devel/qct/Makefile
+++ b/devel/qct/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qct
 PORTVERSION=	1.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel python
 MASTER_SITES=	http://qct.sourceforge.net/ \
 		ftp://ftp.ipt.ru/pub/download/${PORTNAME}/
@@ -15,10 +15,11 @@ MASTER_SITES=	http://qct.sourceforge.net/ \
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	QCT GUI commit tool
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.5+
-USE_PYDISTUTILS=yes
+USE_PYDISTUTILS=easy_install
 WRKSRC=		${WRKDIR}/qct
 
 post-install:
diff --git a/devel/qct/pkg-plist b/devel/qct/pkg-plist
index b8a1ca26189e..2db304ef3825 100644
--- a/devel/qct/pkg-plist
+++ b/devel/qct/pkg-plist
@@ -1,59 +1,69 @@
 bin/qct
-%%PYTHON_SITELIBDIR%%/qctlib/__init__.py
-%%PYTHON_SITELIBDIR%%/qctlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/changeselect.py
-%%PYTHON_SITELIBDIR%%/qctlib/changeselect.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/changeselect.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/gui_logic.py
-%%PYTHON_SITELIBDIR%%/qctlib/gui_logic.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/gui_logic.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/ui_dialog.py
-%%PYTHON_SITELIBDIR%%/qctlib/ui_dialog.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/ui_dialog.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/ui_preferences.py
-%%PYTHON_SITELIBDIR%%/qctlib/ui_preferences.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/ui_preferences.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/ui_select.py
-%%PYTHON_SITELIBDIR%%/qctlib/ui_select.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/ui_select.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/patches.py
-%%PYTHON_SITELIBDIR%%/qctlib/patches.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/patches.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/utils.py
-%%PYTHON_SITELIBDIR%%/qctlib/utils.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/utils.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/__init__.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/__init__.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/__init__.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/bzr.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/bzr.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/bzr.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/cg.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/cg.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/cg.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/cvs.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/cvs.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/cvs.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/git.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/git.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/git.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/hg.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/hg.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/hg.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/mtn.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/mtn.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/mtn.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/p4.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/p4.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/p4.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/svn.py
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/svn.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/vcs/svn.pyo
-%%PYTHON_SITELIBDIR%%/qctlib/version.py
-%%PYTHON_SITELIBDIR%%/qctlib/version.pyc
-%%PYTHON_SITELIBDIR%%/qctlib/version.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/qctlib/vcs
-@dirrm %%PYTHON_SITELIBDIR%%/qctlib
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/changeselect.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/changeselect.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/changeselect.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/gui_logic.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/gui_logic.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/gui_logic.pyo
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_dialog.py
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_dialog.pyc
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_dialog.pyo
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_preferences.py
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_preferences.pyc
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_preferences.pyo
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_select.py
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_select.pyc
+@comment %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/ui_select.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/patches.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/patches.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/patches.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/utils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/utils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/bzr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/bzr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/bzr.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/cg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/cg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/cg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/cvs.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/cvs.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/cvs.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/git.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/git.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/git.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/hg.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/hg.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/hg.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/mtn.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/mtn.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/mtn.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/p4.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/p4.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/p4.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/svn.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/svn.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs/svn.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/version.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/version.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/version.pyo
+%%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/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/qct
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib/vcs
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/qctlib
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@dirrmtry %%PYTHON_SITELIBDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/qct.1.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%