--- a/JavaNativeMethodImpl_OpenJDK6.st	Wed Apr 16 15:57:16 2014 +0200
+++ b/JavaNativeMethodImpl_OpenJDK6.st	Wed Apr 16 18:27:24 2014 +0200
@@ -3170,15 +3170,15 @@
 
     |path|
 
-    "/ mhmh - what is done here ?
-
+    "/ build a colon-separated string
     path := ''.
-    LibPath do:[:comp | path size == 0 ifTrue:[
-                            path := path , comp
-                        ] ifFalse:[
-                            path := path , ':' , comp
-                        ]
-               ].
+    LibPath do:[:comp | 
+        path size == 0 ifTrue:[
+            path := path , comp
+        ] ifFalse:[
+            path := path , ':' , comp
+        ]
+    ].
 
     ^ Java as_String:path
 
@@ -11285,7 +11285,7 @@
 
     <javanative: 'java/lang/System' name: 'initProperties(Ljava/util/Properties;)Ljava/util/Properties;'>
 
-        |props stProps|
+    |props stProps|
 
     props := a1.
     stProps := JavaVM systemProperties.
@@ -11320,6 +11320,9 @@
     name := Java as_ST_String: a1.
 
     OperatingSystem isUNIXlike ifTrue:[
+        OperatingSystem isOSXlike ifTrue:[
+            ^Java as_String: ('lib' , name , '.jnilib').
+        ].
         ^Java as_String: ('lib' , name , '.so').
     ].
 

--- a/Make.proto	Wed Apr 16 15:57:16 2014 +0200
+++ b/Make.proto	Wed Apr 16 18:27:24 2014 +0200
@@ -276,6 +276,7 @@
 $(OUTDIR)JavaMethodAnalyzer.$(O) JavaMethodAnalyzer.$(H): JavaMethodAnalyzer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessorAdapter.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodRef2.$(O) JavaMethodRef2.$(H): JavaMethodRef2.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaClassMemberRef2.$(H) $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodWithException.$(O) JavaMethodWithException.$(H): JavaMethodWithException.st $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMethod.$(H) $(STCHDR)
+$(OUTDIR)JavaNativeMethodImpl_AppleJDK6.$(O) JavaNativeMethodImpl_AppleJDK6.$(H): JavaNativeMethodImpl_AppleJDK6.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaNativeMethodImpl_OpenJDK6.$(H) $(STCHDR)
 $(OUTDIR)JavaNativeMethodImpl_OpenJDK7.$(O) JavaNativeMethodImpl_OpenJDK7.$(H): JavaNativeMethodImpl_OpenJDK7.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaNativeMethodImpl_OpenJDK6.$(H) $(INCLUDE_TOP)/stx/libjava/JavaVMData.$(H) $(STCHDR)
 $(OUTDIR)JavaNativeMethodImpl_SunJDK6.$(O) JavaNativeMethodImpl_SunJDK6.$(H): JavaNativeMethodImpl_SunJDK6.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaNativeMethodImpl_OpenJDK6.$(H) $(STCHDR)
 $(OUTDIR)JavaPrimitiveMirror.$(O) JavaPrimitiveMirror.$(H): JavaPrimitiveMirror.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaMirror.$(H) $(INCLUDE_TOP)/stx/libjava/JavaVMData.$(H) $(STCHDR)

--- a/Make.spec	Wed Apr 16 15:57:16 2014 +0200
+++ b/Make.spec	Wed Apr 16 18:27:24 2014 +0200
@@ -163,6 +163,7 @@
 	JavaMethodAnalyzer \
 	JavaMethodRef2 \
 	JavaMethodWithException \
+	JavaNativeMethodImpl_AppleJDK6 \
 	JavaNativeMethodImpl_OpenJDK7 \
 	JavaNativeMethodImpl_SunJDK6 \
 	JavaPrimitiveMirror \
@@ -299,6 +300,7 @@
     $(OUTDIR_SLASH)JavaMethodAnalyzer.$(O) \
     $(OUTDIR_SLASH)JavaMethodRef2.$(O) \
     $(OUTDIR_SLASH)JavaMethodWithException.$(O) \
