Attachment #176687 for bug #214267

View | Details | Raw Unified | Return to bug 214267
Collapse All | Expand All





PORTNAME=	logitechmediaserver
PORTVERSION=	7.9.0.g2016.09.30
PORTREVISION=	2
CATEGORIES=	audio

MAINTAINER=	mark@tranquillussoftware.co.uk


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})

	${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/${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})




--- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig	2016-08-12 14:27:39.000000000 +0100
+++ ../slimserver-vendor-14cc392/CPAN/buildme.sh	2016-11-06 14:20:09.911729000 +0000
@@ -92,7 +92,7 @@
     exit
 fi

     which $i > /dev/null
     if [ $? -ne 0 ] ; then
         echo "$i not found - please install it"
@@ -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" \

                 $MAKE
                 if [ $? != 0 ]; then
                     echo "make failed"
@@ -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

     
     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

Return to bug 214267

Lines 2-8 Link Here

(-)b/audio/logitechmediaserver/Makefile (-3 / +4 lines)
2		2
3	PORTNAME= logitechmediaserver	3	PORTNAME= logitechmediaserver
4	PORTVERSION= 7.9.0.g2016.09.30	4	PORTVERSION= 7.9.0.g2016.09.30
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= audio	6	CATEGORIES= audio
7		7
8	MAINTAINER= mark@tranquillussoftware.co.uk	8	MAINTAINER= mark@tranquillussoftware.co.uk
Lines 83-88 SLIMGROUP?= ${SLIMUSER} Link Here
83		83
84	do-build:	84	do-build:
85	cd ${WRKSRC_vendor}/CPAN && ./buildme.sh	85	cd ${WRKSRC_vendor}/CPAN && ./buildme.sh
		86	cd ${WRKSRC}/CPAN/arch && ${CP} -r 5.22 5.24
86		87
87	do-install:	88	do-install:
88	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR})	89	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR})
Lines 109-116 do-install: Link Here
109	${INSTALL_SCRIPT} ${WRKSRC}/Bin/dbish ${STAGEDIR}${PREFIX}/${SLIMDIR}/Bin/	110	${INSTALL_SCRIPT} ${WRKSRC}/Bin/dbish ${STAGEDIR}${PREFIX}/${SLIMDIR}/Bin/
110	(cd ${WRKSRC_vendor}/CPAN/build && \	111	(cd ${WRKSRC_vendor}/CPAN/build && \
111	${COPYTREE_SHARE} arch ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN)	112	${COPYTREE_SHARE} arch ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN)
112	(cd ${WRKSRC_vendor}/CPAN/build/5.20/lib/perl5 && \	113	(cd ${WRKSRC_vendor}/CPAN/build/${PERL_VER}/lib/perl5 && \
113	${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/5.20/)	114	${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER}/)
114	do-install-DOCS-on:	115	do-install-DOCS-on:
115	@${MKDIR} ${STAGEDIR}${DOCSDIR}	116	@${MKDIR} ${STAGEDIR}${DOCSDIR}
116	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR})	117	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR})

Lines 1-5 Link Here

