- Support staging

- Extract to subdir and simplify installation
- Move startup script to files/jave6.in instead of making it in the Makefile
- Move post-install message to files/pkg-message.in
- Bump PORTREVISION

PR:		191351
Submitted by:	myself
Approved by:	maintainer timeout (5 weeks)

4 files changed, 22 insertions, 21 deletions

diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile
index 0f3b08524c0a..929ba5f42139 100644
--- a/graphics/jave6/Makefile
+++ b/graphics/jave6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jave6
 PORTVERSION=	0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics java
 MASTER_SITES=	http://www.jave.de/developer/\
 		http://ikaria.informatik.uni-rostock.de/public_bsd/FreeBSD/
@@ -12,29 +12,20 @@ DISTNAME=	jave_6.0_i20060105
 MAINTAINER=	ad001@uni-rostock.de
 COMMENT=	Java ASCII-Art-Generator
 
+EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
+
 USES=		zip
-USE_JAVA=	YES
+USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-NO_BUILD=	YES
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-LNKTARGET=	${PREFIX}/bin/jave6
-HLPSKRIPT=	jave6
+NO_BUILD=	yes
 
-PLIST_SUB+=DATADIR=%%JAVASHAREDIR%%/${PORTNAME}
+SUB_FILES=	jave6 pkg-message
+SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 do-install:
-	@${ECHO} "Installing JavE6 files in ${DATADIR}..."
-	@${MKDIR} ${DATADIR}
-	@${CP} -rv ${WRKDIR}/* ${DATADIR}
-	@${ECHO} "creating start script ${LNKTARGET}..."
-	@${ECHO} "#!/bin/sh" > ${DATADIR}/${HLPSKRIPT}
-	@${ECHO} "JAVA_VERSION=${JAVA_VERSION} exec ${LOCALBASE}/bin/java -jar ${DATADIR}/jave.jar" >> ${DATADIR}/${HLPSKRIPT}
-	@${CHMOD} a+x ${DATADIR}/${HLPSKRIPT}
-	@${LN} -sf ${DATADIR}/${HLPSKRIPT} ${LNKTARGET}
-	@${ECHO} "done."
-
-post-install:
-	@${ECHO} "Errors may occur while running the program, as it will try to access ${DATADIR}/tmp/ for output."
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/jave6/files/jave6.in b/graphics/jave6/files/jave6.in
new file mode 100644
index 000000000000..7b60edec299e
--- /dev/null
+++ b/graphics/jave6/files/jave6.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export JAVA_VERSION="%%JAVA_VERSION%%"
+
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar jave.jar "${@}"
diff --git a/graphics/jave6/files/pkg-message.in b/graphics/jave6/files/pkg-message.in
new file mode 100644
index 000000000000..f41e50d88d50
--- /dev/null
+++ b/graphics/jave6/files/pkg-message.in
@@ -0,0 +1,6 @@
+=============================================================
+
+Errors may occur while running the program, as it will try to
+access %%DATADIR%%/tmp/ for output.
+
+=============================================================
diff --git a/graphics/jave6/pkg-plist b/graphics/jave6/pkg-plist
index 20a25470067f..99a0c7ff4578 100644
--- a/graphics/jave6/pkg-plist
+++ b/graphics/jave6/pkg-plist
@@ -298,7 +298,6 @@ bin/jave6
 %%DATADIR%%/icons/icon.ico
 %%DATADIR%%/icons/icon.xpm
 %%DATADIR%%/jave.jar
-%%DATADIR%%/jave6
 %%DATADIR%%/javeplayer.jar
 %%DATADIR%%/pattern/pattern.jcf
 %%DATADIR%%/readme.txt