diff options
Diffstat (limited to 'audio/squeezecenter')
| -rw-r--r-- | audio/squeezecenter/Makefile | 25 | ||||
| -rw-r--r-- | audio/squeezecenter/files/Custom.pm.in | 83 | ||||
| -rw-r--r-- | audio/squeezecenter/files/patch-Slim_Utils_OSDetect.pm | 14 | ||||
| -rw-r--r-- | audio/squeezecenter/files/patch-Slim_Utils_OS_FreeBSD.pm | 85 | ||||
| -rw-r--r-- | audio/squeezecenter/files/patch-Slim_Utils_OS_Unix.pm | 18 | ||||
| -rw-r--r-- | audio/squeezecenter/pkg-plist | 8 |
6 files changed, 102 insertions, 131 deletions
diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile index e8fc06cdc418..e5b288165a5f 100644 --- a/audio/squeezecenter/Makefile +++ b/audio/squeezecenter/Makefile @@ -7,6 +7,7 @@ PORTNAME= squeezecenter PORTVERSION= 7.3.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.slimdevices.com/SqueezeCenter_v${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.0//}-noCPAN @@ -105,9 +106,12 @@ EXCEPTDIRS= Bin \ CPIOARGS= --quiet -pdum -R PLIST_SUB= SLIMDIR=${SLIMDIR} -SUB_FILES= softsqueeze.sh pkg-install +SUB_FILES= Custom.pm \ + pkg-install \ + softsqueeze.sh SUB_LIST= PERL=${PERL} \ PORTNAME=${PORTNAME} \ + SITE_PERL=${SITE_PERL} \ SLIMDIR=${SLIMDIR} \ SLIMDBDIR=${SLIMDBDIR} \ SLIMUSER=${SLIMUSER} \ @@ -135,7 +139,6 @@ post-patch: -e 's|%%SITE_PERL%%|${SITE_PERL}|g' \ -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|g' \ -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|g' \ - ${WRKSRC}/Slim/Utils/OS/FreeBSD.pm \ ${WRKSRC}/scanner.pl \ ${WRKSRC}/slimserver.pl @@ -163,11 +166,12 @@ do-install: @${RM} -f ${PREFIX}/${SLIMDIR}/Cache @${LN} -s ${SLIMDBDIR}/cache ${PREFIX}/${SLIMDIR}/Cache @cd ${TMP_SLIMDIR} && ${COPYTREE_SHARE} . ${PREFIX}/${SLIMDIR} + @${INSTALL_DATA} ${WRKDIR}/Custom.pm \ + ${PREFIX}/${SLIMDIR}/Slim/Utils/OS/Custom.pm @${CHMOD} 755 ${PREFIX}/${SLIMDIR}/slimserver.pl @${CHMOD} 755 ${PREFIX}/${SLIMDIR}/scanner.pl @${LN} -sf ${LOCALBASE}/share/mysql/errmsg.txt \ - ${PREFIX}/${SLIMDIR}/MySQL/ - @${LN} -sf ${LOCALBASE}/share/mysql/english/errmsg.sys \ + ${LOCALBASE}/share/mysql/english/errmsg.sys \ ${PREFIX}/${SLIMDIR}/MySQL/ @${INSTALL_SCRIPT} ${WRKDIR}/softsqueeze.sh ${PREFIX}/bin/softsqueeze .if !defined(NOPORTDOCS) @@ -192,15 +196,16 @@ build-plist: @${FIND} ${TMP_SLIMDIR}/* -type f | \ ${SED} -e 's|${TMP_SLIMDIR}|%%SLIMDIR%%|' | \ ${SORT} >> ${PLIST} - @${ECHO} "${SLIMDIR}/Cache" >> ${PLIST} - @${ECHO} "${SLIMDIR}/MySQL/errmsg.txt" >> ${PLIST} - @${ECHO} "${SLIMDIR}/MySQL/errmsg.sys" >> ${PLIST} - ${FIND} ${TMP_SLIMDIR} -type d | \ + @${ECHO} "%%SLIMDIR%%/Cache" >> ${PLIST} + @${ECHO} "%%SLIMDIR%%/MySQL/errmsg.txt" >> ${PLIST} + @${ECHO} "%%SLIMDIR%%/MySQL/errmsg.sys" >> ${PLIST} + @${ECHO} "%%SLIMDIR%%/Slim/Utils/OS/Custom.pm" >> ${PLIST} + @${FIND} ${TMP_SLIMDIR} -type d | \ ${EGREP} -v "${TMP_SLIMDIR}(|/Plugins)$$" | \ ${SED} -e 's|${TMP_SLIMDIR}|@dirrm %%SLIMDIR%%|' | \ ${SORT} -r >> ${PLIST} - echo "@dirrmtry %%SLIMDIR%%/Plugins" >> ${PLIST} - echo "@dirrmtry %%SLIMDIR%%" >> ${PLIST} + @echo "@dirrmtry %%SLIMDIR%%/Plugins" >> ${PLIST} + @echo "@dirrmtry %%SLIMDIR%%" >> ${PLIST} @${FIND} ${TMP_DOCSDIR} -type d | \ ${SED} -e 's|${TMP_DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' | \ ${SORT} -r >> ${PLIST} diff --git a/audio/squeezecenter/files/Custom.pm.in b/audio/squeezecenter/files/Custom.pm.in new file mode 100644 index 000000000000..ebc245b152bd --- /dev/null +++ b/audio/squeezecenter/files/Custom.pm.in @@ -0,0 +1,83 @@ +package Slim::Utils::OS::Custom; +#package Slim::Utils::OS::FreeBSD; + +use strict; +use base qw(Slim::Utils::OS::Unix); + +use Config; + +sub initDetails { + my $class = shift; + + $class->{osDetails} = $class->SUPER::initDetails(); + $class->{osDetails}->{'os'} = 'FreeBSD'; + $class->{osDetails}->{osName} = 'FreeBSD'; + + return $class->{osDetails}; +} + +sub initSearchPath { + my $class = shift; + + $class->SUPER::initSearchPath(); + + my @extra_paths = qw(/usr/local/libexec); + + Slim::Utils::Misc::addFindBinPaths(@extra_paths); +} + +sub dirsFor { + my ($class, $dir) = @_; + + my @dirs; + + if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL|lib|Bin)$/) { + + push @dirs, "%%PREFIX%%/squeezecenter/$dir"; + + } elsif ($dir eq 'Plugins') { + + push @dirs, "%%SITE_PERL%%", "%%PREFIX%%/%%SLIMDIR%%/Plugins", "%%PREFIX%%/%%SLIMDIR%%/Slim/Plugin", "%%SLIMDBDIR%%/cache/InstalledPlugins/Plugins"; + + } elsif ($dir eq 'strings' || $dir eq 'revision') { + + push @dirs, "%%PREFIX%%/squeezecenter"; + + } elsif ($dir eq 'types' || $dir eq 'convert') { + + push @dirs, "%%PREFIX%%/squeezecenter"; + + } elsif ($dir eq 'prefs') { + + push @dirs, "%%SLIMDBDIR%%/prefs"; + + } elsif ($dir eq 'log') { + + push @dirs, "/var/log/squeezecenter"; + + } elsif ($dir eq 'cache') { + + push @dirs, "%%SLIMDBDIR%%/cache"; + + } elsif ($dir =~ /^(?:libpath|mysql-language)$/) { + + # Do nothing - use the depended upon MySQL install. + + } elsif ($dir eq 'oldprefs') { + + if (-r '/var/db/slimserver/slimserver.conf') { + + push @dirs, '/var/db/slimserver/slimserver.conf'; + + } + + } else { + + warn "dirsFor: Didn't find a match request: [$dir]\n"; + + } + + return wantarray() ? @dirs : $dirs[0]; +} + +1; diff --git a/audio/squeezecenter/files/patch-Slim_Utils_OSDetect.pm b/audio/squeezecenter/files/patch-Slim_Utils_OSDetect.pm deleted file mode 100644 index 70305f61f8c1..000000000000 --- a/audio/squeezecenter/files/patch-Slim_Utils_OSDetect.pm +++ /dev/null @@ -1,14 +0,0 @@ ---- Slim/Utils/OSDetect.pm.orig 2008-12-11 14:13:33.000000000 -0800 -+++ Slim/Utils/OSDetect.pm 2008-12-22 11:53:19.000000000 -0800 -@@ -121,6 +121,11 @@ - $os = Slim::Utils::OS::Linux->new(); - } - -+ } elsif ($^O =~ /freebsd/i) { -+ -+ require Slim::Utils::OS::FreeBSD; -+ $os = Slim::Utils::OS::FreeBSD->new(); -+ - } else { - - require Slim::Utils::OS::Unix; diff --git a/audio/squeezecenter/files/patch-Slim_Utils_OS_FreeBSD.pm b/audio/squeezecenter/files/patch-Slim_Utils_OS_FreeBSD.pm deleted file mode 100644 index 25d7e03e6911..000000000000 --- a/audio/squeezecenter/files/patch-Slim_Utils_OS_FreeBSD.pm +++ /dev/null @@ -1,85 +0,0 @@ ---- /dev/null 2008-12-22 12:00:01.000000000 -0800 -+++ Slim/Utils/OS/FreeBSD.pm 2008-12-22 12:00:05.000000000 -0800 -@@ -0,0 +1,82 @@ -+package Slim::Utils::OS::FreeBSD; -+ -+use strict; -+use base qw(Slim::Utils::OS::Unix); -+ -+use Config; -+ -+sub initDetails { -+ my $class = shift; -+ -+ $class->{osDetails} = $class->SUPER::initDetails(); -+ $class->{osDetails}->{'os'} = 'FreeBSD'; -+ $class->{osDetails}->{osName} = 'FreeBSD'; -+ -+ return $class->{osDetails}; -+} -+ -+sub initSearchPath { -+ my $class = shift; -+ -+ $class->SUPER::initSearchPath(); -+ -+ my @extra_paths = qw(/usr/local/libexec); -+ -+ Slim::Utils::Misc::addFindBinPaths(@extra_paths); -+} -+ -+sub dirsFor { -+ my ($class, $dir) = @_; -+ -+ my @dirs; -+ -+ if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL|lib|Bin)$/) { -+ -+ push @dirs, "%%PREFIX%%/squeezecenter/$dir"; -+ -+ } elsif ($dir eq 'Plugins') { -+ -+ push @dirs, "%%SITE_PERL%%", "%%PREFIX%%/squeezecenter/Plugins", "%%PREFIX%%/squeezecenter/Slim/Plugin"; -+ -+ } elsif ($dir eq 'strings' || $dir eq 'revision') { -+ -+ push @dirs, "%%PREFIX%%/squeezecenter"; -+ -+ } elsif ($dir eq 'types' || $dir eq 'convert') { -+ -+ push @dirs, "%%PREFIX%%/squeezecenter"; -+ -+ } elsif ($dir eq 'prefs') { -+ -+ push @dirs, "%%SLIMDBDIR%%/prefs"; -+ -+ } elsif ($dir eq 'log') { -+ -+ push @dirs, "/var/log/squeezecenter"; -+ -+ } elsif ($dir eq 'cache') { -+ -+ push @dirs, "%%SLIMDBDIR%%/cache"; -+ -+ } elsif ($dir =~ /^(?:libpath|mysql-language)$/) { -+ -+ # Do nothing - use the depended upon MySQL install. -+ -+ } elsif ($dir eq 'oldprefs') { -+ -+ if (-r '/var/db/slimserver/slimserver.conf') { -+ -+ push @dirs, '/var/db/slimserver/slimserver.conf'; -+ -+ } -+ -+ } else { -+ -+ warn "dirsFor: Didn't find a match request: [$dir]\n"; -+ -+ } -+ -+ return wantarray() ? @dirs : $dirs[0]; -+} -+ -+1; diff --git a/audio/squeezecenter/files/patch-Slim_Utils_OS_Unix.pm b/audio/squeezecenter/files/patch-Slim_Utils_OS_Unix.pm deleted file mode 100644 index dd6116d1be38..000000000000 --- a/audio/squeezecenter/files/patch-Slim_Utils_OS_Unix.pm +++ /dev/null @@ -1,18 +0,0 @@ ---- Slim/Utils/OS/Unix.pm.orig 2008-12-11 14:13:33.000000000 -0800 -+++ Slim/Utils/OS/Unix.pm 2008-12-22 11:05:41.000000000 -0800 -@@ -27,7 +27,7 @@ - - $class->SUPER::initSearchPath(); - -- my @paths = (split(/:/, $ENV{'PATH'}), qw(/usr/bin /usr/local/bin /usr/libexec /sw/bin /usr/sbin)); -+ my @paths = (split(/:/, $ENV{'PATH'}), qw(/usr/bin /usr/local/bin /usr/local/libexec /usr/libexec /sw/bin /usr/sbin)); - - Slim::Utils::Misc::addFindBinPaths(@paths); - } -@@ -101,4 +101,4 @@ - # leave log rotation to the system - sub logRotate {} - --1; -\ No newline at end of file -+1; diff --git a/audio/squeezecenter/pkg-plist b/audio/squeezecenter/pkg-plist index 4ca50bf093a5..8b4456284cbf 100644 --- a/audio/squeezecenter/pkg-plist +++ b/audio/squeezecenter/pkg-plist @@ -2114,7 +2114,6 @@ bin/softsqueeze %%SLIMDIR%%/Slim/Utils/Network.pm %%SLIMDIR%%/Slim/Utils/OS.pm %%SLIMDIR%%/Slim/Utils/OS/Debian.pm -%%SLIMDIR%%/Slim/Utils/OS/FreeBSD.pm %%SLIMDIR%%/Slim/Utils/OS/Linux.pm %%SLIMDIR%%/Slim/Utils/OS/OSX.pm %%SLIMDIR%%/Slim/Utils/OS/ReadyNAS.pm @@ -2221,9 +2220,10 @@ bin/softsqueeze %%SLIMDIR%%/slimservice.pl %%SLIMDIR%%/strings.txt %%SLIMDIR%%/types.conf.sample -squeezecenter/Cache -squeezecenter/MySQL/errmsg.txt -squeezecenter/MySQL/errmsg.sys +%%SLIMDIR%%/Cache +%%SLIMDIR%%/MySQL/errmsg.txt +%%SLIMDIR%%/MySQL/errmsg.sys +%%SLIMDIR%%/Slim/Utils/OS/Custom.pm @dirrm %%SLIMDIR%%/lib/Template @dirrm %%SLIMDIR%%/lib/Ogg/Vorbis/Header @dirrm %%SLIMDIR%%/lib/Ogg/Vorbis |