- Update to 2.0.1

PR:		124219
Submitted by:	Beat Gaetzi <beat@chruetertee.ch> (maintainer)

6 files changed, 36 insertions, 36 deletions

diff --git a/deskutils/thinkingrock/Makefile b/deskutils/thinkingrock/Makefile
index 7df3fe154c45..a36bd84af3d1 100644
--- a/deskutils/thinkingrock/Makefile
+++ b/deskutils/thinkingrock/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	thinkingrock
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	deskutils java
 MASTER_SITES=	SF
-DISTNAME=	tr-${PORTVERSION}.epsilon
+DISTNAME=	tr-${PORTVERSION}
 
 MAINTAINER=	beat@chruetertee.ch
 COMMENT=	Application for collecting and processing your thoughts
 
-USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 NO_BUILD=	yes
@@ -22,18 +21,21 @@ NO_BUILD=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${RM} ${WRKSRC}/bin/thinkingrock.exe
-	@${RM} ${WRKSRC}/bin/thinkingrock_w.exe
-	@${RM} ${WRKSRC}/bin/thinkingrock.orig
-	@${RM} ${WRKSRC}/bin/xdg-email.orig
-	@${RM} ${WRKSRC}/bin/xdg-open.orig
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/bin/tr
+	@${RM} ${WRKSRC}/install.html~
+	@${RM} ${WRKSRC}/bin/tr.bak
+	@${RM} ${WRKSRC}/bin/tr.orig
 
 do-install:
 	@${MKDIR} ${PREFIX}/${PORTNAME}
 	@${CP} -r ${WRKSRC}/* ${PREFIX}/${PORTNAME}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${PORTNAME}
-	@${LN} -sf ${PREFIX}/${PORTNAME}/bin/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	@${LN} -sf ${PREFIX}/${PORTNAME}/bin/tr ${PREFIX}/bin/${PORTNAME}
+	@${LN} -sf ${PREFIX}/${PORTNAME}/bin/xdg-email ${PREFIX}/bin/xdg-email
+	@${LN} -sf ${PREFIX}/${PORTNAME}/bin/xdg-open ${PREFIX}/bin/xdg-open
 	@${ECHO} bin/${PORTNAME} >> ${TMPPLIST}
+	@${ECHO} bin/xdg-email >> ${TMPPLIST}
+	@${ECHO} bin/xdg-open >> ${TMPPLIST}
 	@(cd ${WRKSRC}; ${FIND} . ! -type d) | ${SORT} | ${SED} "s|^.|${PORTNAME}|" >> ${TMPPLIST}
 	@(cd ${WRKSRC}; ${FIND} . -type d) | ${SORT} -r | ${SED} "s|^.|@dirrm ${PORTNAME}|" >> ${TMPPLIST}
 	@(cd ${WRKSRC}; ${FIND} . -type d -empty) | ${SORT} -r | ${SED} "s|^.|@exec mkdir -p ${PORTNAME}|" >> ${TMPPLIST}
diff --git a/deskutils/thinkingrock/distinfo b/deskutils/thinkingrock/distinfo
index b9c4d21f7217..9ce1b69f9550 100644
--- a/deskutils/thinkingrock/distinfo
+++ b/deskutils/thinkingrock/distinfo
@@ -1,3 +1,3 @@
-MD5 (tr-2.0.epsilon.zip) = 404cd094a4f905366f79b54faef568a7
-SHA256 (tr-2.0.epsilon.zip) = 3c8ddf37c0b8d840f078c12ecca441565a43377f21126317e64013c21d60486d
-SIZE (tr-2.0.epsilon.zip) = 17160643
+MD5 (tr-2.0.1.tar.gz) = 31f5472a8d5b7bb77aac12127d21a9b6
+SHA256 (tr-2.0.1.tar.gz) = c71b9498fe1971eba1643a7f3fdd7259675fe5f18bd03628811c983f5e19a565
+SIZE (tr-2.0.1.tar.gz) = 26135271
diff --git a/deskutils/thinkingrock/files/patch-bin_thinkingrock b/deskutils/thinkingrock/files/patch-bin_thinkingrock
deleted file mode 100644
index f7ab8652f65d..000000000000
--- a/deskutils/thinkingrock/files/patch-bin_thinkingrock
+++ /dev/null
@@ -1,8 +0,0 @@
---- bin/thinkingrock.orig	Wed Jan  2 12:29:07 2008
-+++ bin/thinkingrock	Wed Jan  2 12:29:15 2008
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- #
- # resolve symlinks
diff --git a/deskutils/thinkingrock/files/patch-bin_tr b/deskutils/thinkingrock/files/patch-bin_tr
new file mode 100644
index 000000000000..2015d30450d8
--- /dev/null
+++ b/deskutils/thinkingrock/files/patch-bin_tr
@@ -0,0 +1,22 @@
+--- bin/tr.orig	2008-05-31 03:33:36.000000000 +0200
++++ bin/tr	2008-06-02 21:52:26.000000000 +0200
+@@ -4,7 +4,7 @@
+ # resolve symlinks
+ #
+ 
+-PRG=$0
++PRG=%%PREFIX%%/thinkingrock/bin/tr
+ 
+ while [ -h "$PRG" ]; do
+     ls=`ls -ld "$PRG"`
+@@ -17,7 +17,9 @@
+ done
+ 
+ progdir=`dirname "$PRG"`
+-APPNAME=`basename "$0"`
++APPNAME=tr
++
++cd $progdir
+ 
+ if [ -f "$progdir/../etc/$APPNAME".conf ] ; then
+     . "$progdir/../etc/$APPNAME".conf
diff --git a/deskutils/thinkingrock/files/patch-bin_xdg-email b/deskutils/thinkingrock/files/patch-bin_xdg-email
deleted file mode 100644
index 506ab01954d2..000000000000
--- a/deskutils/thinkingrock/files/patch-bin_xdg-email
+++ /dev/null
@@ -1,8 +0,0 @@
---- bin/xdg-email.orig	Wed Jan  2 12:29:26 2008
-+++ bin/xdg-email	Wed Jan  2 12:29:47 2008
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #---------------------------------------------
- #   xdg-email
- #
diff --git a/deskutils/thinkingrock/files/patch-bin_xdg-open b/deskutils/thinkingrock/files/patch-bin_xdg-open
deleted file mode 100644
index 653093c78093..000000000000
--- a/deskutils/thinkingrock/files/patch-bin_xdg-open
+++ /dev/null
@@ -1,8 +0,0 @@
---- bin/xdg-open.orig	Wed Jan  2 12:29:33 2008
-+++ bin/xdg-open	Wed Jan  2 12:29:40 2008
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #---------------------------------------------
- #   xdg-open
- #