svn commit: r423393 - in head: . audio audio/logitechmediaserver audio/logitechmediaserver-dynamicplaylist audio/logitechmediaserver-lazysearch audio/logitechmediaserver-sqlplaylist audio/logitechm...

Ben Woods woodsb02 at FreeBSD.org
Wed Oct 5 22:50:29 UTC 2016 

Author: woodsb02
Date: Wed Oct  5 22:50:25 2016
New Revision: 423393
URL: https://svnweb.freebsd.org/changeset/ports/423393

Log:
  Move audio/squeezeboxserver to audio/logitechmediaserver
  
  audio/squeezeboxserver:
  - Move to audio/logitechmediaserver
  - Update to 7.9.0 pre-release (git commit from 7.9 branch on 2016.09.30)
  - Change default install and database locations to suit new PORTNAME
  - Remove softsqueeze.sh as it is no longer bundled with the server
  - Add /usr/local/etc/newsyslog.conf.d/, don't edit /etc/newsyslog.conf
  - Add LICENSE details
  - Update maintainer (previous maintainer timeout)
  - Use customized perl modules provided in distfile and slimserver-vendor
    GitHub repo, rather than using perl dependencies from ports
  - Changed install method to now copy directly to stagedir instead of an
    intermediate step to TMP_SLIMDIR
  
  audio/squeezeboxserver-dynamicplaylist:
  - Move to audio/logitechmediaserver-dynamicplaylist
  - Update to 2.9.3853
  - Fix MASTER_SITES
  - Add LICENSE details
  - Update maintainer
  
  audio/squeezeboxserver-lazysearch:
  - Move to audio/logitechmediaserver-lazysearch
  - Add LICENSE details
  - Update maintainer
  
  audio/squeezeboxserver-sqlplaylist:
  - Move to audio/logitechmediaserver-sqlplaylist
  - Update to 2.5.3859
  - Fix MASTER_SITES
  - Add LICENSE details
  - Update maintainer
  
  audio/squeezeboxserver-superdatetime:
  - Move to audio/logitechmediaserver-superdatetime
  - Add LICENSE details
  - Update maintainer
  
  audio/squeezeboxserver-trackstat:
  - Move to audio/logitechmediaserver-trackstat
  - Update to 3.2.3951
  - Fix MASTER_SITES
  - Add LICENSE details
  - Update maintainer
  
  PR:		180034
  PR:		203266
  Submitted by:	woodsb02, mark at tranquillussoftware.co.uk (new maintainer)
  Reported by:	david at dawninglight.net, amdmi3
  Approved by:	markk at knigma.org (maintainer timeout), tdb (maintainer), adamw (mentor)
  Differential Revision:	https://reviews.freebsd.org/D6483

Added:
  head/audio/logitechmediaserver/
     - copied from r423392, head/audio/squeezeboxserver/
  head/audio/logitechmediaserver-dynamicplaylist/
     - copied from r423392, head/audio/squeezeboxserver-dynamicplaylist/
  head/audio/logitechmediaserver-lazysearch/
     - copied from r423392, head/audio/squeezeboxserver-lazysearch/
  head/audio/logitechmediaserver-sqlplaylist/
     - copied from r423392, head/audio/squeezeboxserver-sqlplaylist/
  head/audio/logitechmediaserver-superdatetime/
     - copied from r423392, head/audio/squeezeboxserver-superdatetime/
  head/audio/logitechmediaserver-trackstat/
     - copied from r423392, head/audio/squeezeboxserver-trackstat/
  head/audio/logitechmediaserver/files/logitechmediaserver.conf.in   (contents, props changed)
  head/audio/logitechmediaserver/files/logitechmediaserver.in
     - copied, changed from r423352, head/audio/squeezeboxserver/files/squeezeboxserver.in
  head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh   (contents, props changed)
Deleted:
  head/audio/logitechmediaserver/files/patch-modules.conf
  head/audio/logitechmediaserver/files/softsqueeze.sh.in
  head/audio/logitechmediaserver/files/squeezeboxserver.in
  head/audio/squeezeboxserver/
  head/audio/squeezeboxserver-dynamicplaylist/
  head/audio/squeezeboxserver-lazysearch/
  head/audio/squeezeboxserver-sqlplaylist/
  head/audio/squeezeboxserver-superdatetime/
  head/audio/squeezeboxserver-trackstat/
Modified:
  head/MOVED
  head/UPDATING
  head/audio/Makefile
  head/audio/logitechmediaserver-dynamicplaylist/Makefile
  head/audio/logitechmediaserver-dynamicplaylist/distinfo
  head/audio/logitechmediaserver-dynamicplaylist/pkg-descr
  head/audio/logitechmediaserver-lazysearch/Makefile
  head/audio/logitechmediaserver-lazysearch/distinfo
  head/audio/logitechmediaserver-lazysearch/pkg-descr
  head/audio/logitechmediaserver-sqlplaylist/Makefile
  head/audio/logitechmediaserver-sqlplaylist/distinfo
  head/audio/logitechmediaserver-sqlplaylist/pkg-descr
  head/audio/logitechmediaserver-sqlplaylist/pkg-plist
  head/audio/logitechmediaserver-superdatetime/Makefile
  head/audio/logitechmediaserver-superdatetime/distinfo
  head/audio/logitechmediaserver-superdatetime/pkg-descr
  head/audio/logitechmediaserver-trackstat/Makefile
  head/audio/logitechmediaserver-trackstat/distinfo
  head/audio/logitechmediaserver-trackstat/pkg-descr
  head/audio/logitechmediaserver-trackstat/pkg-plist
  head/audio/logitechmediaserver/Makefile
  head/audio/logitechmediaserver/distinfo
  head/audio/logitechmediaserver/files/Custom.pm.in
  head/audio/logitechmediaserver/files/patch-Slim_Utils_Log.pm
  head/audio/logitechmediaserver/files/patch-convert.conf
  head/audio/logitechmediaserver/files/patch-dbix-class-bug.diff
  head/audio/logitechmediaserver/pkg-descr
  head/audio/logitechmediaserver/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/MOVED	Wed Oct  5 22:50:25 2016	(r423393)
@@ -8672,3 +8672,9 @@ databases/postgresql91-server||2016-10-0
 databases/postgresql-pllua||2016-10-03|Has expired: Depends on expired PostgreSQL 9.1
 multimedia/kvazaar-devel|multimedia/kvazaar|2016-10-05|Out of date: use multimedia/kvazaar for now
 emulators/virtualbox-ose-lite|emulators/virtualbox-ose-nox11|2016-10-05|Renamed
