switch to SUBST_CMD

make this somewhat useable w/ jre 1.7.0 although there are still some
icon and font problems
This commit is contained in:
sturm 2008-06-14 16:48:22 +00:00
parent 9dc7ac21b0
commit b1d58e26f1
3 changed files with 17 additions and 5 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2008/06/05 08:33:55 sturm Exp $
# $OpenBSD: Makefile,v 1.3 2008/06/14 16:48:22 sturm Exp $
COMMENT= collecting and processing thoughts according to GTD
V= 2.0.1
DISTNAME= tr-$V
PKGNAME= thinkingrock-${V}
PKGNAME= thinkingrock-${V}p0
CATEGORIES= productivity java
HOMEPAGE= http://www.thinkingrock.com.au/
@ -34,7 +34,7 @@ post-extract:
@rm ${WRKSRC}/etc/tr.conf~
do-configure:
@perl -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/bin/tr
${SUBST_CMD} ${WRKSRC}/bin/tr ${WRKSRC}/etc/tr.conf
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/thinkingrock

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-bin_tr,v 1.1 2008/06/05 08:33:55 sturm Exp $
$OpenBSD: patch-bin_tr,v 1.2 2008/06/14 16:48:22 sturm Exp $
--- bin/tr.orig Sat May 31 03:33:36 2008
+++ bin/tr Sun Jun 1 22:04:29 2008
@@ -16,8 +16,14 @@ while [ -h "$PRG" ]; do
@ -8,7 +8,7 @@ $OpenBSD: patch-bin_tr,v 1.1 2008/06/05 08:33:55 sturm Exp $
-progdir=`dirname "$PRG"`
-APPNAME=`basename "$0"`
+# progdir is always used as $progdir/..
+progdir=%%LOCALBASE%%/share/thinkingrock/etc
+progdir=${LOCALBASE}/share/thinkingrock/etc
+
+JAVA_HOME=`javaPathHelper -h thinkingrock`
+jdkhome=$JAVA_HOME

View File

@ -0,0 +1,12 @@
$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"