From owner-svn-ports-head@freebsd.org Wed Nov 8 09:04:40 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 36362E71D1A; Wed, 8 Nov 2017 09:04:40 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0DD1B7130C; Wed, 8 Nov 2017 09:04:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA894c3P067828; Wed, 8 Nov 2017 09:04:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA894c0v067826; Wed, 8 Nov 2017 09:04:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201711080904.vA894c0v067826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 8 Nov 2017 09:04:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453727 - head/audio/tuxguitar X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/audio/tuxguitar X-SVN-Commit-Revision: 453727 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2017 09:04:40 -0000 Author: amdmi3 Date: Wed Nov 8 09:04:38 2017 New Revision: 453727 URL: https://svnweb.freebsd.org/changeset/ports/453727 Log: - Pet portlint, fix and simplify installation Modified: head/audio/tuxguitar/Makefile head/audio/tuxguitar/pkg-descr Modified: head/audio/tuxguitar/Makefile ============================================================================== --- head/audio/tuxguitar/Makefile Wed Nov 8 09:04:35 2017 (r453726) +++ head/audio/tuxguitar/Makefile Wed Nov 8 09:04:38 2017 (r453727) @@ -53,21 +53,21 @@ SUB_LIST= DATADIR=${DATADIR} \ GECKO=${GECKO:S/19//} post-extract: - ${CP} ${DISTDIR}/8MBGMSFX.SF2 ${WRKDIR} + @${CP} ${DISTDIR}/8MBGMSFX.SF2 ${WRKDIR} post-patch: - ${FIND} ${WRKSRC}/.. -name build.properties | ${XARGS} ${REINPLACE_CMD} -e '\ + @${FIND} ${WRKSRC}/.. -name build.properties | ${XARGS} ${REINPLACE_CMD} -e '\ s|path\.swt=.*|path.swt=${JAVAJARDIR}/swt-devel.jar|; \ s|path\.itext=.*|path.itext=${JAVAJARDIR}/itext.jar|; \ s|path\.gervill=.*|path.gervill=${JAVAJARDIR}/gervill.jar|' - ${FIND} ${WRKSRC}/.. -name GNUmakefile | ${XARGS} ${REINPLACE_CMD} -e '\ + @${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; \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ s|%%JAVAJARDIR%%|${JAVAJARDIR}|g; \ s|%%JAVASHAREDIR%%|${JAVASHAREDIR}|g; \ @@ -85,37 +85,29 @@ post-build: cd ${WRKSRC}/../TuxGuitar-jack/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} do-install: - @${INSTALL} -d ${STAGEDIR}${DATADIR} - @${INSTALL} -d ${STAGEDIR}${DATADIR}/plugins - # Main program and plugins ${INSTALL_SCRIPT} ${WRKDIR}/tuxguitar ${STAGEDIR}${PREFIX}/bin + ${INSTALL_LIB} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib + + @${MKDIR} ${STAGEDIR}${DATADIR}/plugins ${INSTALL_DATA} ${WRKSRC}/tuxguitar.jar ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/../misc/*.tg ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${STAGEDIR}${DATADIR} - ${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 # Inline documentation - cd ${WRKSRC}/share/help && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/help - cd ${WRKSRC}/share/lang && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/lang - cd ${WRKSRC}/share/scales && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/scales - cd ${WRKSRC}/share/skins && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/skins + cd ${WRKSRC}/share/help && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/help + cd ${WRKSRC}/share/lang && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lang + cd ${WRKSRC}/share/scales && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scales + cd ${WRKSRC}/share/skins && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/skins - # XPM icon - @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/../misc/tuxguitar.xpm ${STAGEDIR}${PREFIX}/share/pixmaps - - # Desktop entry - @${INSTALL} -d ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/../misc/tuxguitar.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${STAGEDIR}${MANPREFIX}/man/man1 - # MAN page - ${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${STAGEDIR}${PREFIX}/man/man1 - do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include Modified: head/audio/tuxguitar/pkg-descr ============================================================================== --- head/audio/tuxguitar/pkg-descr Wed Nov 8 09:04:35 2017 (r453726) +++ head/audio/tuxguitar/pkg-descr Wed Nov 8 09:04:38 2017 (r453727) @@ -12,6 +12,4 @@ With TuxGuitar, you will be able to compose music usin * Tempo management * Imports and exports gp3, gp4 and gp5 files - - WWW: http://www.tuxguitar.com.ar/