2 files changed, 6 insertions, 54 deletions

diff --git a/www/trac-tweakui/Makefile b/www/trac-tweakui/Makefile
index 25c26188ee16..613434db9afb 100644
--- a/www/trac-tweakui/Makefile
+++ b/www/trac-tweakui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tweakui
 PORTVERSION=	0.1.7413
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
@@ -16,26 +16,20 @@ COMMENT=	Easily tweak Trac pages with JavaScript expressions
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 DOS2UNIX_REGEX=	.*\.(css|html|js|py|txt)$
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+PORTEXAMPLES=	*
 
 SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/trac${PORTNAME}plugin/0.11
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracTweakUI
-PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}
-PLIST_SUB+=	EGGVERSION="${PORTVERSION:R}" PYTHONVERSION=${PYTHON_VER}
-PYDISTUTILS_NOEGGINFO=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTEXAMPLES)
-	@cd ${WRKSRC}/tractweakui/htdocs && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	cd ${WRKSRC}/tractweakui/htdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/trac-tweakui/pkg-plist b/www/trac-tweakui/pkg-plist
deleted file mode 100644
index a3c0a9e1d12d..000000000000
--- a/www/trac-tweakui/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-%%PYTHON_SITELIBDIR%%/TracTweakUI-%%EGGVERSION%%-py%%PYTHONVERSION%%.egg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trac.ico
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/cluetip/jquery.dimensions.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/cluetip/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/cluetip/wait.gif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/cluetip/jquery.cluetip.css
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/cluetip/jquery.cluetip.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/cluetip/jquery.hoverIntent.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/fieldnotice/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/fieldnotice/jquery.fieldnotice.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/editfullscreen/jquery.autogrow.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/editfullscreen/jquery.editfullscreen.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/editfullscreen/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/form-defaults/jquery.form-defaults.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/form-defaults/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/validate/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/validate/jquery.validate.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/unitfeeder/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/unitfeeder/jquery.unitfeeder.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/datepicker/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/datepicker/datePicker.css
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/datepicker/jquery.datePicker.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/datepicker/date.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/datepicker/datePicker_icon.css
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/datepicker/calendar.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/editcc/jquery.editcc.css
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/editcc/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/editcc/jquery.editcc.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/editcc/del.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/makelink/__template__.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tractweakui/makelink/jquery.makelink.js
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/cluetip
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/fieldnotice
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/editfullscreen
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/form-defaults
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/validate
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/unitfeeder
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/datepicker
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/editcc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui/makelink
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tractweakui
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%