fink/t/PkgVersion ChangeLog,1.3,1.4 get_perl.t,1.5,1.6 get_ruby.t,1.3,1.4 get_splitoffs.t,1.1,1.2 non_consecutive_source.t,1.1,1.2
Update of /cvsroot/fink/fink/t/PkgVersion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8569/t/PkgVersion
Modified Files:
ChangeLog get_perl.t get_ruby.t get_splitoffs.t
non_consecutive_source.t
Log Message:
move stuff around between PkgVersion and Package + allow arguments to
initializers. see changelog for more details
Index: non_consecutive_source.t
===
RCS file: /cvsroot/fink/fink/t/PkgVersion/non_consecutive_source.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- non_consecutive_source.t23 Mar 2004 08:46:18 - 1.1
+++ non_consecutive_source.t31 Aug 2005 04:28:31 - 1.2
@@ -11,9 +11,9 @@
# Can't test validation?
-my $pv = Fink::PkgVersion->new_from_properties(
- read_properties("PkgVersion/non-consecutive-test.info")
-);
+my $pv = (Fink::PkgVersion->pkgversions_from_info_file(
+ "PkgVersion/non-consecutive-test.info"
+))[0];
isa_ok( $pv, "Fink::PkgVersion", "non-consecutive-test.info" );# 2
@@ -32,9 +32,9 @@
like($pv->get_tarball(), qr/gz$/,
"can generate implicit tarball");
# 8
-$pv = Fink::PkgVersion->new_from_properties(
- read_properties("PkgVersion/non-consecutive-test2.info")
-);
+$pv = (Fink::PkgVersion->pkgversions_from_info_file(
+ "PkgVersion/non-consecutive-test2.info"
+))[0];
is($pv->get_source(),
"mirror:gnu:non-consecutive-test2/non-consecutive-test2-1.0.tar.gz",
"old gnu/gnome mirror syntax works");
# 9
Index: get_perl.t
===
RCS file: /cvsroot/fink/fink/t/PkgVersion/get_perl.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- get_perl.t 16 Nov 2003 13:42:43 - 1.5
+++ get_perl.t 31 Aug 2005 04:28:31 - 1.6
@@ -17,9 +17,9 @@
while( my($info, $version) = each %perlversions ) {
-my $pv = Fink::PkgVersion->new_from_properties(
-read_properties("PkgVersion/$info.info")
- );
+my $pv = (Fink::PkgVersion->pkgversions_from_info_file(
+"PkgVersion/$info.info"
+ ))[0];
isa_ok( $pv, "Fink::PkgVersion", $info );
Index: get_splitoffs.t
===
RCS file: /cvsroot/fink/fink/t/PkgVersion/get_splitoffs.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- get_splitoffs.t 25 Apr 2005 21:17:45 - 1.1
+++ get_splitoffs.t 31 Aug 2005 04:28:31 - 1.2
@@ -34,7 +34,9 @@
Fink::Package->forget_packages();
foreach (qw/ p1 p2 p3 / ) {
-
Fink::Package->insert_pkgversions(Fink::Package->packages_from_info_file("PkgVersion/get_splitoffs-tree/finkinfo/$_.info"));
+ Fink::Package->insert_pkgversions(
+ Fink::PkgVersion->pkgversions_from_info_file(
+ "PkgVersion/get_splitoffs-tree/finkinfo/$_.info"));
}
print "Loaded our .info files\n";
Index: get_ruby.t
===
RCS file: /cvsroot/fink/fink/t/PkgVersion/get_ruby.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- get_ruby.t 15 Jan 2004 06:23:50 - 1.3
+++ get_ruby.t 31 Aug 2005 04:28:31 - 1.4
@@ -16,9 +16,9 @@
while( my($info, $version) = each %rubyversions ) {
-my $pv = Fink::PkgVersion->new_from_properties(
-read_properties("PkgVersion/$info.info")
- );
+my $pv = (Fink::PkgVersion->pkgversions_from_info_file(
+"PkgVersion/$info.info"
+ ))[0];
isa_ok( $pv, "Fink::PkgVersion", $info );
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/t/PkgVersion/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog 25 Apr 2005 21:17:45 - 1.3
+++ ChangeLog 31 Aug 2005 04:28:31 - 1.4
@@ -1,3 +1,8 @@
+2005-08-29 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * get_perl.t, get_ruby.t, get_splitoffs.t, non_consecutive_source.t:
+ Adapt to changed methods in Package/PkgVersion.
+
2005-04-25 Daniel Macks <[EMAIL PROTECTED]>
* get_splitoffs.t, get_splitoffs-tree/finkinfo/*: Check all arg
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
fink/t/Package ChangeLog,1.2,1.3 duplicate_fullnames.t,1.2,1.3
Update of /cvsroot/fink/fink/t/Package
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8569/t/Package
Modified Files:
ChangeLog duplicate_fullnames.t
Log Message:
move stuff around between PkgVersion and Package + allow arguments to
initializers. see changelog for more details
Index: duplicate_fullnames.t
===
RCS file: /cvsroot/fink/fink/t/Package/duplicate_fullnames.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- duplicate_fullnames.t 21 Apr 2005 19:38:56 - 1.2
+++ duplicate_fullnames.t 31 Aug 2005 04:28:31 - 1.3
@@ -7,6 +7,7 @@
my $config = Fink::Config->new_with_path('basepath/etc/fink.conf');
require_ok('Fink::Package');
+require_ok('Fink::PkgVersion');
my @tests = (
{ trees => [ qw(epoch1) ],works
=> 1,
@@ -26,7 +27,7 @@
foreach ( @{$test->{trees}} ) {
my $file =
"Package/duplicate_fullname_trees/$_/finkinfo/" .
"duplicate-fullname.info";
- my @pv = Fink::Package->packages_from_info_file($file);
+ my @pv =
Fink::PkgVersion->pkgversions_from_info_file($file);
Fink::Package->insert_pkgversions(@pv);
}
};
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/t/Package/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 21 Apr 2005 19:38:56 - 1.2
+++ ChangeLog 31 Aug 2005 04:28:31 - 1.3
@@ -1,3 +1,8 @@
+2005-08-29 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * get_perl.t, get_ruby.t, get_splitoffs.t, non_consecutive_source.t:
+ Adapt to changed methods in Package/PkgVersion.
+
2005-04-21 Dave Vasilevsky <[EMAIL PROTECTED]>
* duplicate_fullnames.t: Revamp so it works with new Package.pm
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
fink/perlmod/Fink Base.pm,1.14,1.15 ChangeLog,1.1113,1.1114 Package.pm,1.158,1.159 PkgVersion.pm,1.451,1.452 Validation.pm,1.188,1.189
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8281
Modified Files:
Base.pm ChangeLog Package.pm PkgVersion.pm Validation.pm
Log Message:
move stuff around between PkgVersion and Package + allow arguments to
initializers. see changelog for more details
Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -d -r1.451 -r1.452
--- PkgVersion.pm 31 Aug 2005 02:38:13 - 1.451
+++ PkgVersion.pm 31 Aug 2005 04:26:54 - 1.452
@@ -25,14 +25,14 @@
use Fink::Base;
use Fink::Services qw(&filename &execute
&expand_percent &latest_version
- &collapse_space &read_properties_var
+ &collapse_space &read_properties
&read_properties_var
&pkglist2lol &lol2pkglist &cleanup_lol
&file_MD5_checksum &version_cmp
&get_arch &get_system_perl_version
&get_path &eval_conditional
&enforce_gcc
&dpkg_lockwait &aptget_lockwait
&lock_wait
&store_rename);
-use Fink::CLI qw(&print_breaking &rejoin_text
+use Fink::CLI qw(&print_breaking &print_breaking_stderr &rejoin_text
&prompt_boolean &prompt_selection
&should_skip_prompt);
use Fink::Config qw($config $basepath $libpath $debarch $buildpath
@@ -91,24 +91,28 @@
Create a disk-backed PkgVersion, with initial properties from $hashref.
Other properties will be loaded as needed from $file.
+Note that this constructor does B initialize the PkgVersion, since it
+already has an initialized object on-disk.
+
+
+B
When a PkgVersion object is created with new_backed, the first access to the
object MUST be with one of these methods:
-Package: get_version, get_all_versions, get_matching_versions,
get_all_providers
-PkgVersion: get_parent, get_splitoffs, parent_splitoffs
+ Package: get_version, get_all_versions, get_matching_versions,
get_all_providers
+ PkgVersion: get_parent, get_splitoffs, parent_splitoffs
Many of these methods take a $noload flag to allow callers to disable loading.
This should only be done rarely, when the caller is CERTAIN that no unloaded
fields will be used and when it results in many fewer loads. There should be
always be a comment nearby with the text 'noload'.
-
In addition, the following fields should be accessed exclusively through
accessors:
-Package: _providers, _versions
-PkgVersion: _splitoffs_obj, parent_obj
+ Package: _providers, _versions
+ PkgVersion: _splitoffs_obj, parent_obj
=cut
@@ -219,10 +223,186 @@
}
}
+=item handle_infon_block
+
+my $properties = &read_properties($filename);
+($properties, $info_level) =
+ Fink::PkgVersion->handle_infon_block($properties, $filename);
+
+For the .info file lines processed into the hash ref $properties from
+file $filename, deal with the possibility that the whole thing is in a
+InfoN: block.
+
+If so, make sure this fink is new enough to understand this .info
+format (i.e., NE=max_info_level). If so, promote the fields of the
+block up to the top level of %$properties and return a ref to this new
+hash. If called in a scalar context, the InfoN level is returned in
+the "infon" field of the $properties hash. If called in an array
+context, the InfoN level (or 1 if not an InfoN construct) is returned
+as the second element.
+
+If an error with InfoN occurs (N>max_info_level, more than one InfoN
+block, or part of $properties existing outside the InfoN block) print
+a warning message and return a ref to an empty hash (i.e., ignore the
+.info file).
+
+=cut
+
+sub handle_infon_block {
+ shift; # class method - ignore first parameter
+ my $properties = shift;
+ my $filename = shift;
+
+ my($infon,@junk) = grep {/^info\d+$/i} keys %$properties;
+ if (not defined $infon) {
+ wantarray ? return $properties, 1 : return $properties;
+ }
+ # file contains an InfoN block
+ if (@junk) {
+ print_breaking_stderr "Multiple InfoN blocks in $filename;
skipping";
+ return {};
+ }
+ unless (keys %$properties == 1) {
+ # if InfoN, entire file must be within block (avoids
+ # having to merge InfoN block with top-level fields)
+ print_breaking_stderr "Field(s) outside $infon block! Skipping
$filename";
+ return {};
+ }
+ my ($info_level) = ($infon =~ /(\d+)/);
+ my $max_info_level = &Fink::FinkVersion::max_info_level;
+ if
fink ChangeLog,1.363,1.364 fink.conf.5.in,1.31,1.32
Update of /cvsroot/fink/fink In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23707 Modified Files: ChangeLog fink.conf.5.in Log Message: allow overriding bzip2 path Index: fink.conf.5.in === RCS file: /cvsroot/fink/fink/fink.conf.5.in,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- fink.conf.5.in 3 Aug 2005 00:18:20 - 1.31 +++ fink.conf.5.in 31 Aug 2005 02:38:13 - 1.32 @@ -167,6 +167,11 @@ On Tiger, it is recommended that the Buildpath end with .noindex or .build. Otherwise, Spotlight will attempt to index the temporary files in the Buildpath, slowing down builds. +.It Cm Bzip2Path: Ar the path to your bzip2 (or compatible) binary +The Bzip2Path option lets you override the default path for the bzip2 command-line +tool. This allows you to specify an alternate location to your bzip2 executable, +pass optional command-line options, or use a drop-in replacement like pbzip2 for +decompressing .bz2 archives. .El .\" .\" Index: ChangeLog === RCS file: /cvsroot/fink/fink/ChangeLog,v retrieving revision 1.363 retrieving revision 1.364 diff -u -d -r1.363 -r1.364 --- ChangeLog 25 Aug 2005 03:59:19 - 1.363 +++ ChangeLog 31 Aug 2005 02:38:13 - 1.364 @@ -1,3 +1,7 @@ +2005-08-30 Benjamin Reed <[EMAIL PROTECTED]> + + * fink.conf.5.in: Document Bzip2path + 2005-08-24 Dave Morrison <[EMAIL PROTECTED]> * fink.info.in: Use Conflicts/Replaces against gcc3.1 so that the --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink/perlmod/Fink ChangeLog,1.1112,1.1113 PkgVersion.pm,1.450,1.451
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23707/perlmod/Fink
Modified Files:
ChangeLog PkgVersion.pm
Log Message:
allow overriding bzip2 path
Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -d -r1.450 -r1.451
--- PkgVersion.pm 30 Aug 2005 20:08:51 - 1.450
+++ PkgVersion.pm 31 Aug 2005 02:38:13 - 1.451
@@ -2608,7 +2608,7 @@
} elsif ( -e "$basepath/bin/tar" ) {
$tarcommand = "$basepath/bin/tar $tarflags
$permissionflags"; # Use Fink's GNU Tar if available
}
- $bzip2 = "bzip2";
+ $bzip2 = $config->param_default("Bzip2path", "bzip2");
$unzip = "unzip";
$gzip = "gzip";
$cat = "/bin/cat";
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1112
retrieving revision 1.1113
diff -u -d -r1.1112 -r1.1113
--- ChangeLog 30 Aug 2005 20:08:50 - 1.1112
+++ ChangeLog 31 Aug 2005 02:38:13 - 1.1113
@@ -1,3 +1,7 @@
+2005-08-30 Benjamin Reed <[EMAIL PROTECTED]>
+
+ * PkgVersion.pm: allow overriding of bzip2 path in fink.conf
+
2005-08-29 Dave Vasilevsky <[EMAIL PROTECTED]>
* Services.pm: Force gcc_select in fix_gcc_repairperms to use a
restricted
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.3/unstable/main/finkinfo/utils pbzip2.info,NONE,1.1 pbzip2.patch,NONE,1.1
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23660/10.3/unstable/main/finkinfo/utils Added Files: pbzip2.info pbzip2.patch Log Message: pbzip2 -- multi-cpu bzip2 replacement --- NEW FILE: pbzip2.info --- Package: pbzip2 Version: 0.9.4 Revision: 1 BuildDepends: bzip2-dev Depends: bzip2-shlibs Source: http://compression.ca/%n/%n-%v.tar.gz Source-MD5: ba5e06d89ac3fded55d30d33cdfeb872 Patch: %n.patch PatchScript: << perl -pi -e 's,-pthread,,g' Makefile << CompileScript: make InstallScript: << install -d -m 755 %i/bin install -c -m 755 %n %i/bin/ << Description: SMP-capable bzip2 DescDetail: << PBZIP2 is a parallel implementation of the bzip2 block-sorting file compressor that uses pthreads and achieves near-linear speedup on SMP machines. The output of this version is fully compatible with bzip2 1.0.2 (ie: anything compressed with PBZIP2 can be decompressed with bzip2). << DocFiles: AUTHORS COPYING ChangeLog README License: OSI-Approved Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Homepage: http://compression.ca/pbzip2/ --- NEW FILE: pbzip2.patch --- diff -uNr pbzip2-0.9.4/pbzip2.cpp pbzip2-0.9.4-patched/pbzip2.cpp --- pbzip2-0.9.4/pbzip2.cpp 2005-08-30 11:30:11.0 -0400 +++ pbzip2-0.9.4-patched/pbzip2.cpp 2005-08-30 22:25:58.0 -0400 @@ -88,6 +88,9 @@ #ifdef WIN32 #include #endif +#ifdef __APPLE__ +#include +#endif // uncomment for debug output //#define PBZIP_DEBUG @@ -1340,7 +1343,7 @@ fprintf(stderr, " -f : force, overwrite existing output file\n"); fprintf(stderr, " -k : keep input file, don't delete\n"); fprintf(stderr, " -p# : where # is the number of processors (default"); -#ifdef _SC_NPROCESSORS_ONLN +#if defined(_SC_NPROCESSORS_ONLN) || defined(__APPLE__) fprintf(stderr, ": autodetect)\n"); #else fprintf(stderr, " 2)\n"); @@ -1424,7 +1427,14 @@ } // Autodetect the number of CPUs on a box, if available - #ifdef _SC_NPROCESSORS_ONLN + #if defined(__APPLE__) + size_t len = sizeof(numCPU); + int mib[2]; + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + if (sysctl(mib, 2, &numCPU, &len, 0, 0) < 0 || len != sizeof(numCPU)) + numCPU = 1; + #elif defined(_SC_NPROCESSORS_ONLN) numCPU = sysconf(_SC_NPROCESSORS_ONLN); #endif --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/unstable/main/finkinfo/utils pbzip2.info,NONE,1.1 pbzip2.patch,NONE,1.1
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23660/10.4-transitional/unstable/main/finkinfo/utils Added Files: pbzip2.info pbzip2.patch Log Message: pbzip2 -- multi-cpu bzip2 replacement --- NEW FILE: pbzip2.info --- Package: pbzip2 Version: 0.9.4 Revision: 1 BuildDepends: bzip2-dev Depends: bzip2-shlibs Source: http://compression.ca/%n/%n-%v.tar.gz Source-MD5: ba5e06d89ac3fded55d30d33cdfeb872 Patch: %n.patch PatchScript: << perl -pi -e 's,-pthread,,g' Makefile << CompileScript: make InstallScript: << install -d -m 755 %i/bin install -c -m 755 %n %i/bin/ << Description: SMP-capable bzip2 DescDetail: << PBZIP2 is a parallel implementation of the bzip2 block-sorting file compressor that uses pthreads and achieves near-linear speedup on SMP machines. The output of this version is fully compatible with bzip2 1.0.2 (ie: anything compressed with PBZIP2 can be decompressed with bzip2). << DocFiles: AUTHORS COPYING ChangeLog README License: OSI-Approved Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Homepage: http://compression.ca/pbzip2/ --- NEW FILE: pbzip2.patch --- diff -uNr pbzip2-0.9.4/pbzip2.cpp pbzip2-0.9.4-patched/pbzip2.cpp --- pbzip2-0.9.4/pbzip2.cpp 2005-08-30 11:30:11.0 -0400 +++ pbzip2-0.9.4-patched/pbzip2.cpp 2005-08-30 22:25:58.0 -0400 @@ -88,6 +88,9 @@ #ifdef WIN32 #include #endif +#ifdef __APPLE__ +#include +#endif // uncomment for debug output //#define PBZIP_DEBUG @@ -1340,7 +1343,7 @@ fprintf(stderr, " -f : force, overwrite existing output file\n"); fprintf(stderr, " -k : keep input file, don't delete\n"); fprintf(stderr, " -p# : where # is the number of processors (default"); -#ifdef _SC_NPROCESSORS_ONLN +#if defined(_SC_NPROCESSORS_ONLN) || defined(__APPLE__) fprintf(stderr, ": autodetect)\n"); #else fprintf(stderr, " 2)\n"); @@ -1424,7 +1427,14 @@ } // Autodetect the number of CPUs on a box, if available - #ifdef _SC_NPROCESSORS_ONLN + #if defined(__APPLE__) + size_t len = sizeof(numCPU); + int mib[2]; + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + if (sysctl(mib, 2, &numCPU, &len, 0, 0) < 0 || len != sizeof(numCPU)) + numCPU = 1; + #elif defined(_SC_NPROCESSORS_ONLN) numCPU = sysconf(_SC_NPROCESSORS_ONLN); #endif --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/common/main/finkinfo/utils pbzip2.info,NONE,1.1 pbzip2.patch,NONE,1.1
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23107/common/main/finkinfo/utils Added Files: pbzip2.info pbzip2.patch Log Message: new upstream pbzip2 with proper cpu-detection, kdeadmin3 --- NEW FILE: pbzip2.info --- Package: pbzip2 Version: 0.9.4 Revision: 1 BuildDepends: bzip2-dev Depends: bzip2-shlibs Source: http://compression.ca/%n/%n-%v.tar.gz Source-MD5: ba5e06d89ac3fded55d30d33cdfeb872 Patch: %n.patch PatchScript: << perl -pi -e 's,-pthread,,g' Makefile << CompileScript: make InstallScript: << install -d -m 755 %i/bin install -c -m 755 %n %i/bin/ << Description: SMP-capable bzip2 DescDetail: << PBZIP2 is a parallel implementation of the bzip2 block-sorting file compressor that uses pthreads and achieves near-linear speedup on SMP machines. The output of this version is fully compatible with bzip2 1.0.2 (ie: anything compressed with PBZIP2 can be decompressed with bzip2). << DocFiles: AUTHORS COPYING ChangeLog README License: OSI-Approved Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Homepage: http://compression.ca/pbzip2/ --- NEW FILE: pbzip2.patch --- diff -uNr pbzip2-0.9.4/pbzip2.cpp pbzip2-0.9.4-patched/pbzip2.cpp --- pbzip2-0.9.4/pbzip2.cpp 2005-08-30 11:30:11.0 -0400 +++ pbzip2-0.9.4-patched/pbzip2.cpp 2005-08-30 22:25:58.0 -0400 @@ -88,6 +88,9 @@ #ifdef WIN32 #include #endif +#ifdef __APPLE__ +#include +#endif // uncomment for debug output //#define PBZIP_DEBUG @@ -1340,7 +1343,7 @@ fprintf(stderr, " -f : force, overwrite existing output file\n"); fprintf(stderr, " -k : keep input file, don't delete\n"); fprintf(stderr, " -p# : where # is the number of processors (default"); -#ifdef _SC_NPROCESSORS_ONLN +#if defined(_SC_NPROCESSORS_ONLN) || defined(__APPLE__) fprintf(stderr, ": autodetect)\n"); #else fprintf(stderr, " 2)\n"); @@ -1424,7 +1427,14 @@ } // Autodetect the number of CPUs on a box, if available - #ifdef _SC_NPROCESSORS_ONLN + #if defined(__APPLE__) + size_t len = sizeof(numCPU); + int mib[2]; + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + if (sysctl(mib, 2, &numCPU, &len, 0, 0) < 0 || len != sizeof(numCPU)) + numCPU = 1; + #elif defined(_SC_NPROCESSORS_ONLN) numCPU = sysconf(_SC_NPROCESSORS_ONLN); #endif --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/common/main/finkinfo/base pbzip2.info,1.2,NONE
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23107/common/main/finkinfo/base Removed Files: pbzip2.info Log Message: new upstream pbzip2 with proper cpu-detection, kdeadmin3 --- pbzip2.info DELETED --- --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/unstable/main/finkinfo/web links.info,1.1,1.2
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3334
Modified Files:
links.info
Log Message:
Update, new maintainer and deprecate non-ssl version via linking to system's
openssl.
Index: links.info
===
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/web/links.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- links.info 27 Apr 2005 03:26:59 - 1.1
+++ links.info 31 Aug 2005 00:43:59 - 1.2
@@ -1,19 +1,19 @@
Package: links
-Version: 0.98
-Revision: 1
-Source: mirror:custom:links-%v.tar.gz
+Version: 0.99
+Revision: 2
+BuildDepends: system-openssl-dev
+BuildConflicts: openssl-dev, openssl097-dev
+Source: mirror:custom:%n-%v.tar.gz
CustomMirror: <<
Primary: http://artax.karlin.mff.cuni.cz/~mikulas/links/download/
- eur-lt: http://ice.dammit.lt/links/download/
- nam-us: http://links.sourceforge.net/download/
- eur-de: ftp://ftp.fu-berlin.de/unix/network/www/links/
<<
-Source-MD5: c411e8f85e959408d6c0182045bd7b62
-Conflicts: links
-Replaces: links
-ConfigureParams: --without-ssl --mandir='${prefix}/share/man'
+Source-MD5: c487673abcd6ffe568ab04e6003abdc8
+Conflicts:
+Replaces: links-ssl
+ConfigureParams: --mandir='${prefix}/share/man' --with-ssl
--with-ssl-dir=%p/lib/system-openssl
DocFiles: AUTHORS BUGS COPYING ChangeLog NEWS README SITES TODO
Description: Lynx-like text WWW browser with tables
+DescPort: Updated to new version, uses system-openssl now
License: GPL
-Maintainer: Finlay Dobbie <[EMAIL PROTECTED]>
-Homepage: http://artax.karlin.mff.cuni.cz/~mikulas/links/
+Maintainer: Chris Turkel <[EMAIL PROTECTED]>
+Homepage: http://artax.karlin.mff.cuni.cz/~mikulas/links/
\ No newline at end of file
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/common/main/finkinfo/base pbzip2.info,1.1,1.2
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17404/common/main/finkinfo/base Modified Files: pbzip2.info Log Message: added kdeadmin3, new pbzip2 Index: pbzip2.info === RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/pbzip2.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pbzip2.info 12 Mar 2005 20:58:46 - 1.1 +++ pbzip2.info 30 Aug 2005 20:32:25 - 1.2 @@ -1,11 +1,11 @@ Package: pbzip2 -Version: 0.9.2 +Version: 0.9.4 Revision: 1 BuildDepends: bzip2-dev Depends: bzip2-shlibs Source: http://compression.ca/%n/%n-%v.tar.gz -Source-MD5: 3bfbe0d06ec53639a3f86c1bd1724ba4 +Source-MD5: ba5e06d89ac3fded55d30d33cdfeb872] CompileScript: make InstallScript: << install -d -m 755 %i/bin --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/unstable/main/finkinfo/sci mosflm-small.info,1.2,1.3
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14211 Modified Files: mosflm-small.info Log Message: mosflm small display, added missing dependency, 10.4 unst sci Index: mosflm-small.info === RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/mosflm-small.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mosflm-small.info 15 Aug 2005 16:39:15 - 1.2 +++ mosflm-small.info 30 Aug 2005 20:18:34 - 1.3 @@ -7,9 +7,9 @@ SourceDirectory: mosflm625 # NoSourceDirectory: true Source-MD5: 08c0730fa588d71bed219a7763322672 -Depends: x11, ccp4, ccp4lib, libjpeg-shlibs, ccp4lib-shlibs +Depends: x11, ccp4, ccp4lib, libjpeg-shlibs, ccp4lib-shlibs, libgettext3-shlibs #Replaces: mosflm -BuildDepends: g77, ccp4, x11, libjpeg, ccp4lib-shlibs, ccp4lib +BuildDepends: g77, ccp4, x11, libjpeg, ccp4lib-shlibs, ccp4lib, libgettext3-shlibs PatchScript: << #!/bin/zsh -f print $PWD --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/unstable/main/finkinfo/sci mosflm.info,1.1,1.2
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13823 Modified Files: mosflm.info Log Message: mosflm default display version, program version update, 10.4 unst sci Index: mosflm.info === RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/mosflm.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mosflm.info 15 Aug 2005 16:40:11 - 1.1 +++ mosflm.info 30 Aug 2005 20:17:26 - 1.2 @@ -7,9 +7,9 @@ SourceDirectory: mosflm625 # NoSourceDirectory: true Source-MD5: 08c0730fa588d71bed219a7763322672 -Depends: x11, ccp4, ccp4lib, libjpeg-shlibs, ccp4lib-shlibs +Depends: x11, ccp4, ccp4lib, libjpeg-shlibs, ccp4lib-shlibs, libgettext3-shlibs #Replaces: mosflm -BuildDepends: g77, ccp4, x11, libjpeg, ccp4lib-shlibs, ccp4lib +BuildDepends: g77, ccp4, x11, libjpeg, ccp4lib-shlibs, ccp4lib, libgettext3-shlibs PatchScript: << #!/bin/zsh -f print $PWD @@ -36,7 +36,7 @@ cp ipmosflm-* %i/bin/ipmosflm cp ipmosflm-* %i/bin/mosflm << -Description: X-ray data processing, default display version +Description: X-ray data processing, large display DescDetail: << Mosflm is a program for integrating single crystal diffraction data from area detectors. It is assumed that the experiment was conducted @@ -55,6 +55,8 @@ Cambridge CB2 2QH UK E-mail: harry AT mrc-lmb DOT cam DOT ac DOT uk +<< +Homepage: << http://www.mrc-lmb.cam.ac.uk/harry/frames/ << License: GPL --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink/perlmod/Fink ChangeLog,1.1111,1.1112 PkgVersion.pm,1.449,1.450 Services.pm,1.179,1.180
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12110
Modified Files:
ChangeLog PkgVersion.pm Services.pm
Log Message:
local repo improvements
Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- Services.pm 30 Aug 2005 20:02:35 - 1.179
+++ Services.pm 30 Aug 2005 20:08:51 - 1.180
@@ -1213,7 +1213,8 @@
sub fix_gcc_repairperms {
return unless gcc_select_arg(gcc_selected) eq '4.0';
- system('gcc_select --force 4.0 >/dev/null 2>&1') == 0
+ system('/usr/bin/env PATH=/usr/sbin:/usr/bin:/sbin:/bin '
+ . 'gcc_select --force 4.0 >/dev/null 2>&1') == 0
or die "Can't fix GCC after Repair Permissions: $!\n";
}
Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -d -r1.449 -r1.450
--- PkgVersion.pm 29 Aug 2005 21:47:15 - 1.449
+++ PkgVersion.pm 30 Aug 2005 20:08:51 - 1.450
@@ -1472,10 +1472,14 @@
my $hashref = get_aptdb();
-Get a hashref with the current packages available via apt-get
+Get a hashref with the current packages available via apt-get, and the way apt
+wants to get those packages: downloading from a remote site, or using a local
+.deb.
=cut
+our ($APT_REMOTE, $APT_LOCAL) = (1, 2);
+
sub get_aptdb {
my %db;
@@ -1491,9 +1495,16 @@
} elsif (/^\s+File:\s*(\S+)/) { # Need \s+ so we don't get crap
at end
# of apt-cache dump
# Avoid using debs that aren't really apt-getable
- next if $1 eq $statusfile;
+ next if $1 eq $statusfile or $1 eq "/tmp/finkaptstatus";
- $db{"$pkg-$vers"} = 1 if defined $pkg && defined $vers;
+ if (defined $pkg && defined $vers) {
+ next if $db{"$pkg-$vers"}; # Use the first one
+ if ($1 =~ m,/_[^/]*Packages$,) {
+ $db{"$pkg-$vers"} = $APT_LOCAL;
+ } else {
+ $db{"$pkg-$vers"} = $APT_REMOTE;
+ }
+ }
}
}
close APTDUMP;
@@ -1504,9 +1515,14 @@
=item is_aptgetable
my $aptgetable = $pv->is_aptgetable;
+ my $aptgetable = $pv->is_aptgetable $type;
Get whether or not this package is available via apt-get.
+If a type is specified, will only return true if apt get will get the .deb
+in the desired way. Specify one of $APT_LOCAL or $APT_REMOTE, or zero for any
+type. Defaults to $APT_REMOTE.
+
=cut
{
@@ -1514,6 +1530,8 @@
sub is_aptgetable {
my $self = shift;
+ my $wanttype = shift;
+ $wanttype = $APT_REMOTE unless defined $wanttype;
if (!defined $aptdb) { # Load it
if ($config->binary_requested()) {
@@ -1524,8 +1542,56 @@
}
# Return cached value
- return exists $aptdb->{$self->get_name . "-" .
$self->get_fullversion};
+ my $type = $aptdb->{$self->get_name . "-" .
$self->get_fullversion};
+ return 0 unless $type;
+ return 1 if $wanttype == 0;
+ return $type == $wanttype;
}
+
+=item local_apt_location
+
+ my $path = $pv->local_apt_location;
+
+Find the local path where apt says a deb can be found. Returns undef if none
+found.
+
+For packages that have a local non-apt deb file available, the local deb
+should be preferred, so this method returns undef.
+
+=cut
+
+sub local_apt_location {
+ my $self = shift;
+
+ if (!exists $self->{_apt_loc}) {
+ # Apt won't tell us the location if it's installed
+ return undef if $self->is_installed();
+
+ if ($self->is_locally_present() ||
!$self->is_aptgetable($APT_LOCAL)) {
+ $self->{_apt_loc} = undef;
+ } else {
+ # Need --force-yes --yes to bypass downgrade warning
+ my $aptcmd = aptget_lockwait() . " --ignore-breakage
--force-yes "
+ . "--yes --print-uris install "
+ . sprintf("\Q%s=%s", $self->get_name(),
$self->get_fullversion())
+ . " 2>/dev/null";
+
+ my $line;
+ open APT, "-|", $aptcmd or return und
fink/perlmod/Fink Services.pm,1.178,1.179
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10761/perlmod/Fink
Modified Files:
Services.pm
Log Message:
the ChangeLog-less bandit strikes again!
Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- Services.pm 30 Aug 2005 16:50:23 - 1.178
+++ Services.pm 30 Aug 2005 20:02:35 - 1.179
@@ -1630,8 +1630,8 @@
return (wantarray ? (0, 0) : 0) if $no_block;
# Couldn't get lock, meaning process has it
- my $waittime = $really_timeout ? "$timeout seconds " : "";
- print STDERR "Waiting up to ${waittime}for $desc to finish..."
+ my $waittime = $really_timeout ? "up to $timeout seconds " : "";
+ print STDERR "Waiting ${waittime}for $desc to finish..."
unless $quiet;
my $success = 0;
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
fink lockwait.in,1.3,1.4
Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10761
Modified Files:
lockwait.in
Log Message:
the ChangeLog-less bandit strikes again!
Index: lockwait.in
===
RCS file: /cvsroot/fink/fink/lockwait.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lockwait.in 5 May 2005 22:50:40 - 1.3
+++ lockwait.in 30 Aug 2005 20:02:35 - 1.4
@@ -25,7 +25,7 @@
unless (fcntl(LOCK, F_SETLK, $struct_flock)) {
die "lockwait: Can't get lock: $!" unless $! == EAGAIN || $! ==
EACCES;
- my $msg = $timeout ? "$timeout seconds " : "";
+ my $msg = $timeout ? "up to $timeout seconds " : "";
print STDERR "Waiting ${msg}for access to the dpkg database...
";
eval {
local $SIG{ALRM} = sub { die "alarm\n" };
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/common/main/finkinfo/base dpkg.info,1.3,1.4
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5839/common/main/finkinfo/base Modified Files: dpkg.info Log Message: no ls ;) Index: dpkg.info === RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/dpkg.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dpkg.info 30 Aug 2005 19:00:51 - 1.3 +++ dpkg.info 30 Aug 2005 19:40:36 - 1.4 @@ -28,7 +28,6 @@ install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/ done install -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink - ls -la %i/lib/dpkg/methods/* rm -rf %i/lib/dpkg/methods/* << Description: The Debian package manager --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/common/main/finkinfo/base dpkg.info,1.2,1.3
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25973/base Modified Files: dpkg.info Log Message: descport Index: dpkg.info === RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/dpkg.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dpkg.info 30 Aug 2005 18:41:24 - 1.2 +++ dpkg.info 30 Aug 2005 19:00:51 - 1.3 @@ -38,6 +38,11 @@ dselect, a full-screen console frontend to dpkg. << DescPort: << +1.13.11 +- forward-ported changes to 1.13.11 + - md5sum was removed, had to be re-added + - getopt was needed, but not automatically included, so had to be added to the Makefile.in's + 1.10.9 - Removed --without-zlib flag - Gets confused about top_srcdir without the --srcdir arg. --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/neeri/finkinfo-broken lilypond-devel.info,NONE,1.1 lilypond-devel.patch,NONE,1.1
Update of /cvsroot/fink/experimental/neeri/finkinfo-broken
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25230
Added Files:
lilypond-devel.info lilypond-devel.patch
Log Message:
Added fink version having problems with fontconfig
--- NEW FILE: lilypond-devel.patch ---
diff -ruN lilypond-2.5.28-orig/Documentation/user/GNUmakefile
lilypond-2.5.28/Documentation/user/GNUmakefile
--- lilypond-2.5.28-orig/Documentation/user/GNUmakefile 2005-06-07
00:20:25.0 -0700
+++ lilypond-2.5.28/Documentation/user/GNUmakefile 2005-06-07
00:20:57.0 -0700
@@ -277,7 +277,7 @@
local-clean: local-delete
local-delete:
- -for i in $$(seq 0 9); do \
+ -for i in $$(jot 9 0 9); do \
for j in dvi eps eps.bbox eps.trans eps.trans.ps ps log png
tex; do \
rm -f $(outdir)/lily-$$i*$$j; \
done; \
diff -ruN lilypond-2.5.28-orig/Documentation/user/lilypond.tely
lilypond-2.5.28/Documentation/user/lilypond.tely
--- lilypond-2.5.28-orig/Documentation/user/lilypond.tely 2005-06-07
00:20:25.0 -0700
+++ lilypond-2.5.28/Documentation/user/lilypond.tely2005-06-07
00:20:57.0 -0700
@@ -7,7 +7,6 @@
@dircategory GNU music project
@direntry
-
@ignore
(I think)
Current version of the manual: 2.5.18
@@ -32,15 +31,14 @@
@cLilyPond program.
@end ignore
-
-* LilyPond: (lilypond/lilypond). The GNU music typesetter.
-* abc2ly: (lilypond/lilypond)Invoking abc2ly. Importing ABC.
-* convert-ly: (lilypond/lilypond)Invoking convert-ly. Older LilyPond versions.
-* etf2ly: (lilypond/lilypond)Invoking etf2ly. Importing Finale.
-* lilypond-book: (lilypond/lilypond)LilyPond-book. Itegrating text and
music.
-* midi2ly: (lilypond/lilypond)Invoking midi2ly.Importing MIDI.
-* mup2ly: (lilypond/lilypond)Invoking mup2ly. Importing Mup.
-* musedata2ly: (lilypond/lilypond)Invoking musedata2ly.Importing
MuseData.
+* LilyPond: (lilypond). The GNU music typesetter.
+* abc2ly: (lilypond)Invoking abc2ly. Importing ABC.
+* convert-ly: (lilypond)Invoking convert-ly. Older LilyPond versions.
+* etf2ly: (lilypond)Invoking etf2ly. Importing Finale.
+* lilypond-book: (lilypond)LilyPond-book. Itegrating text and music.
+* midi2ly: (lilypond)Invoking midi2ly.Importing MIDI.
+* mup2ly: (lilypond)Invoking mup2ly. Importing Mup.
+* musedata2ly: (lilypond)Invoking musedata2ly.Importing MuseData.
@end direntry
diff -ruN lilypond-2.5.28-orig/Documentation/user/music-glossary.tely
lilypond-2.5.28/Documentation/user/music-glossary.tely
--- lilypond-2.5.28-orig/Documentation/user/music-glossary.tely 2005-06-07
00:20:25.0 -0700
+++ lilypond-2.5.28/Documentation/user/music-glossary.tely 2005-06-07
00:20:57.0 -0700
@@ -16,6 +16,11 @@
and as @uref{source/Documentation/user/out-www/music-glossary.html,one big
page}.
@end ifhtml
[EMAIL PROTECTED] GNU music project
[EMAIL PROTECTED]
+* Glossary: (music-glossary). Glossary of music terms.
[EMAIL PROTECTED] direntry
+
@titlepage
@title Music Glossary
@author Christian Mondrup @c Original author of LilyPond glossary
diff -ruN lilypond-2.5.28-orig/config.make.in lilypond-2.5.28/config.make.in
--- lilypond-2.5.28-orig/config.make.in 2005-06-07 00:20:29.0 -0700
+++ lilypond-2.5.28/config.make.in 2005-06-07 00:20:57.0 -0700
@@ -41,7 +41,7 @@
elispdir = $(datadir)/emacs/site-lisp
package_datadir = $(datadir)/$(package)
-package_infodir = $(infodir)/$(package)
+package_infodir = $(infodir)
package_libdir = $(libdir)/$(package)
package_docdir = $(docdir)/$(package)
package_omfdir = $(omfdir)/$(package)
diff -ruN lilypond-2.5.28-orig/stepmake/stepmake/c++-rules.make
lilypond-2.5.28/stepmake/stepmake/c++-rules.make
--- lilypond-2.5.28-orig/stepmake/stepmake/c++-rules.make 2005-06-07
00:20:28.0 -0700
+++ lilypond-2.5.28/stepmake/stepmake/c++-rules.make2005-06-07
00:20:57.0 -0700
@@ -26,6 +26,7 @@
$(outdir)/%.cc: %.ll
$(FLEX) -Cfe -p -p -o$@ $<
+ perl -i.bak -pe 's/^class istream;/#include ;\nusing
namespace std;/' $@
$(outdir)/%-rc.o: $(outdir)/%.rc
$(WINDRES) $(WINDRES_FLAGS) -o$@ $<
diff -ruN lilypond-2.5.28-orig/stepmake/stepmake/c-vars.make
lilypond-2.5.28/stepmake/stepmake/c-vars.make
--- lilypond-2.5.28-orig/stepmake/stepmake/c-vars.make 2005-06-07
00:20:28.0 -0700
+++ lilypond-2.5.28/stepmake/stepmake/c-vars.make 2005-06-07
00:20:57.0 -0700
@@ -14,4 +14,4 @@
ALL_C_SOURCES += $(H_FILES) $(C_FILES) $(Y_FILES) $(L_FILES)
-ALL_CFLAGS = $(CFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES))
$(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
+ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix
-I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
diff -ruN lilypond-2.5.28-
dists/10.4-transitional/unstable/main/finkinfo/text lilypond-devel.patch,1.3,1.4
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24097 Modified Files: lilypond-devel.patch Log Message: Testing access Index: lilypond-devel.patch === RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/text/lilypond-devel.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- lilypond-devel.patch13 Jul 2005 03:36:23 - 1.3 +++ lilypond-devel.patch30 Aug 2005 18:54:21 - 1.4 @@ -100,7 +100,7 @@ PIC_FLAGS = -fpic -fPIC -SHARED_FLAGS = -shared -+SHARED_FLAGS = -bundle -flat_namespace -undefined suppress ++SHARED_FLAGS = -bundle -flat_namespace -undefined suppress o-dep-out = $(outdir)/$(subst .o,.dep,$(notdir $@))# DO_O_DEP = rm -f $(o-dep-out); DEPENDENCIES_OUTPUT="$(o-dep-out) $(outdir)/$(notdir $@)" --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/common/main/finkinfo/base dpkg.info,1.1,1.2 dpkg.patch,1.1,1.2
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21203/base Modified Files: dpkg.info dpkg.patch Log Message: put md5sum back Index: dpkg.patch === RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/dpkg.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- dpkg.patch 30 Aug 2005 17:40:42 - 1.1 +++ dpkg.patch 30 Aug 2005 18:41:24 - 1.2 @@ -897,6 +897,84 @@ .SH "SEE ALSO" .BR ln (1), FHS, the Filesystem Hierarchy Standard. +diff -uNr dpkg-1.13.11/man/de/md5sum.1 dpkg-1.13.11-patched/man/de/md5sum.1 +--- dpkg-1.13.11/man/de/md5sum.1 1969-12-31 19:00:00.0 -0500 dpkg-1.13.11-patched/man/de/md5sum.1 2004-03-10 19:11:35.0 -0500 +@@ -0,0 +1,74 @@ ++.\" Hey, Emacs! This is an -*- nroff -*- source file. ++.hw ge-knackt ++.TH MD5SUM 1 "29. November 1995" "Lankester et al" "Debian GNU/Linux" ++.SH NAME ++md5sum \- generiert oder überprüft MD5-Prüfsummen ++ ++.SH "ÜBERSICHT" ++.B md5sum ++[-bv] [-c [datei]] | [datei...] ++ ++.SH BESCHREIBUNG ++.B md5sum ++generiert oder überprüft MD5-Prüfsummen. Der Algorithmus zur Generierung ++der Prüfsummen ist ausreichend schnell und sicher genug für die meisten ++Fälle. Die genaue Spezifikation der Algorithmus findet sich in ++.I RFC 1321. ++ ++Normalerweise generiert ++.B md5sum ++Prüfsummen aller als Parameter übergebenen Dateien und gibt die Prüfsummen ++gefolgt von den entsprechenden Dateinamen aus. Wenn allerdings ++.B -c ++angegeben wird, ist nur ein Dateiname erlaubt. Diese Datei sollte Prüfsummen ++und zu ihnen gehörende Dateinamen enthalten; die aufgeführten Dateien werden ++dann mit den angegebenen Prüfsummen gegengeprüft. Siehe Option ++.B -c ++für mehr Information. ++ ++.SH OPTIONEN ++.TP ++.B -b ++Binärmodus benutzen. In einer UNIX-Umgebung ist der einzige Unterschied zwischen ++diesem und dem Normalmodus ein Sternchen, das dem Dateinamen in der Ausgabe ++vorangeht. ++.TP ++.B -c ++Die Prüfsummen aller Dateien, die in ++.I datei ++aufgeführt sind, nachprüfen. Das Format dieser Datei ist das gleiche wie die ++Ausgabe von ++.B md5sum. ++Es beschreibt also jede Zeile eine Datei. Eine Zeile sieht so aus: ++ ++.B ++ ++Wenn also beispielsweise eine Datei erstellt und ihre Prüfsumme berechnet wird, ++etwa so: ++ ++.B echo foo > md5-test-file; md5sum md5-test-file ++ ++dann würde ++.B md5sum ++Folgendes melden: ++ ++.B d3b07384d113edec49eaa6238ad5ff00\ md5-test-file ++ ++.TP ++.B -v ++Wortreicher sein. Gibt Dateinamen während der Überprüfung (mit \fB-c\fR) aus. ++ ++.SH BUGS ++Der verwandte MD4-Prüfsummen-Algorithmus wurde im Oktober 1995 geknackt. MD5 ++sieht nicht mehr so sicher aus wie früher. ++ ++.B md5sum ++akzeptiert keine Standardoptionen wie ++.BR --help . ++ ++.SH AUTOR ++ ++.B md5sum ++wurde ursprünglich von Branko Lankester geschrieben und hiernach von ++Colin Plumb und Ian Jackson ([EMAIL PROTECTED]) geändert. Die Man-Seite ++wurde von Juho Vuori ([EMAIL PROTECTED]) hinzugefügt. diff -uNr dpkg-1.13.11/man/de/update-alternatives.8 dpkg-1.13.11-patched/man/de/update-alternatives.8 --- dpkg-1.13.11/man/de/update-alternatives.8 2005-06-06 00:07:12.0 -0400 +++ dpkg-1.13.11-patched/man/de/update-alternatives.8 2005-08-30 12:25:37.0 -0400 @@ -1178,6 +1256,88 @@ y normalmente no debería cambiar. .TP .B \-\-debug | \-D +diff -uNr dpkg-1.13.11/man/es/md5sum.1 dpkg-1.13.11-patched/man/es/md5sum.1 +--- dpkg-1.13.11/man/es/md5sum.1 1969-12-31 19:00:00.0 -0500 dpkg-1.13.11-patched/man/es/md5sum.1 2003-09-20 21:43:40.0 -0400 +@@ -0,0 +1,78 @@ ++.\" Hey, Emacs! This is an -*- nroff -*- source file. ++.TH MD5SUM 1 "29 de Noviembre de 1995" "Lankester et al" "Debian GNU/Linux" ++.SH NOMBRE ++md5sum \- genera o comprueba las sumas de control MD5 ++ ++.SH SINOPSIS ++.B md5sum ++[-bv] [-c [nombre_archivo]] | [nombre_archivo...] ++ ++.SH DESCRIPCIÓN ++.B md5sum ++genera o comprueba las sumas de control MD5. El algoritmo que genera las ++sumas de control es razonablemente rápido y robusto para la mayoría de ++los casos. Las especificaciones exactas del algoritmo están en ++.I RFC 1321. ++ ++Normalmente ++.B md5sum ++genera las sumas de control de todos los archivos que se le pasan como ++argumentos e imprime las sumas de control seguidas de los nombres de ++los archivos. Sin embargo si se especifica el parámetro ++.B -c ++, solo un nombre de archivo es permitido como parámetro. ++Este fichero debe de contener las sumas de control y los nombres de archivo ++a las que estas se refieren, entonces los ficheros listados en el archivo ++son comprobados con las sumas de control especificadas. Ver opción ++.B -c ++para mas información. ++ ++.SS OPCIONES ++.TP ++.B -b ++Usar modo binario. En Unix, la única diferencia entre este modo y el normal ++es un as
experimental/rangerrick/common/main/finkinfo/languages boo.info,1.3,1.4
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8732/common/main/finkinfo/languages Modified Files: boo.info Log Message: misc updates, dpkg and apt seem to be working nicely Index: boo.info === RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/languages/boo.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- boo.info16 Aug 2005 18:53:38 - 1.3 +++ boo.info30 Aug 2005 17:40:42 - 1.4 @@ -1,8 +1,8 @@ Package: boo -Version: 0.5.6.1701 +Version: 0.6.0.1858 Revision: 1 Source: http://dist.codehaus.org/%n/distributions/%n-%v-src.tar.bz2 -Source-MD5: a2a9a0b239947257f08fdabfb249dfb6 +Source-MD5: a6ba605d4ba989d5272d341c17343d21 SourceDirectory: %n-%v DocFiles: *.txt docs/* Depends: gtksourceview-sharp (>= 2.0-1), gtksourceview-shlibs (>= 1.0-1), mono (>= 1.1.8.3-1), shared-mime-info --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/common/main/finkinfo/base dpkg.info,NONE,1.1 dpkg.patch,NONE,1.1 apt.patch,1.4,1.5
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8732/common/main/finkinfo/base
Modified Files:
apt.patch
Added Files:
dpkg.info dpkg.patch
Log Message:
misc updates, dpkg and apt seem to be working nicely
--- NEW FILE: dpkg.patch ---
diff -uNr dpkg-1.13.11/dpkg-deb/Makefile.in
dpkg-1.13.11-patched/dpkg-deb/Makefile.in
--- dpkg-1.13.11/dpkg-deb/Makefile.in 2005-08-16 23:45:58.0 -0400
+++ dpkg-1.13.11-patched/dpkg-deb/Makefile.in 2005-08-30 13:11:32.0
-0400
@@ -82,7 +82,7 @@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(EXEFLAGS) -o
$@
SOURCES = $(dpkg_deb_SOURCES)
DIST_SOURCES = $(dpkg_deb_SOURCES)
ETAGS = etags
@@ -229,7 +229,7 @@
main.c
dpkg_deb_LDADD = \
- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
+ $(LIBINTL) ../lib/libdpkg.a ../getopt/libopt.a $(ZLIB_LIBS) $(BZ2_LIBS)
$(SELINUX_LIBS)
[...3044 lines suppressed...]
+found=
check_pseudo_package(&macosx_version,possi,&interestingwarnings,&oemsgs);
+break;
+ }
+*/
+ /* FINK LOCAL end */
if (possi->cyclebreak) {
debug(dbg_depcondetail," break cycle so ok and found");
found= 3; break;
diff -uNr dpkg-1.13.11/utils/Makefile.in dpkg-1.13.11-patched/utils/Makefile.in
--- dpkg-1.13.11/utils/Makefile.in 2005-08-16 23:46:02.0 -0400
+++ dpkg-1.13.11-patched/utils/Makefile.in 2005-08-30 12:42:37.0
-0400
@@ -89,7 +89,7 @@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(EXEFLAGS) -o
$@
SOURCES = $(enoent_SOURCES) $(start_stop_daemon_SOURCES)
DIST_SOURCES = $(enoent_SOURCES) $(am__start_stop_daemon_SOURCES_DIST)
ETAGS = etags
Index: apt.patch
===
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/apt.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apt.patch 20 Aug 2005 15:43:27 - 1.4
+++ apt.patch 30 Aug 2005 17:40:42 - 1.5
@@ -1,6 +1,6 @@
diff -uNr apt-0.6.40.1/Makefile apt-0.6.40.1-new/Makefile
--- apt-0.6.40.1/Makefile 2005-08-05 05:58:35.0 -0400
-+++ apt-0.6.40.1-new/Makefile 2005-08-18 14:35:53.0 -0400
apt-0.6.40.1-new/Makefile 2005-08-29 17:30:29.0 -0400
@@ -15,7 +15,6 @@
$(MAKE) -C apt-inst $@
$(MAKE) -C methods $@
@@ -11,7 +11,7 @@
$(MAKE) -C po $@
diff -uNr apt-0.6.40.1/apt-inst/makefile apt-0.6.40.1-new/apt-inst/makefile
--- apt-0.6.40.1/apt-inst/makefile 2005-08-05 05:58:35.0 -0400
-+++ apt-0.6.40.1-new/apt-inst/makefile 2005-08-18 14:36:57.0 -0400
apt-0.6.40.1-new/apt-inst/makefile 2005-08-29 17:30:29.0 -0400
@@ -12,9 +12,9 @@
# The library name
LIBRARY=apt-inst
@@ -24,9 +24,28 @@
APT_DOMAIN:=libapt-inst$(MAJOR)
# Source code for the contributed non-core things
+diff -uNr apt-0.6.40.1/apt-pkg/acquire-item.cc
apt-0.6.40.1-new/apt-pkg/acquire-item.cc
+--- apt-0.6.40.1/apt-pkg/acquire-item.cc 2005-08-05 05:58:35.0
-0400
apt-0.6.40.1-new/apt-pkg/acquire-item.cc 2005-08-29 17:42:31.0
-0400
+@@ -700,12 +700,14 @@
+ // -
+ /* This just sets up the initial fetch environment and queues the first
+possibilitiy */
++
++// FIXME: when fink has a way to trust stuff, set Trusted(true) back to false
;)
+ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
+pkgRecords *Recs,pkgCache::VerIterator const
&Version,
+string &StoreFilename) :
+Item(Owner), Version(Version), Sources(Sources), Recs(Recs),
+StoreFilename(StoreFilename), Vf(Version.FileList()),
+- Trusted(false)
++ Trusted(true)
+ {
+Retries = _config->FindI("Acquire::Retries",0);
+
diff -uNr apt-0.6.40.1/apt-pkg/contrib/cdromutl.cc
apt-0.6.40.1-new/apt-pkg/contrib/cdromutl.cc
--- apt-0.6.40.1/apt-pkg/contrib/cdromutl.cc 2005-08-05 05:58:35.0
-0400
-+++ apt-0.6.40.1-new/apt-pkg/contrib/cdromutl.cc 2005-08-18
14:35:53.0 -0400
apt-0.6.40.1-new/apt-pkg/contrib/cdromutl.cc 2005-08-29
17:30:29.0 -0400
@@ -23,13 +23,13 @@
#include
@@ -56,7 +75,7 @@
// We use a kilobyte block size to advoid overflow
diff -uNr apt-0.6.40.1/apt-pkg/deb/debindexfile.cc
apt-0.6.40.1-ne
experimental/rangerrick/common/main/finkinfo/libs libwpd-0.8.info,NONE,1.1
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/libs
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8732/common/main/finkinfo/libs
Added Files:
libwpd-0.8.info
Log Message:
misc updates, dpkg and apt seem to be working nicely
--- NEW FILE: libwpd-0.8.info ---
Package: libwpd-0.8
Version: 0.8.2
Revision: 1
###
Depends: bzip2-shlibs, libgettext3-shlibs, glib2-shlibs, libgsf-shlibs,
libxml2-shlibs, libiconv, %N-shlibs (= %v-%r)
BuildDepends: pkgconfig, bzip2, gettext-tools, libgettext3-dev, glib2-dev,
libgsf-dev, libxml2, libiconv-dev
Conflicts: libwpd-1
Replaces: libwpd-1
###
Source: mirror:sourceforge:libwpd/libwpd-%v.tar.gz
Source-MD5: 264e955e19c7e961e22382db09e19597
###
PatchScript:<<
### Fix relink bug
perl -pi.bak -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
### Fix bad libtool converting g++ to gcc at link time
perl -pi.bak -e 's,\$CC -r -keep_private_externs -nostdlib -o
\$\{lib\}-master.o \$libobjs \&\& \$CC,\$nonopt -r -keep_private_externs
-nostdlib -o \$\{lib\}-master.o \$libobjs \&\& \$nonopt,g' configure
<<
###
GCC: 3.3
###
ConfigureParams: --with-pic --enable-shared --enable-static
--mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
###
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
###
DocFiles: CHANGES COPYING INSTALL README TODO
###
SplitOff: <<
Package: %N-shlibs
Depends: gettext, glib2-shlibs, libgsf-shlibs, libiconv, libxml2-shlibs
Files: <<
lib/libwpd-0.8.*.dylib
<<
Shlibs: <<
%p/lib/libwpd-1.2.dylib 8.0.0 %n (>= 0.7.1-10)
<<
DocFiles: CHANGES COPYING INSTALL README TODO
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Conflicts: libwpd-1-dev
Replaces: libwpd-1-dev
Files: <<
include
lib
<<
DocFiles: CHANGES COPYING INSTALL README TODO
<<
###
Description: Library for import and export of WordPerfect formats
DescDetail: <<
libwpd is a library designed to help in the process of importing and
exporting WordPerfect documents by hiding its stream-based formatting
behind a modern C++ API. It is used in the recent versions of AbiWord's
WordPerfect filter. A stand-alone utility based on libwpd, wpd2sxw, is
available now for converting WordPerfect documents to OpenOffice.org's
XML-based file format.
<<
###
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://libwpd.sourceforge.net/
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/common/main/finkinfo/graphics cairo.info,1.16,1.17
Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8732/common/main/finkinfo/graphics Modified Files: cairo.info Log Message: misc updates, dpkg and apt seem to be working nicely Index: cairo.info === RCS file: /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/graphics/cairo.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- cairo.info 16 Aug 2005 18:53:37 - 1.16 +++ cairo.info 30 Aug 2005 17:40:42 - 1.17 @@ -1,5 +1,5 @@ Package: cairo -Version: 0.9.2 +Version: 1.0.0 Revision: 1 CustomMirror: << @@ -7,8 +7,8 @@ nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink nam-CA: http://www.southofheaven.net/befunk << -Source: http://cairographics.org/snapshots/%n-%v.tar.gz -Source-MD5: 992095a5db597384a89b41e93737105d +Source: http://cairographics.org/releases/%n-%v.tar.gz +Source-MD5: f0ff35c91983b7bf226154e68b280be3 Patch: %n.patch BuildDepends: fontconfig1-dev, freetype219, glitz (>= 0.4.4-1), pkgconfig, libgl-dev, libpng3, x11-dev, xft2-dev BuildDependsOnly: true --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/rangerrick/3rdparty/main/finkinfo/libs apr.info,1.1,NONE openldap.info,1.2,NONE openldap.patch,1.2,NONE
Update of /cvsroot/fink/experimental/rangerrick/3rdparty/main/finkinfo/libs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8732/3rdparty/main/finkinfo/libs Removed Files: apr.info openldap.info openldap.patch Log Message: misc updates, dpkg and apt seem to be working nicely --- openldap.info DELETED --- --- openldap.patch DELETED --- --- apr.info DELETED --- --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink/perlmod/Fink Services.pm,1.177,1.178
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28596/perlmod/Fink
Modified Files:
Services.pm
Log Message:
just a minor text change
Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- Services.pm 26 Aug 2005 05:29:54 - 1.177
+++ Services.pm 30 Aug 2005 16:50:23 - 1.178
@@ -1631,7 +1631,7 @@
# Couldn't get lock, meaning process has it
my $waittime = $really_timeout ? "$timeout seconds " : "";
- print STDERR "Waiting ${waittime}for $desc to finish..."
+ print STDERR "Waiting up to ${waittime}for $desc to finish..."
unless $quiet;
my $success = 0;
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.3/unstable/main/finkinfo/kde koffice.info,1.22,1.23
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/kde In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12827/10.3/unstable/main/finkinfo/kde Modified Files: koffice.info Log Message: grr Index: koffice.info === RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/kde/koffice.info,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- koffice.info26 Aug 2005 13:27:22 - 1.22 +++ koffice.info30 Aug 2005 15:52:50 - 1.23 @@ -276,9 +276,9 @@ bin/kivio lib/kde3/kivio.* lib/kde3/libkiviopart.* +lib/kde3/libkivio*tool.* lib/kde3/straight_connector.* lib/libkdeinit_kivio.* -lib/libkivio*tool.* share/applications/kde/kivio.* share/apps/kivio share/apps/konqueror/servicemenus/kivio* --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/unstable/main/finkinfo/kde koffice.info,1.3,1.4
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/kde In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12827/10.4-transitional/unstable/main/finkinfo/kde Modified Files: koffice.info Log Message: grr Index: koffice.info === RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/kde/koffice.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- koffice.info26 Aug 2005 13:27:22 - 1.3 +++ koffice.info30 Aug 2005 15:52:50 - 1.4 @@ -276,9 +276,9 @@ bin/kivio lib/kde3/kivio.* lib/kde3/libkiviopart.* +lib/kde3/libkivio*tool.* lib/kde3/straight_connector.* lib/libkdeinit_kivio.* -lib/libkivio*tool.* share/applications/kde/kivio.* share/apps/kivio share/apps/konqueror/servicemenus/kivio* --- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/chris01/10.3/main/finkinfo/libs neon24.info,NONE,1.1 neon24.patch,NONE,1.1
Update of /cvsroot/fink/experimental/chris01/10.3/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14338/libs
Added Files:
neon24.info neon24.patch
Log Message:
Unified versions of neon24 and svn.
The upgrade path is still not completely tested and may not work correctly.
--- NEW FILE: neon24.patch ---
diff -Nur neon-0.24.7/Makefile.in neon-0.24.7-patched/Makefile.in
--- neon-0.24.7/Makefile.in 2004-07-06 15:54:37.0 +0200
+++ neon-0.24.7-patched/Makefile.in 2004-07-06 15:52:27.0 +0200
@@ -21,7 +21,7 @@
man1dir = $(mandir)/man1
man3dir = $(mandir)/man3
datadir = @datadir@
-docdir = $(datadir)/doc/[EMAIL PROTECTED]@
+docdir = $(datadir)/doc/neon24-ssl
includedir = @includedir@
neonincludes = $(includedir)/neon
pkgconfigdir = $(libdir)/pkgconfig
diff -Nur neon-0.24.7/configure neon-0.24.7-patched/configure
--- neon-0.24.7/configure 2004-07-05 20:35:21.0 +0200
+++ neon-0.24.7-patched/configure 2004-07-06 15:55:27.0 +0200
@@ -5686,7 +5686,7 @@
;;
darwin* | rhapsody*)
-if test "$GXX" = yes ; then
+if test "$GCC" = yes ; then
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
--- NEW FILE: neon24.info ---
Package: neon24
Version: 0.24.7
Revision: 13
Description: HTTP/WebDAV client library with a C API
License: LGPL
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
Depends: %N-shlibs (= %v-%r), pkgconfig
BuildDepends: libxml2 (>= 2.5.10-12), system-openssl-dev, libiconv-dev (>=
1.9.1-11)
Conflicts: neon-ssl, neon, neon19, neon19-ssl, neon21, neon21-ssl, neon22,
neon22-ssl, neon23, neon23-ssl, neon25, neon25-ssl
Replaces: neon-ssl, neon, neon19, neon19-ssl, neon21, neon21-ssl, neon22,
neon22-ssl, neon23, neon23-ssl, neon25, neon25-ssl
BuildDependsOnly: True
# Unpack Phase:
Source: http://www.webdav.org/neon/neon-%v.tar.gz
Source-MD5: 5108bcbe41de4afe2e19cc58500fb9f2
# Patch Phase:
Patch: %n.patch
# Compile Phase:
ConfigureParams: --mandir='${prefix}/share/man' --with-libxml2 --with-ssl
--with-libs=%p/lib/system-openssl --without-egd --without-socks --enable-shared
--enable-static
SetCFLAGS: -no-cpp-precomp
# Install Phase:
DocFiles: AUTHORS BUGS ChangeLog NEWS README THANKS TODO src/COPYING.LIB
SplitOff: <<
Package: %N-shlibs
Depends: libxml2-shlibs (>= 2.5.10-12)
Files: lib/libneon.24.0.7.dylib lib/libneon.24.dylib
Shlibs: %p/lib/libneon.24.dylib 25.0.0 %n (>= 0.24.3-11)
DocFiles: src/COPYING.LIB README
<<
SplitOff2: <<
Description: Upgrade package for neon24
Package: %N-ssl
Depends: %N (= %v-%r)
DocFiles: src/COPYING.LIB README
<<
SplitOff3: <<
Description: Upgrade package for neon24
Package: %N-ssl-shlibs
Depends: %N-shlibs (= %v-%r)
DocFiles: src/COPYING.LIB README
<<
# Additionale Information:
DescDetail: <<
Current features:
- High-level interface to HTTP and WebDAV methods (PUT, GET, HEAD etc)
- Low-level interface to HTTP request handling, to allow implementing
new methods easily.
- persistent connections
- RFC2617 basic and digest authentication (including auth-int, md5-sess)
- Proxy support (including basic/digest authentication)
- SSL/TLS support using OpenSSL (including client certificate support)
- Generic WebDAV 207 XML response handling mechanism
- XML parsing using the expat or libxml parsers
- Easy generation of error messages from 207 error responses
- WebDAV resource manipulation: MOVE, COPY, DELETE, MKCOL.
- WebDAV metadata support: set and remove properties, query any set of
properties (PROPPATCH/PROPFIND).
- autoconf macros supplied for easily embedding neon directly inside an
application source tree.
neon is licensed under the GNU LGPL; see COPYING.LIB for full details.
Please note that the neon API is not yet stable, and is subject to
major changes
<<
DescPackaging: <<
Patched so that it installs the html documentation into the default
doc folder.
Version 0.24.7 seems to use a buggy libtool. Patched configure so that
shared libraries are still built. Thanks to [EMAIL PROTECTED] for the patch.
Previous versions by Max Horn <[EMAIL PROTECTED]>.
Previous versions by Bill Bumgarner <[EMAIL PROTECTED]>.
<<
Homepage: http://www.webdav.org/neon/
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/chris01/10.3/main/finkinfo/devel svn.info,NONE,1.1 svn.patch,NONE,1.1
Update of /cvsroot/fink/experimental/chris01/10.3/main/finkinfo/devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14338/devel
Added Files:
svn.info svn.patch
Log Message:
Unified versions of neon24 and svn.
The upgrade path is still not completely tested and may not work correctly.
--- NEW FILE: svn.patch ---
diff -Naur subversion-1.2.0_orig/Makefile.in subversion-1.2.0/Makefile.in
--- subversion-1.2.0_orig/Makefile.in 2005-03-31 01:48:42.0 +0200
+++ subversion-1.2.0/Makefile.in2005-04-08 14:21:52.0 +0200
@@ -577,7 +577,7 @@
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
-swig-pl_DEPS = libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_ra
libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl
$(SWIG_PL_DIR)/native/Makefile
+swig-pl_DEPS = libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
swig-pl: $(swig-pl_DEPS)
cd $(SWIG_PL_DIR)/native; $(MAKE)
diff -Naur subversion-1.2.0_orig/ac-helpers/ltmain.sh
subversion-1.2.0/ac-helpers/ltmain.sh
--- subversion-1.2.0_orig/ac-helpers/ltmain.sh 2005-04-05 01:45:29.0
+0200
+++ subversion-1.2.0/ac-helpers/ltmain.sh 2005-04-08 14:25:27.0
+0200
@@ -4906,7 +4906,7 @@
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-relink_command=\"$relink_command\"
+relink_command=\"\"
# This environment variable determines our operation mode.
if test \"\$libtool_install_magic\" = \"$magic\"; then
@@ -5303,7 +5303,7 @@
libdir='$install_libdir'"
if test "$installed" = no && test "$need_relink" = yes; then
$echo >> $output "\
-relink_command=\"$relink_command\""
+relink_command=\"\""
fi
done
fi
diff -Naur subversion-1.2.0_orig/build/generator/gen_make.py
subversion-1.2.0/build/generator/gen_make.py
--- subversion-1.2.0_orig/build/generator/gen_make.py 2005-03-22
16:08:25.0 +0100
+++ subversion-1.2.0/build/generator/gen_make.py2005-04-08
15:24:29.0 +0200
@@ -5,6 +5,7 @@
import os
import sys
import string
+import ConfigParser
import gen_base
@@ -39,6 +40,13 @@
install_deps = self.graph.get_deps(gen_base.DT_INSTALL)
install_sources = self.graph.get_all_sources(gen_base.DT_INSTALL)
+cp = ConfigParser.ConfigParser()
+cp.read('gen-make.opts')
+if cp.has_option('options', '--installed-libs'):
+ self.installed_libs = cp.get('options', '--installed-libs').split(',')
+else:
+ self.installed_libs = []
+
# ensure consistency between runs
install_deps.sort()
install_sources.sort(lambda s1, s2: cmp(s1.name, s2.name))
@@ -54,11 +62,17 @@
# construct a list of the other .la libs to link against
retreat = build_path_retreat(target.path)
-deps = [ target.filename ]
-link = [ build_path_join(retreat, target.filename) ]
+if target.name in self.installed_libs:
+ deps = []
+ link = [ '-l%s-%s' % (target.name[3:], self.version) ]
+else:
+ deps = [ target.filename ]
+ link = [ build_path_join(retreat, target.filename) ]
for source in self.graph.get_sources(gen_base.DT_LINK, target.name):
if not isinstance(source, gen_base.TargetLib) or source.external_lib:
continue
+ elif source.name in self.installed_libs:
+continue
deps.append(source.filename)
link.append(build_path_join(retreat, source.filename))
@@ -136,6 +150,8 @@
elif isinstance(link_dep, gen_base.TargetLinked):
if link_dep.external_lib:
libs.append(link_dep.external_lib)
+ elif link_dep.name in self.installed_libs:
+libs.append('-l%s-%s' % (link_dep.name[3:], self.version))
else:
# append the output of the target to our stated dependencies
deps.append(link_dep.filename)
diff -Naur subversion-1.2.0_orig/gen-make.py subversion-1.2.0/gen-make.py
--- subversion-1.2.0_orig/gen-make.py 2005-01-31 13:11:57.0 +0100
+++ subversion-1.2.0/gen-make.py2005-04-08 14:45:18.0 +0200
@@ -81,6 +81,13 @@
print
print " The default generator type is 'make'"
print
+ print " UNIX-specific options:"
+ print
+ print " --installed-libs"
+ print " Comma-separated list of Subversion libraries to find"
+ print " pre-installed instead of building (probably only"
+ print " useful for packagers)"
+ print
print " Windows-specific options:"
print
print " --with-apr=DIR"
@@ -176,6 +183,7 @@
'enable-nls',
'enable-bdb-in-apr-util',
'vsnet-version=',
+'installed-libs=',
])
if len(args) > 1:
_usage_exit()
diff -Naur
subversion-1.2.0_orig/subversion/bind
experimental/chris01/10.3/main/finkinfo/libs openldap.patch,1.2,1.3
Update of /cvsroot/fink/experimental/chris01/10.3/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5050
Modified Files:
openldap.patch
Log Message:
Make it compatible with apr on 10.3
Index: openldap.patch
===
RCS file:
/cvsroot/fink/experimental/chris01/10.3/main/finkinfo/libs/openldap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- openldap.patch 29 Aug 2005 21:14:32 - 1.2
+++ openldap.patch 30 Aug 2005 10:43:27 - 1.3
@@ -159,7 +159,7 @@
diff -uNr openldap-2.2.26/libraries/libldap/ntlm.c
openldap-2.2.26-new/libraries/libldap/ntlm.c
--- openldap-2.2.26/libraries/libldap/ntlm.c 1969-12-31 19:00:00.0
-0500
+++ openldap-2.2.26-new/libraries/libldap/ntlm.c 2005-08-29
14:13:15.0 -0400
-@@ -0,0 +1,143 @@
+@@ -0,0 +1,138 @@
+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04
20:38:21 kurt Exp $ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
@@ -231,11 +231,6 @@
+ return ld->ld_errno;
+ }
+
-+#ifndef LDAP_NOCACHE
-+ if ( ld->ld_cache != NULL ) {
-+ ldap_flush_cache( ld );
-+ }
-+#endif /* !LDAP_NOCACHE */
+
+ /* send the message */
+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
---
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
