- Name changes after repocopy in previous commit.

- Update to 2.5

4 files changed, 96 insertions, 19 deletions

diff --git a/audio/squeezeboxserver-sqlplaylist/Makefile b/audio/squeezeboxserver-sqlplaylist/Makefile
index f05cb118839f..74f3a9b35038 100644
--- a/audio/squeezeboxserver-sqlplaylist/Makefile
+++ b/audio/squeezeboxserver-sqlplaylist/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	squeezecenter-sqlplaylist
+# New ports collection makefile for:	squeezeboxserver-sqlplaylist
 # Date created:		21 June 2008
 # Whom:			Tim Bishop <tdb@FreeBSD.org>
 #
@@ -6,25 +6,25 @@
 #
 
 PORTNAME=	sqlplaylist
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	audio
 MASTER_SITES=	http://erland.homeip.net/download/do/downloadapplication?name=slimserver-sqlplaylist&filename=/
-PKGNAMEPREFIX=	squeezecenter-
+PKGNAMEPREFIX=	squeezeboxserver-
 DISTNAME=	SQLPlayList-${PORTVERSION:S/b/beta/}
-DIST_SUBDIR=	squeezecenter
+DIST_SUBDIR=	squeezeboxserver
 
 MAINTAINER=	tdb@FreeBSD.org
-COMMENT=	SqueezeCenter plugin to create playlists based on SQL queries
+COMMENT=	Squeezebox Server plugin to create playlists based on SQL queries
 
-RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezecenter \
-		${LOCALBASE}/${SLIMDIR}/Plugins/DynamicPlayList/install.xml:${PORTSDIR}/audio/squeezecenter-dynamicplaylist
+RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver \
+		${LOCALBASE}/${SLIMDIR}/Plugins/DynamicPlayList/install.xml:${PORTSDIR}/audio/squeezeboxserver-dynamicplaylist
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-SLIMDIR?=	squeezecenter
+SLIMDIR?=	squeezeboxserver
 PLIST_SUB+=	SLIMDIR=${SLIMDIR}
 
 do-install:
diff --git a/audio/squeezeboxserver-sqlplaylist/distinfo b/audio/squeezeboxserver-sqlplaylist/distinfo
index 35bac2d50be2..20a61bd8b717 100644
--- a/audio/squeezeboxserver-sqlplaylist/distinfo
+++ b/audio/squeezeboxserver-sqlplaylist/distinfo
@@ -1,3 +1,3 @@
-MD5 (squeezecenter/SQLPlayList-2.4.zip) = 15c8c87fefab79a7dde340b0d22e4eb5
-SHA256 (squeezecenter/SQLPlayList-2.4.zip) = cb1c01fbb100382ba030dad4b3b412e07a39913bb526c9a631ea9efe32801009
-SIZE (squeezecenter/SQLPlayList-2.4.zip) = 181311
+MD5 (squeezeboxserver/SQLPlayList-2.5.zip) = 23bf80c8155981c02bada8cf8b64e141
+SHA256 (squeezeboxserver/SQLPlayList-2.5.zip) = 0212727e87d8851e9ea95fa1a4b29020bcdbda3253f5357a643574a2c4b59eec
+SIZE (squeezeboxserver/SQLPlayList-2.5.zip) = 304696
diff --git a/audio/squeezeboxserver-sqlplaylist/pkg-descr b/audio/squeezeboxserver-sqlplaylist/pkg-descr
index b04957f64ff4..c0d9a9e20fd7 100644
--- a/audio/squeezeboxserver-sqlplaylist/pkg-descr
+++ b/audio/squeezeboxserver-sqlplaylist/pkg-descr
@@ -1,12 +1,12 @@
-This plugin for SqueezeCenter makes it possible to create smart
-playlists. Although the standard SqueezeCenter doesn't support smart
-playlists by itself, together with iTunes and the standard
-SqueezeCenter iTunes integration, it is possible to use smart
+This plugin for Squeezebox Server makes it possible to create smart
+playlists. Although the standard Squeezebox Server doesn't support
+smart playlists by itself, together with iTunes and the standard
+Squeezebox 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 SqueezeCenter. The SQL Playlist plugin takes
-care of this problem and implements native smart playlist in
-SqueezeCenter without any need to use iTunes. The smart playlists
+you perform a rescan in Squeezebox 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
 implemented in SQL Playlist will also be automatically re-calculated
 after each track played so they will be based on the latest statistic
 information.
