Date: Fri, 13 Dec 2013 04:54:24 GMT From: John Hixson <john@pcbsd.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/184740: update pithos from 0.3.17 to 0.3.18 Message-ID: <201312130454.rBD4sO0l064378@oldred.freebsd.org> Resent-Message-ID: <201312130500.rBD500cn063211@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184740
>Category: ports
>Synopsis: update pithos from 0.3.17 to 0.3.18
>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: Fri Dec 13 05:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: John Hixson
>Release: 11.0-CURRENT
>Organization:
iXsystems, Inc.
>Environment:
FreeBSD thinkbsd 11.0-CURRENT FreeBSD 11.0-CURRENT #17 r259022M: Fri Dec 6 12:03:57 PST 2013 john@thinkbsd:/usr/obj/usr/src/sys/THINKBSD amd64
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/audio/pithos/Makefile pithos/Makefile
--- /usr/ports/audio/pithos/Makefile 2013-09-20 07:36:35.000000000 -0700
+++ pithos/Makefile 2013-12-12 20:49:09.759193447 -0800
@@ -2,10 +2,10 @@
# $FreeBSD: audio/pithos/Makefile 327706 2013-09-20 14:36:35Z bapt $
PORTNAME= pithos
-PORTVERSION= 0.3.17
+PORTVERSION= 0.3.18
CATEGORIES= audio
-MASTER_SITES= DEBIAN
-DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
+MASTER_SITES= https://github.com/pithos/pithos/archive/
+DISTNAME= ${PORTVERSION}
MAINTAINER= john@pcbsd.org
COMMENT= Pandora client for the GNOME desktop
@@ -17,23 +17,25 @@
${LOCALBASE}/libdata/pkgconfig/notify-python.pc:${PORTSDIR}/devel/py-notify \
${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
-WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+FETCH_ARGS= -Fpr
USE_PYTHON= 2.6+
NO_STAGE= yes
USE_GNOME= pygtk2
USE_PYDISTUTILS= yes
+PYDISTUTILS_AUTOPLIST= yes
USE_GSTREAMER= good bad python
PYDISTUTILS_PKGNAME= ${PORTNAME}
+PYEASYINSTALL_EGG= pithos-0.3-py2.7.egg
post-patch:
${REINPLACE_CMD} -e "s,../data/,${DATADIR}/," ${WRKSRC}/pithos/pithosconfig.py
- ${REINPLACE_CMD} -e "s,Icon=pithos,${DATADIR}/media/icon.png," ${WRKSRC}/pithos.desktop
+ ${REINPLACE_CMD} -e "s,Icon=pithos,${DATADIR}/media/icon.png," ${WRKSRC}/data/pithos.desktop
post-install:
- @${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \
- ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
@${MKDIR} ${DATADIR}
@(cd ${WRKSRC}/data/ && ${COPYTREE_SHARE} \* ${DATADIR})
+ @(cd ${WRKSRC}/pithos/data/ && ${COPYTREE_SHARE} \* ${DATADIR})
.include <bsd.port.mk>
diff -urN /usr/ports/audio/pithos/distinfo pithos/distinfo
--- /usr/ports/audio/pithos/distinfo 2012-07-14 05:56:14.000000000 -0700
+++ pithos/distinfo 2013-12-12 09:07:09.540064363 -0800
@@ -1,2 +1,2 @@
-SHA256 (pithos_0.3.17.orig.tar.gz) = ef6ee1545fa60b065b0043d79fe89fd1c1b70fe4ae944055d2c7b9d890cf1bde
-SIZE (pithos_0.3.17.orig.tar.gz) = 141332
+SHA256 (0.3.18.tar.gz) = dc184785258fba2bd33890ebb164666b402ff1001b827021a181f6af0ddb8511
+SIZE (0.3.18.tar.gz) = 115195
diff -urN /usr/ports/audio/pithos/files/patch-setup.py pithos/files/patch-setup.py
--- /usr/ports/audio/pithos/files/patch-setup.py 2012-07-14 05:56:14.000000000 -0700
+++ pithos/files/patch-setup.py 1969-12-31 16:00:00.000000000 -0800
@@ -1,85 +0,0 @@
---- setup.py 2012-05-03 13:47:11.000000000 -0700
-+++ setup.py 2012-06-01 11:40:31.000000000 -0700
-@@ -17,74 +17,19 @@
-
- ###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################
-
--try:
-- import DistUtilsExtra.auto
--except ImportError:
-- import sys
-- print >> sys.stderr, 'To build pithos you need https://launchpad.net/python-distutils-extra'
-- sys.exit(1)
--
--assert DistUtilsExtra.auto.__version__ >= '2.10', 'needs DistUtilsExtra.auto >= 2.10'
-+import sys
- import os
-+from distutils.core import setup
-
--
--def update_data_path(prefix, oldvalue=None):
--
-- try:
-- fin = file('pithos/pithosconfig.py', 'r')
-- fout = file(fin.name + '.new', 'w')
--
-- for line in fin:
-- fields = line.split(' = ') # Separate variable from value
-- if fields[0] == '__pithos_data_directory__':
-- # update to prefix, store oldvalue
-- if not oldvalue:
-- oldvalue = fields[1]
-- line = "%s = '%s'\n" % (fields[0], prefix)
-- else: # restore oldvalue
-- line = "%s = %s" % (fields[0], oldvalue)
-- fout.write(line)
--
-- fout.flush()
-- fout.close()
-- fin.close()
-- os.rename(fout.name, fin.name)
-- except (OSError, IOError), e:
-- print ("ERROR: Can't find pithos/pithosconfig.py")
-- sys.exit(1)
-- return oldvalue
--
--
--class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
-- def run(self):
-- if self.root or self.home:
-- print "WARNING: You don't use a standard --prefix installation, take care that you eventually " \
-- "need to update quickly/quicklyconfig.py file to adjust __quickly_data_directory__. You can " \
-- "ignore this warning if you are packaging and uses --prefix."
-- previous_value = update_data_path(self.prefix + '/share/pithos/')
-- DistUtilsExtra.auto.install_auto.run(self)
-- update_data_path(self.prefix, previous_value)
--
--from distutils.cmd import Command
--class OverrideI18NCommand(Command):
-- def initialize_options(self): pass
-- def finalize_options(self): pass
-- def run(self):
-- self.distribution.data_files.append(('share/applications', ['pithos.desktop']))
--
--from DistUtilsExtra.command.build_extra import build_extra
--from DistUtilsExtra.command.build_icons import build_icons
--
--DistUtilsExtra.auto.setup(
-+required = []
-+setup(
- name='pithos',
-- version='0.3',
-- ext_modules=[],
-+ version='0.3.17',
- license='GPL-3',
- author='Kevin Mehall',
- author_email='km@kevinmehall.net',
- description='Pandora.com client for the GNOME desktop',
-- #long_description='Here a longer description',
- url='https://launchpad.net/pithos',
-- cmdclass={'install': InstallAndUpdateDataDirectory, 'build_icons':build_icons, 'build':build_extra, 'build_i18n':OverrideI18NCommand}
-- )
--
-+ packages=['pithos', 'pithos.pandora', 'pithos.plugins'],
-+ package_dir = {'pithos':'pithos'}
-+)
diff -urN /usr/ports/audio/pithos/pkg-plist pithos/pkg-plist
--- /usr/ports/audio/pithos/pkg-plist 2012-07-14 05:56:14.000000000 -0700
+++ pithos/pkg-plist 1969-12-31 16:00:00.000000000 -0800
@@ -1,94 +0,0 @@
-bin/pithos
-%%PYTHON_SITELIBDIR%%/pithos/AboutPithosDialog.py
-%%PYTHON_SITELIBDIR%%/pithos/PreferencesPithosDialog.py
-%%PYTHON_SITELIBDIR%%/pithos/SearchDialog.py
-%%PYTHON_SITELIBDIR%%/pithos/StationsDialog.py
-%%PYTHON_SITELIBDIR%%/pithos/__init__.py
-%%PYTHON_SITELIBDIR%%/pithos/dbus_service.py
-%%PYTHON_SITELIBDIR%%/pithos/gobject_worker.py
-%%PYTHON_SITELIBDIR%%/pithos/plugin.py
-%%PYTHON_SITELIBDIR%%/pithos/pylast.py
-%%PYTHON_SITELIBDIR%%/pithos/sound_menu.py
-%%PYTHON_SITELIBDIR%%/pithos/pandora/__init__.py
-%%PYTHON_SITELIBDIR%%/pithos/pandora/blowfish.py
-%%PYTHON_SITELIBDIR%%/pithos/pandora/fake.py
-%%PYTHON_SITELIBDIR%%/pithos/pandora/pandora.py
-%%PYTHON_SITELIBDIR%%/pithos/pandora/pandora_keys.py
-%%PYTHON_SITELIBDIR%%/pithos/pandora/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pithos/pandora/blowfish.pyc
-%%PYTHON_SITELIBDIR%%/pithos/pandora/fake.pyc
-%%PYTHON_SITELIBDIR%%/pithos/pandora/pandora.pyc
-%%PYTHON_SITELIBDIR%%/pithos/pandora/pandora_keys.pyc
-%%PYTHON_SITELIBDIR%%/pithos/pandora/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pithos/pandora/blowfish.pyo
-%%PYTHON_SITELIBDIR%%/pithos/pandora/fake.pyo
-%%PYTHON_SITELIBDIR%%/pithos/pandora/pandora.pyo
-%%PYTHON_SITELIBDIR%%/pithos/pandora/pandora_keys.pyo
-%%PYTHON_SITELIBDIR%%/pithos/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/pithos/plugins/mediakeys.py
-%%PYTHON_SITELIBDIR%%/pithos/plugins/notification_icon.py
-%%PYTHON_SITELIBDIR%%/pithos/plugins/notify.py
-%%PYTHON_SITELIBDIR%%/pithos/plugins/screensaver_pause.py
-%%PYTHON_SITELIBDIR%%/pithos/plugins/scrobble.py
-%%PYTHON_SITELIBDIR%%/pithos/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pithos/plugins/mediakeys.pyc
-%%PYTHON_SITELIBDIR%%/pithos/plugins/notification_icon.pyc
-%%PYTHON_SITELIBDIR%%/pithos/plugins/notify.pyc
-%%PYTHON_SITELIBDIR%%/pithos/plugins/screensaver_pause.pyc
-%%PYTHON_SITELIBDIR%%/pithos/plugins/scrobble.pyc
-%%PYTHON_SITELIBDIR%%/pithos/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pithos/plugins/mediakeys.pyo
-%%PYTHON_SITELIBDIR%%/pithos/plugins/notification_icon.pyo
-%%PYTHON_SITELIBDIR%%/pithos/plugins/notify.pyo
-%%PYTHON_SITELIBDIR%%/pithos/plugins/screensaver_pause.pyo
-%%PYTHON_SITELIBDIR%%/pithos/plugins/scrobble.pyo
-%%PYTHON_SITELIBDIR%%/pithos/pithosconfig.py
-%%PYTHON_SITELIBDIR%%/pithos/AboutPithosDialog.pyc
-%%PYTHON_SITELIBDIR%%/pithos/PreferencesPithosDialog.pyc
-%%PYTHON_SITELIBDIR%%/pithos/SearchDialog.pyc
-%%PYTHON_SITELIBDIR%%/pithos/StationsDialog.pyc
-%%PYTHON_SITELIBDIR%%/pithos/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pithos/dbus_service.pyc
-%%PYTHON_SITELIBDIR%%/pithos/gobject_worker.pyc
-%%PYTHON_SITELIBDIR%%/pithos/plugin.pyc
-%%PYTHON_SITELIBDIR%%/pithos/pylast.pyc
-%%PYTHON_SITELIBDIR%%/pithos/sound_menu.pyc
-%%PYTHON_SITELIBDIR%%/pithos/pithosconfig.pyc
-%%PYTHON_SITELIBDIR%%/pithos/AboutPithosDialog.pyo
-%%PYTHON_SITELIBDIR%%/pithos/PreferencesPithosDialog.pyo
-%%PYTHON_SITELIBDIR%%/pithos/SearchDialog.pyo
-%%PYTHON_SITELIBDIR%%/pithos/StationsDialog.pyo
-%%PYTHON_SITELIBDIR%%/pithos/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pithos/dbus_service.pyo
-%%PYTHON_SITELIBDIR%%/pithos/gobject_worker.pyo
-%%PYTHON_SITELIBDIR%%/pithos/plugin.pyo
-%%PYTHON_SITELIBDIR%%/pithos/pylast.pyo
-%%PYTHON_SITELIBDIR%%/pithos/sound_menu.pyo
-%%PYTHON_SITELIBDIR%%/pithos/pithosconfig.pyo
-%%DATADIR%%/icons/scalable/apps/pithos-mono.svg
-%%DATADIR%%/icons/scalable/apps/pithos.svg
-%%DATADIR%%/media/album_default.png
-%%DATADIR%%/media/album_default.svg
-%%DATADIR%%/media/icon.png
-%%DATADIR%%/media/pithos-mono.png
-%%DATADIR%%/media/rate_bg.png
-%%DATADIR%%/media/rate_bg.svg
-%%DATADIR%%/ui/AboutPithosDialog.ui
-%%DATADIR%%/ui/PithosWindow.ui
-%%DATADIR%%/ui/PreferencesPithosDialog.ui
-%%DATADIR%%/ui/SearchDialog.ui
-%%DATADIR%%/ui/StationsDialog.ui
-%%DATADIR%%/ui/about_pithos_dialog.xml
-%%DATADIR%%/ui/pithos_window.xml
-%%DATADIR%%/ui/preferences_pithos_dialog.xml
-%%DATADIR%%/ui/search_dialog.xml
-%%DATADIR%%/ui/stations_dialog.xml
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/media
-@dirrm %%DATADIR%%/icons/scalable/apps
-@dirrm %%DATADIR%%/icons/scalable
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/pithos/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/pithos/pandora
-@dirrm %%PYTHON_SITELIBDIR%%/pithos
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312130454.rBD4sO0l064378>