- Pet portlint, fix and simplify installation

2 files changed, 15 insertions, 25 deletions

diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index f10e67260697..b23f5d2dd24b 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -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
-
-	# MAN page
-	${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${STAGEDIR}${MANPREFIX}/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 <bsd.port.mk>
diff --git a/audio/tuxguitar/pkg-descr b/audio/tuxguitar/pkg-descr
index 85c0a169d83c..e489be5a65a8 100644
--- a/audio/tuxguitar/pkg-descr
+++ b/audio/tuxguitar/pkg-descr
@@ -12,6 +12,4 @@ With TuxGuitar, you will be able to compose music using the following features
     * Tempo management
     * Imports and exports gp3, gp4 and gp5 files
 
-
-
 WWW: http://www.tuxguitar.com.ar/