- do not directly depend on setuptools, use USE_DISTUTILS instead

- bump PORTREVISION because of dependency change
- remove indefinite article in COMMENT
- trim Makefile header
- limit python version to 2.x only
- simplify pkg-plist entries

PR:		173170
Submitted by:	rm (myself)
Approved by:	brooks (maintainer, by mail)
Feature safe:	yes

2 files changed, 62 insertions, 72 deletions

diff --git a/www/trac-fullblog/Makefile b/www/trac-fullblog/Makefile
index 1603aa8ff4e2..f8b86354b085 100644
--- a/www/trac-fullblog/Makefile
+++ b/www/trac-fullblog/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for: trac-fullblog
-# Date created:                      January 9, 2009
-# Whom:                              Brooks Davis <brooks@freebsd.org>
-#
+# Created by: Brooks Davis <brooks@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -15,21 +12,14 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
 DIST_SUBDIR=	trac
 
 MAINTAINER=	brooks@FreeBSD.org
-COMMENT=	This plugin provides a project Blog
+COMMENT=	Plugin that provides a project Blog
 
 RUN_DEPENDS+=	htmldoc:${PORTSDIR}/textproc/htmldoc \
 		tracd:${PORTSDIR}/www/trac
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 
-USE_PYTHON=	2.5+
-NO_BUILD=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	TracFullBlogPlugin
-PYDISTUTILS_NOEGGINFO=	yes
-PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-		PYTHON_VER=${PYTHON_VER}
-
-EGG_PATH=	${PYTHONPREFIX_SITELIBDIR}/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
 
 .if defined(BOOTSTRAP)
 do-fetch:
diff --git a/www/trac-fullblog/pkg-plist b/www/trac-fullblog/pkg-plist
index 33cc2b4c2ef4..c6e5b82b54d0 100644
--- a/www/trac-fullblog/pkg-plist
+++ b/www/trac-fullblog/pkg-plist
@@ -1,57 +1,57 @@
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/__init__.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/__init__.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/__init__.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/admin.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/admin.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/admin.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/api.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/api.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/api.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/core.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/core.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/core.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/db.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/db.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/db.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/htdocs/blog.png
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/htdocs/css/fullblog.css
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/macros.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/macros.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/macros.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/model.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/model.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/model.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/spamfilter.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/spamfilter.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/spamfilter.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/tags.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/tags.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/tags.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog.rss
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog_admin.html
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog_archive.html
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog_delete.html
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog_edit.html
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog_macro_monthlist.html
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog_macro_post.html
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog_sidebar.html
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates/fullblog_view.html
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/util.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/util.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/util.pyo
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/web_ui.py
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/web_ui.pyc
-%%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/web_ui.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/templates
-@dirrm %%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/htdocs/css
-@dirrm %%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog/htdocs
-@dirrm %%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/tracfullblog
-@dirrm %%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/TracFullBlogPlugin-%%PORTVERSION%%-py%%PYTHON_VER%%.egg
+%%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%%