diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-09-15 19:03:48 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-09-15 19:03:48 +0000 |
| commit | 701be455935bb8d5eed16dd2d6f9a25cc0081a3d (patch) | |
| tree | b8d9ad797dcf6be94fdfad166bc9e457451046a5 /media-sound/jmax | |
| parent | Changed init script to after instead of use for bug #59635. (diff) | |
| download | historical-701be455935bb8d5eed16dd2d6f9a25cc0081a3d.tar.gz historical-701be455935bb8d5eed16dd2d6f9a25cc0081a3d.tar.bz2 historical-701be455935bb8d5eed16dd2d6f9a25cc0081a3d.zip | |
Fix java detection in executeable.
Diffstat (limited to 'media-sound/jmax')
| -rw-r--r-- | media-sound/jmax/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/jmax/Manifest | 10 | ||||
| -rw-r--r-- | media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch | 11 |
3 files changed, 21 insertions, 6 deletions
diff --git a/media-sound/jmax/ChangeLog b/media-sound/jmax/ChangeLog index f4818a30bb77..f5f41c90ef57 100644 --- a/media-sound/jmax/ChangeLog +++ b/media-sound/jmax/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/jmax # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.8 2004/07/22 15:07:01 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.9 2004/09/15 19:03:48 eradicator Exp $ + + 15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> + files/jmax-4.1.0-fix-java-check.patch: + Fix java detection in executeable. 22 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/jmax-4.1.0-fix-java-check.patch, jmax-4.1.0.ebuild: diff --git a/media-sound/jmax/Manifest b/media-sound/jmax/Manifest index 79fc369ef46b..8a342d174816 100644 --- a/media-sound/jmax/Manifest +++ b/media-sound/jmax/Manifest @@ -1,8 +1,8 @@ -MD5 dfd896f0ea06214f8f4feb32bc40e9b5 jmax-4.1.0.ebuild 1637 -MD5 1917a62ff1c2e77ef1840d89cdb46410 ChangeLog 1098 +MD5 c669acd948ab4f41086df53ff578894f ChangeLog 1240 MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221 -MD5 14eb868795e30de75f2f6bcd7a962de3 files/jmax-4.1.0-gcc34.patch 968 +MD5 dfd896f0ea06214f8f4feb32bc40e9b5 jmax-4.1.0.ebuild 1637 MD5 ce7938192f9fef7f13fa7fe709c6f3ad files/jmax-4.0.2-work_with_recent_alsa-lib.patch 991 -MD5 a2964306dfa904cce770a5be6a3492d0 files/jmax-4.1.0-otherArch.patch 651 -MD5 8f583b35738cdfbbaeea6289b3e2f6ff files/jmax-4.1.0-fix-java-check.patch 715 MD5 bc96e130e7d54a74caa5c39641d6e898 files/digest-jmax-4.1.0 125 +MD5 a2964306dfa904cce770a5be6a3492d0 files/jmax-4.1.0-otherArch.patch 651 +MD5 14eb868795e30de75f2f6bcd7a962de3 files/jmax-4.1.0-gcc34.patch 968 +MD5 25c6fe2b25184c40b3096887923ecf85 files/jmax-4.1.0-fix-java-check.patch 1206 diff --git a/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch b/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch index 7d0d1f96d589..a63af7dcf704 100644 --- a/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch +++ b/media-sound/jmax/files/jmax-4.1.0-fix-java-check.patch @@ -9,3 +9,14 @@ java_major_version=`echo $java_version | sed 's/\([[0-9]][[0-9]]*\)\..*/\1/'` java_minor_version=`echo $java_version | sed 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\(\.[[0-9]][[0-9]]*\)*/\1/' | sed 's/_.*//g'` +--- bin/jmax.in.orig 2004-09-15 11:59:41.575144987 -0700 ++++ bin/jmax.in 2004-09-15 12:02:31.142218132 -0700 +@@ -208,7 +208,7 @@ + check_java_version () + { + java_to_test="$1" +- java_version=`$java_to_test -version 2>&1 | grep "version" | sed 's/java version//' | sed 's/\"//g' ` ++ java_version=`$java_to_test -version 2>&1 | grep "version" | sed 's/java version//' | sed 's/\"//g' | sed 's/-.*//' ` + if test -z $java_version; then + # domething bad with java version + return 1 |