+    $(OUTDIR_SLASH)JavaNativeMethodImpl_AppleJDK6.$(O) \
     $(OUTDIR_SLASH)JavaNativeMethodImpl_OpenJDK7.$(O) \
     $(OUTDIR_SLASH)JavaNativeMethodImpl_SunJDK6.$(O) \
     $(OUTDIR_SLASH)JavaPrimitiveMirror.$(O) \

--- a/abbrev.stc	Wed Apr 16 15:57:16 2014 +0200
+++ b/abbrev.stc	Wed Apr 16 18:27:24 2014 +0200
@@ -114,6 +114,7 @@
 JavaMethodAnalyzer JavaMethodAnalyzer stx:libjava 'Languages-Java-Support-Decompiling' 0
 JavaMethodRef2 JavaMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes' 0
+JavaNativeMethodImpl_AppleJDK6 JavaNativeMethodImpl_AppleJDK6 stx:libjava 'Languages-Java-Support-Java 6' 0
 JavaNativeMethodImpl_OpenJDK7 JavaNativeMethodImpl_OpenJDK7 stx:libjava 'Languages-Java-Support-Java 7' 0
 JavaNativeMethodImpl_SunJDK6 JavaNativeMethodImpl_SunJDK6 stx:libjava 'Languages-Java-Support-Java 6' 0
 JavaPrimitiveMirror JavaPrimitiveMirror stx:libjava 'Languages-Java-Classes' 0

--- a/bc.mak	Wed Apr 16 15:57:16 2014 +0200
+++ b/bc.mak	Wed Apr 16 18:27:24 2014 +0200
@@ -209,6 +209,7 @@
 $(OUTDIR)JavaMethodAnalyzer.$(O) JavaMethodAnalyzer.$(H): JavaMethodAnalyzer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessorAdapter.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodRef2.$(O) JavaMethodRef2.$(H): JavaMethodRef2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaClassMemberRef2.$(H) $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodWithException.$(O) JavaMethodWithException.$(H): JavaMethodWithException.st $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMethod.$(H) $(STCHDR)
+$(OUTDIR)JavaNativeMethodImpl_AppleJDK6.$(O) JavaNativeMethodImpl_AppleJDK6.$(H): JavaNativeMethodImpl_AppleJDK6.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaNativeMethodImpl_OpenJDK6.$(H) $(STCHDR)
 $(OUTDIR)JavaNativeMethodImpl_OpenJDK7.$(O) JavaNativeMethodImpl_OpenJDK7.$(H): JavaNativeMethodImpl_OpenJDK7.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaNativeMethodImpl_OpenJDK6.$(H) $(INCLUDE_TOP)\stx\libjava\JavaVMData.$(H) $(STCHDR)
 $(OUTDIR)JavaNativeMethodImpl_SunJDK6.$(O) JavaNativeMethodImpl_SunJDK6.$(H): JavaNativeMethodImpl_SunJDK6.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaNativeMethodImpl_OpenJDK6.$(H) $(STCHDR)
 $(OUTDIR)JavaPrimitiveMirror.$(O) JavaPrimitiveMirror.$(H): JavaPrimitiveMirror.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaMirror.$(H) $(INCLUDE_TOP)\stx\libjava\JavaVMData.$(H) $(STCHDR)

--- a/libInit.cc	Wed Apr 16 15:57:16 2014 +0200
+++ b/libInit.cc	Wed Apr 16 18:27:24 2014 +0200
@@ -140,6 +140,7 @@
 _JavaMethodAnalyzer_Init(pass,__pRT__,snd);
 _JavaMethodRef2_Init(pass,__pRT__,snd);
 _JavaMethodWithException_Init(pass,__pRT__,snd);
+_JavaNativeMethodImpl_137AppleJDK6_Init(pass,__pRT__,snd);
 _JavaNativeMethodImpl_137OpenJDK7_Init(pass,__pRT__,snd);
 _JavaNativeMethodImpl_137SunJDK6_Init(pass,__pRT__,snd);
 _JavaPrimitiveMirror_Init(pass,__pRT__,snd);

--- a/libjava.rc	Wed Apr 16 15:57:16 2014 +0200
+++ b/libjava.rc	Wed Apr 16 18:27:24 2014 +0200
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 10 Apr 2014 07:01:52 GMT\0"
+      VALUE "ProductDate", "Wed, 16 Apr 2014 16:21:29 GMT\0"
     END
 
   END