- add upstream patch to fix runtime, using correct url scheme

- adopt staging and use auto-generated packing list
- bump PORTREVISION

PR:		183853
Submitted by:	Douglas William Thrift <douglas@douglasthrift.net> (maintainer)

3 files changed, 27 insertions, 46 deletions

diff --git a/www/trac-OhlohWidgetsMacro/Makefile b/www/trac-OhlohWidgetsMacro/Makefile
index 35adc2b966c6..6b30acce13ab 100644
--- a/www/trac-OhlohWidgetsMacro/Makefile
+++ b/www/trac-OhlohWidgetsMacro/Makefile
@@ -1,8 +1,9 @@
-# Created by: Douglas Thrift
+# Created by: Douglas Thrift <douglas@douglasthrift.net>
 # $FreeBSD$
 
 PORTNAME=	OhlohWidgetsMacro
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	trac-
@@ -10,12 +11,13 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Trac macro to embed Ohloh widgets
 
+LICENSE=	MIT
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:${PORTSDIR}/devel/py-pycerberus \
 		tracd:${PORTSDIR}/www/trac
 
-LICENSE=	MIT
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py b/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py
new file mode 100644
index 000000000000..bf0d163dce74
--- /dev/null
+++ b/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py
@@ -0,0 +1,20 @@
+--- ./ohloh_widgets/macro.py.orig	2013-06-17 12:52:47.000000000 -0700
++++ ./ohloh_widgets/macro.py	2013-06-17 12:53:17.000000000 -0700
+@@ -46,7 +46,7 @@
+        ![[OhlohWidget(project_id, widget_name)]]
+     
+     The macro gets two parameters which you can get from Ohloh's widget page
+-    for your project (!http://www.ohloh.net/p/<project name>/widgets) when you
++    for your project (!https://www.ohloh.net/p/<project name>/widgets) when you
+     look at the embeddable HTML snippet:
+     
+      * project_id -- a 6 digit number which identifies your project
+@@ -70,7 +70,7 @@
+     
+     def url(self, parameters):
+         query_string = ''
+-        url_template = 'http://www.ohloh.net/p/%(project_id)d/widgets/%(widget_name)s.js'
++        url_template = 'https://www.ohloh.net/p/%(project_id)d/widgets/%(widget_name)s.js'
+         widget_name = parameters.widget_name
+         if '?' in widget_name:
+             parameters['widget_name'], query_parameters = widget_name.split('?', 1)
diff --git a/www/trac-OhlohWidgetsMacro/pkg-plist b/www/trac-OhlohWidgetsMacro/pkg-plist
deleted file mode 100644
index 86a5774f8527..000000000000
--- a/www/trac-OhlohWidgetsMacro/pkg-plist
+++ /dev/null
@@ -1,41 +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%%/ohloh_widgets/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/api.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/api.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/api.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/attribute_dict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/attribute_dict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/attribute_dict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/simple_super.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/simple_super.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/simple_super.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/testcase.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/testcase.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib/testcase.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/macro.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/macro.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/macro.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/modifiers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/modifiers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/modifiers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/util.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/validation.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/validation.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/validation.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets/lib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ohloh_widgets
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%