svn commit: r364161 - branches/2014Q3/audio/tuxguitar

[Antoine Brodin]

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