- do not directly depend on setuptools, use USE_DISTUTILS instead

- bump PORTREVISION because of dependency change
- trim Makefile header
- limit python version to 2.x only
- move pkg-plist contents into Makefile:PLIST_FILES
- tab -> space change in pkg-descr:WWW

PR:		173056
Submitted by:	rm (myself)
Approved by:	Sutra Zhou <zhoushuqun at gmail dot com> (maintainer, by mail)
Feature safe:	yes

3 files changed, 8 insertions, 23 deletions

diff --git a/www/trac-spam-filter/Makefile b/www/trac-spam-filter/Makefile
index 251c6faadead..c76abc4f20ee 100644
--- a/www/trac-spam-filter/Makefile
+++ b/www/trac-spam-filter/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	trac-spam-filter
-# Date created:	23 September 2007
-# Whom:					sutra
-#
+# Created by: sutra
 # $FreeBSD$
-#
 
 PORTNAME=	TracSpamFilter
 PORTVERSION=	0.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel python
 MASTER_SITES=	http://zhoushuqun.com/files/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -17,22 +13,12 @@ MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	Allow different ways to reject contributions that contain spam
 
 RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}dev
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}dev
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_NOEGGINFO=	yes
-PLIST_SUB+=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION}
-
-do-build:
-	cd ${WRKSRC}; \
-	${PYTHON_CMD} setup.py bdist_egg
-
-do-install:
-.for i in *
-	${INSTALL_DATA} ${WRKSRC}/dist/${i} ${PYTHON_SITELIBDIR}/
-.endfor
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGVERSION=	${PORTVERSION}dev
+PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 .include <bsd.port.mk>
diff --git a/www/trac-spam-filter/pkg-descr b/www/trac-spam-filter/pkg-descr
index d139e3eb1e54..8f3a8af758a0 100644
--- a/www/trac-spam-filter/pkg-descr
+++ b/www/trac-spam-filter/pkg-descr
@@ -1,4 +1,4 @@
 A plugin is being developed that will allow different ways to reject
 contributions that contain spam.
 
-WWW:	http://trac.edgewall.org/wiki/SpamFilter
+WWW: http://trac.edgewall.org/wiki/SpamFilter
diff --git a/www/trac-spam-filter/pkg-plist b/www/trac-spam-filter/pkg-plist
deleted file mode 100644
index e6035b865a60..000000000000
--- a/www/trac-spam-filter/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%dev-py%%PYTHONVERSION%%.egg