- Update to 2.8

- Use PYDISTUTILS_AUTOPLIST

4 files changed, 19 insertions, 193 deletions

diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile
index f58a50cb3045..2c542b8c0e81 100644
--- a/deskutils/dosage/Makefile
+++ b/deskutils/dosage/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dosage
-PORTVERSION=	2.7
+PORTVERSION=	2.8
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://wummel.github.io/dosage/dist/
 
@@ -15,10 +15,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME=Dosage
-PYTHON_PY3K_PLIST_HACK=yes
+PYDISTUTILS_AUTOPLIST=yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} 's|share/man/man1|man/man1|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/deskutils/dosage/distinfo b/deskutils/dosage/distinfo
index 5a326e7c0071..11d7e1d65f82 100644
--- a/deskutils/dosage/distinfo
+++ b/deskutils/dosage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dosage-2.7.tar.gz) = 578158a2ed7a38b7b5802c4ae411f578866dc3654611bd9a9188f957b7b833f8
-SIZE (dosage-2.7.tar.gz) = 388391
+SHA256 (dosage-2.8.tar.gz) = 1d7b08b3e1885cc07a0f6fa5a5f88442a5ee51df417970ccfe2fd1720c18ae21
+SIZE (dosage-2.8.tar.gz) = 389101
diff --git a/deskutils/dosage/files/patch-setup.py b/deskutils/dosage/files/patch-setup.py
new file mode 100644
index 000000000000..fe13b8f344ac
--- /dev/null
+++ b/deskutils/dosage/files/patch-setup.py
@@ -0,0 +1,14 @@
+--- ./setup.py.orig	2013-12-08 10:46:26.000000000 +0000
++++ ./setup.py	2013-12-09 18:15:42.000000000 +0000
+@@ -188,7 +188,10 @@
+     def get_outputs (self):
+         """Add the generated config file to the list of outputs."""
+         outs = super(MyInstallLib, self).get_outputs()
+-        outs.append(self.get_conf_output())
++        conf_output = self.get_conf_output()
++        outs.append(conf_output)
++        if self.compile:
++            outs.extend(self._bytecode_filenames([conf_output]))
+         return outs
+ 
+ 
diff --git a/deskutils/dosage/pkg-plist b/deskutils/dosage/pkg-plist
deleted file mode 100644
index 1cbb621ff526..000000000000
--- a/deskutils/dosage/pkg-plist
+++ /dev/null
@@ -1,187 +0,0 @@
-bin/dosage
-%%PYTHON_SITELIBDIR%%/_Dosage_configdata.py
-%%PYTHON_SITELIBDIR%%/_Dosage_configdata.pyc
-%%PYTHON_SITELIBDIR%%/_Dosage_configdata.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/__init__.py
-%%PYTHON_SITELIBDIR%%/dosagelib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/ansicolor.py
-%%PYTHON_SITELIBDIR%%/dosagelib/ansicolor.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/ansicolor.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/colorama.py
-%%PYTHON_SITELIBDIR%%/dosagelib/colorama.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/colorama.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/comic.py
-%%PYTHON_SITELIBDIR%%/dosagelib/comic.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/comic.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/configuration.py
-%%PYTHON_SITELIBDIR%%/dosagelib/configuration.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/configuration.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/decorators.py
-%%PYTHON_SITELIBDIR%%/dosagelib/decorators.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/decorators.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/events.py
-%%PYTHON_SITELIBDIR%%/dosagelib/events.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/events.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/fileutil.py
-%%PYTHON_SITELIBDIR%%/dosagelib/fileutil.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/fileutil.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/helpers.py
-%%PYTHON_SITELIBDIR%%/dosagelib/helpers.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/helpers.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/languages.py
-%%PYTHON_SITELIBDIR%%/dosagelib/languages.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/languages.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/loader.py
-%%PYTHON_SITELIBDIR%%/dosagelib/loader.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/loader.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/output.py
-%%PYTHON_SITELIBDIR%%/dosagelib/output.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/output.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/a.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/a.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/a.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/arcamax.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/arcamax.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/arcamax.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/b.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/b.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/b.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/c.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/c.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/c.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/clonemanga.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/clonemanga.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/clonemanga.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/comicfury.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/comicfury.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/comicfury.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/comicgenesis.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/comicgenesis.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/comicgenesis.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/creators.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/creators.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/creators.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/d.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/d.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/d.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/drunkduck.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/drunkduck.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/drunkduck.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/e.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/e.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/e.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/f.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/f.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/f.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/g.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/g.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/g.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/gocomics.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/gocomics.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/gocomics.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/h.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/h.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/h.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/i.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/i.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/i.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/j.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/j.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/j.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/k.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/k.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/k.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/keenspot.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/keenspot.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/keenspot.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/l.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/l.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/l.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/m.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/m.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/m.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/n.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/n.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/n.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/nuklearpower.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/nuklearpower.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/nuklearpower.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/num.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/num.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/num.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/o.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/o.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/o.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/p.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/p.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/p.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/pensandtales.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/pensandtales.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/pensandtales.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/petitesymphony.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/petitesymphony.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/petitesymphony.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/q.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/q.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/q.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/r.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/r.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/r.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/s.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/s.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/s.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/smackjeeves.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/smackjeeves.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/smackjeeves.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/snafu.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/snafu.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/snafu.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/t.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/t.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/t.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/u.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/u.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/u.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/v.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/v.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/v.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/w.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/w.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/w.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/webcomiceu.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/webcomiceu.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/webcomiceu.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/webcomicnation.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/webcomicnation.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/webcomicnation.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/wlpcomics.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/wlpcomics.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/wlpcomics.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/x.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/x.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/x.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/y.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/y.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/y.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/z.py
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/z.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/plugins/z.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/rss.py
-%%PYTHON_SITELIBDIR%%/dosagelib/rss.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/rss.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/scraper.py
-%%PYTHON_SITELIBDIR%%/dosagelib/scraper.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/scraper.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/updater.py
-%%PYTHON_SITELIBDIR%%/dosagelib/updater.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/updater.pyo
-%%PYTHON_SITELIBDIR%%/dosagelib/util.py
-%%PYTHON_SITELIBDIR%%/dosagelib/util.pyc
-%%PYTHON_SITELIBDIR%%/dosagelib/util.pyo
-man/man1/dosage.1.gz
-@dirrm %%PYTHON_SITELIBDIR%%/dosagelib/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/dosagelib