Index: head/audio/logitechmediaserver/Makefile
===================================================================
--- head/audio/logitechmediaserver/Makefile	(revision 426007)
+++ head/audio/logitechmediaserver/Makefile	(revision 426008)
@@ -1,118 +1,119 @@
 # $FreeBSD$
 
 PORTNAME=	logitechmediaserver
 PORTVERSION=	7.9.0.g2016.09.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	mark@tranquillussoftware.co.uk
 COMMENT=	Audio streaming server that powers Squeezebox players from Logitech
 
 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
 
 USERS=		${SLIMUSER}
 GROUPS=		${SLIMGROUP}
 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
 
 # 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
 FLAC_RUN_DEPENDS=	flac:audio/flac
 LAME_RUN_DEPENDS=	lame:audio/lame
 SHORTEN_RUN_DEPENDS=	shorten:audio/shorten
 SOX_RUN_DEPENDS=	sox:audio/sox
 
 USE_RC_SUBR=	logitechmediaserver
 DOCFILES=	Changelog*.html Installation.txt License*.txt
 CONFFILES=	convert.conf types.conf
 
 PLIST_SUB=	SLIMDIR=${SLIMDIR} \
 		SLIMDBDIR=${SLIMDBDIR} \
 		OPSYS=${OPSYS:tl} \
 		ARCH=${ARCH}
 
 SUB_FILES=	Custom.pm \
 		custom-convert.conf \
 		logitechmediaserver.conf
 SUB_LIST=	PERL=${PERL} \
 		PORTNAME=${PORTNAME} \
 		SITE_PERL=${PREFIX}/${SITE_PERL_REL} \
 		SLIMDIR=${SLIMDIR} \
 		SLIMDBDIR=${SLIMDBDIR} \
 		SLIMUSER=${SLIMUSER} \
 		SLIMGROUP=${SLIMGROUP} \
 		CONFFILES="${CONFFILES}"
 
 SLIMDIR?=	share/logitechmediaserver
 SLIMDBDIR?=	/var/db/logitechmediaserver
 SLIMUSER?=	slimserv
 SLIMGROUP?=	${SLIMUSER}
 
 do-build:
 	cd ${WRKSRC_vendor}/CPAN && ./buildme.sh
+	cd ${WRKSRC}/CPAN/arch && ${CP} -R 5.22 5.24
 
 do-install:
 	@(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
 .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 \
 	    ${STAGEDIR}${PREFIX}/${SLIMDIR}/custom-convert.conf
 	@${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/)
+	(cd ${WRKSRC_vendor}/CPAN/build/${PERL_VER}/lib/perl5 && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER}/)
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh
===================================================================
--- head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh	(revision 426007)
+++ head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh	(revision 426008)
@@ -1,30 +1,123 @@
---- ../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
+--- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig	2016-08-12 21:27:39.000000000 +0800
++++ ../slimserver-vendor-14cc392/CPAN/buildme.sh	2016-11-13 13:08:08.765866000 +0800
 @@ -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 @@
+@@ -309,6 +309,19 @@
+     PERL_ARCH=$BUILD/arch/5.22
+ fi
+ 
++# Path to Perl 5.24
++if [ -x "/usr/bin/perl5.24.1" ]; then
++    PERL_524=/usr/bin/perl5.24.1
++fi
++   
++if [ $PERL_524 ]; then
++    echo "Building with Perl 5.24 at $PERL_524"
++    PERL_BIN=$PERL_524
++    # Install dir for 5.24
++    PERL_BASE=$BUILD/5.24
++    PERL_ARCH=$BUILD/arch/5.24
++fi
++
+ # try to use default perl version
+ if [ "$PERL_BIN" = "" ]; then
+     PERL_BIN=`which perl`
+@@ -339,6 +352,9 @@
+     "5.22")
+         PERL_522=$PERL_BIN
+         ;;
++    "5.24")
++	PERL_524=$PERL_BIN
++        ;;
+     *)
+         echo "Failed to find supported Perl version for '$PERL_BIN'"
+         exit
+@@ -504,7 +520,7 @@
+             ;;
+         
+         Class::XSAccessor)
+-            if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
++            if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
+                 build_module Class-XSAccessor-1.18
+                 cp -pR $PERL_BASE/lib/perl5/$ARCH/Class $PERL_ARCH/
+             else
+@@ -520,7 +536,7 @@
+             ;;
+         
+         DBI)
+-            if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
++            if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
+                 build_module DBI-1.628
+                 cp -p $PERL_BASE/lib/perl5/$ARCH/DBI.pm $PERL_ARCH/
+                 cp -pR $PERL_BASE/lib/perl5/$ARCH/DBI $PERL_ARCH/
+@@ -530,7 +546,7 @@
+             ;;
+         
+         DBD::SQLite)
+-            if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
++            if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
+                 build_module DBI-1.628 "" 0
+             else
+                 build_module DBI-1.616 "" 0
+@@ -552,7 +568,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 @@
+@@ -616,7 +632,7 @@
+                 rm -rf DBD-SQLite-1.34_01
+             else
+                 cd ..
+-                if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
++                if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
+                    build_module DBD-SQLite-1.34_01 "" 0
+                 fi
+                 build_module DBD-SQLite-1.34_01
+@@ -698,7 +714,7 @@
+         JSON::XS)
+             build_module common-sense-2.0
+             
+-            if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
++            if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
+                 build_module JSON-XS-2.34
+                 cp -pR $PERL_BASE/lib/perl5/$ARCH/JSON $PERL_ARCH/
+             else
+@@ -728,7 +744,7 @@
+             ;;
+         
+         YAML::LibYAML)
+-            if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
++            if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
+                 build_module YAML-LibYAML-0.35 "" 0
+             else
+                 build_module YAML-LibYAML-0.35
+@@ -1223,6 +1239,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
+@@ -1387,7 +1406,7 @@
+ 
+ # create our directory structure
+ # rsync is used to avoid copying non-binary modules or other extra stuff
+-if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
++if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
+     # Check for Perl using use64bitint and add -64int
+     ARCH=`$PERL_BIN -MConfig -le 'print $Config{archname}' | sed 's/gnu-//' | sed 's/^i[3456]86-/i386-/' | sed 's/armv.*?-/arm-/' `
+ fi