aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2014-08-06 11:59:17 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2014-08-06 11:59:17 +0000
commitb996702072a26a48b37593c19dc16c093fe51594 (patch)
tree9e9bccc456014b8d47c9be698f93dd29fc2e1907
parent105067f0b639cfb9b7841cfe044d7dd0eecdf6cc (diff)
downloadports-b996702072a26a48b37593c19dc16c093fe51594.tar.gz
ports-b996702072a26a48b37593c19dc16c093fe51594.zip
MFH: r363152
- Try to fix the build by patching Makefiles better - While at it, add USES=desktop-file-utils - Bump PORTREVISION
Notes
Notes: svn path=/branches/2014Q3/; revision=364162
-rw-r--r--audio/tuxguitar/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 946bee679a3d..fa8d64022eaa 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tuxguitar
PORTVERSION= 1.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio java
MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
${MASTER_SITE_LOCAL}/gahr/:fluid \
@@ -28,7 +28,7 @@ LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
MAKE_ENV+= PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \
INSTALL_SHARE_DIR=${DATADIR}
-USES= gmake pkgconfig
+USES= desktop-file-utils gmake pkgconfig
USE_JAVA= yes
USE_ANT= yes
WITH_GECKO= libxul
@@ -59,6 +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|-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|CFLAGS\?=|CFLAGS+=|'
${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \