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

[Antoine Brodin]

Author: antoine
Date: Wed Aug  6 11:59:17 2014
New Revision: 364162
URL: http://svnweb.freebsd.org/changeset/ports/364162
QAT: https://qat.redports.org/buildarchive/r364162/

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

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 11:57:32 2014	(r364161)
+++ branches/2014Q3/audio/tuxguitar/Makefile	Wed Aug  6 11:59:17 2014	(r364162)
@@ -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
@@ -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; \