+audio/squeezeboxserver|audio/logitechmediaserver|2016-10-05|Squeezebox Server renamed to Logitech Media Server
+audio/squeezeboxserver-dynamicplaylist|audio/logitechmediaserver-dynamicplaylist|2016-10-05|Squeezebox Server renamed to Logitech Media Server
+audio/squeezeboxserver-lazysearch|audio/logitechmediaserver-lazysearch|2016-10-05|Squeezebox Server renamed to Logitech Media Server
+audio/squeezeboxserver-sqlplaylist|audio/logitechmediaserver-sqlplaylist|2016-10-05|Squeezebox Server renamed to Logitech Media Server
+audio/squeezeboxserver-superdatetime|audio/logitechmediaserver-superdatetime|2016-10-05|Squeezebox Server renamed to Logitech Media Server
+audio/squeezeboxserver-trackstat|audio/logitechmediaserver-trackstat|2016-10-05|Squeezebox Server renamed to Logitech Media Server

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/UPDATING	Wed Oct  5 22:50:25 2016	(r423393)
@@ -5,6 +5,22 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20161005:
+  AFFECTS: Users of audio/squeezeboxserver (now audio/logitechmediaserver)
+  AUTHOR: woodsb02 at FreeBSD.org
+
+  With the rename of the audio/squeezeboxserver port to
+  audio/logitechmediaserver, the server and database are now installed in
+  different locations by default (/usr/local/share/logitechmediaserver and
+  /var/db/logitechmediaserver respectively).
+
+  If you were an existing user of audio/squeezeboxserver, you should
+  consider backing up you server configuration files and database before
+  upgrading to audio/logitechmediaserver. If you wish to override the
+  default locations for storing the server and database, you can set the
+  SLIMDIR and SLIMDBDIR variables in your /etc/make.conf when building
+  the audio/logitechmediaserver port.
+
 20161004:
   AFFECTS: mail/roundcube-carddav
   AUTHOR:  gahr at FreeBSD.org

Modified: head/audio/Makefile
==============================================================================
--- head/audio/Makefile	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/Makefile	Wed Oct  5 22:50:25 2016	(r423393)
@@ -455,6 +455,12 @@
     SUBDIR += linuxsampler
     SUBDIR += listener
     SUBDIR += lmms
+    SUBDIR += logitechmediaserver
+    SUBDIR += logitechmediaserver-dynamicplaylist
+    SUBDIR += logitechmediaserver-lazysearch
+    SUBDIR += logitechmediaserver-sqlplaylist
+    SUBDIR += logitechmediaserver-superdatetime
+    SUBDIR += logitechmediaserver-trackstat
     SUBDIR += lollypop
     SUBDIR += lpac
     SUBDIR += lua51-mpd
@@ -728,12 +734,6 @@
     SUBDIR += splay
     SUBDIR += splaytk
     SUBDIR += squash
-    SUBDIR += squeezeboxserver
-    SUBDIR += squeezeboxserver-dynamicplaylist
-    SUBDIR += squeezeboxserver-lazysearch
-    SUBDIR += squeezeboxserver-sqlplaylist
-    SUBDIR += squeezeboxserver-superdatetime
-    SUBDIR += squeezeboxserver-trackstat
     SUBDIR += streamripper
     SUBDIR += streamtranscoder
     SUBDIR += stymulator

Modified: head/audio/logitechmediaserver-dynamicplaylist/Makefile
==============================================================================
--- head/audio/squeezeboxserver-dynamicplaylist/Makefile	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-dynamicplaylist/Makefile	Wed Oct  5 22:50:25 2016	(r423393)
@@ -2,18 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	dynamicplaylist
-PORTVERSION=	2.8.6
-PORTREVISION=	1
+PORTVERSION=	2.9.3853
 CATEGORIES=	audio
-MASTER_SITES=	http://erland.isaksson.info/download/do/downloadapplication?name=slimserver-dynamicplaylist&filename=/
-PKGNAMEPREFIX=	squeezeboxserver-
+MASTER_SITES=	http://downloads.isaksson.info/download/do/downloadapplication?name=slimserver-dynamicplaylist&filename=/
+PKGNAMEPREFIX=	logitechmediaserver-
 DISTNAME=	DynamicPlayList-${PORTVERSION:S/b/beta/}
-DIST_SUBDIR=	squeezeboxserver
+DIST_SUBDIR=	logitechmediaserver
 
-MAINTAINER=	tdb at FreeBSD.org
-COMMENT=	Squeezebox Server plugin to create dynamic playlists
+MAINTAINER=	mark at tranquillussoftware.co.uk
+COMMENT=	Logitech Media Server plugin to create dynamic playlists
 
-RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/DynamicPlayList/LICENSE.txt
+
+RUN_DEPENDS=	${LOCALBASE}/${SLIMDIR}/slimserver.pl:audio/logitechmediaserver
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip
@@ -21,7 +23,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-SLIMDIR?=	squeezeboxserver
+SLIMDIR?=	share/logitechmediaserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:

Modified: head/audio/logitechmediaserver-dynamicplaylist/distinfo
==============================================================================
--- head/audio/squeezeboxserver-dynamicplaylist/distinfo	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-dynamicplaylist/distinfo	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,2 +1,3 @@
-SHA256 (squeezeboxserver/DynamicPlayList-2.8.6.zip) = a8ab7153c8b54db2a8500578bfe2cabceedb3ce8cde0aaf6ebcc7154ba6cd7f4
-SIZE (squeezeboxserver/DynamicPlayList-2.8.6.zip) = 79762
+TIMESTAMP = 1463782051
+SHA256 (logitechmediaserver/DynamicPlayList-2.9.3853.zip) = af36bbd82768db45f054a5e6af149613c4725f57ce8f5e3c5f14e55e34d3b47c
+SIZE (logitechmediaserver/DynamicPlayList-2.9.3853.zip) = 81890

Modified: head/audio/logitechmediaserver-dynamicplaylist/pkg-descr
==============================================================================
--- head/audio/squeezeboxserver-dynamicplaylist/pkg-descr	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-dynamicplaylist/pkg-descr	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,4 +1,4 @@
-The Dynamic Playlist plugin is a Squeezebox Server plugin that makes
+The Dynamic Playlist plugin is a Logitech Media Server plugin that makes
 it easier for other plugins to implement different types of playlists.
 It shows all supported playlists below the same menu and has the
 advantage that the user doesn't have to know which plugin implements a

Modified: head/audio/logitechmediaserver-lazysearch/Makefile
==============================================================================
--- head/audio/squeezeboxserver-lazysearch/Makefile	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-lazysearch/Makefile	Wed Oct  5 22:50:25 2016	(r423393)
@@ -2,25 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	lazysearch
-PORTVERSION=	3.5.6
-PORTREVISION=	1
+PORTVERSION=	3.6.5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.hickinbottom.com/sc-plugins/
-PKGNAMEPREFIX=	squeezeboxserver-
+PKGNAMEPREFIX=	logitechmediaserver-
 DISTNAME=	LazySearch2-7-${PORTVERSION}
-DIST_SUBDIR=	squeezeboxserver
+DIST_SUBDIR=	logitechmediaserver
 
-MAINTAINER=	tdb at FreeBSD.org
-COMMENT=	Squeezebox Server plugin for performing lazy searches
+MAINTAINER=	mark at tranquillussoftware.co.uk
+COMMENT=	Logitech Media Server plugin for performing lazy searches
 
-RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LazySearch2/LICENSE
+
+RUN_DEPENDS=	${LOCALBASE}/${SLIMDIR}/slimserver.pl:audio/logitechmediaserver
 
 USES=		zip
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-SLIMDIR?=	squeezeboxserver
+SLIMDIR?=	share/logitechmediaserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:

