[pkgsrc/trunk]: pkgsrc/lang/sun-jdk6 Remove the Darwin specific hacks in this...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95b6bedd7005
branches:  trunk
changeset: 548979:95b6bedd7005
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Oct 25 18:06:31 2008 +0000

description:
Remove the Darwin specific hacks in this so it can detect Java on other
 OSes as well (e.g. OpenSolaris).

diffstat:

 lang/sun-jdk6/builtin.mk |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 563db7a10535 -r 95b6bedd7005 lang/sun-jdk6/builtin.mk
--- a/lang/sun-jdk6/builtin.mk  Sat Oct 25 18:05:03 2008 +0000
+++ b/lang/sun-jdk6/builtin.mk  Sat Oct 25 18:06:31 2008 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: builtin.mk,v 1.1 2008/10/24 21:40:00 adrianp Exp $
+# $NetBSD: builtin.mk,v 1.2 2008/10/25 18:06:31 adrianp Exp $
 
 BUILTIN_PKG:=  sun-jdk6
 
-BUILTIN_FIND_FILES_VAR:=               JDK6
+BUILTIN_FIND_FILES_VAR:=       JDK6
 BUILTIN_FIND_FILES.JDK6=       \
-       /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/javac
+       /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/javac\
+       /usr/jdk/instances/jdk1.6.0/bin/javac
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
@@ -28,8 +29,10 @@
 .if !defined(BUILTIN_PKG.sun-jdk6) && \
     !empty(IS_BUILTIN.sun-jdk6:M[yY][eE][sS]) && \
     empty(JDK6:M__nonexistent__)
-BUILTIN_VERSION.sun-jdk6!=                                             \
-       ${BASENAME} /System/Library/Frameworks/JavaVM.framework/Versions/1.6.*
+
+BUILTIN_VERSION.sun-jdk6!= ${JDK6} -version 2>&1 | ${HEAD} -1 | \ 
+       ${AWK} '{print $$2}'
+
 BUILTIN_PKG.sun-jdk6=  sun-jdk6-${BUILTIN_VERSION.sun-jdk6}
 .endif
 MAKEVARS+=     BUILTIN_PKG.sun-jdk6