Upgrade to 1078.

7 files changed, 98 insertions, 22 deletions

diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile
index e7fffceb0d1c..0e981f0b6ec0 100644
--- a/textproc/jarnal/Makefile
+++ b/textproc/jarnal/Makefile
@@ -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>
diff --git a/textproc/jarnal/distinfo b/textproc/jarnal/distinfo
index 8adfc78fb9c0..22ff0a1a1056 100644
--- a/textproc/jarnal/distinfo
+++ b/textproc/jarnal/distinfo
@@ -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
diff --git a/textproc/jarnal/files/patch-jarnal-open-file.sh b/textproc/jarnal/files/patch-jarnal-open-file.sh
new file mode 100644
index 000000000000..54b215377834
--- /dev/null
+++ b/textproc/jarnal/files/patch-jarnal-open-file.sh
@@ -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
diff --git a/textproc/jarnal/files/patch-jarnal.sh b/textproc/jarnal/files/patch-jarnal.sh
index 3f0b8b7e30bc..be26148a9b71 100644
--- a/textproc/jarnal/files/patch-jarnal.sh
+++ b/textproc/jarnal/files/patch-jarnal.sh
@@ -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
diff --git a/textproc/jarnal/files/patch-jarnalannotate.sh b/textproc/jarnal/files/patch-jarnalannotate.sh
index 0769efa06f1e..87ae9d1b6a45 100644
--- a/textproc/jarnal/files/patch-jarnalannotate.sh
+++ b/textproc/jarnal/files/patch-jarnalannotate.sh
@@ -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"
diff --git a/textproc/jarnal/pkg-descr b/textproc/jarnal/pkg-descr
index 5da6e8ce5fd1..c765de562c3a 100644
--- a/textproc/jarnal/pkg-descr
+++ b/textproc/jarnal/pkg-descr
@@ -4,4 +4,4 @@ collaborating using a stylus, mouse or keyboard. It is similar to Microsoft
 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
diff --git a/textproc/jarnal/pkg-plist b/textproc/jarnal/pkg-plist
index 1d8cd10f8ed6..45606c086fc6 100644
--- a/textproc/jarnal/pkg-plist
+++ b/textproc/jarnal/pkg-plist
@@ -1,3 +1,4 @@
+bin/jarnal-open-file.sh
 bin/jarnal.sh
 bin/jarnalannotate.sh
 %%DATADIR%%/templates/annotate.jaj