- Support staging

- Modernize python knobs

6 files changed, 27 insertions, 41 deletions

diff --git a/www/trac-macropost/Makefile b/www/trac-macropost/Makefile
index 7314b81c647e..4b4c3240eca4 100644
--- a/www/trac-macropost/Makefile
+++ b/www/trac-macropost/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	macropost
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.gerritbeine.de/download/trac/
 PKGNAMEPREFIX=	trac-
@@ -15,10 +15,8 @@ COMMENT=	Allows Macros to use POST in forms
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracMacroPost
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/trac-mastertickets/Makefile b/www/trac-mastertickets/Makefile
index bf2cb0c731e1..600eee355ea9 100644
--- a/www/trac-mastertickets/Makefile
+++ b/www/trac-mastertickets/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mastertickets
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	http://mirrors.redv.com/pub/trac/ \
 		LOCAL/glarkin
@@ -17,13 +18,7 @@ RUN_DEPENDS+=	trac>=0.12:${PORTSDIR}/www/trac
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracMasterTickets
-PYDISTUTILS_NOEGGINFO=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-PLIST_SUB+=		PORTVERSION=${PORTVERSION} \
-			PYTHONVERSION=${PYTHON_VER}
-PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/TracMasterTickets-%%PORTVERSION%%-py%%PYTHONVERSION%%.egg
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/trac-nav/Makefile b/www/trac-nav/Makefile
index 4c8d2ba347f0..d1b3d70f656a 100644
--- a/www/trac-nav/Makefile
+++ b/www/trac-nav/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nav
 PORTVERSION=	4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.gerritbeine.de/download/trac/
 PKGNAMEPREFIX=	trac-
@@ -15,10 +15,8 @@ COMMENT=	Fully customizable navigation bar for Trac
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
 WRKSRC=		${WRKDIR}/trac${PORTNAME}
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracNav
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/trac-pagelist/Makefile b/www/trac-pagelist/Makefile
index 1ac3558d40f3..fb749dea252e 100644
--- a/www/trac-pagelist/Makefile
+++ b/www/trac-pagelist/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pagelist
 PORTVERSION=	0.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.gerritbeine.de/download/trac/
 PKGNAMEPREFIX=	trac-
@@ -15,10 +15,8 @@ COMMENT=	TracPageList
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracPageList
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/trac-pagetopdf/Makefile b/www/trac-pagetopdf/Makefile
index 66d0d0b7d1c9..ffa57ab7d10a 100644
--- a/www/trac-pagetopdf/Makefile
+++ b/www/trac-pagetopdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pagetopdf
 PORTVERSION=	0.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.gerritbeine.de/download/trac/
 PKGNAMEPREFIX=	trac-
@@ -15,11 +15,10 @@ COMMENT=	Export trac wiki pages as PDFs
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac \
 		htmldoc:${PORTSDIR}/textproc/htmldoc
 
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
 WRKSRC=			${WRKDIR}/${PORTNAME}plugin
-PYDISTUTILS_PKGNAME=	TracPageToPDF
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
-NO_STAGE=	yes
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+
 .include <bsd.port.mk>
diff --git a/www/trac-pendingticket/Makefile b/www/trac-pendingticket/Makefile
index d4ad828ab740..da11ae5f5011 100644
--- a/www/trac-pendingticket/Makefile
+++ b/www/trac-pendingticket/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pendingticket
 PORTVERSION=	0.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.gerritbeine.de/download/trac/
 PKGNAMEPREFIX=	trac-
@@ -15,14 +15,12 @@ COMMENT=	Support for pending tickets
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/removependingplugin
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	RemovePendingStatusPlugin
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PLIST_FILES=		bin/close_old_pending.py \
-			bin/migrate_pending_attrib_to_status.py \
-			%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+			bin/migrate_pending_attrib_to_status.py
 
-NO_STAGE=	yes
 post-patch:
 	cd ${WRKDIR}/${PORTNAME}plugin && ${PATCH} < ${PATCHDIR}/close_old_pending.py.patch
 	${REINPLACE_CMD} -e "s,%%PYTHON%%,${PYTHON_CMD}," ${WRKDIR}/${PORTNAME}plugin/close_old_pending.py
@@ -30,7 +28,7 @@ post-patch:
 	${REINPLACE_CMD} -e "s,%%PYTHON%%,${PYTHON_CMD}," ${WRKDIR}/${PORTNAME}plugin/migrate_pending_attrib_to_status.py
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}plugin/close_old_pending.py ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}plugin/migrate_pending_attrib_to_status.py ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}plugin/close_old_pending.py ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}plugin/migrate_pending_attrib_to_status.py ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>