Modified: head/audio/logitechmediaserver-lazysearch/distinfo
==============================================================================
--- head/audio/squeezeboxserver-lazysearch/distinfo	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-lazysearch/distinfo	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,2 +1,3 @@
-SHA256 (squeezeboxserver/LazySearch2-7-3.5.6.zip) = 376dcb04c7ec1d037fc6a778df820b68f48784032f1f48fe889c402fa10ea506
-SIZE (squeezeboxserver/LazySearch2-7-3.5.6.zip) = 60299
+TIMESTAMP = 1475672062
+SHA256 (logitechmediaserver/LazySearch2-7-3.6.5.zip) = e3cacd2084c660eb4f31ca96daf26c8e27c000bc18c7a03f98d79cd7055044f8
+SIZE (logitechmediaserver/LazySearch2-7-3.6.5.zip) = 62249

Modified: head/audio/logitechmediaserver-lazysearch/pkg-descr
==============================================================================
--- head/audio/squeezeboxserver-lazysearch/pkg-descr	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-lazysearch/pkg-descr	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,4 +1,4 @@
-This is a Squeezebox Server plugin to add lazy search capabilities.
+This is a Logitech Media Server plugin to add lazy search capabilities.
 Lazy searching allows for much faster entry of search text by allowing
 you to forget about multi-tapping and instead just press each of the
 remote control buttons once for each of the letters in the text,

Modified: head/audio/logitechmediaserver-sqlplaylist/Makefile
==============================================================================
--- head/audio/squeezeboxserver-sqlplaylist/Makefile	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-sqlplaylist/Makefile	Wed Oct  5 22:50:25 2016	(r423393)
@@ -2,19 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	sqlplaylist
-PORTVERSION=	2.5.3359
-PORTREVISION=	2
+PORTVERSION=	2.5.3859
 CATEGORIES=	audio
-MASTER_SITES=	http://erland.isaksson.info/download/do/downloadapplication?name=slimserver-sqlplaylist&filename=/
-PKGNAMEPREFIX=	squeezeboxserver-
+MASTER_SITES=	http://downloads.isaksson.info/download/do/downloadapplication?name=slimserver-sqlplaylist&filename=/
+PKGNAMEPREFIX=	logitechmediaserver-
 DISTNAME=	SQLPlayList-${PORTVERSION:S/b/beta/}
-DIST_SUBDIR=	squeezeboxserver
+DIST_SUBDIR=	logitechmediaserver
 
-MAINTAINER=	tdb at FreeBSD.org
-COMMENT=	Squeezebox Server plugin to create playlists based on SQL queries
+MAINTAINER=	mark at tranquillussoftware.co.uk
+COMMENT=	Logitech Media Server plugin to create playlists based on SQL queries
 
-RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver \
-		${LOCALBASE}/${SLIMDIR}/Plugins/DynamicPlayList/install.xml:audio/squeezeboxserver-dynamicplaylist
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/SQLPlayList/LICENSE.txt
+
+RUN_DEPENDS=	${LOCALBASE}/${SLIMDIR}/slimserver.pl:audio/logitechmediaserver \
+		${LOCALBASE}/${SLIMDIR}/Plugins/DynamicPlayList/install.xml:audio/logitechmediaserver-dynamicplaylist
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip
@@ -22,7 +24,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-SLIMDIR?=	squeezeboxserver
+SLIMDIR?=	share/logitechmediaserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:

Modified: head/audio/logitechmediaserver-sqlplaylist/distinfo
==============================================================================
--- head/audio/squeezeboxserver-sqlplaylist/distinfo	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-sqlplaylist/distinfo	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,2 +1,3 @@
-SHA256 (squeezeboxserver/SQLPlayList-2.5.3359.zip) = 70bc9f7e05ad39cc43395e382d09d4fa8da35f3a3930131a652eaab364584c61
-SIZE (squeezeboxserver/SQLPlayList-2.5.3359.zip) = 298917
+TIMESTAMP = 1463782116
+SHA256 (logitechmediaserver/SQLPlayList-2.5.3859.zip) = b0363cbd0433ebae58e6357cee26ce40548f7b8b87ae4a7dae9bbff4a4bfdd53
+SIZE (logitechmediaserver/SQLPlayList-2.5.3859.zip) = 188051

Modified: head/audio/logitechmediaserver-sqlplaylist/pkg-descr
==============================================================================
--- head/audio/squeezeboxserver-sqlplaylist/pkg-descr	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-sqlplaylist/pkg-descr	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,12 +1,12 @@
-This plugin for Squeezebox Server makes it possible to create smart
-playlists. Although the standard Squeezebox Server doesn't support
+This plugin for Logitech Media Server makes it possible to create smart
+playlists. Although the standard Logitech Media Server doesn't support
 smart playlists by itself, together with iTunes and the standard
-Squeezebox Server iTunes integration, it is possible to use smart
+Logitech Media Server iTunes integration, it is possible to use smart
 playlists defined in iTunes. The problem though is that the integrated
 iTunes smart playlists will not be recalculated until the next time
-you perform a rescan in Squeezebox Server. The SQL Playlist plugin
+you perform a rescan in Logitech Media Server. The SQL Playlist plugin
 takes care of this problem and implements native smart playlist in
-Squeezebox Server without any need to use iTunes. The smart playlists
+Logitech Media Server without any need to use iTunes. The smart playlists
 implemented in SQL Playlist will also be automatically re-calculated
 after each track played so they will be based on the latest statistic
 information.

Modified: head/audio/logitechmediaserver-sqlplaylist/pkg-plist
==============================================================================
--- head/audio/squeezeboxserver-sqlplaylist/pkg-plist	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-sqlplaylist/pkg-plist	Wed Oct  5 22:50:25 2016	(r423393)
@@ -21,7 +21,6 @@
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/EN/plugins/SQLPlayList/sqlplaylist_redirect.html
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/EN/plugins/SQLPlayList/sqlplaylist_reload.html
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/EN/plugins/SQLPlayList/webadminmethods_edititem.html
-%%SLIMDIR%%/Plugins/SQLPlayList/HTML/EN/plugins/SQLPlayList/webadminmethods_edititem.html.rej
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/EN/plugins/SQLPlayList/webadminmethods_editsimpleitem.html
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/EN/plugins/SQLPlayList/webadminmethods_login.html
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/EN/plugins/SQLPlayList/webadminmethods_newitem.html
@@ -95,50 +94,13 @@
 %%SLIMDIR%%/Plugins/SQLPlayList/Templates/topratedforyear.sql.template
 %%SLIMDIR%%/Plugins/SQLPlayList/Templates/topratedforyear.sql.xml
 %%SLIMDIR%%/Plugins/SQLPlayList/install.xml
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/Apache/SOAP.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/Apache/XMLRPC/Lite.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/IO/SessionData.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/IO/SessionSet.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Lite.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/FTP.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/HTTP.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/IO.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/JABBER.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/LOCAL.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/MAILTO.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/MQ.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/POP3.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport/TCP.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Client.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Constants.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Data.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Deserializer.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Fault.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Header.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Lite.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Lite/Deserializer/XMLSchema1999.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Lite/Deserializer/XMLSchema2001.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Lite/Deserializer/XMLSchemaSOAP1_1.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Lite/Deserializer/XMLSchemaSOAP1_2.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Lite/Utils.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Packager.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/SOM.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Schema.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Serializer.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Server.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Test.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Trace.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/FTP.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/HTTP.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/IO.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/JABBER.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/LOCAL.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/MAILTO.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/MQ.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/POP3.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport/TCP.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Utils.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/UDDI/Lite.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/XML/Parser/Lite.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/XMLRPC/Lite.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/XMLRPC/Test.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/XMLRPC/Transport/HTTP.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/XMLRPC/Transport/POP3.pm
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/XMLRPC/Transport/TCP.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/strings.txt

