1.2.0 came out 27.11.2016 already, their sourceforge site redirects to
to the new page and code comes from github now.
Not sure why the license had a XXX back then but it's clearly settled
now.
Required versions have been added for clarity, Python 3 is not supported
(yet).
One patch got in, the other I replaced with a simpler post-install.
Puddletag continues to work fine for me on amd64.
Feedback? Any takers?
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index 9e542cb439b..e9a39e9fee6 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -2,28 +2,32 @@
COMMENT = spreadsheet-like audio file tagger
-MODPY_EGG_VERSION = 1.0.5
-REVISION = 1
-DISTNAME = puddletag-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION = 1.2.0
+GH_ACCOUNT = keithgg
+GH_PROJECT = puddletag
+GH_TAGNAME = v${MODPY_EGG_VERSION}
CATEGORIES = audio
-HOMEPAGE = http://puddletag.sourceforge.net
+HOMEPAGE = http://puddletag.net
-# XXX
+# GPLv3
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
-
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODPY_SETUPTOOLS = Yes
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=puddletag/}
-
-RUN_DEPENDS = audio/py-mutagen \
- devel/py-configobj \
- devel/py-parsing \
+RUN_DEPENDS = audio/py-mutagen>=1.14 \
devel/desktop-file-utils \
- x11/py-qt4
+ devel/py-configobj \
+ devel/py-parsing>=1.5.1 \
+ x11/py-qt4>=4.5
NO_TEST = Yes
+WRKSRC = ${WRKDIST}/source
+
+post-install:
+ mv ${PREFIX}/share/man/man1/puddletag.1 ${PREFIX}/man/man1/
+
.include <bsd.port.mk>
diff --git a/audio/puddletag/distinfo b/audio/puddletag/distinfo
index ba8b18d3095..096647955c8 100644
--- a/audio/puddletag/distinfo
+++ b/audio/puddletag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puddletag-1.0.5.tar.gz) = RpjV7/6PJlRGs1YGi6187QspwfZoJNyUpWiPP//DieI=
-SIZE (puddletag-1.0.5.tar.gz) = 958207
+SHA256 (puddletag-1.2.0.tar.gz) = leSGf9BMU0nxneG188HyM207ZtoIwHb7F17491idyA0=
+SIZE (puddletag-1.2.0.tar.gz) = 9965110
diff --git a/audio/puddletag/patches/patch-puddlestuff_puddleobjects_py
b/audio/puddletag/patches/patch-puddlestuff_puddleobjects_py
deleted file mode 100644
index c9bafd10a19..00000000000
--- a/audio/puddletag/patches/patch-puddlestuff_puddleobjects_py
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-puddlestuff_puddleobjects_py,v 1.1 2015/07/28 11:23:53 jca Exp
$
-
-Fix with recent PyQt4>=4.11.4
-
- https://github.com/keithgg/puddletag/issues/261
-
https://github.com/keithgg/puddletag/commit/489acd2ee62eb5fbff95f8220dc8958c14871931
-
---- puddlestuff/puddleobjects.py.orig Mon Jul 21 19:26:46 2014
-+++ puddlestuff/puddleobjects.py Tue Jul 28 13:09:44 2015
-@@ -1418,7 +1418,7 @@ class ArtworkLabel(QGraphicsView):
- super(ArtworkLabel, self).__init__(*args, **kwargs)
-
- pal = self.palette()
-- pal.setBrush(self.backgroundRole(), QBrush(QPalette.Window))
-+ pal.setBrush(self.backgroundRole(), QBrush(pal.window()))
- self.setAutoFillBackground(True)
- self.setPalette(pal)
-
diff --git a/audio/puddletag/patches/patch-setup_py
b/audio/puddletag/patches/patch-setup_py
deleted file mode 100644
index 7de03d7f7ec..00000000000
--- a/audio/puddletag/patches/patch-setup_py
+++ /dev/null
@@ -1,10 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.2 2015/05/01 12:55:38 ajacoutot Exp $
---- setup.py.orig Sun May 4 19:15:31 2014
-+++ setup.py Fri May 1 14:47:06 2015
-@@ -39,5 +39,5 @@ setup(
- scripts = ['puddletag'],
- data_files=[('share/pixmaps/', ('puddletag.png',)),
- ('share/applications/', ('puddletag.desktop',)),
-- ('share/man/man1/', ('puddletag.1',))]
-+ ('man/man1/', ('puddletag.1',))]
- )
diff --git a/audio/puddletag/pkg/PLIST b/audio/puddletag/pkg/PLIST
index 945d1e896a9..017738c1732 100644
--- a/audio/puddletag/pkg/PLIST
+++ b/audio/puddletag/pkg/PLIST
@@ -30,6 +30,8 @@
lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/util.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/util.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/vorbis.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/vorbis.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/wma.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/audioinfo/wma.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/confirmations.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/confirmations.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/constants.py
@@ -49,8 +51,14 @@
lib/python${MODPY_VERSION}/site-packages/puddlestuff/helperwin.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/
lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/__init__.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/amarok.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/amarok.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/prokyon.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/prokyon.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/quodlibetlib.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/quodlibetlib.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/rhythmbox.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/libraries/rhythmbox.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/loadshortcuts.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/loadshortcuts.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/m3u.py
@@ -80,6 +88,8 @@
lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/tagpanel.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/tagpanel.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/tagtools.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/tagtools.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/teststuff.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/mainwin/teststuff.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/
lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/__init__.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/masstag/__init__.pyc
@@ -119,8 +129,14 @@
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/acoust_id.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/acoust_id.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/amazon.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/amazon.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/amg.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/amg.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/discogs.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/discogs.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/example.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/example.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/exampletags.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/exampletags.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/freedb.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/freedb.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/
@@ -128,6 +144,8 @@
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/__init__.
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/funcs.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/funcs.pyc
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/parse_debug.py
+lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/mp3tag/parse_debug.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/musicbrainz.py
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/musicbrainz.pyc
lib/python${MODPY_VERSION}/site-packages/puddlestuff/tagsources/parse_html.py
