- Support staging

- Modernize python knobs

4 files changed, 11 insertions, 23 deletions

diff --git a/www/trac-wikitemplates/Makefile b/www/trac-wikitemplates/Makefile
index 461e4814ad22..591ee8455b64 100644
--- a/www/trac-wikitemplates/Makefile
+++ b/www/trac-wikitemplates/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wikitemplates
 PORTVERSION=	0.3.0p3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
@@ -18,9 +18,6 @@ RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracWikiTemplates
-PYDISTUTILS_PKGVERSION=	${PORTVERSION:S/p/rc/}
+USE_PYDISTUTILS=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/trac-wikitemplates/pkg-plist b/www/trac-wikitemplates/pkg-plist
deleted file mode 100644
index ddf68a1c022f..000000000000
--- a/www/trac-wikitemplates/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/www/trac-wysiwyg/Makefile b/www/trac-wysiwyg/Makefile
index 779fce27e4ae..04b51216f11b 100644
--- a/www/trac-wysiwyg/Makefile
+++ b/www/trac-wysiwyg/Makefile
@@ -16,13 +16,10 @@ COMMENT=	WYSIWYG editor for Trac wiki
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
 USE_BZIP2=	yes
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracWysiwyg
-PYDISTUTILS_PKGVERSION=	0.12.0.4
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if !defined(SVN_REV)
@@ -45,7 +42,4 @@ do-fetch:
 	echo "SVN_REV=  ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/www/trac-xmlrpc/Makefile b/www/trac-xmlrpc/Makefile
index 8cbff2568bb5..7a148df25189 100644
--- a/www/trac-xmlrpc/Makefile
+++ b/www/trac-xmlrpc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xmlrpc
 PORTVERSION=	1.1.2.r${SVN_REV}
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/
 PKGNAMEPREFIX=	trac-
@@ -18,14 +19,11 @@ SVN_REV=	13203
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/trunk
-USE_ZIP=	yes
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
-
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
-PYDISTUTILS_PKGNAME=	TracXMLRPC
-PYDISTUTILS_PKGVERSION=	${PORTVERSION:C/.r${SVN_REV}//g}
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
-NO_STAGE=	yes
+USE_ZIP=	yes
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+
 .include <bsd.port.mk>