From c82a5fee4bb4b35131727ca76fa8df3226503969 Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 12 Jul 2009 19:58:28 +0000 Subject: [PATCH] maintenance update to 7.3.3 --- audio/squeezecenter/Makefile | 5 +- audio/squeezecenter/distinfo | 10 ++-- .../squeezecenter/patches/patch-convert_conf | 12 ++-- audio/squeezecenter/patches/patch-scanner_pl | 10 ++-- .../squeezecenter/patches/patch-slimserver_pl | 8 +-- audio/squeezecenter/pkg/PLIST | 57 +++++++++++++++---- 6 files changed, 68 insertions(+), 34 deletions(-) diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile index a78bb4ae910..544e292a494 100644 --- a/audio/squeezecenter/Makefile +++ b/audio/squeezecenter/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2009/01/28 01:36:00 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2009/07/12 19:58:28 sthen Exp $ COMMENT = streaming audio server for Squeezebox network music players -V = 7.3.2 +V = 7.3.3 PKGNAME = squeezecenter-${V} DISTNAME = squeezecenter-${V}-noCPAN CATEGORIES = audio net @@ -113,5 +113,6 @@ do-install: cd ${WRKSRC}/; tar cf - Firmware Graphics HTML IR MySQL Plugins \ SQL strings.txt | tar xf - -C ${PREFIX}/${SSSHAREDIR}/ touch ${PREFIX}/share/examples/squeezecenter/empty + find ${PREFIX} -name '*.orig' -print0 | xargs -0 rm .include diff --git a/audio/squeezecenter/distinfo b/audio/squeezecenter/distinfo index cee33085ad4..77bc6e4a19d 100644 --- a/audio/squeezecenter/distinfo +++ b/audio/squeezecenter/distinfo @@ -1,5 +1,5 @@ -MD5 (squeezecenter-7.3.2-noCPAN.tgz) = /I0B60l3vFg9jG6FHr+a3w== -RMD160 (squeezecenter-7.3.2-noCPAN.tgz) = gMBstT/gve04AbJ+lSi1lfhM57Y= -SHA1 (squeezecenter-7.3.2-noCPAN.tgz) = nYjNmfwmBzbSxu68oq65zegcKaw= -SHA256 (squeezecenter-7.3.2-noCPAN.tgz) = Qr4q+W/Qkk3z+2m7bL6z1zMEYIvYZct/LFBcJU+NZk0= -SIZE (squeezecenter-7.3.2-noCPAN.tgz) = 25322353 +MD5 (squeezecenter-7.3.3-noCPAN.tgz) = ug8qUS1TOgOHTRC2du8BJg== +RMD160 (squeezecenter-7.3.3-noCPAN.tgz) = 4iBeTemtlc4eQVGDRyVjILwqCNY= +SHA1 (squeezecenter-7.3.3-noCPAN.tgz) = PZsPeXNHTiC+Bvs+drLkfsk/pVM= +SHA256 (squeezecenter-7.3.3-noCPAN.tgz) = GqprOGdlf2w1oeut8+CqPgv6pRnSbrDzX9uzKg9P9TM= +SIZE (squeezecenter-7.3.3-noCPAN.tgz) = 25491195 diff --git a/audio/squeezecenter/patches/patch-convert_conf b/audio/squeezecenter/patches/patch-convert_conf index 436ba1f405b..3da6a5b4d60 100644 --- a/audio/squeezecenter/patches/patch-convert_conf +++ b/audio/squeezecenter/patches/patch-convert_conf @@ -1,8 +1,8 @@ -$OpenBSD: patch-convert_conf,v 1.2 2009/01/28 01:36:00 sthen Exp $ ---- convert.conf.orig Tue Jan 20 02:35:56 2009 -+++ convert.conf Wed Jan 21 02:05:04 2009 -@@ -160,7 +160,7 @@ wvp wav * * - ## you can comment this out if you want to use LAME to transcode AAC/MOV files to MP3. +$OpenBSD: patch-convert_conf,v 1.3 2009/07/12 19:58:28 sthen Exp $ +--- convert.conf.orig Mon Jun 15 23:02:33 2009 ++++ convert.conf Sat Jul 4 15:00:23 2009 +@@ -175,7 +175,7 @@ aac wav * * + mov aif * * # FR - [mov123] $FILE$ @@ -10,7 +10,7 @@ $OpenBSD: patch-convert_conf,v 1.2 2009/01/28 01:36:00 sthen Exp $ wma wma * * - -@@ -199,7 +199,7 @@ ape flc * * +@@ -222,7 +222,7 @@ aac flc * * mov flc * * # FR diff --git a/audio/squeezecenter/patches/patch-scanner_pl b/audio/squeezecenter/patches/patch-scanner_pl index 0ca948034ad..7234b6daba1 100644 --- a/audio/squeezecenter/patches/patch-scanner_pl +++ b/audio/squeezecenter/patches/patch-scanner_pl @@ -1,8 +1,8 @@ -$OpenBSD: patch-scanner_pl,v 1.2 2009/01/28 01:36:00 sthen Exp $ ---- scanner.pl.orig Tue Jan 20 02:35:56 2009 -+++ scanner.pl Wed Jan 21 01:28:36 2009 -@@ -156,7 +156,8 @@ sub main { - $log->info("SqueezeCenter done init...\n"); +$OpenBSD: patch-scanner_pl,v 1.3 2009/07/12 19:58:28 sthen Exp $ +--- scanner.pl.orig Mon Jun 15 23:02:33 2009 ++++ scanner.pl Sat Jul 4 15:00:23 2009 +@@ -164,7 +164,8 @@ sub main { + $log->info("SqueezeCenter Scanner done init...\n"); # Take the db out of autocommit mode - this makes for a much faster scan. - Slim::Schema->storage->dbh->{'AutoCommit'} = 0; diff --git a/audio/squeezecenter/patches/patch-slimserver_pl b/audio/squeezecenter/patches/patch-slimserver_pl index af82f11dc30..94aca99e76c 100644 --- a/audio/squeezecenter/patches/patch-slimserver_pl +++ b/audio/squeezecenter/patches/patch-slimserver_pl @@ -1,7 +1,7 @@ -$OpenBSD: patch-slimserver_pl,v 1.2 2009/01/28 01:36:00 sthen Exp $ ---- slimserver.pl.orig Tue Jan 20 02:35:56 2009 -+++ slimserver.pl Wed Jan 21 01:28:36 2009 -@@ -821,7 +821,7 @@ sub changeEffectiveUserAndGroup { +$OpenBSD: patch-slimserver_pl,v 1.3 2009/07/12 19:58:28 sthen Exp $ +--- slimserver.pl.orig Mon Jun 15 23:02:33 2009 ++++ slimserver.pl Sat Jul 4 15:00:23 2009 +@@ -816,7 +816,7 @@ sub changeEffectiveUserAndGroup { # MySQL can't be run as root, and it's generally a bad idea anyways. # Try starting as 'slimserver' instead. if (!defined($user)) { diff --git a/audio/squeezecenter/pkg/PLIST b/audio/squeezecenter/pkg/PLIST index 82e792ae852..84359c80f5b 100644 --- a/audio/squeezecenter/pkg/PLIST +++ b/audio/squeezecenter/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2009/01/28 01:36:00 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.4 2009/07/12 19:58:28 sthen Exp $ @newgroup _squeezecenter:610 @newuser _squeezecenter:610:_squeezecenter:daemon:squeezecenter user:/nonexistent:/sbin/nologin bin/scanner.pl @@ -93,7 +93,6 @@ libdata/perl5/site_perl/Slim/Menu/TrackInfo.pm libdata/perl5/site_perl/Slim/Music/ libdata/perl5/site_perl/Slim/Music/Artwork.pm libdata/perl5/site_perl/Slim/Music/Import.pm -@comment libdata/perl5/site_perl/Slim/Music/Import.pm.orig libdata/perl5/site_perl/Slim/Music/Info.pm libdata/perl5/site_perl/Slim/Music/MusicFolderScan.pm libdata/perl5/site_perl/Slim/Music/PlaylistFolderScan.pm @@ -189,6 +188,18 @@ libdata/perl5/site_perl/Slim/Plugin/CLI/Plugin.pm libdata/perl5/site_perl/Slim/Plugin/CLI/Settings.pm libdata/perl5/site_perl/Slim/Plugin/CLI/install.xml libdata/perl5/site_perl/Slim/Plugin/CLI/strings.txt +libdata/perl5/site_perl/Slim/Plugin/Classical/ +libdata/perl5/site_perl/Slim/Plugin/Classical/HTML/ +libdata/perl5/site_perl/Slim/Plugin/Classical/HTML/EN/ +libdata/perl5/site_perl/Slim/Plugin/Classical/HTML/EN/plugins/ +libdata/perl5/site_perl/Slim/Plugin/Classical/HTML/EN/plugins/Classical/ +libdata/perl5/site_perl/Slim/Plugin/Classical/HTML/EN/plugins/Classical/html/ +libdata/perl5/site_perl/Slim/Plugin/Classical/HTML/EN/plugins/Classical/html/images/ +libdata/perl5/site_perl/Slim/Plugin/Classical/HTML/EN/plugins/Classical/html/images/icon.png +libdata/perl5/site_perl/Slim/Plugin/Classical/Plugin.pm +libdata/perl5/site_perl/Slim/Plugin/Classical/ProtocolHandler.pm +libdata/perl5/site_perl/Slim/Plugin/Classical/install.xml +libdata/perl5/site_perl/Slim/Plugin/Classical/strings.txt libdata/perl5/site_perl/Slim/Plugin/DateTime/ libdata/perl5/site_perl/Slim/Plugin/DateTime/HTML/ libdata/perl5/site_perl/Slim/Plugin/DateTime/HTML/EN/ @@ -334,7 +345,6 @@ libdata/perl5/site_perl/Slim/Plugin/LastFM/HTML/EN/plugins/LastFM/html/images/ libdata/perl5/site_perl/Slim/Plugin/LastFM/HTML/EN/plugins/LastFM/html/images/icon.png libdata/perl5/site_perl/Slim/Plugin/LastFM/Plugin.pm libdata/perl5/site_perl/Slim/Plugin/LastFM/ProtocolHandler.pm -@comment libdata/perl5/site_perl/Slim/Plugin/LastFM/ProtocolHandler.pm.orig libdata/perl5/site_perl/Slim/Plugin/LastFM/install.xml libdata/perl5/site_perl/Slim/Plugin/LastFM/strings.txt libdata/perl5/site_perl/Slim/Plugin/LineIn/ @@ -384,6 +394,18 @@ libdata/perl5/site_perl/Slim/Plugin/MP3tunes/HTML/EN/plugins/MP3tunes/html/image libdata/perl5/site_perl/Slim/Plugin/MP3tunes/Plugin.pm libdata/perl5/site_perl/Slim/Plugin/MP3tunes/install.xml libdata/perl5/site_perl/Slim/Plugin/MP3tunes/strings.txt +libdata/perl5/site_perl/Slim/Plugin/Mediafly/ +libdata/perl5/site_perl/Slim/Plugin/Mediafly/HTML/ +libdata/perl5/site_perl/Slim/Plugin/Mediafly/HTML/EN/ +libdata/perl5/site_perl/Slim/Plugin/Mediafly/HTML/EN/plugins/ +libdata/perl5/site_perl/Slim/Plugin/Mediafly/HTML/EN/plugins/Mediafly/ +libdata/perl5/site_perl/Slim/Plugin/Mediafly/HTML/EN/plugins/Mediafly/html/ +libdata/perl5/site_perl/Slim/Plugin/Mediafly/HTML/EN/plugins/Mediafly/html/images/ +libdata/perl5/site_perl/Slim/Plugin/Mediafly/HTML/EN/plugins/Mediafly/html/images/icon.png +libdata/perl5/site_perl/Slim/Plugin/Mediafly/Plugin.pm +libdata/perl5/site_perl/Slim/Plugin/Mediafly/ProtocolHandler.pm +libdata/perl5/site_perl/Slim/Plugin/Mediafly/install.xml +libdata/perl5/site_perl/Slim/Plugin/Mediafly/strings.txt libdata/perl5/site_perl/Slim/Plugin/MusicMagic/ libdata/perl5/site_perl/Slim/Plugin/MusicMagic/ClientSettings.pm libdata/perl5/site_perl/Slim/Plugin/MusicMagic/Common.pm @@ -408,6 +430,18 @@ libdata/perl5/site_perl/Slim/Plugin/MusicMagic/ProtocolHandler.pm libdata/perl5/site_perl/Slim/Plugin/MusicMagic/Settings.pm libdata/perl5/site_perl/Slim/Plugin/MusicMagic/install.xml libdata/perl5/site_perl/Slim/Plugin/MusicMagic/strings.txt +libdata/perl5/site_perl/Slim/Plugin/Napster/ +libdata/perl5/site_perl/Slim/Plugin/Napster/HTML/ +libdata/perl5/site_perl/Slim/Plugin/Napster/HTML/EN/ +libdata/perl5/site_perl/Slim/Plugin/Napster/HTML/EN/plugins/ +libdata/perl5/site_perl/Slim/Plugin/Napster/HTML/EN/plugins/Napster/ +libdata/perl5/site_perl/Slim/Plugin/Napster/HTML/EN/plugins/Napster/html/ +libdata/perl5/site_perl/Slim/Plugin/Napster/HTML/EN/plugins/Napster/html/images/ +libdata/perl5/site_perl/Slim/Plugin/Napster/HTML/EN/plugins/Napster/html/images/icon.png +libdata/perl5/site_perl/Slim/Plugin/Napster/Plugin.pm +libdata/perl5/site_perl/Slim/Plugin/Napster/ProtocolHandler.pm +libdata/perl5/site_perl/Slim/Plugin/Napster/install.xml +libdata/perl5/site_perl/Slim/Plugin/Napster/strings.txt libdata/perl5/site_perl/Slim/Plugin/OPMLBased.pm libdata/perl5/site_perl/Slim/Plugin/Pandora/ libdata/perl5/site_perl/Slim/Plugin/Pandora/HTML/ @@ -613,7 +647,6 @@ libdata/perl5/site_perl/Slim/Schema/GenreTrack.pm libdata/perl5/site_perl/Slim/Schema/MetaInformation.pm libdata/perl5/site_perl/Slim/Schema/PageBar.pm libdata/perl5/site_perl/Slim/Schema/Playlist.pm -@comment libdata/perl5/site_perl/Slim/Schema/Playlist.pm.orig libdata/perl5/site_perl/Slim/Schema/PlaylistTrack.pm libdata/perl5/site_perl/Slim/Schema/Progress.pm libdata/perl5/site_perl/Slim/Schema/Rescan.pm @@ -663,8 +696,6 @@ libdata/perl5/site_perl/Slim/Utils/OS/Suse.pm libdata/perl5/site_perl/Slim/Utils/OS/Unix.pm libdata/perl5/site_perl/Slim/Utils/OS/Win32.pm libdata/perl5/site_perl/Slim/Utils/OSDetect.pm -@comment libdata/perl5/site_perl/Slim/Utils/OSDetect.pm.bak -@comment libdata/perl5/site_perl/Slim/Utils/OSDetect.pm.orig libdata/perl5/site_perl/Slim/Utils/PerfMon.pm libdata/perl5/site_perl/Slim/Utils/PerlRunTime.pm libdata/perl5/site_perl/Slim/Utils/PluginManager.pm @@ -742,7 +773,6 @@ libdata/perl5/site_perl/Slim/Web/Template/Context.pm libdata/perl5/site_perl/Slim/Web/UPnPMediaServer.pm libdata/perl5/site_perl/Slim/Web/XMLBrowser.pm libdata/perl5/site_perl/Slim/bootstrap.pm -@comment libdata/perl5/site_perl/Slim/bootstrap.pm.orig libdata/squeezecenter/ libdata/squeezecenter/Audio/ libdata/squeezecenter/Audio/APE.pm @@ -758,6 +788,8 @@ libdata/squeezecenter/Audio/Wav/Tools.pm libdata/squeezecenter/Audio/Wav/Write/ libdata/squeezecenter/Audio/Wav/Write.pm libdata/squeezecenter/Audio/Wav/Write/Header.pm +libdata/squeezecenter/CGI/ +libdata/squeezecenter/CGI/Cookie.pm libdata/squeezecenter/Cache/ libdata/squeezecenter/Cache/FileBackend.pm libdata/squeezecenter/Log/ @@ -807,16 +839,16 @@ share/squeezecenter/ share/squeezecenter/Firmware/ share/squeezecenter/Firmware/boom.version share/squeezecenter/Firmware/boom_30.bin -share/squeezecenter/Firmware/boom_43.bin +share/squeezecenter/Firmware/boom_47.bin share/squeezecenter/Firmware/receiver.version -share/squeezecenter/Firmware/receiver_58.bin +share/squeezecenter/Firmware/receiver_62.bin share/squeezecenter/Firmware/squeezebox.version share/squeezecenter/Firmware/squeezebox2.version -share/squeezecenter/Firmware/squeezebox2_123.bin +share/squeezecenter/Firmware/squeezebox2_127.bin share/squeezecenter/Firmware/squeezebox_10.bin share/squeezecenter/Firmware/squeezebox_40.bin share/squeezecenter/Firmware/transporter.version -share/squeezecenter/Firmware/transporter_73.bin +share/squeezecenter/Firmware/transporter_77.bin share/squeezecenter/Graphics/ share/squeezecenter/Graphics/CODE2000.HTM share/squeezecenter/Graphics/CODE2000.TTF @@ -1100,7 +1132,6 @@ share/squeezecenter/HTML/EN/html/ext/ share/squeezecenter/HTML/EN/html/ext/adapter/ share/squeezecenter/HTML/EN/html/ext/adapter/ext/ share/squeezecenter/HTML/EN/html/ext/adapter/ext/ext-base.js -share/squeezecenter/HTML/EN/html/ext/ext-all-debug.js share/squeezecenter/HTML/EN/html/ext/ext-all.js share/squeezecenter/HTML/EN/html/ext/license.txt share/squeezecenter/HTML/EN/html/ext/resources/ @@ -1969,4 +2000,6 @@ share/squeezecenter/SQL/mysql/schema_8_down.sql share/squeezecenter/SQL/mysql/schema_8_up.sql share/squeezecenter/SQL/mysql/schema_clear.sql share/squeezecenter/SQL/mysql/schema_optimize.sql +share/squeezecenter/SQL/slimservice/ +share/squeezecenter/SQL/slimservice/slimservice-sqlite.sql share/squeezecenter/strings.txt