From owner-svn-ports-head@FreeBSD.ORG Sat Aug 2 12:49:18 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 595D07D5; Sat, 2 Aug 2014 12:49:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 46FE92B88; Sat, 2 Aug 2014 12:49:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s72CnIiY048816; Sat, 2 Aug 2014 12:49:18 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s72CnHP7048809; Sat, 2 Aug 2014 12:49:17 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201408021249.s72CnHP7048809@svn.freebsd.org> From: "Jason E. Hale" Date: Sat, 2 Aug 2014 12:49:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363811 - in head/graphics/jave6: . files X-SVN-Group: ports-head 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.18 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: Sat, 02 Aug 2014 12:49:18 -0000 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 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