Attachment 176687 Details for Bug 214267 – Proposed fix for perl 524

[patch] Proposed fix for perl 524

perl-524-patch.patch (text/plain), 6.01 KB, created by Mark Dixon on 2016-11-06 15:17:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Dixon

Created: 2016-11-06 15:17:19 UTC

Size: 6.01 KB

patch

obsolete

>diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile
>index a2ad9f8..a4e73a7 100644
>--- a/audio/logitechmediaserver/Makefile
>+++ b/audio/logitechmediaserver/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	logitechmediaserver
> PORTVERSION=	7.9.0.g2016.09.30
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	audio
> 
> MAINTAINER=	mark@tranquillussoftware.co.uk
>@@ -83,6 +83,7 @@ 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})
>@@ -109,8 +110,8 @@ do-install:
> 	${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})
>diff --git a/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh b/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh
>index 5d4a917..d2570dc 100644
>--- a/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh
>+++ b/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh
>@@ -1,5 +1,5 @@
> --- ../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	2016-11-06 14:20:09.911729000 +0000
> @@ -92,7 +92,7 @@
>      exit
>  fi
>@@ -9,7 +9,67 @@
>      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,12 @@
>+     "5.22")
>+         PERL_522=$PERL_BIN
>+         ;;
>++    "5.24")
>++	PERL_524=$PERL_BIN
>++        ;;
>++    "5.24")
>++	PERL_524=$PERL_BIN
>++        ;;
>+     *)
>+         echo "Failed to find supported Perl version for '$PERL_BIN'"
>+         exit
>+@@ -504,7 +523,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 +539,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 +549,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 +571,7 @@
>                      ICUOS="FreeBSD"
>                  fi
>                  CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \
>@@ -18,7 +78,34 @@
>                  $MAKE
>                  if [ $? != 0 ]; then
>                      echo "make failed"
>-@@ -1223,6 +1223,9 @@
>+@@ -616,7 +635,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 +717,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 +747,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 +1242,9 @@
>      if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then
>          FFOPTS="$FFOPTS --arch=x86"
>      fi
>@@ -28,3 +115,12 @@
>      
>      if [ "$OS" = "Darwin" ]; then
>          SAVED_FLAGS=$FLAGS
>+@@ -1387,7 +1409,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

Actions: View | Diff

Attachments on bug 214267: 176687