From owner-svn-ports-branches@FreeBSD.ORG  Wed Aug  6 11:57:33 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3EABCFF7
 for <svn-ports-branches@freebsd.org>; Wed,  6 Aug 2014 11:57:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1461A2D7C
 for <svn-ports-branches@freebsd.org>; Wed,  6 Aug 2014 11:57:33 +0000 (UTC)
Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5aa1
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Wed, 06 Aug 2014 11:57:33 +0000
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 6 Aug 2014 11:57:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r364161 - branches/2014Q3/audio/tuxguitar
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e2182d.5aa1.4d08ab5a@svn.freebsd.org>
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2014 11:57:33 -0000

Author: antoine
Date: Wed Aug  6 11:57:32 2014
New Revision: 364161
URL: http://svnweb.freebsd.org/changeset/ports/364161
QAT: https://qat.redports.org/buildarchive/r364161/

Log:
  MFH: r362791
  
  - Fix by appending to CFLAGS/LDFLAGS instead of trying to overwrite them
  - While at it, install stripped libraries

Modified:
  branches/2014Q3/audio/tuxguitar/Makefile
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/audio/tuxguitar/Makefile
==============================================================================
--- branches/2014Q3/audio/tuxguitar/Makefile	Wed Aug  6 10:03:10 2014	(r364160)
+++ branches/2014Q3/audio/tuxguitar/Makefile	Wed Aug  6 11:57:32 2014	(r364161)
@@ -59,7 +59,8 @@ post-patch:
 	${FIND} ${WRKSRC}/.. -name GNUmakefile | ${XARGS} ${REINPLACE_CMD} -e '\
 	    s|-I$$(shell gcj -print-file-name=include/)|-I${JAVA_HOME}/include \
 	    -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|; \
-	    s|LDFLAGS\?=.*|LDFLAGS?=-L${LOCALBASE}/lib|'
+	    s|LDFLAGS\?=.*|LDFLAGS+=-L${LOCALBASE}/lib|; \
+	    s|CFLAGS\?=|CFLAGS+=|'
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
 	    s|%%PREFIX%%|${PREFIX}|g; \
 	    s|%%JAVAJARDIR%%|${JAVAJARDIR}|g; \
@@ -85,8 +86,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/tuxguitar.jar ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../misc/*.tg ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib
 .for p in ${PLUGINS}
 	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-${p}/tuxguitar-${p}.jar ${STAGEDIR}${DATADIR}/plugins
 .endfor