From owner-svn-ports-all@FreeBSD.ORG Tue Feb 4 13:11:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF1D1165; Tue, 4 Feb 2014 13:11:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8CD091AC6; Tue, 4 Feb 2014 13:11:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14DBTBM065002; Tue, 4 Feb 2014 13:11:29 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14DBTXh064999; Tue, 4 Feb 2014 13:11:29 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402041311.s14DBTXh064999@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 4 Feb 2014 13:11:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342517 - in head/audio/sonata: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Feb 2014 13:11:29 -0000 Author: mat Date: Tue Feb 4 13:11:28 2014 New Revision: 342517 URL: http://svnweb.freebsd.org/changeset/ports/342517 QAT: https://qat.redports.org/buildarchive/r342517/ Log: - Fix build with mpd 0.18+ [1] - Support staging - Use new options knobs PR: 185060 [1] Submitted by: Matthieu Volat [1] Sponsored by: Absolight Deleted: head/audio/sonata/pkg-plist Modified: head/audio/sonata/Makefile head/audio/sonata/files/patch-sonata_main.py head/audio/sonata/pkg-descr Modified: head/audio/sonata/Makefile ============================================================================== --- head/audio/sonata/Makefile Tue Feb 4 12:55:10 2014 (r342516) +++ head/audio/sonata/Makefile Tue Feb 4 13:11:28 2014 (r342517) @@ -3,7 +3,7 @@ PORTNAME= sonata PORTVERSION= 1.6.2.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio python MASTER_SITES= http://codingteam.net/project/sonata/upload/releases/ @@ -15,12 +15,10 @@ LICENSE= GPLv3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd USES= gettext pkgconfig -NO_STAGE= yes USE_GNOME= pygtk2 USE_PYTHON= yes USE_PYDISTUTILS= yes - -PYDISTUTILS_PKGNAME= Sonata +PYDISTUTILS_AUTOPLIST= yes OPTIONS_DEFINE= DOCS MANPAGES MMKEYS MPD PYGNOMEEXTRAS TAGLIB ZSI OPTIONS_DEFAULT= MPD @@ -29,43 +27,19 @@ MPD_DESC= Install Music Player Daemon PYGNOMEEXTRAS_DESC= Use py-gnome-extras for enhanced system tray TAGLIB_DESC= Install support for editing metadata ZSI_DESC= Install support for automatic lyrics fetching +OPTIONS_SUB= yes -.include - -REINPLACE_ARGS= -i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},' \ - -e 's,%%PREFIX%%,${PREFIX},' +MANPAGES_MAKE_ENV_OFF= NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES} +DOCS_MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} +MPD_RUN_DEPENDS+= musicpd:${PORTSDIR}/audio/musicpd +MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:${PORTSDIR}/devel/py-dbus +PYGNOMEEXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:${PORTSDIR}/x11-toolkits/py-gnome-extras +TAGLIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:${PORTSDIR}/audio/py-tagpy +ZSI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:${PORTSDIR}/net/py-zsi post-patch: - @${REINPLACE_CMD} ${WRKSRC}/${PYSETUP} ${WRKSRC}/sonata.py - -.if ${PORT_OPTIONS:MMANPAGES} -MAN1= ${PORTNAME}.1 -.else -MAKE_ENV= NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES} -.endif - -.if !${PORT_OPTIONS:MDOCS} -MAKE_ENV+= NOPORTDOCS=${NOPORTDOCS} -.endif - -.if ${PORT_OPTIONS:MMPD} -RUN_DEPENDS+= musicpd:${PORTSDIR}/audio/musicpd -.endif - -.if ${PORT_OPTIONS:MMMKEYS} -RUN_DEPENDS+=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:${PORTSDIR}/devel/py-dbus -.endif - -.if ${PORT_OPTIONS:MPYGNOMEEXTRAS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:${PORTSDIR}/x11-toolkits/py-gnome-extras -.endif - -.if ${PORT_OPTIONS:MTAGLIB} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:${PORTSDIR}/audio/py-tagpy -.endif - -.if ${PORT_OPTIONS:MZSI} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:${PORTSDIR}/net/py-zsi -.endif + @${REINPLACE_CMD} -e 's,%%DOCSDIR%%,${DOCSDIR},' \ + -e 's,%%PREFIX%%,${PREFIX},' \ + ${WRKSRC}/${PYSETUP} ${WRKSRC}/sonata.py .include Modified: head/audio/sonata/files/patch-sonata_main.py ============================================================================== --- head/audio/sonata/files/patch-sonata_main.py Tue Feb 4 12:55:10 2014 (r342516) +++ head/audio/sonata/files/patch-sonata_main.py Tue Feb 4 13:11:28 2014 (r342517) @@ -1,6 +1,28 @@ ---- sonata/main.py.orig 2013-08-03 13:13:21.000000000 +0200 -+++ sonata/main.py 2013-08-03 13:14:12.000000000 +0200 -@@ -3400,4 +3400,7 @@ class Base(object): +--- sonata/main.py.orig 2009-09-21 23:02:16.000000000 +0200 ++++ sonata/main.py 2013-12-21 09:55:28.000000000 +0100 +@@ -989,13 +989,14 @@ + self.repeatmenu.set_active(self.status['repeat'] == '1') + if not self.last_random or self.last_random != self.status['random']: + self.randommenu.set_active(self.status['random'] == '1') +- if self.status['xfade'] == '0': +- self.config.xfade_enabled = False +- else: +- self.config.xfade_enabled = True +- self.config.xfade = int(self.status['xfade']) +- if self.config.xfade > 30: +- self.config.xfade = 30 ++ self.config.xfade_enabled = False ++ if 'xfade' in self.status: ++ xfade = int(self.status['xfade']) ++ if xfade != 0: ++ self.config.xfade_enabled = True ++ self.config.xfade = xfade ++ if self.config.xfade > 30: ++ self.config.xfade = 30 + self.last_repeat = self.status['repeat'] + self.last_random = self.status['random'] + return +@@ -3400,4 +3401,7 @@ self.on_currsong_notify(force_popup=True) def main(self): Modified: head/audio/sonata/pkg-descr ============================================================================== --- head/audio/sonata/pkg-descr Tue Feb 4 12:55:10 2014 (r342516) +++ head/audio/sonata/pkg-descr Tue Feb 4 13:11:28 2014 (r342517) @@ -20,4 +20,4 @@ FEATURES: + Commandline control + Available in 24 languages -WWW: http://sonata.berlios.de/index.html +WWW: http://sonata.berlios.de/index.html