Date: Thu, 24 Jul 2014 12:30:56 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362791 - head/audio/tuxguitar Message-ID: <201407241230.s6OCUu6o016301@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Thu Jul 24 12:30:56 2014 New Revision: 362791 URL: http://svnweb.freebsd.org/changeset/ports/362791 QAT: https://qat.redports.org/buildarchive/r362791/ Log: - Fix by appending to CFLAGS/LDFLAGS instead of trying to overwrite them - While at it, install stripped libraries Modified: head/audio/tuxguitar/Makefile Modified: head/audio/tuxguitar/Makefile ============================================================================== --- head/audio/tuxguitar/Makefile Thu Jul 24 12:25:47 2014 (r362790) +++ head/audio/tuxguitar/Makefile Thu Jul 24 12:30:56 2014 (r362791) @@ -61,7 +61,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; \ @@ -87,8 +88,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407241230.s6OCUu6o016301>