www/py-feedgenerator: Update to 1.5, Use setuptools and more

- Update to 1.5
- Use setuptools instead of distutils
- Update pkg-plist
- Add RUN_DEPENDS on pytz and six
- Add regression-test: target
- Patch setup.py to fix test_suite and add zip_safe=False [1]
- Trim Makefile header
- Whitespace alignment
- Update WWW location and change Tab->space in pkg-descr

[1] https://github.com/dmdm/feedgenerator-py3k/issues/2

PR:		ports/178768
Approved by:	jlaffaye (maintainer, via IRC)

5 files changed, 71 insertions, 14 deletions

diff --git a/www/py-feedgenerator/Makefile b/www/py-feedgenerator/Makefile
index 9f969b8981c8..88c2c74804e3 100644
--- a/www/py-feedgenerator/Makefile
+++ b/www/py-feedgenerator/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	py-feedgenerator
-# Date created:		2011-06-19
-# Whom:			Julien Laffaye <jlaffaye@FreeBSD.org>
-#
+# Created by: Julien Laffaye <jlaffaye@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	feedgenerator
-PORTVERSION=	1.2.1
+PORTVERSION=	1.5
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +12,13 @@ COMMENT=	Standalone version of django.utils.feedgenerator
 
 LICENSE=	BSD
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	easy_install
+
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.mk>
diff --git a/www/py-feedgenerator/distinfo b/www/py-feedgenerator/distinfo
index 1eadccaba6ef..1e6738c56dde 100644
--- a/www/py-feedgenerator/distinfo
+++ b/www/py-feedgenerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (feedgenerator-1.2.1.tar.gz) = e099309847086ac6092ac498cf0bcc0abf9cdaa037fc3a6d245a03429cbb78e7
-SIZE (feedgenerator-1.2.1.tar.gz) = 5555
+SHA256 (feedgenerator-1.5.tar.gz) = 7bc7dae02d5ca37f305311ca1696f2945625b08db70056b35f18727894bc5a3e
+SIZE (feedgenerator-1.5.tar.gz) = 909738
diff --git a/www/py-feedgenerator/files/patch-setup.py b/www/py-feedgenerator/files/patch-setup.py
new file mode 100644
index 000000000000..0d0cd6f931a3
--- /dev/null
+++ b/www/py-feedgenerator/files/patch-setup.py
@@ -0,0 +1,17 @@
+--- ./setup.py.orig	2013-01-11 11:56:38.000000000 +1100
++++ ./setup.py	2013-06-16 20:20:50.928843954 +1000
+@@ -32,7 +32,7 @@
+ KEYWORDS = "feed atom rss".split(' ')
+ VERSION = '1.5'
+ 
+-TEST_SUITE = 'tests'
++TEST_SUITE = 'tests_feedgenerator'
+ 
+ REQUIRES = ['pytz', 'six']
+ 
+@@ -52,4 +52,5 @@
+     keywords=KEYWORDS,
+     url=URL,
+     classifiers=CLASSIFIERS,
++    zip_safe=False,
+ )
diff --git a/www/py-feedgenerator/pkg-descr b/www/py-feedgenerator/pkg-descr
index e92084c78d90..987ac52573c1 100644
--- a/www/py-feedgenerator/pkg-descr
+++ b/www/py-feedgenerator/pkg-descr
@@ -1,3 +1,3 @@
 Standalone version of django.utils.feedgenerator
 
-WWW:	http://hg.lolnet.org/feedgenerator/
+WWW: https://github.com/dmdm/feedgenerator-py3k
diff --git a/www/py-feedgenerator/pkg-plist b/www/py-feedgenerator/pkg-plist
index f29e80e68b35..b68fadb02a54 100644
--- a/www/py-feedgenerator/pkg-plist
+++ b/www/py-feedgenerator/pkg-plist
@@ -1,4 +1,42 @@
 @comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/feedgenerator.py
-%%PYTHON_SITELIBDIR%%/feedgenerator.pyc
-%%PYTHON_SITELIBDIR%%/feedgenerator.pyo
+%%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/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/datetime_safe.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/datetime_safe.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/datetime_safe.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/encoding.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/encoding.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/encoding.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/feedgenerator.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/feedgenerator.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/feedgenerator.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/functional.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/functional.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/functional.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/six.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/six.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/six.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/timezone.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/timezone.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/timezone.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/xmlutils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/xmlutils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils/xmlutils.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django/utils
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator/django
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedgenerator
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%