Modified: head/audio/logitechmediaserver-superdatetime/Makefile
==============================================================================
--- head/audio/squeezeboxserver-superdatetime/Makefile	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-superdatetime/Makefile	Wed Oct  5 22:50:25 2016	(r423393)
@@ -5,25 +5,27 @@ PORTNAME=	superdatetime
 PORTVERSION=	5.9.16
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
-PKGNAMEPREFIX=	squeezeboxserver-
+PROJECTHOST=	grebrown-projects
+PKGNAMEPREFIX=	logitechmediaserver-
 DISTNAME=	SuperDateTime${PORTVERSION}
-DIST_SUBDIR=	squeezeboxserver
+DIST_SUBDIR=	logitechmediaserver
 
-MAINTAINER=	tdb at FreeBSD.org
-COMMENT=	Squeezebox Server plugin to display weather conditions and forecasts
+MAINTAINER=	mark at tranquillussoftware.co.uk
+COMMENT=	Logitech Media Server plugin to display weather conditions & forecasts
 
-BROKEN=		Unfetchable (google code has gone away)
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver
+BROKEN=		Unfetchable (google code has gone away)
 
-PROJECTHOST=	grebrown-projects
+RUN_DEPENDS=	${LOCALBASE}/${SLIMDIR}/slimserver.pl:audio/logitechmediaserver
 
 USES=		zip
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-SLIMDIR?=	squeezeboxserver
+SLIMDIR?=	share/logitechmediaserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:

Modified: head/audio/logitechmediaserver-superdatetime/distinfo
==============================================================================
--- head/audio/squeezeboxserver-superdatetime/distinfo	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-superdatetime/distinfo	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,2 +1,3 @@
-SHA256 (squeezeboxserver/SuperDateTime5.9.16.zip) = 95b330acf3a8f378bdb5f61cc13df04b0a6a57af915aa02be9c534f3fb417002
-SIZE (squeezeboxserver/SuperDateTime5.9.16.zip) = 916116
+TIMESTAMP = 1463765220
+SHA256 (logitechmediaserver/SuperDateTime5.9.16.zip) = 95b330acf3a8f378bdb5f61cc13df04b0a6a57af915aa02be9c534f3fb417002
+SIZE (logitechmediaserver/SuperDateTime5.9.16.zip) = 916116

Modified: head/audio/logitechmediaserver-superdatetime/pkg-descr
==============================================================================
--- head/audio/squeezeboxserver-superdatetime/pkg-descr	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-superdatetime/pkg-descr	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,4 +1,4 @@
-This is a Squeezebox Server plugin screensaver datetime replacement.
+This is a Logitech Media Server plugin screensaver datetime replacement.
 Graphically displays current weather conditions and forecasts. Will
 also optionally display stock quotes and upcoming/active game
 information for MLB, NBA, NHL, NFL, and college football and

Modified: head/audio/logitechmediaserver-trackstat/Makefile
==============================================================================
--- head/audio/squeezeboxserver-trackstat/Makefile	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-trackstat/Makefile	Wed Oct  5 22:50:25 2016	(r423393)
@@ -2,18 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	trackstat
-PORTVERSION=	2.11.3435
-PORTREVISION=	1
+PORTVERSION=	3.2.3951
 CATEGORIES=	audio
-MASTER_SITES=	http://erland.isaksson.info/download/do/downloadapplication?name=slimserver-trackstat&filename=/
-PKGNAMEPREFIX=	squeezeboxserver-
+MASTER_SITES=	http://downloads.isaksson.info/download/do/downloadapplication?name=slimserver-trackstat&filename=/
+PKGNAMEPREFIX=	logitechmediaserver-
 DISTNAME=	TrackStat-${PORTVERSION:S/b/beta/}
-DIST_SUBDIR=	squeezeboxserver
+DIST_SUBDIR=	logitechmediaserver
 
-MAINTAINER=	tdb at FreeBSD.org
-COMMENT=	Squeezebox Server plugin to store ratings and statistics about songs
+MAINTAINER=	mark at tranquillussoftware.co.uk
+COMMENT=	Logitech Media Server plugin to store song ratings and statistics
 
-RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/TrackStat/LICENSE.txt
+
+RUN_DEPENDS=	${LOCALBASE}/${SLIMDIR}/slimserver.pl:audio/logitechmediaserver
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip
@@ -21,7 +23,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-SLIMDIR?=	squeezeboxserver
+SLIMDIR?=	share/logitechmediaserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:

Modified: head/audio/logitechmediaserver-trackstat/distinfo
==============================================================================
--- head/audio/squeezeboxserver-trackstat/distinfo	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-trackstat/distinfo	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,2 +1,3 @@
-SHA256 (squeezeboxserver/TrackStat-2.11.3435.zip) = 8711e503f03926bf6e4cee96ea9a0689493ed58a43f80b908d8d292628f171e7
-SIZE (squeezeboxserver/TrackStat-2.11.3435.zip) = 300051
+TIMESTAMP = 1463781799
+SHA256 (logitechmediaserver/TrackStat-3.2.3951.zip) = bf872cdaf33f58d06995e7f503b183e28f1409a5c7609c07c0fe7257492aee89
+SIZE (logitechmediaserver/TrackStat-3.2.3951.zip) = 307705

Modified: head/audio/logitechmediaserver-trackstat/pkg-descr
==============================================================================
--- head/audio/squeezeboxserver-trackstat/pkg-descr	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-trackstat/pkg-descr	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,8 +1,8 @@
-This is a statistic plugin for Squeezebox Server. Squeezebox Server
+This is a statistic plugin for Logitech Media Server. Logitech Media Server
 normally stores statistics about the last time a track was played,
 when a specific track was added to the library and how many times a
 track has been played. The problem is that all of these statistics are
-cleared every time you perform a full rescan of Squeezebox Server.
+cleared every time you perform a full rescan of Logitech Media Server.
 
 The TrackStat plugin solves this problem by making sure that the
 statistics survive a rescan. Besides this TrackStat also extends the
@@ -14,7 +14,7 @@ holding a number between 1-5 down on the
 
 The other main functionality the TrackStat plugins provides is various
 ways to browse your music based on the statistic information. The
-standard Squeezebox Server only makes it possible to show most played
+standard Logitech Media Server only makes it possible to show most played
 tracks. The TrackStat plugin makes it possible to show the statistics
 in a lot more ways. The purpose is simply to give you another way to
 select which music you like to play, for example like:

Modified: head/audio/logitechmediaserver-trackstat/pkg-plist
==============================================================================
--- head/audio/squeezeboxserver-trackstat/pkg-plist	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver-trackstat/pkg-plist	Wed Oct  5 22:50:25 2016	(r423393)
@@ -157,12 +157,14 @@
 %%SLIMDIR%%/Plugins/TrackStat/README.txt
 %%SLIMDIR%%/Plugins/TrackStat/SQL/SQLite/dbcreate.sql
 %%SLIMDIR%%/Plugins/TrackStat/SQL/SQLite/dbindex.sql
