Update of /cvsroot/fink/fink/perlmod/Fink
In directory 
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25555/perlmod/Fink

Modified Files:
        ChangeLog VirtPackage.pm 
Log Message:
check for Current/Headers on 10.6

Index: VirtPackage.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- VirtPackage.pm      6 Jan 2010 23:47:53 -0000       1.151
+++ VirtPackage.pm      21 Oct 2010 01:27:20 -0000      1.152
@@ -447,10 +447,14 @@
 END
                                $hash->{compilescript} = 
&gen_compile_script($hash);
 
-                               if (-d $javadir . '/' . $dir . '/Headers') {
-                                       print STDERR "$dir/Headers " if 
($options{debug});
+                               if (-r $javadir . '/' . $dir . 
'/Headers/jni.h') {
+                                       print STDERR "$dir/Headers/jni.h " if 
($options{debug});
+                                       $latest_javadev = $dir unless (defined 
$latest_javadev);
+                               } elsif ($distribution ge "10.6" && $ver >= 14 
&& -r $javadir . '/Current/Headers/jni.h') {
+                                       print STDERR "Current/Headers/jni.h " 
if ($options{debug});
                                        $latest_javadev = $dir unless (defined 
$latest_javadev);
                                } else {
+                                       print STDERR 
"$javadir/$dir/Headers/jni.h missing ";
                                        $hash->{status} = STATUS_ABSENT;
                                }
                                $self->{$hash->{package}} = $hash unless 
(exists $self->{$hash->{package}});

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1682
retrieving revision 1.1683
diff -u -d -r1.1682 -r1.1683
--- ChangeLog   1 Oct 2010 12:18:27 -0000       1.1682
+++ ChangeLog   21 Oct 2010 01:27:20 -0000      1.1683
@@ -1,3 +1,8 @@
+2010-10-20  Benjamin Reed <[email protected]>
+
+       * VirtPackage.pm: Enable system-java-dev if on 10.6 and
+       JDK headers exist.
+
 2010-10-01  Remi Mommsen <[email protected]>
 
        * Validation.pm: Fix validation of gtk-doc URLs in case that


------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to