From owner-svn-ports-all@FreeBSD.ORG  Mon Jul 30 18:40:24 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3C91E106566C;
	Mon, 30 Jul 2012 18:40:24 +0000 (UTC)
	(envelope-from scheidell@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 271268FC14;
	Mon, 30 Jul 2012 18:40:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6UIeOs2024802;
	Mon, 30 Jul 2012 18:40:24 GMT
	(envelope-from scheidell@svn.freebsd.org)
Received: (from scheidell@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6UIeNDJ024800;
	Mon, 30 Jul 2012 18:40:23 GMT
	(envelope-from scheidell@svn.freebsd.org)
Message-Id: <201207301840.q6UIeNDJ024800@svn.freebsd.org>
From: Michael Scheidell <scheidell@FreeBSD.org>
Date: Mon, 30 Jul 2012 18:40:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301735 - head/audio/wildmidi
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jul 2012 18:40:24 -0000

Author: scheidell
Date: Mon Jul 30 18:40:23 2012
New Revision: 301735
URL: http://svn.freebsd.org/changeset/ports/301735

Log:
  - Correct wrong use of '&&' instead of '&' for logical "bit and"
  - Bump PORTREVISION (cause failure on clang build)
  
  PR:		ports/170079
  Submitted by:	RyoTa SimaMoto <liangtai.s4@gmail.com> (maintainer)

Modified:
  head/audio/wildmidi/Makefile

Modified: head/audio/wildmidi/Makefile
==============================================================================
--- head/audio/wildmidi/Makefile	Mon Jul 30 18:34:33 2012	(r301734)
+++ head/audio/wildmidi/Makefile	Mon Jul 30 18:40:23 2012	(r301735)
@@ -7,6 +7,7 @@
 
 PORTNAME=	wildmidi
 PORTVERSION=	0.2.3.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
@@ -14,8 +15,9 @@ MAINTAINER=	liangtai.s4@gmail.com
 COMMENT=	A simple software midi player and a core softsynth library
 
 # player: GPLv3, library: LGPL3
-LICENSE_COMB=	multi
 LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	multi
+
 MAKE_JOBS_UNSAFE=	yes
 
 USE_GZIP=	yes
@@ -39,5 +41,7 @@ post-patch:
 		${REINPLACE_CMD} -e 's@/usr/local/share/wildmidi/@${DATADIR}/@' \
 			-e 's@default_timifityconf@default_wildmidiconf@' \
 			${WRKSRC}/configure
+		${REINPLACE_CMD} -e '/WM_MixerOptions/s/ \&\& / \& /' \
+			${WRKSRC}/src/wildmidi_lib.c
 
 .include <bsd.port.mk>