From b19cd3cb5912d8d1b2ac0a53f5d89cc8bc8affb3 Mon Sep 17 00:00:00 2001
From: adrianp <adrianp@pkgsrc.org>
Date: Sat, 25 Oct 2008 18:06:31 +0000
Subject: Remove the Darwin specific hacks in this so it can detect Java on
 other  OSes as well (e.g. OpenSolaris).

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

(limited to 'lang/sun-jdk6')

diff --git a/lang/sun-jdk6/builtin.mk b/lang/sun-jdk6/builtin.mk
index 4a3175e8a65..b87f7e70d9c 100644
--- a/lang/sun-jdk6/builtin.mk
+++ b/lang/sun-jdk6/builtin.mk
@@ -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 @@ MAKEVARS+=	IS_BUILTIN.sun-jdk6
 .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
-- 
cgit v1.2.3