- Use PYTHON_SITELIBDIR in pkg-plist;

- Change DOCSDIR;
- Remove NOPORTDOCS stuff, it's already in bsd.port.mk;
- Add more backup sites in MASTER_SITES.

PR:		111502
Submitted by:	lwhsu

2 files changed, 54 insertions, 58 deletions

diff --git a/devel/qct/Makefile b/devel/qct/Makefile
index d5f729c727f8..f57aaea0b68e 100644
--- a/devel/qct/Makefile
+++ b/devel/qct/Makefile
@@ -7,8 +7,11 @@
 
 PORTNAME=	qct
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
-MASTER_SITES=	http://qct.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://qct.sourceforge.net/
+MASTER_SITE_SUBDIR=	qct
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
 
 MAINTAINER=	bsam@FreeBSD.org
@@ -19,18 +22,12 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=yes
 
+DOCSDIR=	${TARGETDIR}/share/doc/py-qt4-${PORTNAME}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/qct.1.txt ${DOCSDIR}/qct.1.txt
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	PORTDOCS="@comment "
-.else
-PLIST_SUB+=	PORTDOCS=
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/qct/pkg-plist b/devel/qct/pkg-plist
index eda9a14d52e2..4bca8195ead9 100644
--- a/devel/qct/pkg-plist
+++ b/devel/qct/pkg-plist
@@ -1,51 +1,50 @@
 bin/qct
-lib/python2.4/site-packages/qctlib/ui_dialog.py
-lib/python2.4/site-packages/qctlib/gui_logic.py
-lib/python2.4/site-packages/qctlib/ui_preferences.py
-lib/python2.4/site-packages/qctlib/__init__.py
-lib/python2.4/site-packages/qctlib/version.py
-lib/python2.4/site-packages/qctlib/utils.py
-lib/python2.4/site-packages/qctlib/vcs/cg.py
-lib/python2.4/site-packages/qctlib/vcs/hg.py
-lib/python2.4/site-packages/qctlib/vcs/p4.py
-lib/python2.4/site-packages/qctlib/vcs/bzr.py
-lib/python2.4/site-packages/qctlib/vcs/cvs.py
-lib/python2.4/site-packages/qctlib/vcs/git.py
-lib/python2.4/site-packages/qctlib/vcs/mtn.py
-lib/python2.4/site-packages/qctlib/vcs/svn.py
-lib/python2.4/site-packages/qctlib/vcs/__init__.py
-lib/python2.4/site-packages/qctlib/vcs/cg.pyc
-lib/python2.4/site-packages/qctlib/vcs/hg.pyc
-lib/python2.4/site-packages/qctlib/vcs/p4.pyc
-lib/python2.4/site-packages/qctlib/vcs/bzr.pyc
-lib/python2.4/site-packages/qctlib/vcs/cvs.pyc
-lib/python2.4/site-packages/qctlib/vcs/git.pyc
-lib/python2.4/site-packages/qctlib/vcs/mtn.pyc
-lib/python2.4/site-packages/qctlib/vcs/svn.pyc
-lib/python2.4/site-packages/qctlib/vcs/__init__.pyc
-lib/python2.4/site-packages/qctlib/vcs/cg.pyo
-lib/python2.4/site-packages/qctlib/vcs/hg.pyo
-lib/python2.4/site-packages/qctlib/vcs/p4.pyo
-lib/python2.4/site-packages/qctlib/vcs/bzr.pyo
-lib/python2.4/site-packages/qctlib/vcs/cvs.pyo
-lib/python2.4/site-packages/qctlib/vcs/git.pyo
-lib/python2.4/site-packages/qctlib/vcs/mtn.pyo
-lib/python2.4/site-packages/qctlib/vcs/svn.pyo
-lib/python2.4/site-packages/qctlib/vcs/__init__.pyo
-lib/python2.4/site-packages/qctlib/ui_dialog.pyc
-lib/python2.4/site-packages/qctlib/gui_logic.pyc
-lib/python2.4/site-packages/qctlib/ui_preferences.pyc
-lib/python2.4/site-packages/qctlib/__init__.pyc
-lib/python2.4/site-packages/qctlib/version.pyc
-lib/python2.4/site-packages/qctlib/utils.pyc
-lib/python2.4/site-packages/qctlib/ui_dialog.pyo
-lib/python2.4/site-packages/qctlib/gui_logic.pyo
-lib/python2.4/site-packages/qctlib/ui_preferences.pyo
-lib/python2.4/site-packages/qctlib/__init__.pyo
-lib/python2.4/site-packages/qctlib/version.pyo
-lib/python2.4/site-packages/qctlib/utils.pyo
-@dirrm lib/python2.4/site-packages/qctlib/vcs
-@dirrm lib/python2.4/site-packages/qctlib
-@comment port's docs
+%%PYTHON_SITELIBDIR%%/qctlib/__init__.py
+%%PYTHON_SITELIBDIR%%/qctlib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/qctlib/__init__.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/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
 %%PORTDOCS%%%%DOCSDIR%%/qct.1.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%