Bug 178657
| Summary: | audio/squeezeboxserver: Start failure with mysql-server-5.0 | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Thomas Mueller <tmueller> | ||||
| Component: | Individual Port(s) | Assignee: | Stefan Walter <stefan> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Thomas Mueller
2013-05-15 13:00:00 UTC
Maintainer of audio/squeezeboxserver,
Please note that PR ports/178657 has just been submitted.
If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.
The full text of the PR can be found at:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/178657
--
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool) Responsible Changed From-To: freebsd-ports-bugs->stefan Take while waiting for maintainer's feedback. ----- Forwarded message from Mark Knight <markk@knigma.org> ----- Date: Fri, 17 May 2013 10:43:43 +0100 From: Mark Knight <markk@knigma.org> To: stefan@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org, tmueller@sysgo.com Subject: Re: ports/178657: audio/squeezeboxserver: Start failure with mysql-server-5.0 User-Agent: Mozilla/5.0 (Windows NT 6.0; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 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@knigma.org. Skype: knigma On 15/05/2013 17:02, stefan@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 > --- 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: _______________________________________________ freebsd-ports-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org" ----- End forwarded message ----- 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: _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: feedback->closed Patch committed, thanks! |
