Wed Feb 11 21:20:46 2009 UTC ()
Fix detection on OpenSolaris


(adrianp)
diff -r1.3 -r1.4 pkgsrc/lang/sun-jre6/builtin.mk
cvs diff -r1.3 -r1.4 pkgsrc/lang/sun-jre6/Attic/builtin.mk (expand / switch to unified diff)

--- pkgsrc/lang/sun-jre6/Attic/builtin.mk 2008/10/25 18:05:03 1.3
+++ pkgsrc/lang/sun-jre6/Attic/builtin.mk 2009/02/11 21:20:46 1.4
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: builtin.mk,v 1.3 2008/10/25 18:05:03 adrianp Exp $ 1# $NetBSD: builtin.mk,v 1.4 2009/02/11 21:20:46 adrianp Exp $
2 2
3BUILTIN_PKG:= sun-jre6 3BUILTIN_PKG:= sun-jre6
4 4
5BUILTIN_FIND_FILES_VAR:= JAVAVM6 5BUILTIN_FIND_FILES_VAR:= JAVAVM6
6BUILTIN_FIND_FILES.JAVAVM6= \ 6BUILTIN_FIND_FILES.JAVAVM6= \
7 /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home \ 7 /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home \
8 /usr/jdk/instances/jdk1.6.0/jre 8 /usr/jdk/instances/jdk1.6.0
9 9
10.include "../../mk/buildlink3/bsd.builtin.mk" 10.include "../../mk/buildlink3/bsd.builtin.mk"
11 11
12### 12###
13### Determine if there is a built-in implementation of the package and 13### Determine if there is a built-in implementation of the package and
14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
15### 15###
16.if !defined(IS_BUILTIN.sun-jre6) 16.if !defined(IS_BUILTIN.sun-jre6)
17. if empty(JAVAVM6:M__nonexistent__) 17. if empty(JAVAVM6:M__nonexistent__)
18IS_BUILTIN.sun-jre6= yes 18IS_BUILTIN.sun-jre6= yes
19. else 19. else
20IS_BUILTIN.sun-jre6= no 20IS_BUILTIN.sun-jre6= no
21. endif 21. endif