(-)b/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh (-3 / +99 lines)
1	--- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig 2016-08-12 14:27:39.000000000 +0100	1	--- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig 2016-08-12 14:27:39.000000000 +0100
2	+++ ../slimserver-vendor-14cc392/CPAN/buildme.sh 2016-08-17 21:24:10.394225000 +0100	2	+++ ../slimserver-vendor-14cc392/CPAN/buildme.sh 2016-11-06 14:20:09.911729000 +0000
3	@@ -92,7 +92,7 @@	3	@@ -92,7 +92,7 @@
4	exit	4	exit
5	fi	5	fi
Lines 9-15 Link Here
9	which $i > /dev/null	9	which $i > /dev/null
10	if [ $? -ne 0 ] ; then	10	if [ $? -ne 0 ] ; then
11	echo "$i not found - please install it"	11	echo "$i not found - please install it"
12	@@ -552,7 +552,7 @@	12	@@ -309,6 +309,19 @@
		13	PERL_ARCH=$BUILD/arch/5.22
		14	fi
		15
		16	+# Path to Perl 5.24
		17	+if [ -x "/usr/bin/perl5.24.1" ]; then
		18	+ PERL_524=/usr/bin/perl5.24.1
		19	+fi
		20	+
		21	+if [ $PERL_524 ]; then
		22	+ echo "Building with Perl 5.24 at $PERL_524"
		23	+ PERL_BIN=$PERL_524
		24	+ # Install dir for 5.24
		25	+ PERL_BASE=$BUILD/5.24
		26	+ PERL_ARCH=$BUILD/arch/5.24
		27	+fi
		28	+
		29	# try to use default perl version
		30	if [ "$PERL_BIN" = "" ]; then
		31	PERL_BIN=`which perl`
		32	@@ -339,6 +352,12 @@
		33	"5.22")
		34	PERL_522=$PERL_BIN
		35	;;
		36	+ "5.24")
		37	+ PERL_524=$PERL_BIN
		38	+ ;;
		39	+ "5.24")
		40	+ PERL_524=$PERL_BIN
		41	+ ;;
		42	*)
		43	echo "Failed to find supported Perl version for '$PERL_BIN'"
		44	exit
		45	@@ -504,7 +523,7 @@
		46	;;
		47
		48	Class::XSAccessor)
		49	- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
		50	+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
		51	build_module Class-XSAccessor-1.18
		52	cp -pR $PERL_BASE/lib/perl5/$ARCH/Class $PERL_ARCH/
		53	else
		54	@@ -520,7 +539,7 @@
		55	;;
		56
		57	DBI)
		58	- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
		59	+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
		60	build_module DBI-1.628
		61	cp -p $PERL_BASE/lib/perl5/$ARCH/DBI.pm $PERL_ARCH/
		62	cp -pR $PERL_BASE/lib/perl5/$ARCH/DBI $PERL_ARCH/
		63	@@ -530,7 +549,7 @@
		64	;;
		65
		66	DBD::SQLite)
		67	- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
		68	+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
		69	build_module DBI-1.628 "" 0
		70	else
		71	build_module DBI-1.616 "" 0
		72	@@ -552,7 +571,7 @@
13	ICUOS="FreeBSD"	73	ICUOS="FreeBSD"
14	fi	74	fi
15	CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \	75	CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \
Lines 18-24 Link Here
18	$MAKE	78	$MAKE
19	if [ $? != 0 ]; then	79	if [ $? != 0 ]; then
20	echo "make failed"	80	echo "make failed"
21	@@ -1223,6 +1223,9 @@	81	@@ -616,7 +635,7 @@
		82	rm -rf DBD-SQLite-1.34_01
		83	else
		84	cd ..
		85	- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
		86	+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
		87	build_module DBD-SQLite-1.34_01 "" 0
		88	fi
		89	build_module DBD-SQLite-1.34_01
		90	@@ -698,7 +717,7 @@
		91	JSON::XS)
		92	build_module common-sense-2.0
		93
		94	- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
		95	+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
		96	build_module JSON-XS-2.34
		97	cp -pR $PERL_BASE/lib/perl5/$ARCH/JSON $PERL_ARCH/
		98	else
		99	@@ -728,7 +747,7 @@
		100	;;
		101
		102	YAML::LibYAML)
		103	- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
		104	+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
		105	build_module YAML-LibYAML-0.35 "" 0
		106	else
		107	build_module YAML-LibYAML-0.35
		108	@@ -1223,6 +1242,9 @@
22	if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then	109	if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then
23	FFOPTS="$FFOPTS --arch=x86"	110	FFOPTS="$FFOPTS --arch=x86"
24	fi	111	fi
Lines 28-30 Link Here
28		115
29	if [ "$OS" = "Darwin" ]; then	116	if [ "$OS" = "Darwin" ]; then
30	SAVED_FLAGS=$FLAGS	117	SAVED_FLAGS=$FLAGS
		118	@@ -1387,7 +1409,7 @@
		119
		120	# create our directory structure
		121	# rsync is used to avoid copying non-binary modules or other extra stuff
		122	-if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
		123	+if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
		124	# Check for Perl using use64bitint and add -64int
		125	ARCH=`$PERL_BIN -MConfig -le 'print $Config{archname}' \| sed 's/gnu-//' \| sed 's/^i[3456]86-/i386-/' \| sed 's/armv.*?-/arm-/' `
		126	fi