svn commit: r353703 - in head/multimedia/quodlibet: . files

Thomas Zander riggs at FreeBSD.org
Sun May 11 14:37:23 UTC 2014


Author: riggs
Date: Sun May 11 14:37:21 2014
New Revision: 353703
URL: http://svnweb.freebsd.org/changeset/ports/353703
QAT: https://qat.redports.org/buildarchive/r353703/

Log:
  Un-break install, but while on it
  - Update port to upstream release 2.6.3
  - Use correct download URL (move from Google code to bitbucket)
  - Add LICENSE
  - USE_* -> USES
  - Generate plist via pydistutils
  - Use SPC option on i386 only, it's not supported elsewhere
  - Stagify
  - Change URLs in pkg-message (pointing to bitbucket), simplify
  
  Special thanks to Carlos (submitter) for reviewing, and to
  Christoph Reiter (Quodlibet project) for fixing the '--record'
  option for Quodlibet with pydistutils.
  
  PR:		ports/187263
  Submitted by:	Carlos Jacobo Puga Medina <cjpugmed at gmail.com>
  Reviewed by:	submitter
  Approved by:	thierry (mentor), maintainer timeout
  MFH:		2014Q2

Added:
  head/multimedia/quodlibet/files/extra-patch-pydistutils   (contents, props changed)
  head/multimedia/quodlibet/files/patch-operon.py   (contents, props changed)
Deleted:
  head/multimedia/quodlibet/files/patch-quodlibet__qltk__config.py
  head/multimedia/quodlibet/pkg-plist
Modified:
  head/multimedia/quodlibet/Makefile
  head/multimedia/quodlibet/distinfo
  head/multimedia/quodlibet/pkg-message

Modified: head/multimedia/quodlibet/Makefile
==============================================================================
--- head/multimedia/quodlibet/Makefile	Sun May 11 14:34:22 2014	(r353702)
+++ head/multimedia/quodlibet/Makefile	Sun May 11 14:37:21 2014	(r353703)
@@ -2,39 +2,39 @@
 # $FreeBSD$
 
 PORTNAME=	quodlibet
-PORTVERSION=	2.2
-PORTREVISION=	7
+PORTVERSION=	2.6.3
 CATEGORIES=	multimedia audio python gnome
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	http://bitbucket.org/lazka/${PORTNAME}-files/raw/default/releases/
 
 MAINTAINER=	johnson.peter at gmail.com
 COMMENT=	A GTK+-based audio player written in Python
 
-BROKEN=		Fails to install
+LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2
-USES=		gettext
+USES=		display gettext
 USE_PYDISTUTILS=	yes
-USE_DISPLAY=	yes
-USE_GSTREAMER=	gconf good python
+PYDISTUTILS_INSTALLNOSINGLE=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-pydistutils
 
-MAN1=		exfalso.1 quodlibet.1
+USE_GSTREAMER=	gconf good python
 
 OPTIONS_DEFINE=	FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE EXTENSIONS
-SPC_DESC=	SPC (SNES ROM audio) support
+
+OPTIONS_DEFAULT=	FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE
+
+SPC_DESC=	SPC (SNES ROM audio) support on i386
 SPEEX_DESC=	OGG/Speex audio support
 REMOTE_DESC=	Enable remote playback
 EXTENSIONS_DESC=	Enable extensions
 
-OPTIONS_DEFAULT=	FLAC MP3 AAC MUSEPACK OGG SPC SPEEX VORBIS WAVPACK DBUS REMOTE
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOGG}
 USE_GSTREAMER+=	ogg
@@ -44,7 +44,7 @@ USE_GSTREAMER+=	ogg
 USE_GSTREAMER+=	vorbis
 .endif
 
-.if ${PORT_OPTIONS:MSPC}
+.if ${PORT_OPTIONS:MSPC} && ${ARCH} == i386
 USE_GSTREAMER+=	spc
 .endif
 
@@ -61,17 +61,17 @@ USE_GSTREAMER+=	flac
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
+LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
 USE_GSTREAMER+=	musepack
 .endif
 
 .if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
 USE_GSTREAMER+=	wavpack
 .endif
 
 .if ${PORT_OPTIONS:MAAC}
-LIB_DEPENDS+=	mp4v2.10:${PORTSDIR}/multimedia/mp4v2
+LIB_DEPENDS+=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
 USE_GSTREAMER+=	faad
 .endif
 
