svn commit: r363152 - head/audio/tuxguitar

[Pietro Cerutti]

Author: gahr
Date: Mon Jul 28 13:41:55 2014
New Revision: 363152
URL: http://svnweb.freebsd.org/changeset/ports/363152
QAT: https://qat.redports.org/buildarchive/r363152/

Log:
  - Try to fix the build by patching Makefiles better
  - While at it, add USES=desktop-file-utils
  - Bump PORTREVISION

Modified:
  head/audio/tuxguitar/Makefile

Modified: head/audio/tuxguitar/Makefile
==============================================================================
--- head/audio/tuxguitar/Makefile	Mon Jul 28 13:41:49 2014	(r363151)
+++ head/audio/tuxguitar/Makefile	Mon Jul 28 13:41:55 2014	(r363152)
@@ -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
 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
@@ -61,6 +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|-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; \