Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16693
Modified Files:
Tag: x11-rework
ChangeLog VirtPackage.pm
Log Message:
first blush of pkgconfig detection for virtuals, and hardcoding system-xfree86
based on it
Index: VirtPackage.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v
retrieving revision 1.139.2.1
retrieving revision 1.139.2.2
diff -u -d -r1.139.2.1 -r1.139.2.2
--- VirtPackage.pm 9 Dec 2007 19:49:21 -0000 1.139.2.1
+++ VirtPackage.pm 11 Dec 2007 17:12:20 -0000 1.139.2.2
@@ -1,4 +1,4 @@
-# -*- mode: Perl; tab-width: 4; -*-
+# -*- mode: Perl; tab-width: 4; -*-'
#
# Fink::VirtPackage class
#
@@ -72,8 +72,9 @@
}
our @EXPORT_OK;
-my @xservers = ('XDarwin', 'Xquartz', 'XDarwinQuartz');
-my $the_instance = undef;
+my $pkgconfig_virtual_prefix = 'virtual-pkgconfig-';
+my @xservers = ('XDarwin', 'Xquartz', 'XDarwinQuartz');
+my $the_instance = undef;
END { } # module clean-up code here (global
destructor)
@@ -1116,15 +1117,15 @@
$self->{$hash->{package}} = $hash;
my $found_pc_x11 = 1;
- for my $pkgname ('applewm', 'fontconfig', 'freetype2',
'x11', 'xcb') {
- if (not exists $self->{'pkgconfig-pkg-' .
$pkgname} or $self->{'pkgconfig-pkg-' . $pkgname}->{status} ne STATUS_PRESENT) {
+ for my $pkgname ('applewm', 'fontconfig', 'freetype2',
'x11', 'xcb', 'xorg-server') {
+ if (not exists
$self->{$pkgconfig_virtual_prefix . $pkgname} or
$self->{$pkgconfig_virtual_prefix . $pkgname}->{status} ne STATUS_PRESENT) {
$found_pc_x11 = 0;
last;
}
}
my $xver = 0;
if ($found_pc_x11) {
- $xver = '7';
+ $xver = '7.2';
} else {
($xver) = check_x11_version();
}
@@ -1600,7 +1601,7 @@
first match.
The package name will be the in the form
-"pkgconfig-pkg-name".
+"virtual-pkgconfig-name".
Returns a package object hash.
@@ -1626,7 +1627,7 @@
$name =~ s/\.pc$//;
my $pkgconfig_hash = {};
- $hash->{package} = 'pkgconfig-pkg-' . $name;
+ $hash->{package} = $pkgconfig_virtual_prefix . $name;
if (open(PKGCONFIG, $file)) {
while (my $line = <PKGCONFIG>) {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1517
retrieving revision 1.1517.2.1
diff -u -d -r1.1517 -r1.1517.2.1
--- ChangeLog 27 Nov 2007 18:35:37 -0000 1.1517
+++ ChangeLog 11 Dec 2007 17:12:20 -0000 1.1517.2.1
@@ -1,3 +1,8 @@
+2007-12-11 Benjamin Reed <[EMAIL PROTECTED]>
+
+ * VirtPackage.pm: add support for .pc file virtuals, force x11
+ release version based on existence of certain .pc virtuals
+
2007-11-27 Alexander Hansen <[EMAIL PROTECTED]>
* Bootstrap.pm: recognize 10.5.1 and 10.4.11 .
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
