Index: head/audio/squeezeboxserver/Makefile =================================================================== --- head/audio/squeezeboxserver/Makefile (revision 250279) +++ head/audio/squeezeboxserver/Makefile (revision 250280) @@ -1,253 +1,252 @@ # Ports collection makefile for: squeezeboxserver # Date created: Wed Apr 14, 2004 # Whom: Brooks Davis # # $FreeBSD$ # PORTNAME= squeezeboxserver -PORTVERSION= 7.4.1 -PORTREVISION= 3 +PORTVERSION= 7.4.2 CATEGORIES= audio MASTER_SITES= http://downloads.slimdevices.com/SqueezeboxServer_v${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-noCPAN EXTRACT_SUFX= .tgz MAINTAINER= brooks@FreeBSD.org COMMENT= Slim Devices audio streaming server CONFLICTS= squeezecenter-* # Defaults support playback of relativly unrestricted formats on SB2 or # SB3 devices and wired SB1 devices. OPTIONS= APE "Support Monkey's Audio Codec input" on \ FAAD "Support AAC input via FAAD" on \ FLAC "Support FLAC output (and input on SliMP3 and SB1)" on \ LAME "Support MP3 output via LAME" off \ MUSEPACK "Support musepack input" on \ SHORTEN "Support Shorten input" off \ SOX "Support OGG Vorbis input via SoX (SliMP3 and SB1)" on RESTRICTED= Contains non-redistributable firmware, documentation, and images -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-28947-noCPAN +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-30215-noCPAN RUN_DEPENDS+= ${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \ ${SITE_PERL}/DBIx/Class.pm:${PORTSDIR}/databases/p5-DBIx-Class \ ${SITE_PERL}/File/Which.pm:${PORTSDIR}/sysutils/p5-File-Which \ ${SITE_PERL}/URI/Find.pm:${PORTSDIR}/textproc/p5-URI-Find \ ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \ ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \ ${SITE_PERL}/${PERL_ARCH}/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect \ ${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \ ${SITE_PERL}/${PERL_ARCH}/JSON/XS.pm:${PORTSDIR}/converters/p5-JSON-XS \ ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \ ${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \ ${SITE_PERL}/${PERL_ARCH}/YAML/Syck.pm:${PORTSDIR}/textproc/p5-YAML-Syck \ ${SITE_PERL}/${PERL_ARCH}/EV.pm:${PORTSDIR}/devel/p5-EV \ ${SITE_PERL}/${PERL_ARCH}/Audio/Scan.pm:${PORTSDIR}/audio/p5-Audio-Scan \ ${SITE_PERL}/${PERL_ARCH}/Class/XSAccessor.pm:${PORTSDIR}/devel/p5-Class-XSAccessor PKGINSTALL= ${WRKDIR}/pkg-install USE_PERL5= yes .include USE_MYSQL= yes IGNORE_WITH_MYSQL= 323 40 # We need a dependency on the server because squeezecenter runs the binary # directly with a non-standard config. RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server .if !defined(WITHOUT_APE) RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac .endif .if !defined(WITHOUT_FAAD) RUN_DEPENDS+= faad:${PORTSDIR}/audio/faad .endif .if !defined(WITHOUT_FLAC) RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac .endif .if !defined(WITHOUT_LAME) RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame .endif .if !defined(WITHOUT_MUSEPACK) RUN_DEPENDS+= mppdec:${PORTSDIR}/audio/musepack .endif .if !defined(WITHOUT_SHORTEN) RUN_DEPENDS+= shorten:${PORTSDIR}/audio/shorten .endif .if !defined(WITHOUT_SOX) RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox .endif USE_RC_SUBR= squeezeboxserver.sh TMP_SLIMDIR= ${WRKDIR}/_squeezeboxserver TMP_DOCSDIR= ${WRKDIR}/doc 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/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/Sub \ CPAN/SQL \ CPAN/Template \ CPAN/URI \ CPAN/XML/Parser \ CPAN/YAML CPIOARGS= --quiet -pdum -R PLIST_SUB= SLIMDIR=${SLIMDIR} SUB_FILES= Custom.pm \ pkg-install \ softsqueeze.sh SUB_LIST= PERL=${PERL} \ PORTNAME=${PORTNAME} \ SITE_PERL=${SITE_PERL} \ SLIMDIR=${SLIMDIR} \ SLIMDBDIR=${SLIMDBDIR} \ SLIMUSER=${SLIMUSER} \ 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 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%%|${SITE_PERL}|g' \ -e 's|%%SLIMDBDIR%%|${SLIMDBDIR}|g' \ -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|g' \ ${WRKSRC}/scanner.pl \ ${WRKSRC}/slimserver.pl 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 .if !defined(NOPORTDOCS) @${MKDIR} ${TMP_DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR} .endif pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: @${MKDIR} -m 0755 ${PREFIX}/${SLIMDIR} @${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 \ ${LOCALBASE}/share/mysql/english/errmsg.sys \ ${PREFIX}/${SLIMDIR}/MySQL/ @${INSTALL_SCRIPT} ${WRKDIR}/softsqueeze.sh ${PREFIX}/bin/softsqueeze .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @cd ${TMP_DOCSDIR} && ${COPYTREE_SHARE} . ${DOCSDIR} .endif post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO} @${CAT} ${PKGMESSAGE} build-plist: @${CAT} /dev/null > ${PLIST} @${ECHO} bin/softsqueeze >> ${PLIST} .for _CONF in ${CONFFILES} @${ECHO} '@unexec if cmp -s %D/%%SLIMDIR%%/${_CONF} %D/%%SLIMDIR%%/${_CONF}.sample; then rm -f %D/%%SLIMDIR%%/${_CONF}; fi' >> ${PLIST} .endfor @${FIND} ${TMP_DOCSDIR} -type f | \ ${SED} -e 's|${TMP_DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \ ${SORT} >> ${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} @${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} @${FIND} ${TMP_DOCSDIR} -type d | \ ${SED} -e 's|${TMP_DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' | \ ${SORT} -r >> ${PLIST} @${ECHO} '@unexec rm -rf ${SLIMDBDIR}/cache > /dev/null 2>&1 || true' >> ${PLIST} @${ECHO} '@dirrmtry ${SLIMDBDIR}/playlists' >> ${PLIST} @${ECHO} '@dirrmtry ${SLIMDBDIR}' >> ${PLIST} @${ECHO} '@unexec test -d ${SLIMDBDIR} && (echo "Configuration information saved. If you will *NOT* use this package anymore," && echo "please remove ${SLIMDBDIR} and its contents manually.")' >> ${PLIST} .include Property changes on: head/audio/squeezeboxserver/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.67 \ No newline at end of property +1.68 \ No newline at end of property Index: head/audio/squeezeboxserver/distinfo =================================================================== --- head/audio/squeezeboxserver/distinfo (revision 250279) +++ head/audio/squeezeboxserver/distinfo (revision 250280) @@ -1,3 +1,3 @@ -MD5 (squeezeboxserver-7.4.1-noCPAN.tgz) = cf3a87ac33925842dfe7d404cab5de0a -SHA256 (squeezeboxserver-7.4.1-noCPAN.tgz) = 8236bcc3acf802bd4fc0fa2761930f1f14d4b578460057e7d3d8c7b4b7e8910c -SIZE (squeezeboxserver-7.4.1-noCPAN.tgz) = 22145277 +MD5 (squeezeboxserver-7.4.2-noCPAN.tgz) = 6cab50697b903207c10e3581796ada12 +SHA256 (squeezeboxserver-7.4.2-noCPAN.tgz) = 6f2555c53f0514477935593526e027eb35e9f8735283fe996ecfcfdf0d563b8b +SIZE (squeezeboxserver-7.4.2-noCPAN.tgz) = 22197375 Property changes on: head/audio/squeezeboxserver/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.33 \ No newline at end of property +1.34 \ No newline at end of property Index: head/audio/squeezeboxserver/files/patch-Slim_Utils_Accessor.pm =================================================================== --- head/audio/squeezeboxserver/files/patch-Slim_Utils_Accessor.pm (revision 250279) +++ head/audio/squeezeboxserver/files/patch-Slim_Utils_Accessor.pm (nonexistent) @@ -1,43 +0,0 @@ - -$FreeBSD$ - ---- Slim/Utils/Accessor.pm.orig -+++ Slim/Utils/Accessor.pm -@@ -98,9 +98,15 @@ - if ($type eq 'rw') { - - if ( hasXS() ) { -- Class::XSAccessor::Array::_generate_method( -- $class, $field, $n, 0, 0, 'accessor', -- ); -+ if ($Class::XSAccessor::Array::VERSION ge '1.05') { -+ Class::XSAccessor::Array::_generate_method( -+ $class, $field, $n, {}, 'accessor', -+ ); -+ } else { -+ Class::XSAccessor::Array::_generate_method( -+ $class, $field, $n, 0, 0, 'accessor', -+ ); -+ } - } - else { - $accessor = sub { -@@ -112,9 +118,15 @@ - } elsif ($type eq 'ro') { - - if ( hasXS() ) { -- Class::XSAccessor::Array::_generate_method( -- $class, $field, $n, 0, 0, 'getter', -- ); -+ if ($Class::XSAccessor::Array::VERSION ge '1.05') { -+ Class::XSAccessor::Array::_generate_method( -+ $class, $field, $n, {}, 'getter', -+ ); -+ } else { -+ Class::XSAccessor::Array::_generate_method( -+ $class, $field, $n, 0, 0, 'getter', -+ ); -+ } - } - else { - $accessor = sub { Property changes on: head/audio/squeezeboxserver/files/patch-Slim_Utils_Accessor.pm ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property