Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5825
Modified Files:
ChangeLog VirtPackage.pm
Log Message:
Add a new virtual pkg "system-xfree86-manual-install" as a catch-all
for Apple's X11*.pkg; users will have this choice for x11-dev, etc.
Index: VirtPackage.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/VirtPackage.pm,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- VirtPackage.pm 2 Jan 2005 15:56:59 -0000 1.61
+++ VirtPackage.pm 17 Jan 2005 06:14:11 -0000 1.62
@@ -763,6 +763,35 @@
$hash->{provides} = 'x11-dev, libgl-dev, xft1-dev,
xft2-dev, fontconfig1-dev, xfree86-base-threaded-dev';
$self->{$hash->{package}} = $hash;
+ $hash = {};
+ $hash->{package} = "system-xfree86-manual-install";
+ $hash->{version} = "0-0";
+ $hash->{status} = STATUS_ABSENT;
+ $hash->{description} = "Manually installed X11
components";
+ $hash->{homepage} =
"http://fink.sourceforge.net/faq/usage-general.php#virtpackage";;
+ $hash->{compilescript} = $compile_script;
+ $hash->{descdetail} = <<END;
+This package represents the various components of an
+X11 on your system that is not installed through Fink.
+
+You can either use a Fink-supplied X11, such as the
+xfree86 or xorg sets of packages, or you can use a
+manually-installed (non-Fink) X11, such as Apple's
+X11User and X11SDK packages. You must not mix X11
+suppliers. If you are already using some type of
+manually-installed X11, please make sure you have
+installed all components of it.
+
+For more information, please see the FAQ entry on X11
+installation at:
+
+ http://fink.sourceforge.net/faq/usage-packages.php#apple-x11-wants-xfree86
+
+END
+
+ $hash->{provides} = join ',', map
$self->{$_}->{provides}, qw/ system-xfree86 system-xfree86-shlibs
system-xfree86-dev /;
+ $self->{$hash->{package}} = $hash;
+
my ($xver) = check_x11_version();
if (defined $xver) {
$hash = {};
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -d -r1.809 -r1.810
--- ChangeLog 17 Jan 2005 06:07:09 -0000 1.809
+++ ChangeLog 17 Jan 2005 06:14:10 -0000 1.810
@@ -1,5 +1,10 @@
2005-01-17 Daniel Macks <[EMAIL PROTECTED]>
+ * VirtPackage.pm: Add "system-xfree86-manual-install" as a
+ (non-installed) catch-all for all of Apple X11*.pkg
+
+2005-01-17 Daniel Macks <[EMAIL PROTECTED]>
+
* CLI.pm: (Re)introduce prompt_selection() with timeout; remove
timeout from prompt_selection_new().
* PkgVersion.pm: Fix error msg for buildlock failure.
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