+%%SLIMDIR%%/Plugins/TrackStat/SQL/SQLite/dbupgrade_urlmd5.sql
 %%SLIMDIR%%/Plugins/TrackStat/SQL/mysql/dbcreate.sql
 %%SLIMDIR%%/Plugins/TrackStat/SQL/mysql/dbupgrade_added.sql
 %%SLIMDIR%%/Plugins/TrackStat/SQL/mysql/dbupgrade_history.sql
 %%SLIMDIR%%/Plugins/TrackStat/SQL/mysql/dbupgrade_musicbrainz.sql
 %%SLIMDIR%%/Plugins/TrackStat/SQL/mysql/dbupgrade_url_type.sql
 %%SLIMDIR%%/Plugins/TrackStat/SQL/mysql/dbupgrade_url_type255.sql
+%%SLIMDIR%%/Plugins/TrackStat/SQL/mysql/dbupgrade_urlmd5.sql
 %%SLIMDIR%%/Plugins/TrackStat/Settings/Backup.pm
 %%SLIMDIR%%/Plugins/TrackStat/Settings/BaseSettings.pm
 %%SLIMDIR%%/Plugins/TrackStat/Settings/Basic.pm

Modified: head/audio/logitechmediaserver/Makefile
==============================================================================
--- head/audio/squeezeboxserver/Makefile	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver/Makefile	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,50 +1,51 @@
 # $FreeBSD$
 
-PORTNAME=	squeezeboxserver
-PORTVERSION=	7.5.4
-PORTREVISION=	9
+PORTNAME=	logitechmediaserver
+PORTVERSION=	7.9.0.g2016.09.30
 CATEGORIES=	audio
-MASTER_SITES=	http://downloads.slimdevices.com/SqueezeboxServer_v${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-noCPAN
 
-MAINTAINER=	markk at knigma.org
-COMMENT=	Slim Devices audio streaming server
+MAINTAINER=	mark at tranquillussoftware.co.uk
+COMMENT=	Audio streaming server that powers Squeezebox players from Logitech
 
-# Defaults support playback of relativly unrestricted formats on SB2 or
-# SB3 devices and wired SB1 devices.
-OPTIONS_DEFINE=	APE FAAD FLAC LAME SHORTEN SOX DOCS
-OPTIONS_DEFAULT=	APE FAAD FLAX SOX
-SHORTEN_DESC=	Support Shorten input
-SOX_DESC=	Support OGG Vorbis input via SoX (SliMP3 and SB1)
+LICENSE=	SDL
+LICENSE_NAME=	Slim Devices License
+LICENSE_FILE=	${WRKSRC}/License.txt
+LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
+
+BUILD_DEPENDS=	nasm:devel/nasm \
+		bash:shells/bash \
+		rsync:net/rsync
+LIB_DEPENDS=	libgd.so:graphics/gd
+
+USE_GITHUB=	yes
+GH_TUPLE=	Logitech:slimserver:c835a1f \
+		Logitech:slimserver-vendor:14cc392:vendor
 
 RESTRICTED=	Contains non-redistributable firmware, documentation, and images
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-32171-noCPAN
-
-RUN_DEPENDS+=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
-		p5-File-Which>=0:sysutils/p5-File-Which \
-		p5-URI-Find>=0:textproc/p5-URI-Find \
-		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
-		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
-		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
-		p5-GD>=0:graphics/p5-GD \
-		p5-JSON-XS>=0:converters/p5-JSON-XS \
-		p5-HTML-Parser>=0:www/p5-HTML-Parser \
-		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
-		p5-XML-Parser>=0:textproc/p5-XML-Parser \
-		p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
-		p5-EV>=0:devel/p5-EV \
-		p5-Audio-Scan>=0.87:audio/p5-Audio-Scan \
-		p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
-
-# Work around a bug in p5-Package-Stash port
-RUN_DEPENDS+=	p5-Package-DeprecationManager>=0.10:devel/p5-Package-DeprecationManager
-
 USERS=		${SLIMUSER}
 GROUPS=		${SLIMGROUP}
-USES=		perl5 tar:tgz
+USES=		gettext-runtime gmake perl5 shebangfix tar:tgz
+EXTRA_PATCHES=	${FILESDIR}/vendorpatch-CPAN_buildme.sh
+SHEBANG_FILES=	Bin/darwin/check-update.pl \
+		Bin/dbish \
+		CPAN/Log/Log4perl/Layout/PatternLayout/Multiline.pm \
+		Slim/Plugin/UPnP/t/MediaRenderer.t \
+		Slim/Plugin/UPnP/t/MediaServer.t \
+		cleanup.pl \
+		gdresize.pl \
+		gdresized.pl \
+		lib/MPEG/Audio/Frame.pm \
+		scanner.pl \
+		slimserver.pl \
+		${WRKSRC_vendor}/CPAN/hints/darwin.pl
 
-USE_MYSQL=	server
+# Defaults support playback of relativly unrestricted formats on SB2 or
+# SB3 devices and wired SB1 devices.
+OPTIONS_DEFINE=	APE FAAD FLAC LAME SHORTEN SOX DOCS
+OPTIONS_DEFAULT=APE FAAD FLAX SOX
+SHORTEN_DESC=	Support Shorten input
+SOX_DESC=	Support OGG Vorbis input via SoX (SliMP3 and SB1)
 
 APE_RUN_DEPENDS=	mac:audio/mac
 FAAD_RUN_DEPENDS=	faad:audio/faad
@@ -53,71 +54,17 @@ LAME_RUN_DEPENDS=	lame:audio/lame
 SHORTEN_RUN_DEPENDS=	shorten:audio/shorten
 SOX_RUN_DEPENDS=	sox:audio/sox
 
-USE_RC_SUBR=	squeezeboxserver
-TMP_SLIMDIR=	${WRKDIR}/_squeezeboxserver
-TMP_DOCSDIR=	${WRKDIR}/doc
-DOCFILES=	Changelog.html Installation.txt License.txt
+USE_RC_SUBR=	logitechmediaserver
+DOCFILES=	Changelog*.html Installation.txt License*.txt
 CONFFILES=	convert.conf types.conf
-EXCEPTFILES=	${DOCFILES} \
-		${CONFFILES} \
-		CPAN/Carp/Clan.pm \
-		CPAN/Class/Accessor.pm \
-		CPAN/Class/Accessor/Chained.pm \
-		CPAN/Class/C3.pm \
-		CPAN/Class/Inspector.pm \
-		CPAN/Class/XSAccessor.pm \
-		CPAN/Data/Page.pm \
-		CPAN/DBI.pm \
-		CPAN/EV.pm \
-		CPAN/File/Spec.pm \
-		CPAN/File/Temp.pm \
-		CPAN/File/Which.pm \
-		CPAN/GD.pm \
-		CPAN/HTML/Parser.pm \
-		CPAN/JSON/XS/Boolean.pm \
-		CPAN/JSON/XS.pm \
-		CPAN/Template.pm \
-		CPAN/Test/Simple.pm \
-		CPAN/URI.pm \
-		CPAN/XML/Parser.pm \
-		MySQL/errmsg.txt \
-		MySQL/errmsg.sys
-
-EXCEPTDIRS=	Bin \
-		CPAN/arch \
-		CPAN/Algorith \
-		CPAN/Audio \
-		CPAN/Compress \
-		CPAN/Class/Accessor/Chained \
-		CPAN/Class/C3 \
-		CPAN/Class/Inspector \
-		CPAN/Class/XSAccessor \
-		CPAN/DBD \
-		CPAN/DBI \
-		CPAN/DBIx \
-		CPAN/Digest \
-		CPAN/Encode \
-		CPAN/GD \
-		CPAN/Module \
-		CPAN/MRO \
-		CPAN/Path \
-		CPAN/Scope \
-		CPAN/File/Spec \
-		CPAN/Sub \
-		CPAN/SQL \
-		CPAN/Template \
-		CPAN/URI \
-		CPAN/XML/Parser \
-		CPAN/YAML
 
