Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 May 2013 22:37:05 +0000 (UTC)
From:      Stefan Walter <stefan@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r318462 - head/audio/squeezeboxserver
Message-ID:  <201305182237.r4IMb5iR061518@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: stefan
Date: Sat May 18 22:37:05 2013
New Revision: 318462
URL: http://svnweb.freebsd.org/changeset/ports/318462

Log:
  Configure correct database table depending on MySQL version in use.
  
  PR:		178657
  Submitted by:	Thomas Mueller <tmueller@sysgo.com>
  Approved by:	Mark Knight <markk@knigma.org> (maintainer)

Modified:
  head/audio/squeezeboxserver/Makefile

Modified: head/audio/squeezeboxserver/Makefile
==============================================================================
--- head/audio/squeezeboxserver/Makefile	Sat May 18 22:33:33 2013	(r318461)
+++ head/audio/squeezeboxserver/Makefile	Sat May 18 22:37:05 2013	(r318462)
@@ -1,13 +1,9 @@
-# Ports collection makefile for:		squeezeboxserver
-# Date created:					Wed Apr 14, 2004
-# Whom:						Brooks Davis <brooks@freebsd.org>
-#
+# Created by: Brooks Davis <brooks@freebsd.org>
 # $FreeBSD$
-#
 
 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 +170,16 @@ post-patch:
 	    -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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305182237.r4IMb5iR061518>