@@ -88,14 +88,6 @@ USE_GSTREAMER+=	gnomevfs
 
 .if ${PORT_OPTIONS:MEXTENSIONS}
 USE_GNOME+=	pygnomeextras
-PLIST_SUB+=	EXTENSIONS=""
-.else
-PLIST_SUB+=	EXTENSIONS="@comment "
 .endif
 
-post-install:
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/multimedia/quodlibet/distinfo
==============================================================================
--- head/multimedia/quodlibet/distinfo	Sun May 11 14:34:22 2014	(r353702)
+++ head/multimedia/quodlibet/distinfo	Sun May 11 14:37:21 2014	(r353703)
@@ -1,2 +1,2 @@
-SHA256 (quodlibet-2.2.tar.gz) = 1aac91369b26fa897c0d9eaa6a43aadcd5ffe8751a298a6c7beabe7591c0e713
-SIZE (quodlibet-2.2.tar.gz) = 910381
+SHA256 (quodlibet-2.6.3.tar.gz) = dff4ebb90c676678f72cecbff8ab15d80154354f40a865b6c9c82bb048d48a46
+SIZE (quodlibet-2.6.3.tar.gz) = 2507416

Added: head/multimedia/quodlibet/files/extra-patch-pydistutils
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/quodlibet/files/extra-patch-pydistutils	Sun May 11 14:37:21 2014	(r353703)
@@ -0,0 +1,145 @@
+--- gdist/icons.py.orig	2013-09-25 12:31:19.000000000 +0200
++++ gdist/icons.py	2014-04-23 11:06:22.328926759 +0200
+@@ -35,13 +35,16 @@
+     prefix = None
+ 
+     def initialize_options(self):
+-        pass
++        self.outfiles = []
+ 
+     def finalize_options(self):
+         self.set_undefined_options('install',
+                                    ('root', 'root'),
+                                    ('install_base', 'prefix'))
+ 
++    def get_outputs(self):
++        return self.outfiles
++
+     def run(self):
+         # install into hicolor icon theme
+         basepath = os.path.join(self.prefix, 'share', 'icons', 'hicolor')
+@@ -52,11 +55,13 @@
+ 
+         scalable = os.path.join(local, "scalable", "apps")
+         scalable_dst = os.path.join(basepath, "scalable", "apps")
+-        self.copy_tree(scalable, scalable_dst)
++        out = self.copy_tree(scalable, scalable_dst)
++        self.outfiles.extend(out)
+ 
+         png = os.path.join(local, "64x64", "apps")
+         png_dst = os.path.join(basepath, "64x64", "apps")
+-        self.copy_tree(png, png_dst)
++        out = self.copy_tree(png, png_dst)
++        self.outfiles.extend(out)
+ 
+         # this fails during packaging.. so ignore the outcome
+         subprocess.call(['gtk-update-icon-cache', basepath])
+@@ -66,4 +71,5 @@
+         if self.root is not None:
+             basepath = change_root(self.root, basepath)
+ 
+-        self.copy_tree(png, basepath)
++        out = self.copy_tree(png, basepath)
++        self.outfiles.extend(out)
+--- gdist/man.py.orig	2013-09-25 12:31:19.000000000 +0200
++++ gdist/man.py	2014-04-23 11:10:03.793912457 +0200
+@@ -29,7 +29,7 @@
+     root = None
+ 
+     def initialize_options(self):
+-        pass
++        self.outfiles = []
+ 
+     def finalize_options(self):
+         self.set_undefined_options('install', ('root', 'root'), ('install_base', 'prefix'))
+@@ -38,15 +38,22 @@
+             if not man_page[-1].isdigit():
+                 raise SystemExit("%r has no section" % man_page)
+ 
++    def get_outputs(self):
++        return self.outfiles
++
+     def run(self):
+         basepath = os.path.join(self.prefix, 'share', 'man')
+         if self.root != None:
+           basepath = change_root(self.root, basepath)
+-        self.mkpath(basepath)
++        out = self.mkpath(basepath)
++        self.outfiles.extend(out or [])
+         for man_page in self.man_pages:
+             manpath = os.path.join(basepath, "man" + man_page[-1])
+             self.mkpath(manpath)
++            out = self.mkpath(manpath)
++            self.outfiles.extend(out or [])
+             fullpath = os.path.join(manpath, os.path.basename(man_page))
+-            self.copy_file(man_page, fullpath)
++            (out, _) = self.copy_file(man_page, fullpath)
++            self.outfiles.append(out)
+ 
+ __all__ = ["install_man"]
+--- gdist/po.py.orig	2013-09-25 12:31:19.000000000 +0200
++++ gdist/po.py	2014-04-23 11:06:22.329926420 +0200
+@@ -149,7 +149,7 @@
+     root = None
+ 
+     def initialize_options(self):
+-        pass
++        self.outfiles = []
+ 
+     def finalize_options(self):
+         self.set_undefined_options('build', ('build_base', 'build_base'))
+@@ -159,6 +159,9 @@
+             ('install_base', 'install_base'),
+             ('skip_build', 'skip_build'))
+ 
++    def get_outputs(self):
++        return self.outfiles
++
+     def run(self):
+         if not self.skip_build:
+             self.run_command('build_mo')
+@@ -166,6 +169,7 @@
+         dest = os.path.join(self.install_base, "share", "locale")
+         if self.root != None:
+             dest = change_root(self.root, dest)
+-        self.copy_tree(src, dest)
++        out = self.copy_tree(src, dest)
++        self.outfiles.extend(out)
+ 
+ __all__ = ["build_mo", "install_mo", "po_stats", "check_pot"]
+--- gdist/shortcuts.py.orig	2013-09-25 12:31:19.000000000 +0200
++++ gdist/shortcuts.py	2014-04-23 11:11:31.218905210 +0200
+@@ -66,7 +66,7 @@
+     root = None
+ 
+     def initialize_options(self):
+-        pass
++        self.outfiles = []
+ 
+     def finalize_options(self):
+         self.set_undefined_options('build', ('build_base', 'build_base'))
+@@ -79,6 +79,9 @@
+         self.set_undefined_options(
+             'build_shortcuts', ('shortcuts', 'shortcuts'))
+ 
++    def get_outputs(self):
++        return self.outfiles
++
+     def run(self):
+         if not self.skip_build:
+             self.run_command('build_shortcuts')
+@@ -86,10 +89,13 @@
+         if self.root != None:
+             basepath = change_root(self.root, basepath)
+         srcpath = os.path.join(self.build_base, 'share', 'applications')
+-        self.mkpath(basepath)
++        out = self.mkpath(basepath)
++        self.outfiles.extend(out or [])
+         for shortcut in self.shortcuts:
+             fullsrc = os.path.join(srcpath, shortcut)
+             fullpath = os.path.join(basepath, shortcut)
+             self.copy_file(fullsrc, fullpath)
++            (out, _) = self.copy_file(fullsrc, fullpath)
++            self.outfiles.append(out)
+ 
+ __all__ = ["build_shortcuts", "install_shortcuts"]