-CPIOARGS=	--quiet -pdum -R
 PLIST_SUB=	SLIMDIR=${SLIMDIR} \
-		SLIMDBDIR=${SLIMDBDIR}
+		SLIMDBDIR=${SLIMDBDIR} \
+		ARCH=${ARCH}
 
 SUB_FILES=	Custom.pm \
-		pkg-install \
-		softsqueeze.sh \
-		custom-convert.conf
+		custom-convert.conf \
+		logitechmediaserver.conf
 SUB_LIST=	PERL=${PERL} \
 		PORTNAME=${PORTNAME} \
 		SITE_PERL=${PREFIX}/${SITE_PERL_REL} \
@@ -127,74 +74,43 @@ SUB_LIST=	PERL=${PERL} \
 		SLIMGROUP=${SLIMGROUP} \
 		CONFFILES="${CONFFILES}"
 
-pre-fetch:
-.if !defined(SLIMDIR)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define SLIMDIR to override default of 'squeezeboxserver'."
-	@${ECHO_MSG} ""
-.endif
-
-SLIMDIR?=	squeezeboxserver
-SLIMDBDIR?=	/var/db/squeezeboxserver
+SLIMDIR?=	share/logitechmediaserver
+SLIMDBDIR?=	/var/db/logitechmediaserver
 SLIMUSER?=	slimserv
 SLIMGROUP?=	${SLIMUSER}
 
-post-patch:
-	@${REINPLACE_CMD} \
-	    -e 's|/usr/bin/perl|${PERL}|g' \
-	    -e 's|%%DISTDIR%%|${_DISTDIR}|g' \
-	    -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-	    -e 's|%%PREFIX%%|${PREFIX}|g' \
-	    -e 's|%%SITE_PERL%%|${PREFIX}/${SITE_PERL_REL}|g' \
-	    -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|g' \
-	    -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|g' \
-		${WRKSRC}/scanner.pl \
-		${WRKSRC}/slimserver.pl
-	@${REINPLACE_CMD} \
-		-e 's/skip-locking/skip-external-locking/' \
-		-e 's/default-character-set/character-set-server/'\
-		-e 's/default-collation/collation-server/'  ${WRKSRC}/MySQL/my.tt
-# table_open_cache was known as table_cache in MySQL 5.1.2 and earlier
-	@if [ "${MYSQL_VER}" != "50" ] ; then \
-		${REINPLACE_CMD} \
-			-e 's/table_cache/table_open_cache/' ${WRKSRC}/MySQL/my.tt ;\
-	fi
-	@${REINPLACE_CMD} \
-		-e 's/TYPE=InnoDB/ENGINE=InnoDB/' ${WRKSRC}/SQL/mysql/schema_*.sql
-
 do-build:
