- Remove easy_install dependency

- Convert to PYDISTUTILS_AUTOPLIST
- Bump PORTREVISION to enforce a cleanup for the easy_install references

With hat:	python@
Approved by:	portmgr (implicit)

2 files changed, 6 insertions, 71 deletions

diff --git a/www/trac-fullblog/Makefile b/www/trac-fullblog/Makefile
index a1a154fec89c..2c23ebc2eda4 100644
--- a/www/trac-fullblog/Makefile
+++ b/www/trac-fullblog/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
+PORTNAME=	fullblog
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -16,9 +16,9 @@ COMMENT=	Plugin that provides a project Blog
 RUN_DEPENDS+=	htmldoc:${PORTSDIR}/textproc/htmldoc \
 		tracd:${PORTSDIR}/www/trac
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracFullBlogPlugin
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .if defined(BOOTSTRAP)
 do-fetch:
@@ -29,13 +29,5 @@ do-fetch:
 	    tar cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-build-plist:
-	@${CAT} /dev/null > ${PLIST}
-	${FIND} ${EGG_PATH} -type f | \
-	    ${SED} -e 's|${EGG_PATH}|%%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}-%%PORTVERSION%%-py%%PYTHON_VER%%.egg|' | \
-	    ${SORT} >> ${PLIST}
-	${FIND} ${EGG_PATH} -type d | \
-	    ${SED} -e 's|${EGG_PATH}|@dirrm %%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}-%%PORTVERSION%%-py%%PYTHON_VER%%.egg|' | \
-	    ${SORT} -r >> ${PLIST}
-
+.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>
diff --git a/www/trac-fullblog/pkg-plist b/www/trac-fullblog/pkg-plist
deleted file mode 100644
index c6e5b82b54d0..000000000000
--- a/www/trac-fullblog/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-%%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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/admin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/admin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/admin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/api.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/api.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/api.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/core.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/core.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/core.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/db.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/db.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/db.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/htdocs/blog.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/htdocs/css/fullblog.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/macros.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/macros.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/macros.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/model.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/model.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/model.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/spamfilter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/spamfilter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/spamfilter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/tags.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/tags.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/tags.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog.rss
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog_admin.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog_archive.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog_delete.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog_edit.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog_macro_monthlist.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog_macro_post.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog_sidebar.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates/fullblog_view.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/web_ui.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/web_ui.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/web_ui.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/htdocs/css
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog/htdocs
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tracfullblog
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%