summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-07-23 09:25:20 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-07-23 09:25:20 +0000
commit1fb5416eb642d1396be1f4e5d6d8b667cc91beef (patch)
tree28b6704b92876c6297a7402c06b7a9b4446f081e /dev-db/henplus/files
parentAdded to stable amd64 (Manifest recommit) (diff)
downloadgentoo-2-1fb5416eb642d1396be1f4e5d6d8b667cc91beef.tar.gz
gentoo-2-1fb5416eb642d1396be1f4e5d6d8b667cc91beef.tar.bz2
gentoo-2-1fb5416eb642d1396be1f4e5d6d8b667cc91beef.zip
fixed patch, 40197
Diffstat (limited to 'dev-db/henplus/files')
-rw-r--r--dev-db/henplus/files/digest-henplus-0.9.5-r11
-rw-r--r--dev-db/henplus/files/digest-henplus-0.9.5-r2 (renamed from dev-db/henplus/files/digest-henplus-0.9.5)0
-rw-r--r--dev-db/henplus/files/henplus.patch23
3 files changed, 16 insertions, 8 deletions
diff --git a/dev-db/henplus/files/digest-henplus-0.9.5-r1 b/dev-db/henplus/files/digest-henplus-0.9.5-r1
deleted file mode 100644
index 7db26f4124e9..000000000000
--- a/dev-db/henplus/files/digest-henplus-0.9.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 135e00fddd80ec0cf903171760c02a1b henplus-0.9.5.tar.gz 106161
diff --git a/dev-db/henplus/files/digest-henplus-0.9.5 b/dev-db/henplus/files/digest-henplus-0.9.5-r2
index 7db26f4124e9..7db26f4124e9 100644
--- a/dev-db/henplus/files/digest-henplus-0.9.5
+++ b/dev-db/henplus/files/digest-henplus-0.9.5-r2
diff --git a/dev-db/henplus/files/henplus.patch b/dev-db/henplus/files/henplus.patch
index 4c6fa7038f45..c1028161c4cc 100644
--- a/dev-db/henplus/files/henplus.patch
+++ b/dev-db/henplus/files/henplus.patch
@@ -1,6 +1,14 @@
--- bin/henplus 2004-02-02 14:53:28.000000000 +0100
-+++ bin/henplus 2004-07-18 15:56:40.061422352 +0200
-@@ -13,20 +13,9 @@
++++ /usr/bin/henplus 2004-07-23 11:21:11.518166136 +0200
+@@ -2,6 +2,7 @@
+ # $Id: henplus.patch,v 1.2 2004/07/23 09:25:20 axxo Exp $
+ ##
+
++echo $(dirname $0)
+ # additional flags you might want to pass to the java interpreter
+ # like -Dfile.encoding=ISO-8859-1
+ JAVA_FLAGS=
+@@ -13,20 +14,8 @@
JAVA=$JAVA_HOME/bin/java
fi
@@ -12,22 +20,23 @@
-if [ ! -d "$HENPLUSDIR" ] ; then
- HENPLUSDIR=$THISDIR/../build
-fi
-+HENPLUSDIR=$(dirname $(java-config -p henplus))
-
+-
-# location of the readline lib.
-# Modify this, if you installation stores this at a different
-# position.
-LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH
-CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar
++HENPLUSDIR=$(dirname $(java-config -p henplus))
+CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java)
# you may just throw your own jar files in this dir.
# (like additional JDBC-drivers, that are not in default
-@@ -66,6 +55,4 @@
+@@ -65,7 +54,4 @@
+ CLASSPATH=$CLASSPATH:$f
fi
done
-
+-
-export CLASSPATH LD_LIBRARY_PATH
-
-exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
-+exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"
++LD_LIBRARY_PATH="/usr/lib:$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"