ports/101138: [PATCH] audio/picard: Update to 0.7.0
Alexander Botero-Lowry
alex at foxybanana.com
Tue Aug 1 04:40:18 UTC 2006
>Number: 101138
>Category: ports
>Synopsis: [PATCH] audio/picard: Update to 0.7.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 01 04:40:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alexander Botero-Lowry
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD Laptop.mine.box 6.1-STABLE FreeBSD 6.1-STABLE #1: Mon Jul 10 22:43:23 CDT 2006
>Description:
- Update to 0.7.0
- Remove all the fake module stuff since picard is now setup this way by
default.
- This unbreaks with libtunepimp in ports
I would really like to takeover the port, the maintainer seems to be busy
with other things and has had many timeouts on this and other ports. I maintain
two of the five dependencies already anyway.
Removed file(s):
- files/__init__.py
- files/extra-psyco-patch-tagger.py
- files/setup.py
Port maintainer (lioux at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- picard-0.7.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/picard/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 6 May 2006 13:35:08 -0000 1.2
+++ Makefile 1 Aug 2006 04:33:22 -0000
@@ -6,62 +6,25 @@
#
PORTNAME= picard
-DISTVERSION= 0.6.0
+DISTVERSION= 0.7.0
CATEGORIES= audio python
-MASTER_SITES= https://helixcommunity.org/download.php/1791/
+MASTER_SITES= https://helixcommunity.org/download.php/2093/
MAINTAINER= lioux at FreeBSD.org
COMMENT= Next generation MusicBrainzTagger
+LIB_DEPENDS= ofa.0:${PORTSDIR}/audio/libofa
RUN_DEPENDS= \
${PYTHON_SITELIBDIR}/tunepimp/__init__.py:${PORTSDIR}/audio/py-libtunepimp \
- ${PYTHON_SITELIBDIR}/musicbrainz.py:${PORTSDIR}/audio/py-musicbrainz \
- ${PYTHON_SITELIBDIR}/wx-2.6-gtk2-unicode/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26-unicode
+ ${PYTHON_SITELIBDIR}/musicbrainz.py:${PORTSDIR}/audio/py-musicbrainz
+
+USE_WX= 2.6
+WX_COMPS= python_run
+WX_UNICODE= yes
USE_PYTHON= yes
USE_PYDISTUTILS=yes
-
-SOURCEFILE= ${DISTNAME}${EXTRACT_SUFX}
-PICARD_MODULES= browser lib ui
-
-post-extract:
-# build a fake module directory structure
- @${MKDIR} ${WRKSRC}/${PORTNAME}
-.for dir in ${PICARD_MODULES}
- @${MV} ${WRKSRC}/${dir} ${WRKSRC}/${PORTNAME}
-.endfor
-# use a locally made __init__.py to enable the fake
-# directory structure to work
- @${SED} -E \
- -e 's|%%VERSION%%|${DISTVERSION}|' \
- ${FILESDIR}/__init__.py \
- > ${WRKSRC}/${PORTNAME}/__init__.py
-# use a locally made setup
- @${CP} ${FILESDIR}/setup.py ${WRKSRC}
-
-post-patch:
-# avoid using such a generic script name
- @${MV} ${WRKSRC}/tagger.py ${WRKSRC}/mb_tagger.py
-# update the launch script
- @${REINPLACE_CMD} -E \
- -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
- -e 's|tagger.py|${PREFIX}/bin/mb_tagger.py|' \
- ${WRKSRC}/MBTagger
-# update modules to the fake module directory structure
-.for module in ${PICARD_MODULES}
- @${FIND} ${WRKSRC}/ -type f -name "*py" \
- -print0 | ${XARGS} -0 -n 1 \
- ${REINPLACE_CMD} -E \
- -e 's|^from[[:space:]]+(${module})|from ${PORTNAME}.\1|'
-.endfor
-
-post-install:
- @${LN} -sf MBTagger ${PREFIX}/bin/${PORTNAME}
-
-pre-everything::
-.ifndef(WITHOUT_PSYCO)
- @${ECHO_MSG} '===> Define WITHOUT_PSYCO to disable devel/py-psyco optimization'
-.endif
+NO_BUILD= yes
.include <bsd.port.pre.mk>
@@ -69,14 +32,4 @@
IGNORE= systems prior to FreeBSD 5.0 do not support Unicode
.endif
-.if ${ARCH} != "i386"
-WITHOUT_PSYCO= yes
-.endif
-
-.ifndef(WITHOUT_PSYCO)
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
-
-EXTRA_PATCHES+= ${FILESDIR}/extra-psyco-patch-tagger.py
-.endif
-
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/picard/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 7 Apr 2006 18:18:07 -0000 1.1
+++ distinfo 1 Aug 2006 04:33:22 -0000
@@ -1,3 +1,3 @@
-MD5 (picard-0.6.0.tar.gz) = 82c2da853ba4c5a0ab8e1baf3fb494eb
-SHA256 (picard-0.6.0.tar.gz) = c7d036382df15726c83a4f2dafdda002611eee1e26004e5aecceb50937d411db
-SIZE (picard-0.6.0.tar.gz) = 234607
+MD5 (picard-0.7.0.tar.gz) = 57c38983e6768f89052b7eacfe39545d
+SHA256 (picard-0.7.0.tar.gz) = 7cf75d2debfea060ac40ea7c533b8cf27c202bd662ee0bf958c1d72dd77294b3
+SIZE (picard-0.7.0.tar.gz) = 316947
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/picard/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 7 Apr 2006 18:18:07 -0000 1.1
+++ pkg-plist 1 Aug 2006 04:33:22 -0000
@@ -1,9 +1,16 @@
-bin/MBTagger
-bin/mb_tagger.py
bin/picard
%%PYTHON_SITELIBDIR%%/picard/__init__.py
%%PYTHON_SITELIBDIR%%/picard/__init__.pyc
%%PYTHON_SITELIBDIR%%/picard/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/album.py
+%%PYTHON_SITELIBDIR%%/picard/album.pyc
+%%PYTHON_SITELIBDIR%%/picard/album.pyo
+%%PYTHON_SITELIBDIR%%/picard/albummanager.py
+%%PYTHON_SITELIBDIR%%/picard/albummanager.pyc
+%%PYTHON_SITELIBDIR%%/picard/albummanager.pyo
+%%PYTHON_SITELIBDIR%%/picard/artist.py
+%%PYTHON_SITELIBDIR%%/picard/artist.pyc
+%%PYTHON_SITELIBDIR%%/picard/artist.pyo
%%PYTHON_SITELIBDIR%%/picard/browser/__init__.py
%%PYTHON_SITELIBDIR%%/picard/browser/__init__.pyc
%%PYTHON_SITELIBDIR%%/picard/browser/__init__.pyo
@@ -16,57 +23,42 @@
%%PYTHON_SITELIBDIR%%/picard/browser/launch.py
%%PYTHON_SITELIBDIR%%/picard/browser/launch.pyc
%%PYTHON_SITELIBDIR%%/picard/browser/launch.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/album.py
-%%PYTHON_SITELIBDIR%%/picard/lib/album.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/album.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/albummanager.py
-%%PYTHON_SITELIBDIR%%/picard/lib/albummanager.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/albummanager.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/artist.py
-%%PYTHON_SITELIBDIR%%/picard/lib/artist.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/artist.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/cluster.py
-%%PYTHON_SITELIBDIR%%/picard/lib/cluster.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/cluster.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/countries.py
-%%PYTHON_SITELIBDIR%%/picard/lib/countries.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/countries.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/coverartcache.py
-%%PYTHON_SITELIBDIR%%/picard/lib/coverartcache.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/coverartcache.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/cuesheet.py
-%%PYTHON_SITELIBDIR%%/picard/lib/cuesheet.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/cuesheet.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/dataobjs.py
-%%PYTHON_SITELIBDIR%%/picard/lib/dataobjs.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/dataobjs.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/debug.py
-%%PYTHON_SITELIBDIR%%/picard/lib/debug.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/debug.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/dircache.py
-%%PYTHON_SITELIBDIR%%/picard/lib/dircache.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/dircache.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/events.py
-%%PYTHON_SITELIBDIR%%/picard/lib/events.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/events.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/playlist.py
-%%PYTHON_SITELIBDIR%%/picard/lib/playlist.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/playlist.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/tpmanager.py
-%%PYTHON_SITELIBDIR%%/picard/lib/tpmanager.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/tpmanager.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/track.py
-%%PYTHON_SITELIBDIR%%/picard/lib/track.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/track.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/util.py
-%%PYTHON_SITELIBDIR%%/picard/lib/util.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/util.pyo
-%%PYTHON_SITELIBDIR%%/picard/lib/wpath.py
-%%PYTHON_SITELIBDIR%%/picard/lib/wpath.pyc
-%%PYTHON_SITELIBDIR%%/picard/lib/wpath.pyo
+%%PYTHON_SITELIBDIR%%/picard/cluster.py
+%%PYTHON_SITELIBDIR%%/picard/cluster.pyc
+%%PYTHON_SITELIBDIR%%/picard/cluster.pyo
+%%PYTHON_SITELIBDIR%%/picard/coverartcache.py
+%%PYTHON_SITELIBDIR%%/picard/coverartcache.pyc
+%%PYTHON_SITELIBDIR%%/picard/coverartcache.pyo
+%%PYTHON_SITELIBDIR%%/picard/cuesheet.py
+%%PYTHON_SITELIBDIR%%/picard/cuesheet.pyc
+%%PYTHON_SITELIBDIR%%/picard/cuesheet.pyo
+%%PYTHON_SITELIBDIR%%/picard/dataobjs.py
+%%PYTHON_SITELIBDIR%%/picard/dataobjs.pyc
+%%PYTHON_SITELIBDIR%%/picard/dataobjs.pyo
+%%PYTHON_SITELIBDIR%%/picard/debug.py
+%%PYTHON_SITELIBDIR%%/picard/debug.pyc
+%%PYTHON_SITELIBDIR%%/picard/debug.pyo
+%%PYTHON_SITELIBDIR%%/picard/dircache.py
+%%PYTHON_SITELIBDIR%%/picard/dircache.pyc
+%%PYTHON_SITELIBDIR%%/picard/dircache.pyo
+%%PYTHON_SITELIBDIR%%/picard/events.py
+%%PYTHON_SITELIBDIR%%/picard/events.pyc
+%%PYTHON_SITELIBDIR%%/picard/events.pyo
+%%PYTHON_SITELIBDIR%%/picard/playlist.py
+%%PYTHON_SITELIBDIR%%/picard/playlist.pyc
+%%PYTHON_SITELIBDIR%%/picard/playlist.pyo
+%%PYTHON_SITELIBDIR%%/picard/puidmanager.py
+%%PYTHON_SITELIBDIR%%/picard/puidmanager.pyc
+%%PYTHON_SITELIBDIR%%/picard/puidmanager.pyo
+%%PYTHON_SITELIBDIR%%/picard/tagger.py
+%%PYTHON_SITELIBDIR%%/picard/tagger.pyc
+%%PYTHON_SITELIBDIR%%/picard/tagger.pyo
+%%PYTHON_SITELIBDIR%%/picard/tpmanager.py
+%%PYTHON_SITELIBDIR%%/picard/tpmanager.pyc
+%%PYTHON_SITELIBDIR%%/picard/tpmanager.pyo
+%%PYTHON_SITELIBDIR%%/picard/track.py
+%%PYTHON_SITELIBDIR%%/picard/track.pyc
+%%PYTHON_SITELIBDIR%%/picard/track.pyo
%%PYTHON_SITELIBDIR%%/picard/ui/__init__.py
%%PYTHON_SITELIBDIR%%/picard/ui/__init__.pyc
%%PYTHON_SITELIBDIR%%/picard/ui/__init__.pyo
@@ -91,6 +83,9 @@
%%PYTHON_SITELIBDIR%%/picard/ui/mdatapanel.py
%%PYTHON_SITELIBDIR%%/picard/ui/mdatapanel.pyc
%%PYTHON_SITELIBDIR%%/picard/ui/mdatapanel.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/nagdialog.py
+%%PYTHON_SITELIBDIR%%/picard/ui/nagdialog.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/nagdialog.pyo
%%PYTHON_SITELIBDIR%%/picard/ui/options/__init__.py
%%PYTHON_SITELIBDIR%%/picard/ui/options/__init__.pyc
%%PYTHON_SITELIBDIR%%/picard/ui/options/__init__.pyo
@@ -139,6 +134,9 @@
%%PYTHON_SITELIBDIR%%/picard/ui/options/proxy.py
%%PYTHON_SITELIBDIR%%/picard/ui/options/proxy.pyc
%%PYTHON_SITELIBDIR%%/picard/ui/options/proxy.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/puid.py
+%%PYTHON_SITELIBDIR%%/picard/ui/options/puid.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/puid.pyo
%%PYTHON_SITELIBDIR%%/picard/ui/options/tags.py
%%PYTHON_SITELIBDIR%%/picard/ui/options/tags.pyc
%%PYTHON_SITELIBDIR%%/picard/ui/options/tags.pyo
@@ -148,10 +146,21 @@
%%PYTHON_SITELIBDIR%%/picard/ui/toolbar.py
%%PYTHON_SITELIBDIR%%/picard/ui/toolbar.pyc
%%PYTHON_SITELIBDIR%%/picard/ui/toolbar.pyo
+%%PYTHON_SITELIBDIR%%/picard/usercheck.py
+%%PYTHON_SITELIBDIR%%/picard/usercheck.pyc
+%%PYTHON_SITELIBDIR%%/picard/usercheck.pyo
+%%PYTHON_SITELIBDIR%%/picard/util.py
+%%PYTHON_SITELIBDIR%%/picard/util.pyc
+%%PYTHON_SITELIBDIR%%/picard/util.pyo
+%%PYTHON_SITELIBDIR%%/picard/wpath.py
+%%PYTHON_SITELIBDIR%%/picard/wpath.pyc
+%%PYTHON_SITELIBDIR%%/picard/wpath.pyo
+share/applications/picard.desktop
+share/icons/picard16.png
+share/icons/picard32.png
+ at dirrm %%PYTHON_SITELIBDIR%%/picard/browser
@dirrm %%PYTHON_SITELIBDIR%%/picard/ui/options
@dirrm %%PYTHON_SITELIBDIR%%/picard/ui
- at dirrm %%PYTHON_SITELIBDIR%%/picard/lib
- at dirrm %%PYTHON_SITELIBDIR%%/picard/browser
@dirrm %%PYTHON_SITELIBDIR%%/picard
- at dirrmtry %%PYTHON_SITELIBDIR%%
- at dirrmtry %%PYTHON_LIBDIR%%
+ at dirrmtry share/applications
+ at dirrmtry share/icons
Index: files/__init__.py
===================================================================
RCS file: files/__init__.py
diff -N files/__init__.py
--- files/__init__.py 7 Apr 2006 18:18:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-""" picard modules for Python
-
-Copyright (c) 2005 Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
- $Id$
-
-"""
-# (note that subpackages have their own version number)
-__version__ = '%%VERSION%%'
-
-# Copyright notice string
-__copyright__ = """\
- See the documentation for information on copyrights,
- or contact the author. All Rights Reserved.
-"""
Index: files/extra-psyco-patch-tagger.py
===================================================================
RCS file: files/extra-psyco-patch-tagger.py
diff -N files/extra-psyco-patch-tagger.py
--- files/extra-psyco-patch-tagger.py 7 Apr 2006 18:18:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
---- tagger.py.orig Thu Apr 6 16:48:21 2006
-+++ tagger.py Thu Apr 6 16:48:47 2006
-@@ -54,6 +54,13 @@
- # ***** END LICENSE BLOCK *****
-
- try:
-+ import psyco
-+ assert psyco.__version__ >= 0x010300f0
-+ psyco.full()
-+except:
-+ pass
-+
-+try:
- import wxversion
- wxversion.select(["2.6-unicode"])
- except:
Index: files/setup.py
===================================================================
RCS file: files/setup.py
diff -N files/setup.py
--- files/setup.py 7 Apr 2006 18:18:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2005 Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $Id$
-
-from distutils.core import setup
-
-import glob
-
-scripts = ["MBTagger", "mb_tagger.py"]
-
-setup(
- name = "Picard",
- url = "http://wiki.musicbrainz.org/PicardTagger",
- scripts = scripts,
- packages = ["picard", "picard/browser", "picard/lib", "picard/ui", "picard/ui/options"],
- )
--- picard-0.7.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list