Added: head/multimedia/quodlibet/files/patch-operon.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/quodlibet/files/patch-operon.py	Sun May 11 14:37:21 2014	(r353703)
@@ -0,0 +1,8 @@
+--- operon.py.orig	2013-09-13 00:49:22.000000000 +0200
++++ operon.py	2014-04-23 12:21:26.430626881 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ # Copyright 2012,2013 Christoph Reiter
+ #
+ # This program is free software; you can redistribute it and/or modify

Modified: head/multimedia/quodlibet/pkg-message
==============================================================================
--- head/multimedia/quodlibet/pkg-message	Sun May 11 14:34:22 2014	(r353702)
+++ head/multimedia/quodlibet/pkg-message	Sun May 11 14:37:21 2014	(r353703)
@@ -1,13 +1,11 @@
+=====================================================================
 For additional Quod Libet plugins:
 
-1. Fetch plugins archive.
+1. Fetch plugins archive from project download page:
+   https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-2.6.3.tar.gz
 
-	fetch http://quodlibet.googlecode.com/files/quodlibet-plugins-2.2.tar.gz
-
-2. Extract archive.
-
-	tar xvfz quodlibet-plugins-2.2.tar.gz
-
-3. Copy extracted files to Quod Libet plugins directory.
-
-	cp -R quodlibet-plugins-2.2/* ~/.quodlibet/plugins/
+2. Extract archive into plugin dir in a user's home directory
+   mkdir -p ~/.quodlibet/plugins/
+   cd ~/.quodlibet/plugins/
+   tar xf path/to/downloaded/quodlibet-plugins-2.6.3.tar.gz
+=====================================================================


More information about the svn-ports-all mailing list