Date: Mon, 28 Apr 2014 20:28:30 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352552 - in head/textproc/jarnal: . files Message-ID: <201404282028.s3SKSUJ6024795@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Mon Apr 28 20:28:29 2014 New Revision: 352552 URL: http://svnweb.freebsd.org/changeset/ports/352552 QAT: https://qat.redports.org/buildarchive/r352552/ Log: Upgrade to 1078. Added: head/textproc/jarnal/files/patch-jarnal-open-file.sh (contents, props changed) Modified: head/textproc/jarnal/Makefile head/textproc/jarnal/distinfo head/textproc/jarnal/files/patch-jarnal.sh head/textproc/jarnal/files/patch-jarnalannotate.sh head/textproc/jarnal/pkg-descr head/textproc/jarnal/pkg-plist Modified: head/textproc/jarnal/Makefile ============================================================================== --- head/textproc/jarnal/Makefile Mon Apr 28 20:23:15 2014 (r352551) +++ head/textproc/jarnal/Makefile Mon Apr 28 20:28:29 2014 (r352552) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jarnal -PORTVERSION= 999 +PORTVERSION= 1078 CATEGORIES= textproc editors MASTER_SITES= http://levine.sscnet.ucla.edu/general/software/tc1000/ DISTNAME= ${PORTNAME}-install @@ -11,32 +11,32 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= A tool to take notes, annotate documents (including PDF), and more +LICENSE= GPLv2 + RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ -LICENSE= GPLv2 - NO_BUILD= yes +NO_ARCH= yes NO_WRKSUBDIR= yes -SCRIPTS= jarnal.sh jarnalannotate.sh +SCRIPTS= jarnal.sh jarnalannotate.sh jarnal-open-file.sh LIBFILES= lbouncy_license.html lib-ver.txt jarnal-readme.txt -NO_STAGE= yes pre-configure: ${MV} ${WRKDIR}/lib/readme.txt ${WRKDIR}/lib/jarnal-readme.txt ${REINPLACE_CMD} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|' \ -e 's|%%DATADIR%%|${DATADIR}|' ${SCRIPTS:S|^|${WRKDIR}/|} do-install: - ${MKDIR} ${JAVAJARDIR}/lib ${DATADIR}/templates - ${INSTALL_DATA} ${PORTNAME:S|^|${WRKDIR}/|:S|$|.jar|} ${JAVAJARDIR} - ${INSTALL_DATA} ${WRKDIR}/lib/*.jar ${JAVAJARDIR}/lib/ - ${INSTALL_DATA} ${LIBFILES:S|^|${WRKDIR}/lib/|} ${JAVAJARDIR}/lib/ - ${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKDIR}/|} ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKDIR}/templates/* ${DATADIR}/templates/ + ${MKDIR} ${STAGEDIR}${JAVAJARDIR}/lib ${STAGEDIR}${DATADIR}/templates + ${INSTALL_DATA} ${PORTNAME:S|^|${WRKDIR}/|:S|$|.jar|} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKDIR}/lib/*.jar ${STAGEDIR}${JAVAJARDIR}/lib/ + ${INSTALL_DATA} ${LIBFILES:S|^|${WRKDIR}/lib/|} ${STAGEDIR}${JAVAJARDIR}/lib/ + ${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKDIR}/|} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKDIR}/templates/* ${STAGEDIR}${DATADIR}/templates/ .include <bsd.port.mk> Modified: head/textproc/jarnal/distinfo ============================================================================== --- head/textproc/jarnal/distinfo Mon Apr 28 20:23:15 2014 (r352551) +++ head/textproc/jarnal/distinfo Mon Apr 28 20:28:29 2014 (r352552) @@ -1,2 +1,2 @@ -SHA256 (jarnal-999/jarnal-install.zip) = a14a10c6f11131835f711979537d74398eea86d69f69421811537f320036e8b4 -SIZE (jarnal-999/jarnal-install.zip) = 12915894 +SHA256 (jarnal-1078/jarnal-install.zip) = 116915be770654ae5a9bace9b364719a379521868989a6b5526255935d092175 +SIZE (jarnal-1078/jarnal-install.zip) = 12928827 Added: head/textproc/jarnal/files/patch-jarnal-open-file.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/jarnal/files/patch-jarnal-open-file.sh Mon Apr 28 20:28:29 2014 (r352552) @@ -0,0 +1,34 @@ +--- jarnal-open-file.sh.orig 2014-02-20 07:10:52.000000000 +0100 ++++ jarnal-open-file.sh 2014-04-28 21:58:13.000000000 +0200 +@@ -1,19 +1,20 @@ +-#! /bin/bash ++#! /bin/sh + +-SOURCE=$0 +-echo $SOURCE +-while [ -h "$SOURCE" ]; do +- DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" +- SOURCE="$(readlink "$SOURCE")" +- [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" +-done +-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" +-cd $DIR ++#SOURCE=$0 ++#echo $SOURCE ++#while [ -h "$SOURCE" ]; do ++# DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" ++# SOURCE="$(readlink "$SOURCE")" ++# [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" ++#done ++#DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" ++#cd $DIR ++cd %%JAVAJARDIR%% + + if [ -d upgrade-lib ]; then + cp -fr lib old-lib + cp -fr upgrade-lib lib +- rm -fr upgrade-lib ++ rm -fr upgrade-lib + fi + if [ -f upgrade-jarnal.jar ]; then + cp -f jarnal.jar old-jarnal.jar Modified: head/textproc/jarnal/files/patch-jarnal.sh ============================================================================== --- head/textproc/jarnal/files/patch-jarnal.sh Mon Apr 28 20:23:15 2014 (r352551) +++ head/textproc/jarnal/files/patch-jarnal.sh Mon Apr 28 20:28:29 2014 (r352552) @@ -1,11 +1,29 @@ ---- jarnal.sh.orig 2009-09-02 15:02:32.000000000 +0200 -+++ jarnal.sh 2010-08-28 15:46:31.000000000 +0200 -@@ -1,14 +1,14 @@ +--- jarnal.sh.orig 2013-05-01 23:14:56.000000000 +0200 ++++ jarnal.sh 2014-04-28 21:45:35.000000000 +0200 +@@ -1,23 +1,24 @@ -#! /bin/bash +#! /bin/sh --cd `dirname $0` +-SOURCE=$0 +-echo $SOURCE +-while [ -h "$SOURCE" ]; do +- DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" +- SOURCE="$(readlink "$SOURCE")" +- [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" +-done +-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" +-cd $DIR ++#SOURCE=$0 ++#echo $SOURCE ++#while [ -h "$SOURCE" ]; do ++# DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" ++# SOURCE="$(readlink "$SOURCE")" ++# [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" ++#done ++#DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" ++#cd $DIR +cd %%JAVAJARDIR%% + if [ -d upgrade-lib ]; then cp -fr lib old-lib cp -fr upgrade-lib lib Modified: head/textproc/jarnal/files/patch-jarnalannotate.sh ============================================================================== --- head/textproc/jarnal/files/patch-jarnalannotate.sh Mon Apr 28 20:23:15 2014 (r352551) +++ head/textproc/jarnal/files/patch-jarnalannotate.sh Mon Apr 28 20:28:29 2014 (r352552) @@ -1,11 +1,29 @@ ---- jarnalannotate.sh.orig 2009-09-02 16:04:31.000000000 +0200 -+++ jarnalannotate.sh 2010-08-28 16:34:02.000000000 +0200 -@@ -1,10 +1,10 @@ +--- jarnalannotate.sh.orig 2013-05-01 23:14:48.000000000 +0200 ++++ jarnalannotate.sh 2014-04-28 21:48:45.000000000 +0200 +@@ -1,23 +1,24 @@ -#! /bin/bash +#! /bin/sh --cd `dirname $0` +-SOURCE=$0 +-echo $SOURCE +-while [ -h "$SOURCE" ]; do +- DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" +- SOURCE="$(readlink "$SOURCE")" +- [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" +-done +-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" +-cd $DIR ++#SOURCE=$0 ++#echo $SOURCE ++#while [ -h "$SOURCE" ]; do ++# DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" ++# SOURCE="$(readlink "$SOURCE")" ++# [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" ++#done ++#DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" ++#cd $DIR +cd %%JAVAJARDIR%% + if [ -d upgrade-lib ]; then cp -fr lib old-lib cp -fr upgrade-lib lib @@ -14,3 +32,8 @@ fi if [ -f upgrade-jarnal.jar ]; then cp -f jarnal.jar old-jarnal.jar + cp -f upgrade-jarnal.jar jarnal.jar + rm -f upgrade-jarnal.jar + fi +-java -Dfile.encoding=UTF-8 -Xmx192m -jar jarnal.jar -t templates/annotate.jaj -b "$1" "$2" "$3" "$4" "$5" ++java -Dfile.encoding=UTF-8 -Xmx192m -jar jarnal.jar -t %%DATADIR%%/templates/annotate.jaj -b "$1" "$2" "$3" "$4" "$5" Modified: head/textproc/jarnal/pkg-descr ============================================================================== --- head/textproc/jarnal/pkg-descr Mon Apr 28 20:23:15 2014 (r352551) +++ head/textproc/jarnal/pkg-descr Mon Apr 28 20:28:29 2014 (r352552) @@ -4,4 +4,4 @@ collaborating using a stylus, mouse or k Windows Journal and to the earlier Mimeo whiteboarding and Palm notepad applications. -WWW: http://levine.sscnet.ucla.edu/general/software/tc1000/jarnal.htm +WWW: http://levine.sscnet.ucla.edu/general/software/tc1000/jarnal.htm Modified: head/textproc/jarnal/pkg-plist ============================================================================== --- head/textproc/jarnal/pkg-plist Mon Apr 28 20:23:15 2014 (r352551) +++ head/textproc/jarnal/pkg-plist Mon Apr 28 20:28:29 2014 (r352552) @@ -1,3 +1,4 @@ +bin/jarnal-open-file.sh bin/jarnal.sh bin/jarnalannotate.sh %%DATADIR%%/templates/annotate.jaj
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404282028.s3SKSUJ6024795>