Date: Sat, 2 Aug 2014 12:49:17 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363811 - in head/graphics/jave6: . files Message-ID: <201408021249.s72CnHP7048809@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Sat Aug 2 12:49:17 2014 New Revision: 363811 URL: http://svnweb.freebsd.org/changeset/ports/363811 QAT: https://qat.redports.org/buildarchive/r363811/ Log: - 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) Added: head/graphics/jave6/files/ head/graphics/jave6/files/jave6.in (contents, props changed) head/graphics/jave6/files/pkg-message.in (contents, props changed) Modified: head/graphics/jave6/Makefile head/graphics/jave6/pkg-plist Modified: head/graphics/jave6/Makefile ============================================================================== --- head/graphics/jave6/Makefile Sat Aug 2 12:47:56 2014 (r363810) +++ head/graphics/jave6/Makefile Sat Aug 2 12:49:17 2014 (r363811) @@ -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> Added: head/graphics/jave6/files/jave6.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jave6/files/jave6.in Sat Aug 2 12:49:17 2014 (r363811) @@ -0,0 +1,5 @@ +#!/bin/sh + +export JAVA_VERSION="%%JAVA_VERSION%%" + +cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar jave.jar "${@}" Added: head/graphics/jave6/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/jave6/files/pkg-message.in Sat Aug 2 12:49:17 2014 (r363811) @@ -0,0 +1,6 @@ +============================================================= + +Errors may occur while running the program, as it will try to +access %%DATADIR%%/tmp/ for output. + +============================================================= Modified: head/graphics/jave6/pkg-plist ============================================================================== --- head/graphics/jave6/pkg-plist Sat Aug 2 12:47:56 2014 (r363810) +++ head/graphics/jave6/pkg-plist Sat Aug 2 12:49:17 2014 (r363811) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408021249.s72CnHP7048809>