- STAGE-clean

- USE_GECKO -> WITH_GECKO
- Add LICENSE
- Remove article from COMMENT line

2 files changed, 25 insertions, 29 deletions

diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 7667f2fd6ecd..826c708e9359 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -14,7 +14,9 @@ DISTFILES=	${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}:src \
 EXTRACT_ONLY=	${PORTNAME}-src-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	A Multitrack tablature editor and player
+COMMENT=	Multitrack tablature editor and player
+
+LICENSE=	LGPL21
 
 BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel \
 		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext \
@@ -27,20 +29,15 @@ MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \
 		INSTALL_SHARE_DIR=${DATADIR}
 
 USES=		gmake pkgconfig
-NO_STAGE=	yes
 USE_JAVA=	yes
 USE_ANT=	yes
-USE_GECKO=	libxul
+WITH_GECKO=	libxul
 USE_LDCONFIG=	yes
 JAVA_VERSION=	1.6+
 NOCCACHE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/TuxGuitar
 
-.if !defined(WITHOUT_MAN)
-MAN1=		tuxguitar.1
-.endif
-
 .include <bsd.port.pre.mk>
 PLUGINS=	ascii browser-ftp compat converter fluidsynth gervill gtp \
 		jsa lilypond midi musicxml oss pdf ptb tef tray tuner
@@ -81,41 +78,39 @@ post-build:
 	cd ${WRKSRC}/../TuxGuitar-jack/jni && ${GMAKE}
 
 do-install:
-	${INSTALL} -d ${DATADIR}
-	${INSTALL} -d ${DATADIR}/plugins
+	@${INSTALL} -d ${STAGEDIR}${DATADIR}
+	@${INSTALL} -d ${STAGEDIR}${DATADIR}/plugins
 	# Main program and plugins
-	${INSTALL_SCRIPT} ${WRKDIR}/tuxguitar ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/tuxguitar.jar ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../misc/*.tg ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${PREFIX}/lib
+	${INSTALL_SCRIPT} ${WRKDIR}/tuxguitar ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/tuxguitar.jar ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../misc/*.tg ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib
 .for p in ${PLUGINS}
-	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-${p}/tuxguitar-${p}.jar ${DATADIR}/plugins
+	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-${p}/tuxguitar-${p}.jar ${STAGEDIR}${DATADIR}/plugins
 .endfor
 	# Inline documentation
-	cd ${WRKSRC}/share/help &&   ${COPYTREE_SHARE} \* ${DATADIR}/help
-	cd ${WRKSRC}/share/lang &&   ${COPYTREE_SHARE} \* ${DATADIR}/lang
-	cd ${WRKSRC}/share/scales && ${COPYTREE_SHARE} \* ${DATADIR}/scales
-	cd ${WRKSRC}/share/skins &&  ${COPYTREE_SHARE} \* ${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 ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/../misc/tuxguitar.xpm ${PREFIX}/share/pixmaps
+	@${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 ${PREFIX}/share/applications
+	@${INSTALL} -d ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/../misc/tuxguitar.desktop ${STAGEDIR}${PREFIX}/share/applications
 
-.if !defined(WITHOUT_MAN)
 	# MAN page
-	${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${MANPREFIX}/man/man1
-.endif
+	${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${STAGEDIR}${PREFIX}/man/man1
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 .endif
 	@${ECHO}
 	@${ECHO} "SoundFonts for the FluidSynth plugin are available at:"
diff --git a/audio/tuxguitar/pkg-plist b/audio/tuxguitar/pkg-plist
index 1382194565c5..bd5e108c42e6 100644
--- a/audio/tuxguitar/pkg-plist
+++ b/audio/tuxguitar/pkg-plist
@@ -1,4 +1,5 @@
 bin/tuxguitar
+man/man1/tuxguitar.1.gz
 lib/libtuxguitar-fluidsynth-jni.so
 lib/libtuxguitar-oss-jni.so
 %%DATADIR%%/8MBGMSFX.SF2