-	@${MKDIR} -m 0755 ${TMP_SLIMDIR}
-	cd ${WRKSRC} && \
-	    ${FIND} . -name \*.orig -o -name \*.bak \
-	    ${EXCEPTFILES:S|^|-o -path ./|} \
-	    ${EXCEPTDIRS:S|^|-o -path ./|} \
-	    ${EXCEPTDIRS:S/$/\/\*/:S/^/-o -path .\//} -o -print | \
-	    ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${TMP_SLIMDIR}
-.for _CONF in ${CONFFILES}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${_CONF} ${TMP_SLIMDIR}/${_CONF}.sample
-.endfor
-do-build-DOCS-on:
-	@${MKDIR} ${TMP_DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR}
-
-pre-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	cd ${WRKSRC_vendor}/CPAN && ./buildme.sh
 
 do-install:
-	@${MKDIR} -m 0755 ${STAGEDIR}${PREFIX}/${SLIMDIR}
-	@${RM} -f ${STAGEDIR}${PREFIX}/${SLIMDIR}/Cache
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR})
+	(cd ${STAGEDIR}${PREFIX}/${SLIMDIR} && \
+		${FIND} . -name \*.orig -delete -o -name \*.bak -delete && \
+		${FIND} ./CPAN/arch/ -d 1 ! -name ${PERL_VER} -print0 | ${XARGS} -0 ${RM} -r -- && \
+		${RM} -r -- Bin/* && \
+		${RM} -- ${CONFFILES} ${DOCFILES})
+	(cd ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER} && \
+		${RM} -r -- arm-linux-gnueabihf-thread-multi-64int && \
+		${RM} -r -- i386-linux-thread-multi-64int && \
+		${RM} -r -- x86_64-linux-thread-multi)
 	@${LN} -s ${SLIMDBDIR}/cache ${STAGEDIR}${PREFIX}/${SLIMDIR}/Cache
-	@cd ${TMP_SLIMDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}
-	@${INSTALL_DATA} ${WRKDIR}/Custom.pm \
+.for _CONF in ${CONFFILES}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${_CONF} ${STAGEDIR}${PREFIX}/${SLIMDIR}/${_CONF}.sample)
+.endfor
+	${INSTALL_DATA} ${WRKDIR}/Custom.pm \
 	    ${STAGEDIR}${PREFIX}/${SLIMDIR}/Slim/Utils/OS/Custom.pm
-	@${INSTALL_DATA} ${WRKDIR}/custom-convert.conf \
+	${INSTALL_DATA} ${WRKDIR}/custom-convert.conf \
 	    ${STAGEDIR}${PREFIX}/${SLIMDIR}/custom-convert.conf
-	@${LN} -sf ${LOCALBASE}/share/mysql/errmsg.txt \
-	    ${LOCALBASE}/share/mysql/english/errmsg.sys \
-	    ${STAGEDIR}${PREFIX}/${SLIMDIR}/MySQL/
-	@${INSTALL_SCRIPT} ${WRKDIR}/softsqueeze.sh ${STAGEDIR}${PREFIX}/bin/softsqueeze
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
+	${INSTALL_DATA} ${WRKDIR}/logitechmediaserver.conf \
+	    ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/
+	${INSTALL_SCRIPT} ${WRKSRC}/Bin/dbish ${STAGEDIR}${PREFIX}/${SLIMDIR}/Bin/
+	(cd ${WRKSRC_vendor}/CPAN/build && \
+		${COPYTREE_SHARE} arch ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN)
+	(cd ${WRKSRC_vendor}/CPAN/build/5.20/lib/perl5 && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/5.20/)
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${TMP_DOCSDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/audio/logitechmediaserver/distinfo
==============================================================================
--- head/audio/squeezeboxserver/distinfo	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver/distinfo	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,2 +1,5 @@
-SHA256 (squeezeboxserver-7.5.4-noCPAN.tgz) = cee93ca23b5197037a0c055acb1aac1ae46da3a7777acbb16633924e13c1004a
-SIZE (squeezeboxserver-7.5.4-noCPAN.tgz) = 19816973
+TIMESTAMP = 1475588350
+SHA256 (Logitech-slimserver-7.9.0.g2016.09.30-c835a1f_GH0.tar.gz) = 01f392f7a6f2c86926e6f86fa99b78d00fe47b8c90893f2c3b5fcc03f1144035
+SIZE (Logitech-slimserver-7.9.0.g2016.09.30-c835a1f_GH0.tar.gz) = 187923230
+SHA256 (Logitech-slimserver-vendor-14cc392_GH0.tar.gz) = 4256458c6c77c06eb2616b1afed851f422f5bf26f2a0c2631339ed3b14d3e385
+SIZE (Logitech-slimserver-vendor-14cc392_GH0.tar.gz) = 115661507

Modified: head/audio/logitechmediaserver/files/Custom.pm.in
==============================================================================
--- head/audio/squeezeboxserver/files/Custom.pm.in	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver/files/Custom.pm.in	Wed Oct  5 22:50:25 2016	(r423393)
@@ -33,7 +33,7 @@ sub dirsFor {
 	
 	if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL|lib|Bin)$/) {
 
-		push @dirs, "%%PREFIX%%/squeezeboxserver/$dir";
+		push @dirs, "%%PREFIX%%/%%SLIMDIR%%/$dir";
 
 	} elsif ($dir eq 'Plugins') {
 
@@ -41,11 +41,11 @@ sub dirsFor {
 
 	} elsif ($dir eq 'strings' || $dir eq 'revision') {
 
-		push @dirs, "%%PREFIX%%/squeezeboxserver";
+		push @dirs, "%%PREFIX%%/%%SLIMDIR%%";
 
 	} elsif ($dir eq 'types' || $dir eq 'convert') {
 
-		push @dirs, "%%PREFIX%%/squeezeboxserver";
+		push @dirs, "%%PREFIX%%/%%SLIMDIR%%";
 
 	} elsif ($dir eq 'prefs') {
 
@@ -53,9 +53,9 @@ sub dirsFor {
 
 	} elsif ($dir eq 'log') {
 
-		push @dirs, "/var/log/squeezeboxserver";
+		push @dirs, "/var/log/%%PORTNAME%%";
 
-	} elsif ($dir eq 'cache' || $dir eq 'updates') {
+	} elsif ($dir eq 'cache' || $dir eq 'updates' || $dir eq 'oldprefs') {
 
 		push @dirs, "%%SLIMDBDIR%%/cache";
 
@@ -65,12 +65,16 @@ sub dirsFor {
 
 	} elsif ($dir eq 'scprefs') {
 
-		if (-r '/var/db/squeezecenter/prefs/server.prefs') {
+		if (-r '%%SLIMDBDIR%%/prefs/server.prefs') {
 
-			push @dirs, '/var/db/squeezecenter/prefs';
+			push @dirs, '%%SLIMDBDIR%%/prefs';
 
 		}
 
+	} elsif ($dir =~ /^(?:music|playlists|videos|pictures)$/) {
+
+		push @dirs, '';
+
 	} else {
 
 		warn "dirsFor: Didn't find a match request: [$dir]\n";

Added: head/audio/logitechmediaserver/files/logitechmediaserver.conf.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/logitechmediaserver/files/logitechmediaserver.conf.in	Wed Oct  5 22:50:25 2016	(r423393)
@@ -0,0 +1,7 @@
+# newsyslog configuration file for %%PORTNAME%%
+# $FreeBSD$
+#
+# see newsyslog.conf(5) for details
+#
+# logfilename				[owner:group]			mode	count	size	when	flags	[/pid_file]				[sig_num]
+/var/log/%%PORTNAME%%/server.log	%%SLIMUSER%%:%%SLIMGROUP%%	644	3	100	*	J	/var/run/%%PORTNAME%%/%%PORTNAME%%.pid

Copied and modified: head/audio/logitechmediaserver/files/logitechmediaserver.in (from r423352, head/audio/squeezeboxserver/files/squeezeboxserver.in)
==============================================================================
--- head/audio/squeezeboxserver/files/squeezeboxserver.in	Wed Oct  5 15:38:16 2016	(r423352, copy source)
+++ head/audio/logitechmediaserver/files/logitechmediaserver.in	Wed Oct  5 22:50:25 2016	(r423393)
@@ -30,7 +30,7 @@ prefsdir=${statedir}/prefs
 playlistdir=${statedir}/playlists
 u=%%SLIMUSER%%
 g=%%SLIMGROUP%%
-command_args="--daemon --pidfile=${pidfile}"
+command_args="--daemon --pidfile=${pidfile} --user=${u} --group=${g}"
 %%PORTNAME%%_user=${u}
 %%PORTNAME%%_group=${g}
 

Modified: head/audio/logitechmediaserver/files/patch-Slim_Utils_Log.pm
==============================================================================
--- head/audio/squeezeboxserver/files/patch-Slim_Utils_Log.pm	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver/files/patch-Slim_Utils_Log.pm	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,4 +1,4 @@
---- Slim/Utils/Log.pm.orig	2011-01-24 15:15:39 UTC
+--- Slim/Utils/Log.pm.orig	2016-09-30 13:54:28 UTC
 +++ Slim/Utils/Log.pm
 @@ -134,7 +134,7 @@ sub init {
  	# Make sure recreate option is set if user has an existing log.conf
@@ -9,7 +9,7 @@
  	}
  	else {
  		$config{'log4perl.appender.server.recreate'}              = 0;
-@@ -989,7 +989,7 @@ sub _defaultAppenders {
+@@ -1005,7 +1005,7 @@ sub _defaultAppenders {
  
  	if ( !main::ISWINDOWS && !$ENV{NYTPROF} ) {
  		$defaultAppenders{server}->{recreate}              = 1;

Modified: head/audio/logitechmediaserver/files/patch-convert.conf
==============================================================================
--- head/audio/squeezeboxserver/files/patch-convert.conf	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver/files/patch-convert.conf	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,45 +1,11 @@
---- convert.conf.orig	2011-01-24 15:16:10 UTC
+--- convert.conf.orig	2016-09-30 13:54:28 UTC
 +++ convert.conf
-@@ -86,8 +86,8 @@ sls mp3 * *
- 	[sls] $FILE$ - -s | [lame] --silent -q $QUALITY$ $RESAMPLE$ $BITRATE$ - -
- 
- mov mp3 * *
--	# FRB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
--	[mov123] $FILE$ | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - -
-+	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
-+	[faad] -q -w -f 2 $FILE$ | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --little-endian - -
- 
- alc mp3 * *
- 	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}T:{START=-j %s}
-@@ -127,7 +127,7 @@ mpc mp3 * *
+@@ -135,7 +135,7 @@ mpc mp3 * *
  
  ape mp3 * *
- 	# FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D}
--	[mac] $FILE$ - -d | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - -
+ 	# FB:{BITRATE=--abr %B}D:{RESAMPLE=--resample %D}
+-	[mac] $FILE$ - -d | [lame] --silent -q $QUALITY$ $RESAMPLE$ $BITRATE$ - -
 +	[faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - -
  
  wvp mp3 * *
- 	# FB:{BITRATE=-B %B}T:{START=--skip=%t}U:{END=--until=%v}D:{RESAMPLE=--resample %D}
-@@ -197,9 +197,9 @@ sls pcm * *
- 	# F
- 	[sls] $FILE$ - -r -s
- 
--mov aif * *
-+mov wav * *
- 	# FR
--	[mov123] $FILE$
-+	[faad] -q -w -f 2 -b 1 -s 44100 $FILE$
- 
- wma wma * *
- 	-
-@@ -264,8 +264,8 @@ sls flc * *
- 	[sls] $FILE$ - -s | [sox] -q -t wav - -t flac -C 0 $RESAMPLE$ -
- 
- mov flc * *
--	# FR
--	[mov123] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 -
-+	# F
-+	[faad] -w -q -f 2 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian little --sign signed --channels 2 --bps 16 --sample-rate 44100 -
- 
- alc flc * *
- 	# FT:{START=-j %s}D:{RESAMPLE=-r %d}
+ 	# FB:{BITRATE=--abr %B}T:{START=--skip=%t}U:{END=--until=%v}D:{RESAMPLE=--resample %D}

Modified: head/audio/logitechmediaserver/files/patch-dbix-class-bug.diff
==============================================================================
--- head/audio/squeezeboxserver/files/patch-dbix-class-bug.diff	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver/files/patch-dbix-class-bug.diff	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,8 +1,21 @@
+--- scanner.pl.orig	2016-09-30 13:54:28 UTC
++++ scanner.pl
+@@ -279,10 +279,6 @@ sub main {
+ 	# Perform pre-scan steps specific to the database type, i.e. SQLite needs to copy to a new file
+ 	$sqlHelperClass->beforeScan();
+ 
+-	# Take the db out of autocommit mode - this makes for a much faster scan.
+-	# Scanner::Local will commit every few operations
+-	Slim::Schema->dbh->{'AutoCommit'} = 0;
+-
+ 	my $scanType = 'SETUP_STANDARDRESCAN';
+ 
+ 	if ($wipe) {
 Index: Slim/Schema.pm
 ===================================================================
---- Slim/Schema.pm.orig	2011-01-24 15:15:39 UTC
+--- Slim/Schema.pm.orig	2016-09-30 13:54:28 UTC
 +++ Slim/Schema.pm
-@@ -274,11 +274,15 @@ sub _connect {
+@@ -270,12 +270,16 @@ sub _connect {
  	# For custom exceptions
  	$class->storage_type('Slim::Schema::Storage');
  	
@@ -10,24 +23,13 @@ Index: Slim/Schema.pm
 +	# Needs to be set here as setting dbh->{'AutoCommit'} = 0 later
 +	# confusing the transaction nesting logic.
 +	my $AutoCommit = (main::SCANNER ? 0 : 1);
+ 	my $sqlHelperClass = Slim::Utils::OSDetect->getOS()->sqlHelperClass();
  	my $on_connect_do = $sqlHelperClass->on_connect_do();
  	
  	$class->connection( $dsn || $source, $username, $password, { 
  		RaiseError    => 1,
 -		AutoCommit    => 1,
-+		AutoCommit    => $AutoCommit, 
++		AutoCommit    => $AutoCommit,
  		PrintError    => 0,
  		Taint         => 1,
  		on_connect_do => [
---- scanner.pl.orig	2011-03-21 13:05:58 UTC
-+++ scanner.pl
-@@ -236,9 +236,6 @@ sub main {
- 
- 	main::INFOLOG && $log->info("Squeezebox Server Scanner done init...\n");
- 
--	# Take the db out of autocommit mode - this makes for a much faster scan.
--	Slim::Schema->storage->dbh->{'AutoCommit'} = 0;
--
- 	my $scanType = 'SETUP_STANDARDRESCAN';
- 
- 	if ($wipe) {

Added: head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh	Wed Oct  5 22:50:25 2016	(r423393)
@@ -0,0 +1,30 @@
+--- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig	2016-08-12 14:27:39.000000000 +0100
++++ ../slimserver-vendor-14cc392/CPAN/buildme.sh	2016-08-17 21:24:10.394225000 +0100
+@@ -92,7 +92,7 @@
+     exit
+ fi
+ 
+-for i in gcc cpp rsync make rsync ; do
++for i in cc cpp rsync make rsync ; do
+     which $i > /dev/null
+     if [ $? -ne 0 ] ; then
+         echo "$i not found - please install it"
+@@ -552,7 +552,7 @@
+                     ICUOS="FreeBSD"
+                 fi
+                 CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \
+-                    ./runConfigureICU $ICUOS --prefix=$BUILD --enable-static --with-data-packaging=archive
++                    ./configure --prefix=$BUILD --enable-static --with-data-packaging=archive
+                 $MAKE
+                 if [ $? != 0 ]; then
+                     echo "make failed"
+@@ -1223,6 +1223,9 @@
+     if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then
+         FFOPTS="$FFOPTS --arch=x86"
+     fi
++    if [ "$OS" = "FreeBSD" ]; then
++	FFOPTS="$FFOPTS --cc=clang"
++    fi
+     
+     if [ "$OS" = "Darwin" ]; then
+         SAVED_FLAGS=$FLAGS

Modified: head/audio/logitechmediaserver/pkg-descr
==============================================================================
--- head/audio/squeezeboxserver/pkg-descr	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver/pkg-descr	Wed Oct  5 22:50:25 2016	(r423393)
@@ -15,4 +15,7 @@ An audio streaming server with many feat
 - Cross platform Open Source software, written in Perl (GPL)
 - Listen from any computer using an MP3 software player (Winamp or iTunes)
 
+Logitech acquired Slim Devices in 2006, prior to which Logitech Media Server
+was known as Squeezebox Server (version 7.4 to 7.6) and SlimServer (before 7.4).
+
 WWW: http://wiki.slimdevices.com/index.php/Squeezebox_Server

Modified: head/audio/logitechmediaserver/pkg-plist
==============================================================================
--- head/audio/squeezeboxserver/pkg-plist	Wed Oct  5 21:34:22 2016	(r423392)
+++ head/audio/logitechmediaserver/pkg-plist	Wed Oct  5 22:50:25 2016	(r423393)
@@ -1,8 +1,24 @@
-bin/softsqueeze
+etc/newsyslog.conf.d/logitechmediaserver.conf
 %%PORTDOCS%%%%DOCSDIR%%/Changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/Changelog1.html
+%%PORTDOCS%%%%DOCSDIR%%/Changelog2.html
+%%PORTDOCS%%%%DOCSDIR%%/Changelog3.html
+%%PORTDOCS%%%%DOCSDIR%%/Changelog4.html
+%%PORTDOCS%%%%DOCSDIR%%/Changelog5.html
+%%PORTDOCS%%%%DOCSDIR%%/Changelog6.html
+%%PORTDOCS%%%%DOCSDIR%%/Changelog7.html
 %%PORTDOCS%%%%DOCSDIR%%/Installation.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.de.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.es.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.fr.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.he.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.it.txt
+%%PORTDOCS%%%%DOCSDIR%%/License.nl.txt
 %%PORTDOCS%%%%DOCSDIR%%/License.txt
+%%SLIMDIR%%/Bin/dbish
+%%SLIMDIR%%/CPAN/AE.pm
 %%SLIMDIR%%/CPAN/Algorithm/C3.pm
+%%SLIMDIR%%/CPAN/AnyEvent.pm

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list