update to thinkingrock 2.2.1

productivity/thinkingrock/Makefile

@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.8 2009/04/26 09:38:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2009/09/05 15:52:06 sturm Exp $
 
 COMMENT=	collecting and processing thoughts according to GTD
 
-V=		2.0.1
+V=		2.2.1
 DISTNAME=	tr-$V
-PKGNAME=	thinkingrock-${V}p5
+PKGNAME=	thinkingrock-${V}
 CATEGORIES=	productivity java
 
-HOMEPAGE=	http://www.thinkingrock.com.au/
+HOMEPAGE=	http://www.trgtd.com.au/
 
 MAINTAINER=	Nikolay Sturm <sturm@openbsd.org>
 
@@ -32,14 +32,11 @@ NO_REGRESS=	Yes
 PKG_ARCH=	*
 
 do-configure:
-	${SUBST_CMD} ${WRKSRC}/bin/tr ${WRKSRC}/etc/tr.conf
-	@rm ${WRKSRC}/etc/tr.conf~
-	@rm ${WRKSRC}/etc/tr.conf.bak
-	@rm ${WRKSRC}/etc/tr.conf.orig
+	${SUBST_CMD} ${WRKSRC}/bin/tr
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/thinkingrock
-	for d in etc ide9 platform8 tr; do \
+	for d in etc ide10 platform9 tr; do \
 		cp -R ${WRKSRC}/$$d ${PREFIX}/share/thinkingrock; \
 	done
 	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/thinkingrock

productivity/thinkingrock/distinfo

@@ -1,5 +1,5 @@
-MD5 (tr-2.0.1.tar.gz) = H9U0YaXm5AYr2qpV/4lNhw==
-RMD160 (tr-2.0.1.tar.gz) = Xmba9sGg4eZ/SxFo8JsKY5jG1tk=
-SHA1 (tr-2.0.1.tar.gz) = Wl2LHlW8R8UNQcqL1sMWqUlUVpA=
-SHA256 (tr-2.0.1.tar.gz) = YcoiMOpLFbAFaM9EQqCp1u06feChP3W1xh5FCmC3Srs=
-SIZE (tr-2.0.1.tar.gz) = 26159030
+MD5 (tr-2.2.1.tar.gz) = o9FAVVm+zXeW65MfGjJOpg==
+RMD160 (tr-2.2.1.tar.gz) = yRw57KikY6MP65aon/l7ZrlgaHk=
+SHA1 (tr-2.2.1.tar.gz) = MYe35qztJY/0O5t/lmvlpnLAa9w=
+SHA256 (tr-2.2.1.tar.gz) = 9U0yBv7ZGqzvd289ZpebwLuXiT4+kic4+jFWxPze3EI=
+SIZE (tr-2.2.1.tar.gz) = 38697846

productivity/thinkingrock/patches/patch-etc_tr_conf

@@ -1,12 +0,0 @@
-$OpenBSD: patch-etc_tr_conf,v 1.1 2008/06/14 16:48:22 sturm Exp $
---- etc/tr.conf.orig	Sat Jun 14 18:29:18 2008
-+++ etc/tr.conf	Sat Jun 14 18:29:51 2008
-@@ -6,7 +6,7 @@ default_userdir="${HOME}/.thinkingrock/tr-2.0.1"
- base_options="-J-Xms64m -J-Xmx256m -J-XX:PermSize=64m -J-XX:MaxPermSize=256m -J-Dsun.java2d.noddraw=true -J-client"
- test_options="-J-Dnetbeans.logger.console=true -J-ea"
- live_options="-J-Xverify:none"
--endorsed="-J-Djava.endorsed.dirs=../tr/modules/ext/endorsed"
-+endorsed="-J-Djava.endorsed.dirs=${PREFIX}/share/thinkingrock/tr/modules/ext/endorsed"
- laf_metal="--laf javax.swing.plaf.metal.MetalLookAndFeel"
- font_size="--fontsize 12"
- 

productivity/thinkingrock/patches/patch-platform9_lib_nbexec

@@ -1,7 +1,7 @@
-$OpenBSD: patch-platform8_lib_nbexec,v 1.1 2008/06/05 08:33:55 sturm Exp $
---- platform8/lib/nbexec.orig	Sun Jun  1 22:04:59 2008
-+++ platform8/lib/nbexec	Sun Jun  1 22:06:02 2008
-@@ -299,18 +299,18 @@ detect_gnome_proxy () {
+$OpenBSD: patch-platform9_lib_nbexec,v 1.1 2009/09/05 15:52:06 sturm Exp $
+--- platform9/lib/nbexec.orig	Thu Sep  3 07:44:10 2009
++++ platform9/lib/nbexec	Thu Sep  3 07:44:43 2009
+@@ -362,18 +362,18 @@ detect_gnome_proxy () {
  detect_kde_proxy () {
      kioslaverc="${HOME}/.kde/share/config/kioslaverc"
      if [ -f $kioslaverc ] ; then
@@ -21,6 +21,6 @@ $OpenBSD: patch-platform8_lib_nbexec,v 1.1 2008/06/05 08:33:55 sturm Exp $
          else
 -            if /bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
 +            if /usr/bin/grep -q 'ProxyType=0' "$kioslaverc" ; then
-                 http_proxy_tmp="DIRECT"
-                 return 0
-             fi
+                 detect_system_proxy
+                 if [ -z "$http_proxy_tmp" ]; then
+                     http_proxy_tmp="DIRECT"