From owner-svn-ports-branches@FreeBSD.ORG  Wed Aug  6 11:59:17 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DD72A1BB
 for <svn-ports-branches@freebsd.org>; Wed,  6 Aug 2014 11:59:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AF42E2E90
 for <svn-ports-branches@freebsd.org>; Wed,  6 Aug 2014 11:59:17 +0000 (UTC)
Received: from antoine (uid 1152) (envelope-from antoine@FreeBSD.org) id 5ab8
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Wed, 06 Aug 2014 11:59:17 +0000
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 6 Aug 2014 11:59:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r364162 - branches/2014Q3/audio/tuxguitar
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e21895.5ab8.6f247021@svn.freebsd.org>
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2014 11:59:17 -0000

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; \