Update of /cvsroot/fink/fink/perlmod/Fink
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6236
Modified Files:
Tag: branch_0_29
ChangeLog Validation.pm VirtPackage.pm
Log Message:
backport new java detection ("thanks apple, really!") and gtk-doc val tweak
Index: VirtPackage.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v
retrieving revision 1.146.2.5
retrieving revision 1.146.2.6
diff -u -d -r1.146.2.5 -r1.146.2.6
--- VirtPackage.pm 7 Jan 2010 02:08:42 -0000 1.146.2.5
+++ VirtPackage.pm 23 Oct 2010 15:35:45 -0000 1.146.2.6
@@ -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.5" && $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 " if ($options{debug});
$hash->{status} = STATUS_ABSENT;
}
$self->{$hash->{package}} = $hash unless
(exists $self->{$hash->{package}});
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.303.2.10
retrieving revision 1.303.2.11
diff -u -d -r1.303.2.10 -r1.303.2.11
--- Validation.pm 25 Sep 2010 08:35:39 -0000 1.303.2.10
+++ Validation.pm 23 Oct 2010 15:35:45 -0000 1.303.2.11
@@ -1842,8 +1842,8 @@
my %seen_lines = (); # only print one example
of each bad line
while (<$gtkdocfile>) {
chomp;
- if (/href\s*=\s*[\"\']?(\/[^\/]+)/) {
- if ($1 ne $basepath and
!$seen_lines{$_}++) {
+ if (/href\s*=\s*[\"\']?(\/[\w\/_\.]+)/)
{
+ if ($1 !~ /^$basepath\/.*/ and
!$seen_lines{$_}++) {
&stack_msg($msgs, "Bad
local URL (\"$1\" does not look like a fink location).", $filename, $_);
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1592.2.48
retrieving revision 1.1592.2.49
diff -u -d -r1.1592.2.48 -r1.1592.2.49
--- ChangeLog 25 Sep 2010 14:52:09 -0000 1.1592.2.48
+++ ChangeLog 23 Oct 2010 15:35:45 -0000 1.1592.2.49
@@ -1,3 +1,10 @@
+2010-10-23 Daniel Macks <dma...@netspace.org>
+
+ * Validation.pm: Fix validation of gtk-doc URLs in case that
+ $basepath has multiple directory levels, e.g. /opt/fink vs /sw
+ * VirtPackage.pm: Enable system-java-dev if on 10.6 and
+ JDK headers exist.
+
2010-09-25 Daniel Macks <dma...@netspace.org>
* NetAccess.pm: backport aria2 downloadmethod
------------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
