Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27326
Modified Files:
ChangeLog PkgVersion.pm VirtPackage.pm
Log Message:
type: java and system-java; TODO: auto-add depends/builddepends on system-java*
Index: VirtPackage.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- VirtPackage.pm 8 Jul 2004 03:49:44 -0000 1.43
+++ VirtPackage.pm 9 Jul 2004 02:45:29 -0000 1.44
@@ -163,6 +163,7 @@
# create dummy object for java
print STDERR "- checking Java directories:\n" if ($options{debug});
my $javadir = '/System/Library/Frameworks/JavaVM.framework/Versions';
+ my $latest_java;
if (opendir(DIR, $javadir)) {
for my $dir ( sort readdir(DIR)) {
chomp($dir);
@@ -182,6 +183,7 @@
$hash->{homepage} =
"http://fink.sourceforge.net/faq/usage-general.php?phpLang=en#virtpackage";;
$hash->{provides} = 'system-java';
$self->{$hash->{package}} = $hash;
+ $latest_java = $dir;
if (-d $javadir . '/' . $dir . '/Headers') {
print STDERR "$dir/Headers " if
($options{debug});
@@ -201,6 +203,15 @@
closedir(DIR);
}
+ if (defined $latest_java) {
+ $hash = {};
+ $hash->{package} = "system-java";
+ $hash->{status} = "install ok installed";
+ $hash->{version} = $latest_java . "-1";
+ $hash->{description} = "[virtual package representing Java
$latest_java]";
+ $self->{$hash->{package}} = $hash;
+ }
+
# create dummy object for Java3D
print STDERR "- searching for java3d... " if ($options{debug});
if (-f '/System/Library/Java/Extensions/j3dcore.jar') {
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -d -r1.278 -r1.279
--- PkgVersion.pm 1 Jul 2004 14:39:56 -0000 1.278
+++ PkgVersion.pm 9 Jul 2004 02:45:29 -0000 1.279
@@ -2600,6 +2600,24 @@
$ENV{'MACOSX_DEPLOYMENT_TARGET'} = $sw_vers;
}
}
+
+ if (not $self->has_param('SetJAVA_HOME') or not $self->has_param('SetPATH')) {
+ if ($self->is_type('java')) {
+ my ($subtype, $dir, $found);
+ if ($subtype = $self->get_subtype('java')) {
+ if (opendir(DIR,
'/System/Library/Frameworks/JavaVM.framework/Versions')) {
+ for $dir (sort(readdir(DIR))) {
+ if ($dir =~ /^${subtype}/ and -f
'/System/Library/Frameworks/JavaVM.framework/Versions/' . $dir . '/Headers/jni.h') {
+ $ENV{'JAVA_HOME'} =
'/System/Library/Frameworks/JavaVM.framework/Versions/' . $dir . '/Home' unless
$self->has_param('SetJAVA_HOME');
+ $ENV{'PATH'} =
'/System/Library/Frameworks/JavaVM.framework/Versions/' . $dir . '/Home/bin:' .
$ENV{'PATH'} unless $self->has_param('SetPATH');
+ $found++;
+ }
+ }
+ closedir(DIR);
+ }
+ }
+ }
+ }
}
### run script
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.657
retrieving revision 1.658
diff -u -d -r1.657 -r1.658
--- ChangeLog 6 Jul 2004 20:12:11 -0000 1.657
+++ ChangeLog 9 Jul 2004 02:45:29 -0000 1.658
@@ -1,3 +1,8 @@
+2004-07-08 Benjamin Reed <[EMAIL PROTECTED]>
+
+ * VirtPackage.pm: system-java
+ * PkgVersion.pm: support for Type: java
+
2004-07-02 Dave Morrison <[EMAIL PROTECTED]>
* Bootstrap.pm: Allow bootstrapping with perl 5.8.2 and perl 5.8.4.
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
