ports/178657: audio/squeezeboxserver: Start failure with mysql-server-5.0

Mark Knight markk at knigma.org
Fri May 17 09:43:47 UTC 2013


Thanks, approved, slightly tweaked patch file attached with correct 
white space. Apologies for breaking compatibility with old versions of 
mysql.

-- 
Mark Knight
Mobile: +44 7880 556751.  Home: +44 1223 858596
Email: markk at knigma.org.  Skype: knigma

On 15/05/2013 17:02, stefan at FreeBSD.org wrote:
> Synopsis: audio/squeezeboxserver: Start failure with mysql-server-5.0
>
> Responsible-Changed-From-To: freebsd-ports-bugs->stefan
> Responsible-Changed-By: stefan
> Responsible-Changed-When: Wed May 15 16:01:58 UTC 2013
> Responsible-Changed-Why:
> Take while waiting for maintainer's feedback.
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=178657
>

-------------- next part --------------
--- Makefile.orig	2013-05-17 10:27:59.000000000 +0100
+++ Makefile	2013-05-17 10:37:58.000000000 +0100
@@ -7,7 +7,7 @@
 
 PORTNAME=	squeezeboxserver
 PORTVERSION=	7.5.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.slimdevices.com/SqueezeboxServer_v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-noCPAN
@@ -174,12 +174,16 @@
 	    -e 's|%%TMP_SLIMDIR%%|${TMP_SLIMDIR}|g' \
 		${WRKSRC}/scanner.pl \
 		${WRKSRC}/slimserver.pl
-	${REINPLACE_CMD} \
+	@${REINPLACE_CMD} \
 		-e 's/skip-locking/skip-external-locking/' \
 		-e 's/default-character-set/character-set-server/'\
-		-e 's/table_cache/table_open_cache/'\
 		-e 's/default-collation/collation-server/'  ${WRKSRC}/MySQL/my.tt
-	${REINPLACE_CMD} \
+# table_open_cache was known as table_cache in MySQL 5.1.2 and earlier
+	@if [ "$(MYSQL_VER)" != "50" ] ; then \
+		${REINPLACE_CMD} \
+			-e 's/table_cache/table_open_cache/' ${WRKSRC}/MySQL/my.tt ;\
+	fi
+	@${REINPLACE_CMD} \
 		-e 's/TYPE=InnoDB/ENGINE=InnoDB/' ${WRKSRC}/SQL/mysql/schema_*.sql
 
 do-build:


More information about the freebsd-ports-bugs mailing list