diff --git a/audio/squeezeboxserver-sqlplaylist/pkg-plist b/audio/squeezeboxserver-sqlplaylist/pkg-plist
index d5e0448e3bcd..7a6ee2c8a960 100644
--- a/audio/squeezeboxserver-sqlplaylist/pkg-plist
+++ b/audio/squeezeboxserver-sqlplaylist/pkg-plist
@@ -1,3 +1,14 @@
+%%SLIMDIR%%/Plugins/SQLPlayList/BaseSettings.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/BaseParser.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/ContentParser.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/DirectoryLoader.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/Main.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/ParameterHandler.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/PlaylistWebAdminMethods.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/PluginLoader.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/TemplateContentParser.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/TemplateParser.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager/WebAdminMethods.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/Classic/html/images/sqlplaylist_mix.gif
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/Default/html/images/sqlplaylist_mix.gif
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/Default/plugins/SQLPlayList/dynamicplaylistlink.html
@@ -10,6 +21,7 @@
 %%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
@@ -21,6 +33,7 @@
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/EN/plugins/SQLPlayList/webadminmethods_savedownloadeditem.html
 %%SLIMDIR%%/Plugins/SQLPlayList/HTML/Fishbone/html/images/sqlplaylist_mix.gif
 %%SLIMDIR%%/Plugins/SQLPlayList/LICENSE.txt
+%%SLIMDIR%%/Plugins/SQLPlayList/MixHandler.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/Mixes/sqlplaylist.cb.mix.xml
 %%SLIMDIR%%/Plugins/SQLPlayList/Playlists/randomalbums.sql.values.xml
 %%SLIMDIR%%/Plugins/SQLPlayList/Playlists/randomalbumsforartist.sql.values.xml
@@ -37,7 +50,10 @@
 %%SLIMDIR%%/Plugins/SQLPlayList/Playlists/randomforyear.sql.values.xml
 %%SLIMDIR%%/Plugins/SQLPlayList/Playlists/randomtracks.sql.values.xml
 %%SLIMDIR%%/Plugins/SQLPlayList/Playlists/randomyears.sql.values.xml
+%%SLIMDIR%%/Plugins/SQLPlayList/Plugin.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/README.txt
+%%SLIMDIR%%/Plugins/SQLPlayList/Settings.pm
+%%SLIMDIR%%/Plugins/SQLPlayList/Template/Reader.pm
 %%SLIMDIR%%/Plugins/SQLPlayList/Templates/advanced.sql.template
 %%SLIMDIR%%/Plugins/SQLPlayList/Templates/advanced.sql.xml
 %%SLIMDIR%%/Plugins/SQLPlayList/Templates/advancedwithrating.sql.template
@@ -79,10 +95,70 @@
 %%SLIMDIR%%/Plugins/SQLPlayList/Templates/topratedforyear.sql.template
 %%SLIMDIR%%/Plugins/SQLPlayList/Templates/topratedforyear.sql.xml
 %%SLIMDIR%%/Plugins/SQLPlayList/install.xml
-%%SLIMDIR%%/Plugins/SQLPlayList/lib/Plugins-SQLPlayList-Plugin.par
+%%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/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
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/XMLRPC/Transport
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/XMLRPC
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/XML/Parser
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/XML
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/UDDI
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP/Transport
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/SOAP
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/Plugins
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP/Transport
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs/SOAP
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/OldDocs
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/IO
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/Apache/XMLRPC
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib/Apache
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/lib
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/Templates
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/Template
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/Playlists
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/Mixes
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/HTML/Fishbone/html/images
@@ -101,6 +177,7 @@
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/HTML/Classic/html
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/HTML/Classic
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList/HTML
+@dirrm %%SLIMDIR%%/Plugins/SQLPlayList/ConfigManager
 @dirrm %%SLIMDIR%%/Plugins/SQLPlayList
 @dirrmtry %%SLIMDIR%%/Plugins
 @dirrmtry %%SLIMDIR%%