scripts/buildfink filters.xml,1.4,1.5 buildfink,1.23,1.24

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2535

Modified Files:
filters.xml buildfink 
Log Message:
Add configurable per-package build time and log size limits

Index: filters.xml
===
RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- filters.xml 11 Jan 2006 20:25:09 -  1.4
+++ filters.xml 13 Mar 2006 20:25:30 -  1.5
@@ -151,7 +151,10 @@
error: conflicting types 
for '__mbstate_t'
 
sys/signal.h:166
-   ^Failed:
+
+   ^Failed: 
Log size limit exceeded
+   ^Failed: 
Build process timed out
+   ^Failed:
 
(head|tail)\s+-[0-9]
 

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- buildfink   1 Mar 2006 20:17:31 -   1.23
+++ buildfink   13 Mar 2006 20:25:30 -  1.24
@@ -24,7 +24,7 @@
 
 =head1 USAGE
 
-   buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE] 
[--skip PACKAGE] [--validate] [--build-as-nobody] FINKDIR OUTDIR
+   buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE] 
[--skip PACKAGE] [--validate] [--build-as-nobody] [--max-log-size [P:]N] 
[--max-build-time [P:]T] [FINKDIR OUTDIR
buildfink [-r CHECKPOINT]
 
 C builds every package in Fink, taking care of things like avoiding 
repeated building
@@ -58,6 +58,19 @@
 it will try building as root if that fails and keep track of which packages
 only succeed when built as root.
 
+buildfink places limits on the maximum size of the log file for an individual
+build and the build time of an individual package to prevent runaway packages
+from breaking the build.  C<--max-log-size N> and C<--max-build-time T> can be
+used to adjust these limits.  An C or C of 0 will disable the
+corresponding limit.  C is in bytes, unless it has a suffix of C, C,
+or C indicating kilobytes, megabytes, and gigabytes respsectively.
+C is in seconds, unless it has a suffix of C or C indicating,
+respectively, minutes and hours.  The defaults are 250 megabytes and 4 hours
+respectively.  Package-specific limits can be provided by specifying
+C in front of the limit value.  For instance,
+C<--max-build-time openoffice.org:24h> would specify a 24-hour limit for 
+openoffice.org.
+
 =head2 CHECKPOINTS
 
 Sometimes there will be system issues partway through a build.  For instance, 
a recalcitrant
@@ -74,7 +87,7 @@
 use File::Copy;
 use File::Find;
 use Data::Dumper;
-use POSIX qw(dup2);
+use POSIX qw(dup2 setsid sys_wait_h);
 use Getopt::Long;
 use FindBin qw($Bin);
 use lib "$Bin";
@@ -83,6 +96,49 @@
 our($Bin, $FinkConfig, $FinkDir, $rundir, $dryrun, $infofilter, $patchdir, 
@skiplist, $checkpoint, $DoValidate, $BuildNobody);
 our $VERSION = '$Revision$';
 
+our $max_build_time = 60*60*4;
+our $max_log_size = 1024*1024*250;
+our %max_build_time_forpkg = ();
+our %max_log_size_forpkg = ();
+
+sub limit_arg {
+   my($arg, $val) = @_;
+   my $pkg;
+
+   $pkg = $1 if $val =~ s/^(.*)://;
+
+   if($val =~ s/([kmgh])b?$//i) {
+   my $suffix = $1;
+   if($suffix eq "k") {
+   $val *= 1024;
+   } elsif($suffix eq "m") {
+   if($arg =~ /time/) {
+   $val *= 60;
+   } else {
+   $val *= 1024*1024;
+   }
+   } elsif($suffix eq "h") {
+   $val *= 60*60;
+   } elsif($suffix eq "g") {
+   $val *= 1024*1024*1024;
+   }
+   }
+
+   if($arg =~ /time/) {
+   if($pkg) {
+   $max_build_time_forpkg{$pkg} = $val;
+   } else {
+   $max_build_time = $val;
+   }
+   } else {
+   if($pkg) {
+   $max_log_size_forpkg{$pkg} = $val;
+   } else {
+   $max_log_size = $val;
+   }
+   }
+}
+
 my $opts_ok = GetOptions(
"n" => \$dryrun,
"infofilter=s" => \$infofilter,
@@ -90,7 +146,9 @@
"skip=s" => [EMAIL PROTECTED],
"r=s" => \$checkpoint,
"validate" => \$DoValidate,
-   "build-as-nobody:s" => \$BuildNobody
+   "build-as-nobody:s" => \$BuildNobody,
+   "max-build-time=s" => \&limit_arg,
+   "max-log-size=s" => \&limit_arg
 );
 if(@ARGV != 2 and not (($dryrun and @ARGV == 1) or $checkpoint)) {
warn "You must specify a Fink directory and an output directory.\n";
@@ -352,6 +410,83 @@
}
 }
 
+# Do the build command, logging to the package log and enforcing time and
+# space limits.
+sub doBuild {
+   my($buildcmd, $pkg) = @_;
+   m

scripts/buildfink filters.xml,1.5,1.6

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3202

Modified Files:
filters.xml 
Log Message:
Add some new filter categories, especially to catch Intel-specific problems

Index: filters.xml
===
RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- filters.xml 13 Mar 2006 20:25:30 -  1.5
+++ filters.xml 16 Mar 2006 18:06:17 -  1.6
@@ -51,6 +51,11 @@
prerequisite XML::SAX 
failed to load
Could not create task or type 
of type: junit
 
+   Unknown pseudo-op|no such 386 
instruction|match any known 386 instruction|memory input .* not directly 
addressable|unknown register name
+   PIC register (.*) 
clobbered
+   configure: error: .* hasn't been 
ported to `i386-apple-darwin|error: "(.*) has not been ported|error: Unknown 
architecture
+   warning (.*?) cputype .* 
does not match
+   unable to find a register to 
spill|error: can't find a register|impossible register constraint|output 
constraint .* must .* register
 
(! I can't find file 
`docstrip.tex'.)|(! LaTeX Error: File `article.cls' not found.)|(! Font .* not 
loadable)
\*\*\* Could not run GTK
@@ -82,6 +87,12 @@
 
error: #error "GCC no longer 
implements .varargs.h.
 
+   Package (.*) was not found 
in the pkg-config search path|can not find package (\S+)
+   can't locate file for: 
-l(.*)|cannot find the library `(.*)'|error: (lib.*) is missing|can't locate 
framework for: -framework (.*)|error: Invalid lib(.*) directory|can't find 
header files for (.*)
+   error: (.*) perl module 
is required
+
+   cc1: error: invalid 
option|bad value .* for -mtune
+   No directories in 
update-desktop-database search path could be processed and updated.
dyld: Library not loaded: 
(.*)
Can't locate (.*) in 
@INC
\*\*\* The glib-config script 
installed by GLIB could not be found
@@ -128,6 +139,7 @@
Failed: Dependency (.*) failed 
to build
Failed: .* is on the skip list
 
+   You don't have 
ghostscript .* /usr/local
Internal error: node for (.*) already 
exists
Can't locate 
Test/Harness.pm
That looks like readline 
1.0!



---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink filters.xml,1.6,1.7

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4683

Modified Files:
filters.xml 
Log Message:
Filters typo fix

Index: filters.xml
===
RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- filters.xml 16 Mar 2006 18:06:17 -  1.6
+++ filters.xml 16 Mar 2006 18:08:18 -  1.7
@@ -89,7 +89,7 @@
 
Package (.*) was not found 
in the pkg-config search path|can not find package (\S+)
can't locate file for: 
-l(.*)|cannot find the library `(.*)'|error: (lib.*) is missing|can't locate 
framework for: -framework (.*)|error: Invalid lib(.*) directory|can't find 
header files for (.*)
-   error: (.*) perl module 
is required
+   error: (.*) perl module 
is required
 
cc1: error: invalid 
option|bad value .* for -mtune
No directories in 
update-desktop-database search path could be processed and updated.



---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.24,1.25

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31295

Modified Files:
buildfink 
Log Message:
When doing the dependency ordering, skip if is_virtual == 1.  This skips the 
Provides: aliases of regular packages.

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- buildfink   13 Mar 2006 20:25:30 -  1.24
+++ buildfink   16 Mar 2006 18:50:04 -  1.25
@@ -776,6 +776,11 @@
 
my $pkgobj = Fink::Package->package_by_name($pkgname);
 
+   # is_virtual == 1 are the Provides: aliases of regular packages.
+   # This is not to be confused with is_virtual == 2, which are the
+   # regular virtual packages.
+   next if $pkgobj->is_virtual() == 1;
+
# We've also satisfied things which depend on somethign we 
provide
foreach my $provider ($pkgobj->get_all_providers()) {
my $pname = $provider->get_name();
@@ -820,7 +825,12 @@
my $dep = $deps->{$pkgname};
next if $dep->{ordered};
my(%unsats) = (%{$dep->{unsatisfied}->{build}}, 
%{$dep->{unsatisfied}->{run}});
-   logPackageFail($pkgname, "Can't figure out how to build.  
Unsatisfied dependencies: " . join(" ", sort keys %unsats));
+   my $failmsg = "Can't figure out how to build.  Unsatisfied 
dependencies: " . join(" ", sort keys %unsats);
+   if($dryrun) {
+   doLog($failmsg);
+   } else {
+   logPackageFail($pkgname, $failmsg);
+   }
}
 
return @ret;



---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

base-files ChangeLog,1.42,1.43 VERSION,1.20,1.21 init.csh.in,1.18,1.19 init.sh.in,1.19,1.20

[Matthew Sachs]

Update of /cvsroot/fink/base-files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31191

Modified Files:
ChangeLog VERSION init.csh.in init.sh.in 
Log Message:
* init.sh.in, init.csh.in: Only set DYLD_FALLBACK_LIBRARY_PATH on 
10.4.{x|x<3}.
* VERSION: Bumped base-files version to 1.9.8


Index: init.sh.in
===
RCS file: /cvsroot/fink/base-files/init.sh.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- init.sh.in  1 Jul 2005 15:12:03 -   1.19
+++ init.sh.in  9 Nov 2005 20:14:49 -   1.20
@@ -51,6 +51,7 @@
 export PATH
 
 osMajorVer=`uname -r | cut -d. -f1`
+osMinorVer=`uname -r | cut -d. -f2`
 if [ -z "$MANPATH" ]; then
   if [ $osMajorVer -gt 7 ]; then
 MANPATH=`/usr/bin/manpath`
@@ -97,12 +98,12 @@
 export MANPATH
 fi
 
-# On Mac OS X 10.4 there is a dyld bug (rdar://problem/4139432)
+# On Mac OS X 10.4.{x|x<3} there is a dyld bug (rdar://problem/4139432)
 # where a library will not load if a library with a matching basename
 # is already loaded from one of the system paths,
 # the workaround is to set DYLD_FALLBACK_LIBRARY_PATH to :
 if [ -z "$DYLD_FALLBACK_LIBRARY_PATH" ]; then
-  if [ $osMajorVer -gt 7 ]; then
+  if [ $osMajorVer -eq 8 -a $osMinorVer -lt 3 ]; then
 DYLD_FALLBACK_LIBRARY_PATH=:
 export DYLD_FALLBACK_LIBRARY_PATH
   fi

Index: VERSION
===
RCS file: /cvsroot/fink/base-files/VERSION,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- VERSION 5 Aug 2005 14:51:37 -   1.20
+++ VERSION 9 Nov 2005 20:14:49 -   1.21
@@ -1 +1 @@
-1.9.7.cvs
+1.9.8.cvs

Index: init.csh.in
===
RCS file: /cvsroot/fink/base-files/init.csh.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- init.csh.in 1 Jul 2005 15:12:03 -   1.18
+++ init.csh.in 9 Nov 2005 20:14:49 -   1.19
@@ -39,6 +39,7 @@
 endif
 
 set osMajorVersion = `uname -r | cut -d. -f1`
+set osMinorVersion = `uname -r | cut -d. -f2`
 if ( ! $?MANPATH ) then
   if ( $osMajorVersion > 7) then
 setenv MANPATH `/usr/bin/manpath`
@@ -79,12 +80,12 @@
 append_path MANPATH /usr/X11R6/man
 endif
 
-# On Mac OS X 10.4 there is a dyld bug (rdar://problem/4139432)
+# On Mac OS X 10.4.{x|x<3} there is a dyld bug (rdar://problem/4139432)
 # where a library will not load if a library with a matching basename
 # is already loaded from one of the system paths,
 # the workaround is to set DYLD_FALLBACK_LIBRARY_PATH to :
 if ( ! $?DYLD_FALLBACK_LIBRARY_PATH ) then
-  if (  $osMajorVersion > 7) then
+  if (  $osMajorVersion == 8 && $osMinorVersion < 3 ) then
 setenv DYLD_FALLBACK_LIBRARY_PATH :
   endif
 endif

Index: ChangeLog
===
RCS file: /cvsroot/fink/base-files/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ChangeLog   5 Aug 2005 14:51:37 -   1.42
+++ ChangeLog   9 Nov 2005 20:14:49 -   1.43
@@ -1,3 +1,9 @@
+2005-11-09  Matthew Sachs  <[EMAIL PROTECTED]>
+
+   * init.sh.in, init.csh.in: Only set DYLD_FALLBACK_LIBRARY_PATH
+   on 10.4.{x|x<3}.
+   * VERSION: Bumped base-files version to 1.9.8
+
 2005-08-05  Dave Morrison  <[EMAIL PROTECTED]>
 
* VERSION: Bumped base-files version to 1.9.7



---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink cmplink,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13728

Modified Files:
cmplink 
Log Message:
Change link style

Index: cmplink
===
RCS file: /cvsroot/fink/scripts/buildfink/cmplink,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmplink 29 Jun 2005 02:02:40 -  1.2
+++ cmplink 25 Nov 2005 16:24:00 -  1.3
@@ -16,9 +16,12 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+die "Usage: $0 a-dir b-dir\n" unless @ARGV == 2;
+my($adir, $bdir) = @ARGV;
+
 print "\n";
 while(<>) {
-   s!^(.*?):!$1:!;
+   s!^\s*(.*?): (.*) => (.*)!: $2 => $3!;
s!$!!;
print $_;
 }



---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink cmplink,1.3,1.4

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14413

Modified Files:
cmplink 
Log Message:
typo fixes

Index: cmplink
===
RCS file: /cvsroot/fink/scripts/buildfink/cmplink,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmplink 25 Nov 2005 16:24:00 -  1.3
+++ cmplink 25 Nov 2005 16:27:18 -  1.4
@@ -17,11 +17,11 @@
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 die "Usage: $0 a-dir b-dir\n" unless @ARGV == 2;
-my($adir, $bdir) = @ARGV;
+my($adir, $bdir) = (shift, shift);
 
 print "\n";
 while(<>) {
-   s!^\s*(.*?): (.*) => (.*)!: $2 => $3!;
+   s!^\s*(.*?): (.*) => (.*)!$1: $2 => $3!;
s!$!!;
print $_;
 }



---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/games xdigger.info,1.4,1.5 xdigger.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15568/10.3/unstable/main/finkinfo/games

Modified Files:
xdigger.info xdigger.patch 
Log Message:
Patch out the nested functions.


Index: xdigger.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games/xdigger.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xdigger.info6 Dec 2005 03:27:48 -   1.4
+++ xdigger.info6 Dec 2005 05:58:53 -   1.5
@@ -1,13 +1,13 @@
 Package: xdigger
 Version: 1.0.10
-Revision: 13
+Revision: 14
 Maintainer: None 
-BuildDepends: x11-dev, gcc3.3
+BuildDepends: x11-dev
 Depends: x11, passwd
 Source: mirror:sourceforge:fink/direct_download/source/%n-%v.tgz
 Source-MD5: 74959b5c3f0ba47d1f25f515438c86ab
 PatchScript: sed 's|@prefix@|%p|g' <%a/%n.patch | patch -p1
-CompileScript: xmkmf; make CC=/usr/bin/gcc-3.3
+CompileScript: xmkmf; make CC=/usr/bin/gcc
 InstallScript: <<
 mkdir -p %i/bin
 mkdir -p %i/share/xdigger

Index: xdigger.patch
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games/xdigger.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xdigger.patch   14 Dec 2003 08:00:36 -  1.1
+++ xdigger.patch   6 Dec 2005 05:58:53 -   1.2
@@ -1,5 +1,7 @@
 xdigger-1.0.10/configure.h Sun Jul  4 09:50:04 1999
-+++ xdigger-1.0.10-patched/configure.h Mon Mar 18 23:03:05 2002
+Only in xdigger-1.0.10.patched: Makefile
+diff -ur xdigger-1.0.10/configure.h xdigger-1.0.10.patched/configure.h
+--- xdigger-1.0.10/configure.h 1999-07-04 05:50:04.0 -0400
 xdigger-1.0.10.patched/configure.h 2005-12-06 00:36:42.0 -0500
 @@ -19,8 +19,8 @@
  #define _CONFIGURE_H
  
@@ -11,8 +13,9 @@
  
  #define SOUND_DSP_AUDIO
  
 xdigger-1.0.10/drawpixmaps.c   Sun Jul  4 09:50:44 1999
-+++ xdigger-1.0.10-patched/drawpixmaps.c   Mon Mar 18 23:04:20 2002
+diff -ur xdigger-1.0.10/drawpixmaps.c xdigger-1.0.10.patched/drawpixmaps.c
+--- xdigger-1.0.10/drawpixmaps.c   1999-07-04 05:50:44.0 -0400
 xdigger-1.0.10.patched/drawpixmaps.c   2005-12-06 00:36:42.0 
-0500
 @@ -14,7 +14,7 @@
  along with this program; see the file COPYING.  If not, write to
  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
@@ -22,3 +25,205 @@
  #include 
  #include 
  #include 
+diff -ur xdigger-1.0.10/runlevels.c xdigger-1.0.10.patched/runlevels.c
+--- xdigger-1.0.10/runlevels.c 1999-07-04 05:52:18.0 -0400
 xdigger-1.0.10.patched/runlevels.c 2005-12-06 00:43:18.0 -0500
+@@ -672,6 +672,20 @@
+ }
+ } /* DiggerHalfStep() */
+ 
++typedef struct
++{
++  unsigned char x, y, id, type;
++} TMerk;
++  
++void Merke(unsigned char type, int x, int y, int *merkidx, TMerk *merk)
++{
++  merk[*merkidx].x = x;
++  merk[*merkidx].y = y;
++  merk[*merkidx].id = field[x][y].id & 7;
++  merk[*merkidx].type = type;
++  *merkidx++;   
++}  
++
+ void StoneDiamondStep()
+ {
+ 
+@@ -680,24 +694,10 @@
+ #define SF_LEFTDOWN  2
+ #define SF_CHANGER   3
+   
+-  typedef struct
+-  {
+-unsigned char x, y, id, type;
+-  } TMerk;
+-  
+   TMerk merk[140], ghosts_todie[17];
+   int i, x, y, dx, dy, merkidx, ghosts_todie_idx;
+   Bool digger_todie = False;  
+-  
+-  void Merke(unsigned char type)
+-{
+-  merk[merkidx].x = x;
+-  merk[merkidx].y = y;
+-  merk[merkidx].id = field[x][y].id & 7;
+-  merk[merkidx].type = type;
+-  merkidx++;   
+-}  
+-  
++
+   /* Schritt 1  (nur markieren) : */
+   merkidx = 0; ghosts_todie_idx = 0;
+   
+@@ -708,19 +708,19 @@
+ (field[x][y].id == ID_IVDIAMOND))
+ {
+   if (field[x][y+1].id == ID_NOTHING)
+-Merke(SF_DOWN);
++Merke(SF_DOWN, x, y, &merkidx, merk);
+   else
+ if ((field[x][y+1].id == ID_STONE) ||
+ (field[x][y+1].id == ID_DIAMOND))
+ {
+   if ((field[x-1][y].id == ID_NOTHING) &&
+   (field[x-1][y+1].id == ID_NOTHING))
+-Merke(SF_LEFTDOWN);
++Merke(SF_LEFTDOWN, x, y, &merkidx, merk);
+   else
+ if ((field[x+1][y].id == ID_NOTHING) &&
+ (field[x+1][y+1].id == ID_NOTHING))
+ {  
+-  Merke(SF_RIGHTDOWN);
++  Merke(SF_RIGHTDOWN, x, y, &merkidx, &merk);
+   field[x+1][y+1].id = ID_FSTODMD;
+ }
+ }
+@@ -729,7 +729,7 @@
+(field[x][y].id == ID_IVSTONE)) &&
+   (field[x][y+1].id == ID_CHANGER) &&
+   (field[x][y+2].id == ID_NOTHING))
+-Merke(SF_CHANGER);
++Merke(SF_CHANGER, x, y, &merkidx, &merk);
+ }
+   merk[merkidx].x = 0;
+   merk[merkidx].y = 0;
+@@ -1573,6 +1573,50 @@
+ 
+ 
/*

dists/10.4-transitional/unstable/main/finkinfo/games xdigger.info,1.2,1.3 xdigger.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15568/10.4-transitional/unstable/main/finkinfo/games

Modified Files:
xdigger.info xdigger.patch 
Log Message:
Patch out the nested functions.


Index: xdigger.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/xdigger.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xdigger.info6 Dec 2005 03:27:49 -   1.2
+++ xdigger.info6 Dec 2005 05:58:53 -   1.3
@@ -1,13 +1,13 @@
 Package: xdigger
 Version: 1.0.10
-Revision: 13
+Revision: 14
 Maintainer: None 
-BuildDepends: x11-dev, gcc3.3
+BuildDepends: x11-dev
 Depends: x11, passwd
 Source: mirror:sourceforge:fink/direct_download/source/%n-%v.tgz
 Source-MD5: 74959b5c3f0ba47d1f25f515438c86ab
 PatchScript: sed 's|@prefix@|%p|g' <%a/%n.patch | patch -p1
-CompileScript: xmkmf; make CC=/usr/bin/gcc-3.3
+CompileScript: xmkmf; make CC=/usr/bin/gcc
 InstallScript: <<
 mkdir -p %i/bin
 mkdir -p %i/share/xdigger

Index: xdigger.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/xdigger.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xdigger.patch   27 Apr 2005 03:25:40 -  1.1
+++ xdigger.patch   6 Dec 2005 05:58:53 -   1.2
@@ -1,5 +1,7 @@
 xdigger-1.0.10/configure.h Sun Jul  4 09:50:04 1999
-+++ xdigger-1.0.10-patched/configure.h Mon Mar 18 23:03:05 2002
+Only in xdigger-1.0.10.patched: Makefile
+diff -ur xdigger-1.0.10/configure.h xdigger-1.0.10.patched/configure.h
+--- xdigger-1.0.10/configure.h 1999-07-04 05:50:04.0 -0400
 xdigger-1.0.10.patched/configure.h 2005-12-06 00:36:42.0 -0500
 @@ -19,8 +19,8 @@
  #define _CONFIGURE_H
  
@@ -11,8 +13,9 @@
  
  #define SOUND_DSP_AUDIO
  
 xdigger-1.0.10/drawpixmaps.c   Sun Jul  4 09:50:44 1999
-+++ xdigger-1.0.10-patched/drawpixmaps.c   Mon Mar 18 23:04:20 2002
+diff -ur xdigger-1.0.10/drawpixmaps.c xdigger-1.0.10.patched/drawpixmaps.c
+--- xdigger-1.0.10/drawpixmaps.c   1999-07-04 05:50:44.0 -0400
 xdigger-1.0.10.patched/drawpixmaps.c   2005-12-06 00:36:42.0 
-0500
 @@ -14,7 +14,7 @@
  along with this program; see the file COPYING.  If not, write to
  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
@@ -22,3 +25,205 @@
  #include 
  #include 
  #include 
+diff -ur xdigger-1.0.10/runlevels.c xdigger-1.0.10.patched/runlevels.c
+--- xdigger-1.0.10/runlevels.c 1999-07-04 05:52:18.0 -0400
 xdigger-1.0.10.patched/runlevels.c 2005-12-06 00:43:18.0 -0500
+@@ -672,6 +672,20 @@
+ }
+ } /* DiggerHalfStep() */
+ 
++typedef struct
++{
++  unsigned char x, y, id, type;
++} TMerk;
++  
++void Merke(unsigned char type, int x, int y, int *merkidx, TMerk *merk)
++{
++  merk[*merkidx].x = x;
++  merk[*merkidx].y = y;
++  merk[*merkidx].id = field[x][y].id & 7;
++  merk[*merkidx].type = type;
++  *merkidx++;   
++}  
++
+ void StoneDiamondStep()
+ {
+ 
+@@ -680,24 +694,10 @@
+ #define SF_LEFTDOWN  2
+ #define SF_CHANGER   3
+   
+-  typedef struct
+-  {
+-unsigned char x, y, id, type;
+-  } TMerk;
+-  
+   TMerk merk[140], ghosts_todie[17];
+   int i, x, y, dx, dy, merkidx, ghosts_todie_idx;
+   Bool digger_todie = False;  
+-  
+-  void Merke(unsigned char type)
+-{
+-  merk[merkidx].x = x;
+-  merk[merkidx].y = y;
+-  merk[merkidx].id = field[x][y].id & 7;
+-  merk[merkidx].type = type;
+-  merkidx++;   
+-}  
+-  
++
+   /* Schritt 1  (nur markieren) : */
+   merkidx = 0; ghosts_todie_idx = 0;
+   
+@@ -708,19 +708,19 @@
+ (field[x][y].id == ID_IVDIAMOND))
+ {
+   if (field[x][y+1].id == ID_NOTHING)
+-Merke(SF_DOWN);
++Merke(SF_DOWN, x, y, &merkidx, merk);
+   else
+ if ((field[x][y+1].id == ID_STONE) ||
+ (field[x][y+1].id == ID_DIAMOND))
+ {
+   if ((field[x-1][y].id == ID_NOTHING) &&
+   (field[x-1][y+1].id == ID_NOTHING))
+-Merke(SF_LEFTDOWN);
++Merke(SF_LEFTDOWN, x, y, &merkidx, merk);
+   else
+ if ((field[x+1][y].id == ID_NOTHING) &&
+ (field[x+1][y+1].id == ID_NOTHING))
+ {  
+-  Merke(SF_RIGHTDOWN);
++  Merke(SF_RIGHTDOWN, x, y, &merkidx, &merk);
+   field[x+1][y+1].id = ID_FSTODMD;
+ }
+ }
+@@ -729,7 +729,7 @@
+(field[x][y].id == ID_IVSTONE)) &&
+   (field[x][y+1].id == ID_CHANGER) &&
+   (field[x][y+2].id == ID_NOTHING))
+-Merke(SF_CHANGER);
++Merke(SF_CHANGER, x, y, &merkidx, &merk);
+ }
+   merk[merkidx].x = 0;
+   merk[merkidx].y = 0;
+@@ -1573,

dists/10.4-transitional/unstable/main/finkinfo/libs/perlmods xml-sax-pm.info,1.1,1.2

[Matthew Sachs]

Update of 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/perlmods
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17206/10.4-transitional/unstable/main/finkinfo/libs/perlmods

Modified Files:
xml-sax-pm.info 
Log Message:
Fix for purge with system rmdir

Index: xml-sax-pm.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/perlmods/xml-sax-pm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xml-sax-pm.info 4 Oct 2005 00:56:33 -   1.1
+++ xml-sax-pm.info 8 Dec 2005 01:51:37 -   1.2
@@ -1,7 +1,7 @@
 Info2: <<
 Package: xml-sax-pm%type_pkg[perl]
 Version: 0.12
-Revision: 18
+Revision: 19
 Replaces: xml-sax-pm (<= 0.12-16), %{Ni}560, %{Ni}580, %{Ni}581, %{Ni}584, 
%{Ni}586
 Source: mirror:cpan:authors/id/M/MS/MSERGEANT/XML-SAX-%v.tar.gz
 Source-MD5: bff58bd077a9693fc8cf32e2b95f571f
@@ -58,7 +58,7 @@
 then
 rm -f %p/etc/perl/XML/SAX/ParserDetails.ini
 cd %p/etc/perl && \
-rmdir --parents --ignore-fail-on-non-empty 
XML/SAX/ParserDetails.d
+rmdir -p XML/SAX/ParserDetails.d || true
 fi
 <<
 Description: Perl Simple API for XML



---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.25,1.26

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3403

Modified Files:
buildfink 
Log Message:
Nuke buildlocks after aborting a build

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- buildfink   16 Mar 2006 18:50:04 -  1.25
+++ buildfink   24 May 2006 20:51:53 -  1.26
@@ -465,6 +465,7 @@
kill(-15, $pid);
sleep(10) if kill(0, $pid);
kill(-9, $pid);
+   removeBuildLocks();
last;
}
}
@@ -476,6 +477,7 @@
kill(-15, $pid);
sleep(10);
kill(-9, $pid);
+   removeBuildLocks();
}
 
close(BUILDLOG);



___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink owbuild,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16009

Modified Files:
owbuild 
Log Message:
gcc4 legitimately takes a long time to build

Index: owbuild
===
RCS file: /cvsroot/fink/scripts/buildfink/owbuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- owbuild 1 Mar 2006 20:36:38 -   1.1
+++ owbuild 24 May 2006 22:57:36 -  1.2
@@ -126,4 +126,5 @@
--skip stylebook \
--skip fftw-absoft --skip netcdf-absoft \
--skip mac-growl-pm581 --skip mac-growl-pm586 \
+   --max-build-time gcc4:12h \
 $FINKDIR $OWDIR/$1



___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink FinkLib.pm,1.13,1.14 buildfink,1.26,1.27

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12300

Modified Files:
FinkLib.pm buildfink 
Log Message:
Reread package list before removing buildlocks

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- FinkLib.pm  9 Mar 2006 21:13:34 -   1.13
+++ FinkLib.pm  26 May 2006 21:09:30 -  1.14
@@ -62,13 +62,17 @@
}
 }
 
+sub readPackages {
+   $Fink::Status::the_instance ||= Fink::Status->new();
+   $Fink::Status::the_instance->read();
+}
+
 # Purge packages we may have previously built
 sub purgeNonEssential {
my @essentials = map { quotemeta($_) } 
Fink::Package->list_essential_packages();
my $re = "^(?:" . join("|", @essentials) . ")\$";
 
-   $Fink::Status::the_instance ||= Fink::Status->new();
-   $Fink::Status::the_instance->read();
+   readPackages();
 
my @packages = Fink::Package->list_packages();
my @purgelist;

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- buildfink   24 May 2006 20:51:53 -  1.26
+++ buildfink   26 May 2006 21:09:30 -  1.27
@@ -660,6 +660,7 @@
 # at the same time.  They can get left over if the system crashes
 # while building a package.
 sub removeBuildLocks {
+   FinkLib::readPackages();
foreach my $pkgname (Fink::Package->list_packages()) {
next unless $pkgname =~ /^fink-buildlock-.*/;
system("dpkg", "-r", $pkgname);



___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink filters.xml,1.7,1.8

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10850

Modified Files:
filters.xml 
Log Message:
Add filter for g++ -force_flat_namespace

Index: filters.xml
===
RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- filters.xml 16 Mar 2006 18:08:18 -  1.7
+++ filters.xml 27 May 2006 18:34:36 -  1.8
@@ -69,7 +69,7 @@
internal link edit command 
failed
 
internal compiler error
-   
+   /usr/lib/gcc/powerpc-apple-darwin8/4.0.1/crt3.o
 private external definition of _atexit
 
error: parse error
error: incompatible implicit 
declaration



___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink FinkLib.pm,1.14,1.15

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24676

Modified Files:
FinkLib.pm 
Log Message:
Normalize RangerRick's maintainer emails

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- FinkLib.pm  26 May 2006 21:09:30 -  1.14
+++ FinkLib.pm  30 May 2006 20:43:17 -  1.15
@@ -129,6 +129,8 @@
my $maint = "None <[EMAIL PROTECTED]>";
if($obj->has_param('maintainer')) {
$maint = $obj->param('maintainer');
+   # RangerRick has one email per package, but we want 
them clustered for maintindex
+   $maint =~ s/<[EMAIL PROTECTED]>/<[EMAIL PROTECTED]>/;
}
 
$maints{$maint} ||= [];



___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink owbuild,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3812

Modified Files:
owbuild 
Log Message:
Skip system-viha

Index: owbuild
===
RCS file: /cvsroot/fink/scripts/buildfink/owbuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- owbuild 24 May 2006 22:57:36 -  1.2
+++ owbuild 31 May 2006 01:11:45 -  1.3
@@ -100,6 +100,7 @@
 #  netcdf-absoft
 #  mac-growl-pm581
 #  mac-growl-pm586
+#  system-viha
 
 exec $BFDIR/buildfink  \
--skip gwydion-dylan-bootstrap \
@@ -126,5 +127,6 @@
--skip stylebook \
--skip fftw-absoft --skip netcdf-absoft \
--skip mac-growl-pm581 --skip mac-growl-pm586 \
+   --skip system-viha \
--max-build-time gcc4:12h \
 $FINKDIR $OWDIR/$1



___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

[cvs] scripts/buildfink FinkLib.pm,1.15,1.16 buildfink,1.27,1.28

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6471

Modified Files:
FinkLib.pm buildfink 
Log Message:
 buildfink doesn't properly clean up buildlocks after 
timeouts
Fix up FinkLib::readPackages to scan both the Fink and dpkg databases,
in the correct order, and refactor things a bit so when to call it is 
more sensible.  Make sure to call it before trying to remove build locks.


Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- FinkLib.pm  30 May 2006 20:43:17 -  1.15
+++ FinkLib.pm  8 Aug 2006 19:25:28 -   1.16
@@ -40,7 +40,7 @@
 
$FinkConfig = Fink::Services::read_config("$FinkDir/etc/fink.conf");
Fink::Config::set_options({Verbose => 3, KeepBuildDir => 1});
-   Fink::Package->require_packages();
+   readPackages();
 
return $FinkConfig;
 }
@@ -65,6 +65,16 @@
 sub readPackages {
$Fink::Status::the_instance ||= Fink::Status->new();
$Fink::Status::the_instance->read();
+
+   eval {
+   Fink::Package->forget_packages(2, 0);
+   };
+   if($@ and $@ =~ /new API for forget_packages/) {
+   Fink::Package->forget_packages({disk => 1});
+   } elsif($@) {
+   die $@;
+   }
+   Fink::Package->require_packages();
 }
 
 # Purge packages we may have previously built

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- buildfink   26 May 2006 21:09:30 -  1.27
+++ buildfink   8 Aug 2006 19:25:28 -   1.28
@@ -201,10 +201,7 @@
 restoreSystem();
 prepSystem();
 FinkLib::purgeNonEssential();
-
-# Rebuild the package database, just to be paranoid.
-scanPackages();
-
+FinkLib::readPackages();
 removeBuildLocks();
 my(@pkglist) = Fink::Package->list_packages();
 
@@ -214,9 +211,6 @@
 
# Only let Fink see our modified packages
injectPackages();
-
-   # Now that we've patched the info files, rebuild the package database 
again.
-   scanPackages();
 }
 
 # Now order the list of packages in dependency order, so that all of X's
@@ -304,6 +298,7 @@
 sub injectPackages {
symlink("$rundir/pkginfo", "$FinkDir/fink/dists/buildfink");
$FinkConfig->set_param("Trees" => "buildfink");
+   FinkLib::readPackages();
 }
 
 # Copy all package files to the buildfink repository and, if necessary,  patch 
the .info/.patch files.
@@ -465,6 +460,7 @@
kill(-15, $pid);
sleep(10) if kill(0, $pid);
kill(-9, $pid);
+   FinkLib::readPackages();
removeBuildLocks();
last;
}
@@ -477,6 +473,7 @@
kill(-15, $pid);
sleep(10);
kill(-9, $pid);
+   FinkLib::readPackages();
removeBuildLocks();
}
 
@@ -660,7 +657,6 @@
 # at the same time.  They can get left over if the system crashes
 # while building a package.
 sub removeBuildLocks {
-   FinkLib::readPackages();
foreach my $pkgname (Fink::Package->list_packages()) {
next unless $pkgname =~ /^fink-buildlock-.*/;
system("dpkg", "-r", $pkgname);
@@ -956,19 +952,6 @@
return "";
 }
 
-# Rescan the .info files and rebuild the package database
-sub scanPackages {
-   eval {
-   Fink::Package->forget_packages(2, 0);
-   };
-   if($@ and $@ =~ /new API for forget_packages/) {
-   Fink::Package->forget_packages({disk => 1});
-   } elsif($@) {
-   die $@;
-   }
-   Fink::Package->require_packages();
-}
-
 # Take a list of package names and filter out the ones which are split-offs.
 # When we have a split-off in the list, replace it with its parent and suppress
 # any further instances of members of that family.  This preserves our 
dependency
@@ -1022,9 +1005,7 @@
die "[EMAIL PROTECTED]" if $@;
 
prepSystem();
-   scanPackages();
injectPackages();
-   scanPackages();
removeBuildLocks();
 
doLog("Restored from checkpoint");


-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lis

scripts/buildfink buildfink,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12485

Modified Files:
buildfink 
Log Message:
Make better use of the Fink API (suggestions from vasi and dmacks)

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- buildfink   11 May 2005 19:04:34 -  1.1
+++ buildfink   24 May 2005 23:10:38 -  1.2
@@ -221,7 +221,7 @@
 # Allow Fink to see our modified packages and only those packages
 sub injectPackages {
symlink("$rundir/pkginfo", "$FinkDir/fink/dists/buildfink");
-   $FinkConfig->set_param("Trees", "buildfink");
+   $FinkConfig->set_param("Trees" => "buildfink");
 }
 
 # Copy all package files to the buildfink repository and, if necessary,  patch 
the .info/.patch files.
@@ -371,16 +371,18 @@
 
doLog("Building package $pkg...");
purgeNonBase();
-   my $srcdir = "$FinkDir/src/$pkg-" . $obj->{_fullversion};
+   my $srcdir = $FinkConfig::buildpath; # Suppress "used only 
once" warning
+   $srcdir = "$FinkConfig::buildpath/" . $obj->get_fullname();
 
if(system("printf '\n\n' | fink --yes rebuild $pkg > 
$rundir/logs/$pkg.log 2>&1") != 0) {
doLog("Build of $pkg failed!");
$failures->{$pkg} = 1;
push @newfails, $pkg;
 
-   # Also, any splitoffs of this package have failed
-   if($obj->{_relatives}) {
-   foreach (@{$obj->{_relatives}}) {
+   # Also, any splitoffs of this package have failed.
+   my $relatives = getRelatives($obj);
+   if($relatives) {
+   foreach (@$relatives) {
my $name = $_->get_name();
$failures->{$name} = 1;
push @newfails, $name;
@@ -401,6 +403,21 @@
 
 ###  Generic Fink-related functions 
 
+# Get split-offs of a package
+sub getRelatives {
+   my $obj = shift;
+
+   # _relatives has been replaced by a real method in
+   # Fink CVS.
+   my $relatives;
+   eval {
+   $relatives = $obj->{_relatives};
+   $relatives = $obj->get_relatives();
+   };
+
+   return $relatives;
+}
+
 # Buildlocks are how Fink stops a package from being built twice
 # at the same time.  They can get left over if the system crashes
 # while building a package.
@@ -491,8 +508,9 @@
next;
}
 
-   if($obj->{_relatives}) {
-   foreach (@{$obj->{_relatives}}) {
+   my $relatives = getRelatives($obj);
+   if($relatives) {
+   foreach (@$relatives) {
my $name = $_->get_name();
push @queue, $name;
}
@@ -541,8 +559,10 @@
doLog("Couldn't order $obj: $@");
next;
}
-   if($obj->{_relatives}) {
-   foreach (@{$obj->{_relatives}}) {
+
+   my $relatives = getRelatives($obj);
+   if($relatives) {
+   foreach (@$relatives) {
my $name = $_->get_name();
push @queue, $name;
}
@@ -707,10 +727,8 @@
 
 # Rescan the .info files and rebuild the package database
 sub scanPackages {
-   # Touching fink.conf makes Fink think the package database is outdated
-   system("touch", "$FinkDir/etc/fink.conf");
-
-   Fink::Package->scan_all();
+   Fink::Package->forget_packages(2, 0);
+   Fink::Package->require_packages();
 }
 
 # Take a list of package names and filter out the ones which are split-offs.



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink filters.xml,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18867

Modified Files:
filters.xml 
Log Message:
Add filter for emacs segfault

Index: filters.xml
===
RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- filters.xml 11 May 2005 19:04:34 -  1.1
+++ filters.xml 25 May 2005 16:49:02 -  1.2
@@ -57,7 +57,7 @@
 
 
(package javax.servlet.http does not 
exist)|(./org/bouncycastle/util/encoders/test/AbstractCoderTest.java:8: cannot 
resolve symbol)|(ERROR: JAVA_HOME not found in your environment.)
-
+   Segmentation fault.*EMACS
undefined compiler specification 
com.apple.compilers.gcc.4_0
 
^/usr/bin/ld: Undefined 
symbols:\n.*\$LDBLStub



---
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink filters.xml,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29716

Modified Files:
filters.xml 
Log Message:
Add some more filters

Index: filters.xml
===
RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- filters.xml 25 May 2005 16:49:02 -  1.2
+++ filters.xml 25 May 2005 17:41:47 -  1.3
@@ -63,6 +63,9 @@
^/usr/bin/ld: Undefined 
symbols:\n.*\$LDBLStub
internal link edit command 
failed
 
+   internal compiler error
+   
+
error: parse error
error: incompatible implicit 
declaration
error: array type has incomplete 
element type
@@ -79,6 +82,7 @@
 
error: #error "GCC no longer 
implements .varargs.h.
 
+   Can't locate .* in @INC
\*\*\* The glib-config script 
installed by GLIB could not be found
trying to overwrite .*, which 
is also in package
(/usr/bin/perl.*: Command not 
found)|(Can't exec "/Volumes/SandBox/fink/sw/bin/perl")
@@ -123,6 +127,7 @@
Failed: Dependency (.*) failed 
to build
Failed: .* is on the skip list
 
+   Internal error: node for .* already 
exists
Can't locate 
Test/Harness.pm
That looks like readline 
1.0!
^Package gcc.* is an 
autogenerated virtual package.



---
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2069

Modified Files:
buildfink 
Log Message:
Fix relatives and buildpath (thanks, dmacks)

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- buildfink   24 May 2005 23:10:38 -  1.2
+++ buildfink   25 May 2005 23:19:52 -  1.3
@@ -371,8 +371,8 @@
 
doLog("Building package $pkg...");
purgeNonBase();
-   my $srcdir = $FinkConfig::buildpath; # Suppress "used only 
once" warning
-   $srcdir = "$FinkConfig::buildpath/" . $obj->get_fullname();
+   my $srcdir = $Fink::Config::buildpath; # Suppress "used only 
once" warning
+   $srcdir = "$Fink::Config::buildpath/" . $obj->get_fullname();
 
if(system("printf '\n\n' | fink --yes rebuild $pkg > 
$rundir/logs/$pkg.log 2>&1") != 0) {
doLog("Build of $pkg failed!");
@@ -381,13 +381,11 @@
 
# Also, any splitoffs of this package have failed.
my $relatives = getRelatives($obj);
-   if($relatives) {
-   foreach (@$relatives) {
-   my $name = $_->get_name();
-   $failures->{$name} = 1;
-   push @newfails, $name;
-   }
-   } 
+   foreach (@$relatives) {
+   my $name = $_->get_name();
+   $failures->{$name} = 1;
+   push @newfails, $name;
+   }
 
system("mv", $srcdir, "$rundir/src/$pkg") or 
doLog("Couldn't move $srcdir to $rundir/src/$pkg: $!");
} else {
@@ -409,13 +407,8 @@
 
# _relatives has been replaced by a real method in
# Fink CVS.
-   my $relatives;
-   eval {
-   $relatives = $obj->{_relatives};
-   $relatives = $obj->get_relatives();
-   };
-
-   return $relatives;
+   my $relatives = $obj->can("get_relatives") ? $obj->get_relatives() : 
$obj->{_relatives};
+   return $relatives || [];
 }
 
 # Buildlocks are how Fink stops a package from being built twice
@@ -509,12 +502,10 @@
}
 
my $relatives = getRelatives($obj);
-   if($relatives) {
-   foreach (@$relatives) {
-   my $name = $_->get_name();
-   push @queue, $name;
-   }
-   } 
+   foreach (@$relatives) {
+   my $name = $_->get_name();
+   push @queue, $name;
+   }
}
 
doLog("Processing queue");
@@ -561,11 +552,9 @@
}
 
my $relatives = getRelatives($obj);
-   if($relatives) {
-   foreach (@$relatives) {
-   my $name = $_->get_name();
-   push @queue, $name;
-   }
+   foreach (@$relatives) {
+   my $name = $_->get_name();
+   push @queue, $name;
}
}
}



---
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.3,1.4

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5932

Modified Files:
buildfink 
Log Message:
get_relatives returns list, not listref

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- buildfink   25 May 2005 23:19:52 -  1.3
+++ buildfink   25 May 2005 23:39:59 -  1.4
@@ -380,8 +380,8 @@
push @newfails, $pkg;
 
# Also, any splitoffs of this package have failed.
-   my $relatives = getRelatives($obj);
-   foreach (@$relatives) {
+   my @relatives = getRelatives($obj);
+   foreach (@relatives) {
my $name = $_->get_name();
$failures->{$name} = 1;
push @newfails, $name;
@@ -407,8 +407,8 @@
 
# _relatives has been replaced by a real method in
# Fink CVS.
-   my $relatives = $obj->can("get_relatives") ? $obj->get_relatives() : 
$obj->{_relatives};
-   return $relatives || [];
+   my @relatives = $obj->can("get_relatives") ? $obj->get_relatives() : 
@{$obj->{_relatives}};
+   return @relatives;
 }
 
 # Buildlocks are how Fink stops a package from being built twice
@@ -501,8 +501,8 @@
next;
}
 
-   my $relatives = getRelatives($obj);
-   foreach (@$relatives) {
+   my @relatives = getRelatives($obj);
+   foreach (@relatives) {
my $name = $_->get_name();
push @queue, $name;
}
@@ -551,8 +551,8 @@
next;
}
 
-   my $relatives = getRelatives($obj);
-   foreach (@$relatives) {
+   my @relatives = getRelatives($obj);
+   foreach (@relatives) {
my $name = $_->get_name();
push @queue, $name;
}



---
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.4,1.5

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7547

Modified Files:
buildfink 
Log Message:
Don't die if using 0.24.6 and there are no splitoffs

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- buildfink   25 May 2005 23:39:59 -  1.4
+++ buildfink   25 May 2005 23:46:58 -  1.5
@@ -407,7 +407,7 @@
 
# _relatives has been replaced by a real method in
# Fink CVS.
-   my @relatives = $obj->can("get_relatives") ? $obj->get_relatives() : 
@{$obj->{_relatives}};
+   my @relatives = $obj->can("get_relatives") ? $obj->get_relatives() : 
@{$obj->{_relatives} || []};
return @relatives;
 }
 



---
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.5,1.6

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9493

Modified Files:
buildfink 
Log Message:
Don't try to getRelatives on a nonexistant package

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- buildfink   25 May 2005 23:46:58 -  1.5
+++ buildfink   25 May 2005 23:56:50 -  1.6
@@ -403,7 +403,7 @@
 
 # Get split-offs of a package
 sub getRelatives {
-   my $obj = shift;
+   my $obj = shift or return;
 
# _relatives has been replaced by a real method in
# Fink CVS.



---
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink cleanfink,NONE,1.1 FinkLib.pm,1.1,1.2 buildfink,1.6,1.7

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19394

Modified Files:
FinkLib.pm buildfink 
Added Files:
cleanfink 
Log Message:
Add purgeNonEssential to FinkLib, new script cleanfink which just does that

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FinkLib.pm  11 May 2005 19:04:34 -  1.1
+++ FinkLib.pm  26 May 2005 18:14:33 -  1.2
@@ -44,4 +44,32 @@
return $FinkConfig;
 }
 
+# Purge packages we may have previously built
+sub purgeNonEssential {
+   my @essentials = map { quotemeta($_) } 
Fink::Package->list_essential_packages();
+   my $re = "^(?:" . join("|", @essentials) . ")\$";
+
+   $Fink::Status::the_instance ||= Fink::Status->new();
+   $Fink::Status::the_instance->read();
+
+   my @packages = Fink::Package->list_packages();
+   my @purgelist;
+   foreach my $pkgname (@packages) {
+   next if $pkgname =~ /$re/i;
+   next if $pkgname =~ /^fink-buildlock/;
+   next if Fink::VirtPackage->query_package($pkgname);
+
+   my $obj;
+   eval {
+   $obj = Fink::Package->package_by_name($pkgname);
+   };
+   next if $@ or !$obj;
+   next unless $obj->is_any_installed();
+
+   push @purgelist, $pkgname;
+   }
+
+   system("dpkg --purge " . join(" ", @purgelist) . " 2>&1 | grep -v 'not 
installed'") if @purgelist;
+}
+
 1;

--- NEW FILE: cleanfink ---
#!/usr/bin/perl

# Purge non-essential packages

#Copyright (c) 2005 Apple Computer, Inc.  All Rights Reserved.
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation; either version 2 of the License, or
#(at your option) any later version.
#
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#GNU General Public License for more details.
#
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

use strict;
use warnings;
use FindBin qw($Bin);
use lib "$Bin";
use FinkLib;

die "Usage: $0 finkdir" unless @ARGV == 1;
my $FinkDir = shift;

if($FinkDir and not -d $FinkDir) {
die "The specified Fink directory does not exist.\n";
} elsif($FinkDir and not -x "$FinkDir/bin/fink") {
die "The specified Fink directory does not appear to contain a Fink 
installation.\n";
}


FinkLib::initFink($FinkDir);
FinkLib::purgeNonEssential();

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- buildfink   25 May 2005 23:56:50 -  1.6
+++ buildfink   26 May 2005 18:14:33 -  1.7
@@ -129,7 +129,7 @@
 
 restoreSystem();
 prepSystem();
-purgeNonBase();
+FinkLib::purgeNonEssential();
 
 # Rebuild the package database, just to be paranoid.
 scanPackages();
@@ -370,7 +370,7 @@
next if $obj->{type} and $obj->{type} eq "dummy";
 
doLog("Building package $pkg...");
-   purgeNonBase();
+   FinkLib::purgeNonEssential();
my $srcdir = $Fink::Config::buildpath; # Suppress "used only 
once" warning
$srcdir = "$Fink::Config::buildpath/" . $obj->get_fullname();
 
@@ -686,34 +686,6 @@
return "";
 }
 
-# Purge packages we may have previously built
-sub purgeNonBase {
-   my @essentials = map { quotemeta($_) } 
Fink::Package->list_essential_packages();
-   my $re = "^(?:" . join("|", @essentials) . ")\$";
-
-   $Fink::Status::the_instance ||= Fink::Status->new();
-   $Fink::Status::the_instance->read();
-
-   my @packages = Fink::Package->list_packages();
-   my @purgelist;
-   foreach my $pkgname (@packages) {
-   next if $pkgname =~ /$re/i;
-   next if $pkgname =~ /^fink-buildlock/;
-   next if Fink::VirtPackage->query_package($pkgname);
-
-   my $obj;
-   eval {
-   $obj = Fink::Package->package_by_name($pkgname);
-   };
-   next if $@ or !$obj;
-   next unless $obj->is_any_installed();
-
-   push @purgelist, $pkgname;
-   }
-
-   system("dpkg --purge " . join(" ", @purgelist) . " 2>&1 | grep -v 'not 
installed'") if @purgelist;
-}
-
 # Rescan the .info files and rebuild the package database
 sub scanPackages {
Fink::Package->forget_packa

scripts/buildfink README,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16983

Modified Files:
README 
Log Message:
Add cleanfink to README

Index: README
===
RCS file: /cvsroot/fink/scripts/buildfink/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README  11 May 2005 19:04:34 -  1.2
+++ README  26 May 2005 22:47:25 -  1.3
@@ -7,6 +7,8 @@
The core script; performs the actual build.
 *buildstats
See how long each package took to build and how large its log was.
+*cleanfink
+   Purge all non-essential packages
 *cmplink
HTML-ify the output from cmpruns.
 *cmpruns



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/gnome orbit.info,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13611/10.4-transitional/unstable/main/finkinfo/gnome

Modified Files:
orbit.info 
Log Message:
Add missing builddepend on gettext-tools

Index: orbit.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/orbit.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- orbit.info  27 Apr 2005 03:25:42 -  1.1
+++ orbit.info  31 May 2005 17:18:05 -  1.2
@@ -7,7 +7,7 @@
 Replaces: %N-bin
 Conflicts: %N-bin
 Depends: %N-shlibs (= %v-%r), libiconv, gettext
-BuildDepends: glib, libiconv-dev, gettext-dev
+BuildDepends: glib, libiconv-dev, gettext-dev, gettext-tools
 DescPackaging: <<
   Uses pkgconfig.
   Any package which BuildDepends on this one must also BuildDepend on:



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/stable/main/finkinfo/gnome orbit.info,1.3,1.4

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13611/10.3/stable/main/finkinfo/gnome

Modified Files:
orbit.info 
Log Message:
Add missing builddepend on gettext-tools

Index: orbit.info
===
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/gnome/orbit.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- orbit.info  30 Nov 2004 17:55:07 -  1.3
+++ orbit.info  31 May 2005 17:18:04 -  1.4
@@ -7,7 +7,7 @@
 Replaces: %N-bin
 Conflicts: %N-bin
 Depends: %N-shlibs (= %v-%r), libiconv, gettext
-BuildDepends: glib, libiconv-dev, gettext-dev
+BuildDepends: glib, libiconv-dev, gettext-dev, gettext-tools
 DescPackaging: <<
   Uses pkgconfig.
   Any package which BuildDepends on this one must also BuildDepend on:



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/gnome orbit.info,1.4,1.5

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13611/10.3/unstable/main/finkinfo/gnome

Modified Files:
orbit.info 
Log Message:
Add missing builddepend on gettext-tools

Index: orbit.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/orbit.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- orbit.info  30 Nov 2004 17:55:10 -  1.4
+++ orbit.info  31 May 2005 17:18:04 -  1.5
@@ -7,7 +7,7 @@
 Replaces: %N-bin
 Conflicts: %N-bin
 Depends: %N-shlibs (= %v-%r), libiconv, gettext
-BuildDepends: glib, libiconv-dev, gettext-dev
+BuildDepends: glib, libiconv-dev, gettext-dev, gettext-tools
 DescPackaging: <<
   Uses pkgconfig.
   Any package which BuildDepends on this one must also BuildDepend on:



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/stable/main/finkinfo/gnome orbit.info,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13611/10.4-transitional/stable/main/finkinfo/gnome

Modified Files:
orbit.info 
Log Message:
Add missing builddepend on gettext-tools

Index: orbit.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/orbit.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- orbit.info  27 Apr 2005 03:38:48 -  1.1
+++ orbit.info  31 May 2005 17:18:05 -  1.2
@@ -7,7 +7,7 @@
 Replaces: %N-bin
 Conflicts: %N-bin
 Depends: %N-shlibs (= %v-%r), libiconv, gettext
-BuildDepends: glib, libiconv-dev, gettext-dev
+BuildDepends: glib, libiconv-dev, gettext-dev, gettext-tools
 DescPackaging: <<
   Uses pkgconfig.
   Any package which BuildDepends on this one must also BuildDepend on:



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
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 grep-dctrl-1.10-20.info,NONE,1.1 grep-dctrl-1.10-20.patch,NONE,1.1 grep-dctrl-1.10-1.info,1.1,NONE grep-dctrl-1.10-1.patch,1.1,NONE

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32057

Added Files:
grep-dctrl-1.10-20.info grep-dctrl-1.10-20.patch 
Removed Files:
grep-dctrl-1.10-1.info grep-dctrl-1.10-1.patch 
Log Message:
Allow building with GCC 4

--- grep-dctrl-1.10-1.info DELETED ---

--- grep-dctrl-1.10-1.patch DELETED ---

--- NEW FILE: grep-dctrl-1.10-20.patch ---
diff -ruN grep-dctrl-1.9/Makefile.in grep-dctrl-1.9.new/Makefile.in
--- grep-dctrl-1.9/Makefile.in  2001-07-30 13:03:08.0 -0400
+++ grep-dctrl-1.9.new/Makefile.in  2002-12-26 12:23:20.0 -0500
@@ -57,6 +57,8 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+EXTRASRC = @EXTRASRC@
+EXTRAOBJ = @EXTRAOBJ@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -87,7 +89,8 @@
 SUBDIRS = intl po
 
 bin_PROGRAMS = grep-dctrl
-grep_dctrl_SOURCES = grep-dctrl.c matcher.c buffer.c strutil.c msg.c   
buffer.h i18n.h matcher.h  msg.h strutil.h rc.c rc.h
+grep_dctrl_SOURCES = grep-dctrl.c matcher.c buffer.c strutil.c msg.c \
+buffer.h i18n.h matcher.h msg.h strutil.h rc.c rc.h $(EXTRASRC)
 
 
 sysconf_DATA = grep-dctrl.rc
@@ -110,7 +113,7 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 grep_dctrl_OBJECTS =  grep-dctrl.o matcher.o buffer.o strutil.o msg.o \
-rc.o
+rc.o $(EXTRAOBJ)
 grep_dctrl_LDADD = $(LDADD)
 grep_dctrl_DEPENDENCIES = 
 grep_dctrl_LDFLAGS = 
diff -ruN grep-dctrl-1.9/configure grep-dctrl-1.9.new/configure
--- grep-dctrl-1.9/configure2000-02-06 09:04:51.0 -0500
+++ grep-dctrl-1.9.new/configure2002-12-26 12:25:44.0 -0500
@@ -3400,6 +3400,10 @@
 [EMAIL PROTECTED]@%$USE_INCLUDED_LIBINTL%g
 [EMAIL PROTECTED]@%$CATALOGS%g
 [EMAIL PROTECTED]@%$CATOBJEXT%g
+
[EMAIL PROTECTED]@%$EXTRASRC%g
[EMAIL PROTECTED]@%$EXTRAOBJ%g
+
 [EMAIL PROTECTED]@%$DATADIRNAME%g
 [EMAIL PROTECTED]@%$GMOFILES%g
 [EMAIL PROTECTED]@%$INSTOBJEXT%g
diff -ruN grep-dctrl-1.9/matcher.c grep-dctrl-1.9.new/matcher.c
--- grep-dctrl-1.9/matcher.c2005-04-03 16:57:15.0 -0700
+++ grep-dctrl-1.9.new/matcher.c2005-04-03 16:59:17.0 -0700
@@ -54,6 +54,7 @@
 }
 
 /* strstr ignoring case */
+#if 0
 static char *
 strcasestr (const char * haystack, const char * needle)
  /* This implemetation is suboptimal.  Ugh. */
@@ -84,6 +85,7 @@
 
   return rv;
 }
+#endif
 
 /* Copy the body of the field "field" from "s" to "body". */
 static void

--- NEW FILE: grep-dctrl-1.10-20.info ---
Package: grep-dctrl
Version: 1.10
Revision: 20
#Source: mirror:debian:pool/main/g/%n/%n_1.10.tar.gz
#SourceRename: %n-%v.tar.gz
Source: mirror:sourceforge:fink/%n-%v.tar.gz
SourceDirectory: %n-1.9
Source-MD5: 1f97dbc603d9c8bda2d706da3cdd8e56
BuildDepends: publib, help2man, gettext-dev, gettext-bin, gettext-tools, gcc3.3
Patch: %f.patch
PatchScript: perl -p -i -e 's:/var/lib:%p/var/lib:;' grep-dctrl.rc
SetCFLAGS: -O2 -Wall
SetLIBS: -lintl
ConfigureParams: --mandir='${prefix}/share/man'
CompileScript: <<
 ./configure %c
 make
<<
DocFiles: AUTHORS COPYING Compatibility README TODO debian/changelog NEWS 
debian/copyright
ConfFiles: %p/etc/grep-dctrl.rc
Description: Grep Debian package information
DescDetail: <<
The grep-dctrl program can answer such questions as
  * "What is the Debian package foo?"
  * "Which version of the Debian package bar is now current?"
  * "Which Debian packages does John Doe maintain?"
  * "Which Debian packages are somehow related to the Scheme
 programming language?"
and with some help
  * "Who maintain the essential packages of a Debian system?"
given a useful input file.

It is a specialised grep program that is meant for processing any file which 
has the general format of a Debian package control file. These include the 
dpkg available file, the dpkg status file, and the Packages files on a 
distribution medium (such as a Debian CD-ROM or an FTP site carrying Debian).
<<
License: GPL
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://packages.debian.org/unstable/admin/menu.html



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/games jzip.info,1.1,1.2 jzip.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4665

Modified Files:
jzip.info jzip.patch 
Log Message:
Allow building with GCC 4

Index: jzip.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/jzip.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jzip.info   27 Apr 2005 03:25:40 -  1.1
+++ jzip.info   31 May 2005 18:57:00 -  1.2
@@ -1,6 +1,6 @@
 Package: jzip
 Version: 2.1
-Revision: 1
+Revision: 20
 Description: John's Zcode InterPreter runs Infocom & Inform bytecodegames
 Homepage: http://jzip.sourceforge.net/
 BuildDepends: libncurses5

Index: jzip.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/jzip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jzip.patch  27 Apr 2005 03:25:40 -  1.1
+++ jzip.patch  31 May 2005 18:57:00 -  1.2
@@ -21,3 +21,15 @@
 +  /* fatal( "open_story(): Zcode file not found" ); */
 }
 else if ( STANDALONE_FLAG && ( path = getenv( "PATH" ) ) == NULL )
+--- ./osdepend.c   2005-05-12 01:25:50.0 -0700
 ./osdepend.c-fink  2005-05-12 01:26:29.0 -0700
+@@ -87,7 +87,7 @@
+ /* getopt linkages */
+ 
+ extern int optind;
+-extern const char *optarg;
++extern char *optarg;
+ extern ZINT16 default_fg, default_bg;
+ 
+ #endif /* !defined(AMIGA) */
+



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/graphics metapixel.info,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21972

Modified Files:
metapixel.info 
Log Message:
Honor Fink prefix

Index: metapixel.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics/metapixel.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- metapixel.info  17 May 2005 05:43:24 -  1.2
+++ metapixel.info  31 May 2005 19:31:36 -  1.3
@@ -1,6 +1,6 @@
 Package: metapixel
 Version: 1.0.0
-Revision: 1
+Revision: 2
 Source: http://www.complang.tuwien.ac.at/~schani/%n/%n-%v.tar.gz
 #Patch: %n.patch
 Source-MD5: df8709bb890061c2bea4c65db4a1057c
@@ -8,8 +8,14 @@
 Depends: libpng3-shlibs, libjpeg-shlibs
 SetCFLAGS: -I%p/include
 SetLDFLAGS: -L%p/lib
+PatchScript: <<
+perl -pi -e 's,MACOS_LDOPTS = .*,MACOS_LDOPTS = \$(LDFLAGS),' Makefile
+perl -pi -e 's,MACOS_CCOPTS = .*,MACOS_CCOPTS = \$(CFLAGS),' Makefile
+perl -pi -e 's,PREFIX = .*,PREFIX = %p,' Makefile
+perl -pi -e 's,MANPAGE_XSL = /sw,MANPAGE_XSL = %p,' Makefile
+<<
 CompileScript: << 
-make COPTS=""
+make
 strip %n
 <<
 InstallScript: <<
@@ -21,12 +27,12 @@
 Can generate classical photomosaics, in which the source image is viewed 
 as a matrix of equally sized rectangles for each of which a matching image 
 is substitued, as well as collage-style photomosaics, in which rectangular 
-parts of the source image at arbitrary positions (i.e. not aligned to a 
matrix) 
-are substituted by matching images.
+parts of the source image at arbitrary positions (i.e. not aligned to a
+matrix) are substituted by matching images.
 <<
 DescUsage: <<
-Read readme for instructions. Prepare script has problems on images with 
spaces and 
-special characters in the name.
+Read readme for instructions. Prepare script has problems on images with
+spaces and special characters in the name.
 <<
 DocFiles: NEWS README COPYING
 License: GPL



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/gnome linc1.info,1.1,1.2 linc1.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24567

Modified Files:
linc1.info linc1.patch 
Log Message:
Allow building with GCC 4 on Tiger

Index: linc1.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/linc1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- linc1.patch 27 Apr 2005 03:25:42 -  1.1
+++ linc1.patch 31 May 2005 19:36:04 -  1.2
@@ -58,3 +58,32 @@
  
  #undef LOCAL_DEBUG
  
+--- linc-1.0.3-old/include/linc/linc-protocol.h2005-04-03 
14:14:32.0 -0700
 linc-1.0.3/include/linc/linc-protocol.h2005-04-03 14:15:05.0 
-0700
+@@ -14,6 +14,7 @@
+ 
+ #include 
+ 
++#include 
+ #if defined(__APPLE__) && !defined(socklen_t)
+ #  define socklen_t int
+ #endif
+@@ -22,7 +23,6 @@
+ 
+ #include 
+ #include 
+-#include 
+ #include 
+ 
+ /* socklen_t seems rather un-portable */
+--- linc-1.0.3-old/src/linc-protocols.c2005-04-03 14:17:41.0 
-0700
 linc-1.0.3/src/linc-protocols.c2005-04-03 14:23:47.0 -0700
+@@ -614,7 +614,7 @@
+ /* FIXME: is IN6ADDR_ANY_INIT exported on Mac OS X ? */
+ /* on Mac OS X 10.1 inaddr6_any isn't exported by libc */
+ #ifndef in6addr_any
+-  static const struct in6_addr in6addr_any = { { { 0 } } };
++  const struct in6_addr in6addr_any = { { { 0 } } };
+ #endif
+ 
+ static gboolean

Index: linc1.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/linc1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- linc1.info  27 Apr 2005 03:25:42 -  1.1
+++ linc1.info  31 May 2005 19:36:03 -  1.2
@@ -1,8 +1,8 @@
 Package: linc1
 Version: 1.0.3
-Revision: 4
+Revision: 20
 Depends: %N-shlibs (= %v-%r), gettext, glib2 (>= 2.2.3-1), libiconv, pkgconfig
-BuildDepends: glib2-dev (>= 2.2.3-1), pkgconfig, gtk-doc (>= 1.1-1), 
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, openjade (>= 1.3.2-12), 
gcc3.3
+BuildDepends: glib2-dev (>= 2.2.3-1), pkgconfig, gtk-doc (>= 1.1-1), 
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, openjade (>= 1.3.2-12)
 DescPackaging: <<
   Uses pkgconfig.
   Any package which BuildDepends on this one must also BuildDepend on:
@@ -15,8 +15,8 @@
 SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
 ConfigureParams: --without-ssl --disable-gtk-doc
 CompileScript: <<
- export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
- make CC=gcc-3.3 CXX=g++-3.3
+ ./configure %c
+ make
 <<
 InstallScript: make install DESTDIR=%d
 BuildDependsOnly: True
@@ -36,7 +36,6 @@
 transmission/receipt.
 <<
 DescPort: <<
-- socklen_t was defined as int.
 - Disabled IPv6 support.
 - Disabled SSL support.
 <<



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/games tornado.info,1.1,1.2 tornado.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4134

Modified Files:
tornado.info tornado.patch 
Log Message:
Allow building on Tiger

Index: tornado.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/tornado.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tornado.patch   27 Apr 2005 03:25:40 -  1.1
+++ tornado.patch   31 May 2005 19:55:24 -  1.2
@@ -307,3 +307,16 @@
 -  rm -f $(PREFIX)/man/nl/man6/tornado.6
 +  rm -f $(DESTDIR)$(MANDIR)/man/nl/man6/tornado.6
 
+--- tornado-1.2/network.c.bak  2005-04-04 01:49:11.0 -0700
 tornado-1.2/network.c  2005-04-04 01:49:23.0 -0700
+@@ -31,10 +31,6 @@
+ #include 
+ #include 
+ 
+-#ifndef socklen_t
+-typedef int socklen_t;
+-#endif
+-
+ /* local variables */
+ static int socketfd; /* active socket file descriptor */
+ static int const one = 1;/* for the stupid setsockopt(7) function 
*/

Index: tornado.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/tornado.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tornado.info27 Apr 2005 03:25:40 -  1.1
+++ tornado.info31 May 2005 19:55:24 -  1.2
@@ -1,6 +1,6 @@
 Package: tornado
 Version: 1.2.1a
-Revision: 4
+Revision: 20
 Patch: %n.patch
 PatchScript: <<
 find . -name "Makefile" | xargs perl -pi.bak -e "s/ cpp / cpp3 /g"



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/crypto/finkinfo libnessus-ssl.patch,NONE,1.1 libnessus-ssl.info,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6517/crypto/finkinfo

Modified Files:
libnessus-ssl.info 
Added Files:
libnessus-ssl.patch 
Log Message:
Allow building on Tiger with GCC 4

--- NEW FILE: libnessus-ssl.patch ---
--- nessus-libraries/libnessus/harglists.c  2005-04-04 01:31:05.0 
-0700
+++ nessus-libraries-patched/libnessus/harglists.c  2005-04-04 
01:31:24.0 -0700
@@ -503,6 +503,7 @@
 }
 
 
+static void **harg_walk_next_ptr (hargwalk*);
 static void
 do_harg_dump
   (harglst *a,
@@ -510,7 +511,6 @@
 {
   hargwalk *w ;
   harg **R, *r ;
-  static void **harg_walk_next_ptr (hargwalk*);
 
   if(a == 0 || (w = harg_walk_init (a)) == 0) {
 do_printf ("-error; no such list!\n",0,0,0,0,0);

Index: libnessus-ssl.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/libnessus-ssl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libnessus-ssl.info  27 Apr 2005 03:07:10 -  1.1
+++ libnessus-ssl.info  31 May 2005 20:00:22 -  1.2
@@ -1,6 +1,6 @@
 Package: libnessus-ssl
 Version: 1.2.6
-Revision: 11
+Revision: 21
 ###
 Depends: openssl-shlibs, libpcap-shlibs, pth-shlibs,  gmp-shlibs, %N-shlibs (= 
%v-%r)
 BuildDepends: libpcap, pth, gmp, openssl, openssl-dev
@@ -13,6 +13,7 @@
 SourceDirectory: nessus-libraries
 Source-MD5: b5074295d1dc8f7a009a33e742e543c6
 ###
+Patch: %n.patch
 SetCFLAGS: -DBIND_8_COMPAT
 SetCPPFLAGS: -DBIND_8_COMPAT
 ConfigureParams: --disable-nessuspcap --with-ssl=%p --with-pic --enable-shared 
--enable-static --mandir=%i/share/man --infodir=%p/share/info 
--libexecdir=%p/lib



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/libs libnessus.patch,NONE,1.1 libnessus.info,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6517/main/finkinfo/libs

Modified Files:
libnessus.info 
Added Files:
libnessus.patch 
Log Message:
Allow building on Tiger with GCC 4

--- NEW FILE: libnessus.patch ---
--- nessus-libraries/libnessus/harglists.c  2005-04-04 01:31:05.0 
-0700
+++ nessus-libraries-patched/libnessus/harglists.c  2005-04-04 
01:31:24.0 -0700
@@ -503,6 +503,7 @@
 }
 
 
+static void **harg_walk_next_ptr (hargwalk*);
 static void
 do_harg_dump
   (harglst *a,
@@ -510,7 +511,6 @@
 {
   hargwalk *w ;
   harg **R, *r ;
-  static void **harg_walk_next_ptr (hargwalk*);
 
   if(a == 0 || (w = harg_walk_init (a)) == 0) {
 do_printf ("-error; no such list!\n",0,0,0,0,0);

Index: libnessus.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libnessus.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libnessus.info  27 Apr 2005 03:26:03 -  1.1
+++ libnessus.info  31 May 2005 20:00:22 -  1.2
@@ -1,9 +1,9 @@
 Package: libnessus
 Version: 1.2.6
-Revision: 11
+Revision: 21
 ###
 Depends: libpcap-shlibs, pth-shlibs, gmp-shlibs, %N-shlibs (= %v-%r)
-BuildDepends: libpcap, pth, gmp, gcc3.3
+BuildDepends: libpcap, pth, gmp
 BuildDependsOnly: true
 Replaces: libnessus3, nessus-libraries, libnessus-ssl
 Conflicts: libnessus3, nessus-libraries, libnessus-ssl
@@ -15,8 +15,7 @@
 ###
 SetCFLAGS: -DBIND_8_COMPAT
 SetCPPFLAGS: -DBIND_8_COMPAT
-SetCC: gcc-3.3
-SetCXX: g++-3.3
+Patch: %n.patch
 ConfigureParams: --disable-nessuspcap --without-ssl --with-pic --enable-shared 
--enable-static --mandir=%i/share/man --infodir=%p/share/info 
--libexecdir=%p/lib
 InstallScript: <<
   make install prefix=%i



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/shells scsh.patch,NONE,1.1 scsh.info,1.3,1.4

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/shells
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16041/10.3/unstable/main/finkinfo/shells

Modified Files:
scsh.info 
Added Files:
scsh.patch 
Log Message:
Tracker submission 1205795: Sync with unstable; allow building with GCC 4

Index: scsh.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/shells/scsh.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scsh.info   5 Feb 2005 00:28:08 -   1.3
+++ scsh.info   31 May 2005 20:21:33 -  1.4
@@ -1,6 +1,6 @@
 Package: scsh
 Version: 0.6.6
-Revision: 12
+Revision: 13
 Description: Unix shell embedded in Scheme
 License: BSD
 Maintainer: Michel Schinz <[EMAIL PROTECTED]>
@@ -8,6 +8,8 @@
 Source: ftp://ftp.scsh.net/pub/scsh/0.6/%n-%v.tar.gz
 Source-MD5: fa0a62f8ec7b0629c297144c59027ba4
 
+Patch: %n.patch
+
 ConfigureParams: --with-lib-dirs-list='("%p/share/scsh-0.6/modules")'
 BuildDepends: gcc3.3
 

--- NEW FILE: scsh.patch ---
diff -u -r scsh-0.6.6-orig/c/unix/io.c scsh-0.6.6/c/unix/io.c
--- scsh-0.6.6-orig/c/unix/io.c Tue Sep 14 14:44:54 1999
+++ scsh-0.6.6/c/unix/io.c  Tue May 17 20:26:47 2005
@@ -146,12 +146,12 @@
   return 0; }
 }
 
+static long write_integer(unsigned long n, FILE *port);
+
 long
 ps_write_integer(long n, FILE *port)
 {
   int status;
-
-  static long write_integer(unsigned long n, FILE *port);
 
   if (n == 0) {
 WRITE_CHAR('0', port, status);



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/shells scsh.patch,NONE,1.1 scsh.info,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/shells
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16041/10.4-transitional/unstable/main/finkinfo/shells

Modified Files:
scsh.info 
Added Files:
scsh.patch 
Log Message:
Tracker submission 1205795: Sync with unstable; allow building with GCC 4

Index: scsh.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/shells/scsh.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scsh.info   27 Apr 2005 03:26:37 -  1.1
+++ scsh.info   31 May 2005 20:21:34 -  1.2
@@ -1,6 +1,6 @@
 Package: scsh
 Version: 0.6.6
-Revision: 12
+Revision: 20
 Description: Unix shell embedded in Scheme
 License: BSD
 Maintainer: Michel Schinz <[EMAIL PROTECTED]>
@@ -8,12 +8,13 @@
 Source: ftp://ftp.scsh.net/pub/scsh/0.6/%n-%v.tar.gz
 Source-MD5: fa0a62f8ec7b0629c297144c59027ba4
 
+Patch: %n.patch
+
 ConfigureParams: --with-lib-dirs-list='("%p/share/scsh-0.6/modules")'
-BuildDepends: gcc3.3
 
 CompileScript: <<
- export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
- make CC=gcc-3.3 CXX=g++-3.3
+ ./configure %c
+ make
 <<
 DocFiles: COPYING RELEASE
 InstallScript: <<

--- NEW FILE: scsh.patch ---
diff -u -r scsh-0.6.6-orig/c/unix/io.c scsh-0.6.6/c/unix/io.c
--- scsh-0.6.6-orig/c/unix/io.c Tue Sep 14 14:44:54 1999
+++ scsh-0.6.6/c/unix/io.c  Tue May 17 20:26:47 2005
@@ -146,12 +146,12 @@
   return 0; }
 }
 
+static long write_integer(unsigned long n, FILE *port);
+
 long
 ps_write_integer(long n, FILE *port)
 {
   int status;
-
-  static long write_integer(unsigned long n, FILE *port);
 
   if (n == 0) {
 WRITE_CHAR('0', port, status);



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/stable/main/finkinfo/shells scsh.info,NONE,1.1 scsh.patch,NONE,1.1 scsh-0.6.4-11.info,1.1,NONE

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/shells
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16041/10.4-transitional/stable/main/finkinfo/shells

Added Files:
scsh.info scsh.patch 
Removed Files:
scsh-0.6.4-11.info 
Log Message:
Tracker submission 1205795: Sync with unstable; allow building with GCC 4

--- NEW FILE: scsh.info ---
Package: scsh
Version: 0.6.6
Revision: 20
Description: Unix shell embedded in Scheme
License: BSD
Maintainer: Michel Schinz <[EMAIL PROTECTED]>

Source: ftp://ftp.scsh.net/pub/scsh/0.6/%n-%v.tar.gz
Source-MD5: fa0a62f8ec7b0629c297144c59027ba4

Patch: %n.patch

ConfigureParams: --with-lib-dirs-list='("%p/share/scsh-0.6/modules")'

CompileScript: <<
 ./configure %c
 make
<<
DocFiles: COPYING RELEASE
InstallScript: <<
make install DESTDIR=%d mandir=%p/share/man/man1
mkdir -p %i/share/doc/%n
ln -s ../../../lib/scsh/doc/scsh-manual/man.pdf %i/share/doc/%n/scsh-manual.pdf
ln -s ../../../lib/scsh/doc/scsh-manual/html %i/share/doc/%n/scsh-manual-html
echo "Additional documentation is available in directory %p/lib/scsh/doc" > 
%i/share/doc/%n/README
<<

Homepage: http://www.scsh.net/
DescDetail: <<
Scsh is a Unix Scheme shell which uses Scheme as its scripting
language. It is currently aimed primarily at scripting, rather than
interactive use, and makes for a nice Perl/Python/... replacement.
Scsh uses Scheme48 as the underlying Scheme interpreter.
<<
DescUsage: <<
After starting the scsh interpreter (scsh), you can get help by typing
  ,help
at the prompt.
<<


--- scsh-0.6.4-11.info DELETED ---

--- NEW FILE: scsh.patch ---
diff -u -r scsh-0.6.6-orig/c/unix/io.c scsh-0.6.6/c/unix/io.c
--- scsh-0.6.6-orig/c/unix/io.c Tue Sep 14 14:44:54 1999
+++ scsh-0.6.6/c/unix/io.c  Tue May 17 20:26:47 2005
@@ -146,12 +146,12 @@
   return 0; }
 }
 
+static long write_integer(unsigned long n, FILE *port);
+
 long
 ps_write_integer(long n, FILE *port)
 {
   int status;
-
-  static long write_integer(unsigned long n, FILE *port);
 
   if (n == 0) {
 WRITE_CHAR('0', port, status);



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/stable/main/finkinfo/shells scsh.info,NONE,1.1 scsh.patch,NONE,1.1 scsh-0.6.4-11.info,1.2,NONE

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/shells
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16041/10.3/stable/main/finkinfo/shells

Added Files:
scsh.info scsh.patch 
Removed Files:
scsh-0.6.4-11.info 
Log Message:
Tracker submission 1205795: Sync with unstable; allow building with GCC 4

--- NEW FILE: scsh.info ---
Package: scsh
Version: 0.6.6
Revision: 13
Description: Unix shell embedded in Scheme
License: BSD
Maintainer: Michel Schinz <[EMAIL PROTECTED]>

Source: ftp://ftp.scsh.net/pub/scsh/0.6/%n-%v.tar.gz
Source-MD5: fa0a62f8ec7b0629c297144c59027ba4

Patch: %n.patch

ConfigureParams: --with-lib-dirs-list='("%p/share/scsh-0.6/modules")'
BuildDepends: gcc3.3

CompileScript: <<
 export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
 make CC=gcc-3.3 CXX=g++-3.3
<<
DocFiles: COPYING RELEASE
InstallScript: <<
make install DESTDIR=%d mandir=%p/share/man/man1
mkdir -p %i/share/doc/%n
ln -s ../../../lib/scsh/doc/scsh-manual/man.pdf %i/share/doc/%n/scsh-manual.pdf
ln -s ../../../lib/scsh/doc/scsh-manual/html %i/share/doc/%n/scsh-manual-html
echo "Additional documentation is available in directory %p/lib/scsh/doc" > 
%i/share/doc/%n/README
<<

Homepage: http://www.scsh.net/
DescDetail: <<
Scsh is a Unix Scheme shell which uses Scheme as its scripting
language. It is currently aimed primarily at scripting, rather than
interactive use, and makes for a nice Perl/Python/... replacement.
Scsh uses Scheme48 as the underlying Scheme interpreter.
<<
DescUsage: <<
After starting the scsh interpreter (scsh), you can get help by typing
  ,help
at the prompt.
<<


--- scsh-0.6.4-11.info DELETED ---

--- NEW FILE: scsh.patch ---
diff -u -r scsh-0.6.6-orig/c/unix/io.c scsh-0.6.6/c/unix/io.c
--- scsh-0.6.6-orig/c/unix/io.c Tue Sep 14 14:44:54 1999
+++ scsh-0.6.6/c/unix/io.c  Tue May 17 20:26:47 2005
@@ -146,12 +146,12 @@
   return 0; }
 }
 
+static long write_integer(unsigned long n, FILE *port);
+
 long
 ps_write_integer(long n, FILE *port)
 {
   int status;
-
-  static long write_integer(unsigned long n, FILE *port);
 
   if (n == 0) {
 WRITE_CHAR('0', port, status);



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/games advancemame.info,1.1,1.2 advancemame.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26605

Modified Files:
advancemame.info advancemame.patch 
Log Message:
Allow building with GCC 4

Index: advancemame.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/advancemame.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- advancemame.info27 Apr 2005 03:25:39 -  1.1
+++ advancemame.info31 May 2005 20:41:03 -  1.2
@@ -1,6 +1,6 @@
 Package: advancemame
 Version: 0.84.0
-Revision: 10
+Revision: 20
 Description: SDL-based unofficial MAME emulator
 License: GPL
 Maintainer: James Gibbs <[EMAIL PROTECTED]>

Index: advancemame.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/advancemame.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- advancemame.patch   27 Apr 2005 03:25:39 -  1.1
+++ advancemame.patch   31 May 2005 20:41:03 -  1.2
@@ -1262,3 +1262,13 @@
 +  return 0;
 +}
 +
+--- advancemame-0.84.0/src/includes/turbo.h2005-05-31 12:39:43.0 
-0700
 advancemame-0.84.0-patched/src/includes/turbo.h2005-05-31 
12:39:56.0 -0700
+@@ -9,7 +9,6 @@
+ extern UINT8 turbo_opa, turbo_opb, turbo_opc;
+ extern UINT8 turbo_ipa, turbo_ipb, turbo_ipc;
+ extern UINT8 turbo_fbpla, turbo_fbcol;
+-extern UINT8 turbo_speed;
+ 
+ extern UINT8 subroc3d_col, subroc3d_ply, subroc3d_chofs;
+ 



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/gnome libgnome2.info,1.1,1.2 libgnome2.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16258

Modified Files:
libgnome2.info libgnome2.patch 
Log Message:
Allow building on Tiger with GCC 4

Index: libgnome2.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/libgnome2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgnome2.info  27 Apr 2005 03:25:41 -  1.1
+++ libgnome2.info  31 May 2005 21:23:29 -  1.2
@@ -1,6 +1,6 @@
 Package: libgnome2
 Version: 2.6.1.2
-Revision: 9
+Revision: 20
 Source: mirror:gnome:sources/libgnome/2.6/libgnome-%v.tar.bz2
 Source-MD5: 5970203d9f6822652cc95bdd72082bfb
 Depends: %N-shlibs (= %v-%r), audiofile-bin (>= 0.2.5-1), audiofile-shlibs (>= 
0.2.5-1), esound (>= 0.2.34-1), gconf2 (>= 2.6.0-1), gettext, glib2 (>= 
2.2.3-1), gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl (>= 2.6.0-1), libbonobo2 (>= 
2.6.0-1), libiconv, libxml2-shlibs (>= 2.6.7-1), orbit2 (>= 2.10.0-1), 
popt-shlibs

Index: libgnome2.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/libgnome2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgnome2.patch 27 Apr 2005 03:25:41 -  1.1
+++ libgnome2.patch 31 May 2005 21:23:29 -  1.2
@@ -139,3 +139,24 @@
done
fi
  
+--- libgnome-2.6.1.2-old/config.h.in   2005-04-03 15:45:28.0 -0700
 libgnome-2.6.1.2/config.h.in   2005-04-03 15:45:36.0 -0700
+@@ -1,6 +1,8 @@
+ /* config.h.in.  Generated from configure.in by autoheader.  */
+ #undef GNOME_ENABLE_DEBUG
+ 
++#define HAVE_STRTOK_R 1
++
+ /* always defined to indicate that i18n is enabled */
+ #undef ENABLE_NLS
+ 
+--- libgnome-2.6.1.2-old/libgnome/gnome-gconf.c2005-05-31 
14:20:21.0 -0700
 libgnome-2.6.1.2/libgnome/gnome-gconf.c2005-05-31 14:20:34.0 
-0700
+@@ -30,6 +30,7 @@
+ #define GCONF_ENABLE_INTERNALS
+ #include 
+ #include 
++#include 
+ extern struct poptOption gconf_options[];
+ 
+ #include "gnome-i18nP.h"



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.7,1.8

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29357

Modified Files:
buildfink 
Log Message:
Add --build-as-nobody and --validate options

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- buildfink   26 May 2005 18:14:33 -  1.7
+++ buildfink   1 Jun 2005 17:33:05 -   1.8
@@ -24,7 +24,7 @@
 
 =head1 USAGE
 
-   buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE] 
[--skip PACKAGE] FINKDIR OUTDIR
+   buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE] 
[--skip PACKAGE] [--validate] [--build-as-nobody] FINKDIR OUTDIR
buildfink [-r CHECKPOINT]
 
 C builds every package in Fink, taking care of things like avoiding 
repeated building
@@ -52,6 +52,14 @@
 The C<--skip> option, which may be specified multiple times, allows the given 
package to be skipped.
 Skipped packages will not be built, nor will any packages which depend on them.
 
+The C<--validate> option, if specified, causes buildfink to validate packages
+as it builds them.
+
+The C<--build-as-nobody> option, if present, causes buildfink to build
+packages as "nobody" instead of root; if C<--build-as-nobody=try> is specified,
+it will try building as root if that fails and keep track of which packages
+only succeed when built as root.
+
 =head2 CHECKPOINTS
 
 Sometimes there will be system issues partway through a build.  For instance, 
a recalcitrant
@@ -66,6 +74,7 @@
 use warnings;
 use File::Basename;
 use File::Copy;
+use File::Find;
 use Data::Dumper;
 use POSIX qw(dup2);
 use Getopt::Long;
@@ -73,7 +82,7 @@
 use lib "$Bin";
 use FinkLib;
 
-our($Bin, $FinkConfig, $FinkDir, $rundir, $dryrun, $infofilter, $patchdir, 
@skiplist, $checkpoint);
+our($Bin, $FinkConfig, $FinkDir, $rundir, $dryrun, $infofilter, $patchdir, 
@skiplist, $checkpoint, $DoValidate, $BuildNobody);
 our $VERSION = '$Revision$';
 
 my $opts_ok = GetOptions(
@@ -81,7 +90,9 @@
"infofilter=s" => \$infofilter,
"patchdir=s" => \$patchdir,
"skip=s" => [EMAIL PROTECTED],
-   "r=s" => \$checkpoint
+   "r=s" => \$checkpoint,
+   "validate" => \$DoValidate,
+   "build-as-nobody:s" => \$BuildNobody
 );
 if(@ARGV != 2 and not (($dryrun and @ARGV == 1) or $checkpoint)) {
warn "You must specify a Fink directory and an output directory.\n";
@@ -115,6 +126,10 @@
warn "The specified patch directory does not exist or is not a 
directory.\n";
$opts_ok = 0;
 }
+if($BuildNobody and $BuildNobody ne "try") {
+   warn "The only valid value for '--build-as-nobody' is 'try'.\n";
+   $opts_ok = 0;
+}
 
 if(!$opts_ok) {
die "See 'perldoc $0' for more information.\n";
@@ -176,7 +191,7 @@
return if $dryrun;
 
mkdir($rundir);
-   mkdir("$rundir/$_") for qw(pkginfo logs src out);
+   mkdir("$rundir/$_") for qw(pkginfo logs src out validate nobody);
mkdir("$rundir/pkginfo/finkinfo");
mkdir("$rundir/pkginfo/binary-darwin-powerpc");
 
@@ -210,6 +225,16 @@
print "$out\n";
 }
 
+sub doValidateWarn {
+   my($pkg, $fmt, @args) = @_;
+
+   open(VAL, ">>", "$rundir/validate/$pkg") or die "Couldn't open 
validation log for $pkg: $!\n";
+   my($out) = sprintf($fmt, @args);
+   chomp($out);
+   print VAL "$out\n";
+   close VAL;
+}
+
 # Log a package-specific failure
 sub logPackageFail {
my($pkg, $reason) = @_;
@@ -341,6 +366,17 @@
# Also set packages on the skiplist to failed
$failures->{$_} = 1 foreach keys %skiphash;
 
+   my %finkfiles;
+   if($DoValidate) {
+   Fink::Config::set_options({"Pedantic" => 1});
+
+   # One of the validation steps is to identify files left in /sw
+   # by the build process.
+   find({no_chdir => 1, wanted => sub {
+   $finkfiles{$File::Find::name} = 1;
+   }}, $FinkDir);
+   }
+
my @newfails;
PACKAGE: foreach my $pkg(@$pkgs) {
doLog("Thinking about building $pkg");
@@ -369,12 +405,36 @@
 
next if $obj->{type} and $obj->{type} eq "dummy";
 
+   if($DoValidate) {
+   open(VAL, ">>", "$rundir/validate/$pkg") or die 
"Couldn't open validation log for $pkg: $!\n";
+   my $oldfh = select(VAL);
+   
Fink::Validation::validate_info_file($obj->get_info_filename());
+   close(VAL);
+   select($oldfh);
+   }
+
doLog("Building package $pkg...");
-   FinkLib::purgeNonEssential();
my $srcdir = $Fink::Config::buildpath; # Suppress "used only 
once" warning
$srcdir = "$Fink::Config::buildpath/" . $obj->get_fullname();
 
- 

scripts/buildfink FinkLib.pm,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv820

Modified Files:
FinkLib.pm 
Log Message:
Faster purgeNonEssentials from Vasi; require Fink::Validation

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FinkLib.pm  26 May 2005 18:14:33 -  1.2
+++ FinkLib.pm  1 Jun 2005 17:39:19 -   1.3
@@ -33,6 +33,7 @@
require Fink::PkgVersion;
require Fink::VirtPackage;
require Fink::Status;
+   require Fink::Validation;
 
$ENV{PATH} = 
"$FinkDir/bin:$FinkDir/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin";
$ENV{PERL5LIB} = "$FinkDir/lib/perl5:$FinkDir/lib/perl5/darwin";
@@ -45,28 +46,17 @@
 }
 
 # Purge packages we may have previously built
+# Thanks to Dave Vasilevsky for this routine.
 sub purgeNonEssential {
-   my @essentials = map { quotemeta($_) } 
Fink::Package->list_essential_packages();
-   my $re = "^(?:" . join("|", @essentials) . ")\$";
-
$Fink::Status::the_instance ||= Fink::Status->new();
-   $Fink::Status::the_instance->read();
+   my $list = $Fink::Status::the_instance->list();
 
-   my @packages = Fink::Package->list_packages();
my @purgelist;
-   foreach my $pkgname (@packages) {
-   next if $pkgname =~ /$re/i;
-   next if $pkgname =~ /^fink-buildlock/;
-   next if Fink::VirtPackage->query_package($pkgname);
-
-   my $obj;
-   eval {
-   $obj = Fink::Package->package_by_name($pkgname);
-   };
-   next if $@ or !$obj;
-   next unless $obj->is_any_installed();
-
-   push @purgelist, $pkgname;
+   foreach my $pkg (keys %$list) {
+   next if exists $Fink::Status::the_instance->{$pkg}{essential};
+   next if $pkg =~ /^fink-buildlock/;
+   next if Fink::VirtPackage->query_package($pkg);
+   push @purgelist, $pkg;
}
 
system("dpkg --purge " . join(" ", @purgelist) . " 2>&1 | grep -v 'not 
installed'") if @purgelist;



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/libs/perlmods xml-sax-pm581.info,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/perlmods
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6238/10.3/unstable/main/finkinfo/libs/perlmods

Modified Files:
xml-sax-pm581.info 
Log Message:
Allow purge even if GNU fileutils aren't installed

Index: xml-sax-pm581.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/perlmods/xml-sax-pm581.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xml-sax-pm581.info  23 May 2004 16:17:24 -  1.1
+++ xml-sax-pm581.info  1 Jun 2005 18:38:22 -   1.2
@@ -1,6 +1,6 @@
 Package: xml-sax-pm581
 Version: 0.12
-Revision: 16
+Revision: 17
 Replaces: xml-sax-pm (<= 0.12-16), xml-sax-pm560, xml-sax-pm580
 Source: mirror:cpan:authors/id/M/MS/MSERGEANT/XML-SAX-%v.tar.gz
 Source-MD5: bff58bd077a9693fc8cf32e2b95f571f
@@ -57,7 +57,7 @@
 then
rm -f %p/etc/perl/XML/SAX/ParserDetails.ini
cd %p/etc/perl && \
-   rmdir --parents --ignore-fail-on-non-empty 
XML/SAX/ParserDetails.d
+   rmdir -p XML/SAX/ParserDetails.d || true
 fi
 <<
 Description: Perl Simple API for XML



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/libs/perlmods xml-sax-pm581.info,1.1,1.2

[Matthew Sachs]

Update of 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/perlmods
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6238/10.4-transitional/unstable/main/finkinfo/libs/perlmods

Modified Files:
xml-sax-pm581.info 
Log Message:
Allow purge even if GNU fileutils aren't installed

Index: xml-sax-pm581.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/perlmods/xml-sax-pm581.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xml-sax-pm581.info  27 Apr 2005 03:09:36 -  1.1
+++ xml-sax-pm581.info  1 Jun 2005 18:38:22 -   1.2
@@ -1,6 +1,6 @@
 Package: xml-sax-pm581
 Version: 0.12
-Revision: 16
+Revision: 17
 Replaces: xml-sax-pm (<= 0.12-16), xml-sax-pm560, xml-sax-pm580
 Source: mirror:cpan:authors/id/M/MS/MSERGEANT/XML-SAX-%v.tar.gz
 Source-MD5: bff58bd077a9693fc8cf32e2b95f571f
@@ -57,7 +57,7 @@
 then
rm -f %p/etc/perl/XML/SAX/ParserDetails.ini
cd %p/etc/perl && \
-   rmdir --parents --ignore-fail-on-non-empty 
XML/SAX/ParserDetails.d
+   rmdir -p XML/SAX/ParserDetails.d || true
 fi
 <<
 Description: Perl Simple API for XML



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.8,1.9

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19275

Modified Files:
buildfink 
Log Message:
Store value of BuildNobody and DoValidate in checkpoint

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- buildfink   1 Jun 2005 17:33:05 -   1.8
+++ buildfink   1 Jun 2005 20:01:28 -   1.9
@@ -852,8 +852,8 @@
open(CHECKPOINT, ">", "$rundir/checkpoint");
 
print CHECKPOINT Data::Dumper->Dump(
-   [$FinkDir, $rundir, [EMAIL PROTECTED], $orderedPkgs, $deps, 
$failures],
-   [qw(FinkDir rundir skiplist orderedPkgs deps failures)]
+   [$FinkDir, $rundir, $BuildNobody, $DoValidate, [EMAIL 
PROTECTED], $orderedPkgs, $deps, $failures],
+   [qw(FinkDir rundir BuildNobody DoValidate skiplist orderedPkgs 
deps failures)]
);
 
close CHECKPOINT;



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.9,1.10

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29827

Modified Files:
buildfink 
Log Message:
Validation fixes

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- buildfink   1 Jun 2005 20:01:28 -   1.9
+++ buildfink   1 Jun 2005 20:22:14 -   1.10
@@ -409,8 +409,8 @@
open(VAL, ">>", "$rundir/validate/$pkg") or die 
"Couldn't open validation log for $pkg: $!\n";
my $oldfh = select(VAL);

Fink::Validation::validate_info_file($obj->get_info_filename());
-   close(VAL);
select($oldfh);
+   close(VAL);
}
 
doLog("Building package $pkg...");
@@ -459,7 +459,9 @@
my @killqueue;
 
find({no_chdir => 1, wanted => sub {
-   if(!$finkfiles{$File::Find::name}) {
+   if(/\.deb$/ or $_ =~ /fink\.build$/  or 
$File::Find::name eq "$FinkDir/var/lib/fink/finkinfodb") {
+   $File::Find::prune = 1;
+   } elsif(!$finkfiles{$File::Find::name}) {
doValidateWarn($pkg, "Leftover file 
$File::Find::name");
push @killqueue, $File::Find::name;
}
@@ -477,8 +479,8 @@

Fink::Validation::validate_dpkg_file($relative->get_debname());
}
 
-   close(VAL);
select($oldfh);
+   close(VAL);
}
} continue {
updateCheckpoint(@newfails);



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.10,1.11

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15578

Modified Files:
buildfink 
Log Message:
Use get_debfile, not get_debname

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- buildfink   1 Jun 2005 20:22:14 -   1.10
+++ buildfink   1 Jun 2005 20:53:40 -   1.11
@@ -474,9 +474,9 @@
open(VAL, ">>", "$rundir/validate/$pkg") or die 
"Couldn't open validation log for $pkg: $!\n";
my $oldfh = select(VAL);
 
-   
Fink::Validation::validate_dpkg_file($obj->get_debname());
+   
Fink::Validation::validate_dpkg_file($obj->get_debfile());
foreach my $relative(getRelatives($obj)) {
-   
Fink::Validation::validate_dpkg_file($relative->get_debname());
+   
Fink::Validation::validate_dpkg_file($relative->get_debfile());
}
 
select($oldfh);



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.11,1.12

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27310

Modified Files:
buildfink 
Log Message:
Move debs to pkginfo dir, check for existence before validating

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- buildfink   1 Jun 2005 20:53:40 -   1.11
+++ buildfink   1 Jun 2005 21:18:38 -   1.12
@@ -451,6 +451,19 @@
} else {
doLog("Build of $pkg succeeded!");
system("rm", "-rf", $srcdir);
+
+
+   my $deb = $obj->get_debname();
+   move(readlink("$FinkDir/fink/debs/$deb"), 
"$rundir/pkginfo/binary-darwin-powerpc/$deb");
+   unlink("$FinkDir/fink/debs/$deb");
+   symlink("$rundir/pkginfo/binary-darwin-powerpc/$deb", 
"$FinkDir/fink/debs/$deb");
+
+   foreach my $relative(getRelatives($obj)) {
+   my $deb = $relative->get_debname();
+   move(readlink("$FinkDir/fink/debs/$deb"), 
"$rundir/pkginfo/binary-darwin-powerpc/$deb");
+   unlink("$FinkDir/fink/debs/$deb");
+   
symlink("$rundir/pkginfo/binary-darwin-powerpc/$deb", 
"$FinkDir/fink/debs/$deb");
+   }
}
 
FinkLib::purgeNonEssential();
@@ -474,9 +487,11 @@
open(VAL, ">>", "$rundir/validate/$pkg") or die 
"Couldn't open validation log for $pkg: $!\n";
my $oldfh = select(VAL);
 
-   
Fink::Validation::validate_dpkg_file($obj->get_debfile());
+   my $deb = "$rundir/pkginfo/binary-darwin-powerpc/" . 
$obj->get_debname();
+   Fink::Validation::validate_dpkg_file($deb) if -f $deb;
foreach my $relative(getRelatives($obj)) {
-   
Fink::Validation::validate_dpkg_file($relative->get_debfile());
+   my $deb = 
"$rundir/pkginfo/binary-darwin-powerpc/" . $relative->get_debname();
+   Fink::Validation::validate_dpkg_file($deb) if 
-f $deb;
}
 
select($oldfh);



---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.12,1.13

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14471

Modified Files:
buildfink 
Log Message:
Don't call initFink from restoreCheckpoint, prepSystem does it now

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- buildfink   1 Jun 2005 21:18:38 -   1.12
+++ buildfink   3 Jun 2005 19:04:25 -   1.13
@@ -849,7 +849,6 @@
die "[EMAIL PROTECTED]" if $@;
 
prepSystem();
-   initFink();
scanPackages();
injectPackages();
scanPackages();



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink FinkLib.pm,1.3,1.4

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23582

Modified Files:
FinkLib.pm 
Log Message:
Switch back to old purgeNonEssential, new version wasn't working

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FinkLib.pm  1 Jun 2005 17:39:19 -   1.3
+++ FinkLib.pm  3 Jun 2005 19:19:25 -   1.4
@@ -46,17 +46,28 @@
 }
 
 # Purge packages we may have previously built
-# Thanks to Dave Vasilevsky for this routine.
 sub purgeNonEssential {
+   my @essentials = map { quotemeta($_) } 
Fink::Package->list_essential_packages();
+   my $re = "^(?:" . join("|", @essentials) . ")\$";
+
$Fink::Status::the_instance ||= Fink::Status->new();
-   my $list = $Fink::Status::the_instance->list();
+   $Fink::Status::the_instance->read();
 
+   my @packages = Fink::Package->list_packages();
my @purgelist;
-   foreach my $pkg (keys %$list) {
-   next if exists $Fink::Status::the_instance->{$pkg}{essential};
-   next if $pkg =~ /^fink-buildlock/;
-   next if Fink::VirtPackage->query_package($pkg);
-   push @purgelist, $pkg;
+   foreach my $pkgname (@packages) {
+   next if $pkgname =~ /$re/i;
+   next if $pkgname =~ /^fink-buildlock/;
+   next if Fink::VirtPackage->query_package($pkgname);
+
+   my $obj;
+   eval {
+   $obj = Fink::Package->package_by_name($pkgname);
+   };
+   next if $@ or !$obj;
+   next unless $obj->is_any_installed();
+
+   push @purgelist, $pkgname;
}
 
system("dpkg --purge " . join(" ", @purgelist) . " 2>&1 | grep -v 'not 
installed'") if @purgelist;



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink FinkLib.pm,1.4,1.5

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26987

Modified Files:
FinkLib.pm 
Log Message:
Remove buildlocks

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FinkLib.pm  3 Jun 2005 19:19:25 -   1.4
+++ FinkLib.pm  3 Jun 2005 19:25:29 -   1.5
@@ -57,7 +57,6 @@
my @purgelist;
foreach my $pkgname (@packages) {
next if $pkgname =~ /$re/i;
-   next if $pkgname =~ /^fink-buildlock/;
next if Fink::VirtPackage->query_package($pkgname);
 
my $obj;



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink FinkLib.pm,1.5,1.6 buildfink,1.13,1.14

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30249

Modified Files:
FinkLib.pm buildfink 
Log Message:
Dummy handling fix

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FinkLib.pm  3 Jun 2005 19:25:29 -   1.5
+++ FinkLib.pm  3 Jun 2005 19:31:03 -   1.6
@@ -65,6 +65,8 @@
};
next if $@ or !$obj;
next unless $obj->is_any_installed();
+   my $vo = Fink::PkgVersion->match_package($pkgname);
+   next if $vo->is_type('dummy');
 
push @purgelist, $pkgname;
}

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- buildfink   3 Jun 2005 19:04:25 -   1.13
+++ buildfink   3 Jun 2005 19:31:03 -   1.14
@@ -266,7 +266,7 @@
doLog("Couldn't get version for $pkgname: $@");
next;
}
-   next if $pkg->{type} and $pkg->{type} eq "dummy";
+   next if $pkg->is_type('dummy');
 
my $info = $pkg->get_info_filename();
if(!$info) {
@@ -403,7 +403,7 @@
next;
}
 
-   next if $obj->{type} and $obj->{type} eq "dummy";
+   next if $obj->is_type('dummy');
 
if($DoValidate) {
open(VAL, ">>", "$rundir/validate/$pkg") or die 
"Couldn't open validation log for $pkg: $!\n";



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.14,1.15

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22930

Modified Files:
buildfink 
Log Message:
Don't copy over things which we're skipping

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- buildfink   3 Jun 2005 19:31:03 -   1.14
+++ buildfink   6 Jun 2005 18:16:13 -   1.15
@@ -257,6 +257,7 @@
 
foreach my $pkgname(@pkgnames) {
next unless $pkgname;
+   next if grep { $_ eq $pkgname } @skiplist;
 
my $pkg;
eval {



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink FinkLib.pm,1.6,1.7 buildfink,1.15,1.16

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28696

Modified Files:
FinkLib.pm buildfink 
Log Message:
Make sure that all essential packages are installed before starting the build

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FinkLib.pm  3 Jun 2005 19:31:03 -   1.6
+++ FinkLib.pm  9 Jun 2005 20:19:22 -   1.7
@@ -45,6 +45,12 @@
return $FinkConfig;
 }
 
+# Make sure all essential packages are installed
+sub installEssentials {
+   my @essentials = Fink::Package->list_essential_packages();
+   system("fink", "reinstall", @essentials);
+}
+
 # Purge packages we may have previously built
 sub purgeNonEssential {
my @essentials = map { quotemeta($_) } 
Fink::Package->list_essential_packages();

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- buildfink   6 Jun 2005 18:16:13 -   1.15
+++ buildfink   9 Jun 2005 20:19:31 -   1.16
@@ -177,6 +177,7 @@
 
 # Now do the run
 initCheckpoint([EMAIL PROTECTED], \%deps, {});
+FinkLib::installEssentials();
 buildAll([EMAIL PROTECTED], [EMAIL PROTECTED], \%deps, {});
 doLog("Done building");
 



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/games jzip.info,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15715/10.4-transitional/unstable/main/finkinfo/games

Modified Files:
jzip.info 
Log Message:
jzip no longer has a maintainer

Index: jzip.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/games/jzip.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jzip.info   31 May 2005 18:57:00 -  1.2
+++ jzip.info   9 Jun 2005 21:56:46 -   1.3
@@ -43,7 +43,7 @@
  tail -n 22 license.c | head -n 20 | sed '[EMAIL PROTECTED]@@' | sed '[EMAIL 
PROTECTED]|"\|);@@g' | sed '[EMAIL PROTECTED]@Jzip [EMAIL PROTECTED]' > 
license.txt
 <<
 DocFiles: license.txt
-Maintainer: Carsten Klapp <[EMAIL PROTECTED]>
+Maintainer: None 
 DescPort: <<
  fileio.c patched to look for games in %p/share/zcode-games when user's
  INFOCOM_PATH env var is not set.



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/games jzip.info,1.3,1.4

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15715/10.3/unstable/main/finkinfo/games

Modified Files:
jzip.info 
Log Message:
jzip no longer has a maintainer

Index: jzip.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games/jzip.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jzip.info   16 Jan 2005 02:54:54 -  1.3
+++ jzip.info   9 Jun 2005 21:56:46 -   1.4
@@ -43,7 +43,7 @@
  tail -n 22 license.c | head -n 20 | sed '[EMAIL PROTECTED]@@' | sed '[EMAIL 
PROTECTED]|"\|);@@g' | sed '[EMAIL PROTECTED]@Jzip [EMAIL PROTECTED]' > 
license.txt
 <<
 DocFiles: license.txt
-Maintainer: Carsten Klapp <[EMAIL PROTECTED]>
+Maintainer: None 
 DescPort: <<
  fileio.c patched to look for games in %p/share/zcode-games when user's
  INFOCOM_PATH env var is not set.



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink maintnotify,NONE,1.1 FinkLib.pm,1.7,1.8 report,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7704

Modified Files:
FinkLib.pm report 
Added Files:
maintnotify 
Log Message:
Automate nagging maintainers

Index: report
===
RCS file: /cvsroot/fink/scripts/buildfink/report,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- report  11 May 2005 19:04:34 -  1.1
+++ report  9 Jun 2005 22:38:52 -   1.2
@@ -274,30 +274,7 @@
 
 # And the per-maintainer index.
 
-my %maints;
-foreach my $pkg(keys %catmap) {
-   my $obj;
-   eval {
-   $obj = Fink::PkgVersion->match_package($pkg);
-   };
-   if($@ or !$obj) {
-   warn "Couldn't get object for $pkg: [EMAIL PROTECTED]";
-   next;
-   }
-
-   my $maint = "No Maintainer";
-   if($obj->has_param('maintainer')) {
-   $maint = $obj->param('maintainer');
-
-   # Transform name+email into name
-   $maint =~ s/^(.*) <(.*)>/$1/;
-   $maint =~ s/\@/ /;
-   $maint =~ s/"//g;
-   }
-
-   $maints{$maint} ||= [];
-   push @{$maints{$maint}}, $pkg;
-}
+my %maints = FinkLib::sortPackagesByMaintainer(keys %catmap);
 
 open(MAINTIDX, ">", "maintindex.html") or die "Couldn't open maintindex: $!\n";
 
@@ -309,7 +286,13 @@
 HTMHEAD
 
 foreach my $maint(sort keys %maints) {
-   print MAINTIDX "$maint\n";
+   my $maintname = FinkLib::maintName($maint);
+   if(!$maintname) {
+   $maintname = FinkLib::maintEmail($maint);
+   $maintname =~ s/\@/ _at_ /;
+   }
+
+   print MAINTIDX "$maintname\n";
foreach my $pkg(sort @{$maints{$maint}}) {
my $result = $catmap{$pkg};
print MAINTIDX "$pkg: $result\n";

Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- FinkLib.pm  9 Jun 2005 20:19:22 -   1.7
+++ FinkLib.pm  9 Jun 2005 22:38:52 -   1.8
@@ -80,4 +80,47 @@
system("dpkg --purge " . join(" ", @purgelist) . " 2>&1 | grep -v 'not 
installed'") if @purgelist;
 }
 
+
+# Get either the name or email address from the value of the maintainer field
+sub maintParse {
+   my $maint = shift;
+   my($name, $email);
+
+   if($maint =~ m/^(.*) <(.*)>/) {
+   ($name, $email) = ($1, $2);
+   $name =~ s/"//g;
+   } else {
+   ($name, $email) = ("", $maint);
+   }
+   return($name, $email);
+}
+sub maintName { return (maintParse(shift))[0]; }
+sub maintEmail { return (maintParse(shift))[1]; }
+
+# Take a list of packages, and return it arranged by maintainer.
+# Returns a hash of listrefs.  Hash keys are maintainers.
+sub sortPackagesByMaintainer {
+   my %maints;
+   foreach my $pkg(@_) {
+   my $obj;
+   eval {
+   $obj = Fink::PkgVersion->match_package($pkg);
+   };
+   if($@ or !$obj) {
+   warn "Couldn't get object for $pkg: [EMAIL PROTECTED]";
+   next;
+   }
+
+   my $maint = "None <[EMAIL PROTECTED]>";
+   if($obj->has_param('maintainer')) {
+   $maint = $obj->param('maintainer');
+   }
+
+   $maints{$maint} ||= [];
+   push @{$maints{$maint}}, $pkg;
+   }
+
+   return %maints;
+}
+
 1;

--- NEW FILE: maintnotify ---
#!/usr/bin/perl

# Notify maintainers about problems with their packages

#Copyright (c) 2005 Apple Computer, Inc.  All Rights Reserved.
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation; either version 2 of the License, or
#(at your option) any later version.
#
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#GNU General Public License for more details.
#
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

=pod

=head1 SYNOPSIS

maintnotify -- Notify maintainers about problems with their packages

=head1 USAGE

maintnotify --finkdir FINKDIR --pkgfile PKGFILE --template TEMPLATE 
--from FROM [--subject SUBJ] [--cc CC]

C sends an email to the maintainers of all packages which you
specify.  It sends one email per maintainer.  Messages are sent via the 
Mail::Send module.

C specifies the root of your Fink installation; this is usually C.

C is a file containing a list of packages to

scripts/buildfink README,1.3,1.4 maintnotify,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12159

Modified Files:
README maintnotify 
Log Message:
Allow suffix in %P

Index: README
===
RCS file: /cvsroot/fink/scripts/buildfink/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README  26 May 2005 22:47:25 -  1.3
+++ README  9 Jun 2005 23:42:21 -   1.4
@@ -24,6 +24,8 @@
"buildfink --infofilter", which causes /usr/bin/gcc to be
used to compile the package, removing any attempts by the
package to build with an alternate compiler, such as /usr/bin/gcc-3.3
+*maintnotify
+   Notify maintainers about problems with their packages.
 *report
Running this script from the 'out' subdirectory of a run after running
'analyze' will produce the HTML and text reports.

Index: maintnotify
===
RCS file: /cvsroot/fink/scripts/buildfink/maintnotify,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- maintnotify 9 Jun 2005 22:38:52 -   1.1
+++ maintnotify 9 Jun 2005 23:42:22 -   1.2
@@ -60,6 +60,11 @@
 's' if the message is about multiple packages; otherwise, the empty
 string.  So, C will be either C or C.
 
+=item B<%s{foo}{foos}
+
+The first alternative if the message is about one package; otherwise,
+the second alternative.
+
 =item B<%p>
 
 A comma-separated list of the packages this message is about.
@@ -68,11 +73,12 @@
 
 A newline-separated list of the packages this message is about.
 
-=item B<%P{foo}>
+=item B<%P{foo}{bar}>
 
 A newline-separated list of the packages this message is about; each
-package will be preceeded by C.  This can be used to indent
-the list of packages or turn it into a list of URLs.
+package will be preceeded by C and followed by C.
+This can be used to indent the list of packages or turn it into a list of URLs.
+The suffix is optional.
 
 =back
 
@@ -156,20 +162,29 @@
 sub applyTemplate {
my($template, @pkgs) = @_;
 
-   $template =~ s/%(.)(?:{(.*?)})?/
+   $template =~ s/%(.)(?:{(.*?)})?(?:{(.*?)})?/
if($1 eq "%") {
"%";
} elsif($1 eq "s") {
-   if(@pkgs == 1) {
-   "";
+   if($2 and $3) {
+   if(@pkgs == 1) {
+   $2;
+   } else {
+   $3;
+   }
} else {
-   "s";
+   if(@pkgs == 1) {
+   "";
+   } else {
+   "s";
+   }
}
} elsif($1 eq "p") {
join(", ", @pkgs);
} elsif($1 eq "P") {
my $prefix = $2 || "";
-   join("\n", map { "$prefix$_" } @pkgs);
+   my $suffix = $3 || "";
+   join("\n", map { "$prefix$_$suffix" } @pkgs);
} else {
die "Unrecognized escape '$1' in template!\n";
}



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink maintnotify,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17067

Modified Files:
maintnotify 
Log Message:
Template enhancements for better English

Index: maintnotify
===
RCS file: /cvsroot/fink/scripts/buildfink/maintnotify,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maintnotify 9 Jun 2005 23:42:22 -   1.2
+++ maintnotify 9 Jun 2005 23:50:38 -   1.3
@@ -65,9 +65,13 @@
 The first alternative if the message is about one package; otherwise,
 the second alternative.
 
-=item B<%p>
+=item B<%p{and }{0}>
 
 A comma-separated list of the packages this message is about.
+If the optional parameter is specified, it will be prepended to the last
+package if there are more than one; it defaults to "and ".  If the
+second optional parameter is set to 1, there will be a comma if
+there are only two items; normally, there won't be.
 
 =item B<%P>
 
@@ -180,7 +184,16 @@
}
}
} elsif($1 eq "p") {
-   join(", ", @pkgs);
+   my $finalsuffix = $2;
+   $finalsuffix = "and " if !defined($2);
+
+   $pkgs[-1] = $finalsuffix . $pkgs[-1] if @pkgs > 1;
+
+   if(@pkgs == 2 and !$3) {
+   join(" ", @pkgs);
+   } else {
+   join(", ", @pkgs);
+   }
} elsif($1 eq "P") {
my $prefix = $2 || "";
my $suffix = $3 || "";



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink filters-nobody.xml,NONE,1.1

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25577

Added Files:
filters-nobody.xml 
Log Message:
Filters for nobody-only failures

--- NEW FILE: filters-nobody.xml ---

(?:install|rm|touch|cp|mv|rmdir|mkdir).*permission denied
ch(?:own|mod|grp).*Operation not permitted
^Failed:




---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink maintnotify,1.3,1.4

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20502

Modified Files:
maintnotify 
Log Message:
Add support for attachments

Index: maintnotify
===
RCS file: /cvsroot/fink/scripts/buildfink/maintnotify,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- maintnotify 9 Jun 2005 23:50:38 -   1.3
+++ maintnotify 14 Jun 2005 00:53:36 -  1.4
@@ -26,7 +26,7 @@
 
 =head1 USAGE
 
-   maintnotify --finkdir FINKDIR --pkgfile PKGFILE --template TEMPLATE 
--from FROM [--subject SUBJ] [--cc CC]
+   maintnotify --finkdir FINKDIR --pkgfile PKGFILE --template TEMPLATE 
--from FROM [--subject SUBJ] [--cc CC] [--attachdir ATTACHDIR]
 
 C sends an email to the maintainers of all packages which you
 specify.  It sends one email per maintainer.  Messages are sent via the 
Mail::Send module.
@@ -44,6 +44,11 @@
 
 C is an optional email address to send copies of all messages to.
 
+C is an optional path to a directory containing files to
+attach to the email.  For a message about package foo, any files in that
+directory which start with "foo." will be attached (for instance foo.info
+or foo.patch.)  This requires the MIME::Lite and MIME::Types modules.
+
 =head1 EMAIL TEMPLATES
 
 There are some escape codes you can use in emails which will get replaced
@@ -104,7 +109,8 @@
"template=s" => \$options{template},
"from=s" => \$options{from},
"subject=s" => \$options{subject},
-   "cc=s" => \$options{cc}
+   "cc=s" => \$options{cc},
+   "attachdir=s" => \$options{attachdir},
 );
 if(@ARGV) {
warn "Extra command-line arguments left over after option 
processing.\n";
@@ -128,12 +134,20 @@
if(not -f $options{template}) {
die "The specified template file does not exist.\n";
}
+   if($options{attachdir} and not -d $options{attachdir}) {
+   die "The specified attachments directory does not exist.\n";
+   }
 }
 
 if(!$opts_ok) {
die "See 'perldoc $0' for more information.\n";
 }
 
+if($options{attachdir}) {
+   require MIME::Lite;
+   require MIME::Types;
+}
+
 FinkLib::initFink($options{finkdir});
 
 open(PKGFILE, $options{pkgfile}) or die "Couldn't open package file: $!\n";
@@ -145,6 +159,13 @@
 my $template = join("", );
 close TEMPLATE;
 
+my @attachfiles;
+if($options{attachdir}) {
+   opendir(ADIR, $options{attachdir}) or die "Couldn't open attachdir: 
$!\n";
+   @attachfiles = grep { $_ ne "." and $_ ne ".." } readdir(ADIR);
+   close(ADIR);
+}
+
 my %maints = FinkLib::sortPackagesByMaintainer(@packages);
 foreach my $maint(keys %maints) {
my @pkgs = @{$maints{$maint}};
@@ -152,15 +173,43 @@
my $subject = applyTemplate($options{subject}, @pkgs);
my $body = applyTemplate($template, @pkgs);
 
-   my $msg = new Mail::Send or die "Couldn't instantiate Mail::Send: $!\n";
-   $msg->to($to);
-   $msg->subject($subject);
-   $msg->cc($options{cc}) if $options{cc};
-   $msg->set("From", $options{from});
+   my @afiles;
+   foreach my $pkg(@pkgs) {
+   push @afiles,
+   map { $options{attachdir} . "/$_" }
+   grep { /^\Q$pkg\E\./ } @attachfiles;
+   }
+   if(@afiles) {
+   my(%args) = (
+   From => $options{from},
+   To => $to,
+   Subject => $subject,
+   Type => 'multipart/mixed'
+   );
+   $args{Cc} = $options{cc} if $options{cc};
+   my $msg = MIME::Lite->new(%args);
 
-   my $fh = $msg->open or die "Couldn't open Mail::Send: $!\n";
-   print $fh $body or die "Couldn't write to Mail::Send: $!\n";
-   $fh->close or die "Couldn't close Mail::Send: $!\n";
+   $msg->attach(Type => 'TEXT', Data => $body);
+   foreach my $afile (@afiles) {
+   $msg->attach(
+   Path => $afile,
+   Disposition => 'attachment',
+   Type => "AUTO"
+   );
+   }
+
+   $msg->send();
+   } else {
+   my $msg = new Mail::Send or die "Couldn't instantiate 
Mail::Send: $!\n";
+   $msg->to($to);
+   $msg->subject($subject);
+   $msg->cc($options{cc}) if $options{cc};
+   $msg->set("From", $options{from});
+
+   my $fh = $msg->open or die "Couldn't open Mail::Send: $!\n";
+   print $fh $body or die "Couldn't write to Mail::Send: $!\n";
+   $fh->close or die "Couldn't close Mail::Send: $!\n";
+   }
 }
 
 sub applyTemplate {



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projec

scripts/buildfink maintnotify,1.4,1.5

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28391

Modified Files:
maintnotify 
Log Message:
Don't munge @pkgs in applyTemplates

Index: maintnotify
===
RCS file: /cvsroot/fink/scripts/buildfink/maintnotify,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- maintnotify 14 Jun 2005 00:53:36 -  1.4
+++ maintnotify 14 Jun 2005 01:08:52 -  1.5
@@ -233,15 +233,17 @@
}
}
} elsif($1 eq "p") {
+   my @pkgtemp = @pkgs;
+
my $finalsuffix = $2;
$finalsuffix = "and " if !defined($2);
 
-   $pkgs[-1] = $finalsuffix . $pkgs[-1] if @pkgs > 1;
+   $pkgtemp[-1] = $finalsuffix . $pkgtemp[-1] if @pkgtemp 
> 1;
 
-   if(@pkgs == 2 and !$3) {
-   join(" ", @pkgs);
+   if(@pkgtemp == 2 and !$3) {
+   join(" ", @pkgtemp);
} else {
-   join(", ", @pkgs);
+   join(", ", @pkgtemp);
}
} elsif($1 eq "P") {
my $prefix = $2 || "";



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/crypto/finkinfo ftp-tls-20020906-4.patch,NONE,1.1 ftp-tls-20020906-4.info,NONE,1.1 ftp-tls-20020906-3.info,1.1,NONE ftp-tls-20020906-3.patch,1.1,NONE

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7425

Added Files:
ftp-tls-20020906-4.patch ftp-tls-20020906-4.info 
Removed Files:
ftp-tls-20020906-3.info ftp-tls-20020906-3.patch 
Log Message:
Checking in Xcode 2.1 fixes per maintainer request

--- ftp-tls-20020906-3.patch DELETED ---

--- ftp-tls-20020906-3.info DELETED ---

--- NEW FILE: ftp-tls-20020906-4.info ---
Package: ftp-tls
Version: 20020906
Revision: 4
Source: ftp://ftp.runestig.com/pub/ftp-tls/ftp-tls-%v.tar.gz
Depends: openssl097-shlibs
BuildDepends: openssl097-dev
Source-MD5: 8823a6f9388add4e3fcd4459422d57d8
Patch: %f.patch
ConfigureParams: --mandir=%i/share/man
CompileScript: <<
head -n 29 tlsutil.c >> LICENSE
./configure %c
make
<<
DocFiles: LICENSE README.TLS PLATFORMS draft-murray-auth-ftp-ssl-09.txt
SetCPPFLAGS: -no-cpp-precomp
Description: SSL/TLS enabled replacement for standard FTP tool
DescDetail: <<
This is a a port of the OpenBSD FTP tool, with added support for
SSL/TLS, using the OpenSSL library.  Server support for this is still
emerging, but several servers have support for it available.  These
include Peter Runestig's matching ftpd-tls version of the OpenBSD
ftpd server and ProFTPd, available as a patch from Peter Runestig.
This ftp tool also includes editline/history support and a progress
indicator.
<<
License: BSD
Maintainer: Avram Cherry <[EMAIL PROTECTED]>
Homepage: http://www.runestig.com/osp.html

--- NEW FILE: ftp-tls-20020906-4.patch ---
diff -Naur ftp-tls-20020906/complete.c ftp-tls-mac/complete.c
--- ftp-tls-20020906/complete.c Wed Jan 30 18:29:09 2002
+++ ftp-tls-mac/complete.c  Sat Oct  5 15:18:55 2002
@@ -39,7 +39,7 @@
 #ifdef HAVE_CONFIG_H
 #include 
 #endif
-
+#include 
 #ifndef SMALL
 #ifndef lint
 static char rcsid[] = "$OpenBSD: complete.c,v 1.12 2001/08/03 22:43:16 millert 
Exp $";
diff -Naur ftp-tls-20020906/configure ftp-tls-mac/configure
--- ftp-tls-20020906/configure  Fri Sep  6 11:44:48 2002
+++ ftp-tls-mac/configure   Sat Oct  5 15:15:22 2002
@@ -5762,9 +5762,8 @@
 _ACEOF
 
 else
-LIBS="-ledit -L./libedit $LIBS"
-CPPFLAGS="$CPPFLAGS -I./libedit"
-LIBEDITTARGET=libedit-all
+LIBS="-ledit $LIBS"
+CPPFLAGS="$CPPFLAGS"
 MANEDITRC=editrc.5
 fi
 
diff -Naur ftp-tls-20020906/main.c ftp-tls-mac/main.c
--- ftp-tls-20020906/main.c Thu Jul 25 16:49:16 2002
+++ ftp-tls-mac/main.c  Sat Oct  5 15:17:59 2002
@@ -519,7 +519,7 @@
} else {
const char *buf;
cursor_pos = NULL;
-
+   HistEvent hev;
if ((buf = el_gets(el, &num)) == NULL || num == 0)
quit(0, 0);
if (buf[--num] == '\n') {
@@ -532,7 +532,7 @@
}
memcpy(line, buf, (size_t)num);
line[num] = '\0';
-   history(hist, H_ENTER, buf);
+   history(hist, &hev, H_ENTER, buf);
}
 #endif /* !SMALL */
 
diff -Naur ftp-tls-20020906/util.c ftp-tls-mac/util.c
--- ftp-tls-20020906/util.c Thu Jul 25 16:49:16 2002
+++ ftp-tls-mac/util.c  Sat Oct  5 15:17:59 2002
@@ -94,7 +94,6 @@
 
 #include "ftp_var.h"
 #include "pathnames.h"
-
 #ifdef TLS
 # ifdef __STDC__
 #  include 
@@ -1013,9 +1012,10 @@
 controlediting()
 {
if (editing && el == NULL && hist == NULL) {
-   el = el_init(progname, stdin, ttyout); /* init editline */
+   HistEvent hev;
+   el = el_init(progname, stdin, ttyout, stderr); /* init editline 
*/
hist = history_init();  /* init the builtin history */
-   history(hist, H_EVENT, 100);/* remember 100 events */
+   history(hist, &hev, H_SETSIZE, 100);/* remember 100 events 
*/
el_set(el, EL_HIST, history, hist); /* use history */
 
el_set(el, EL_EDITOR, "emacs"); /* default editor is emacs */
diff -ur ftp-tls-20020906.old/extern.h ftp-tls-20020906/extern.h
--- ftp-tls-20020906.old/extern.h   2002-05-21 23:43:08.0 -0700
+++ ftp-tls-20020906/extern.h   2005-06-13 11:27:04.0 -0700
@@ -65,7 +65,11 @@
  * @(#)extern.h8.3 (Berkeley) 10/9/94
  */
 
+#ifndef __EXTERN_H
+#define __EXTERN_H
+
 #include 
+#include "ftp_var.h"
 
 voidabort_remote __P((FILE *));
 voidabortpt __P((int));
@@ -219,3 +223,5 @@
 extern charreply_string[];
 extern off_t   restart_point;
 extern int NCMDS;
+
+#endif
diff -ur ftp-tls-20020906.old/ftp_var.h ftp-tls-20020906/ftp_var.h
--- ftp-tls-20020906.old/ftp_var.h  2002-07-25 09:49:16.0 -0700
+++ ftp-tls-20020906/ftp_var.h  2005-06-13 11:29:21.0 -0700
@@ -65,6 +65,9 @@
  * @(#)ftp_var.h   8.4 (Berkeley) 10/9/94
  */
 
+#ifndef __FTP_VAR_H
+#define __FTP_VAR_H
+
 /*
  * FTP global variables.
  */
@@ -86,6 +89,22 @@
 #endif
 
 #include "s

dists/10.4-transitional/unstable/main/finkinfo/net epic4.info,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/net
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10105/10.4-transitional/unstable/main/finkinfo/net

Modified Files:
epic4.info 
Log Message:
Checking in --build-as-nobody fix from maintainer

Index: epic4.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/net/epic4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- epic4.info  27 Apr 2005 03:26:11 -  1.1
+++ epic4.info  14 Jun 2005 01:37:30 -  1.2
@@ -1,12 +1,10 @@
 Package: epic4 
 Version: 1.2.1
-Revision: 10
+Revision: 11
 Source: ftp://ftp.prbh.org/pub/epic/EPIC4-BETA/%n-%v.tar.gz
 Source-MD5: 9ead7e851c1ca446561298df23d7c5c6
 BuildDepends: libncurses5
 DocFiles: BUG_FORM COPYRIGHT INSTALL KNOWNBUGS README UPDATES VOTES 
doc/DCC_REVERSE doc/EPIC_ABOUT doc/EPIC_THANKS doc/EPIC_VERSIONS doc/IPV6 
doc/IRCII_VERSIONS doc/README.SSL doc/SILLINESS doc/TS4 doc/color.txt 
doc/colors doc/dccresum.txt doc/local_vars doc/missing doc/new-load 
doc/nicknames doc/outputhelp
-# Fix incorrect ownership in source tree
-PatchScript: chown -R root:admin .
 # This -idirafter flag is to work around a conflict between the local term.h 
and the ncurses term.h
 SetCFLAGS: -no-cpp-precomp -idirafter %p/include
 #SetCC: gcc3



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/net epic4.info,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10105/10.3/unstable/main/finkinfo/net

Modified Files:
epic4.info 
Log Message:
Checking in --build-as-nobody fix from maintainer

Index: epic4.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/epic4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- epic4.info  16 Jan 2005 02:54:59 -  1.2
+++ epic4.info  14 Jun 2005 01:37:29 -  1.3
@@ -1,12 +1,10 @@
 Package: epic4 
 Version: 1.2.1
-Revision: 10
+Revision: 11
 Source: ftp://ftp.prbh.org/pub/epic/EPIC4-BETA/%n-%v.tar.gz
 Source-MD5: 9ead7e851c1ca446561298df23d7c5c6
 BuildDepends: libncurses5
 DocFiles: BUG_FORM COPYRIGHT INSTALL KNOWNBUGS README UPDATES VOTES 
doc/DCC_REVERSE doc/EPIC_ABOUT doc/EPIC_THANKS doc/EPIC_VERSIONS doc/IPV6 
doc/IRCII_VERSIONS doc/README.SSL doc/SILLINESS doc/TS4 doc/color.txt 
doc/colors doc/dccresum.txt doc/local_vars doc/missing doc/new-load 
doc/nicknames doc/outputhelp
-# Fix incorrect ownership in source tree
-PatchScript: chown -R root:admin .
 # This -idirafter flag is to work around a conflict between the local term.h 
and the ncurses term.h
 SetCFLAGS: -no-cpp-precomp -idirafter %p/include
 #SetCC: gcc3



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/net tf-40s1-22.info,NONE,1.1 tf-40s1-22.patch,NONE,1.1 tf-40s1-21.info,1.1,NONE tf-40s1-21.patch,1.1,NONE

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/net
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13391/10.4-transitional/unstable/main/finkinfo/net

Added Files:
tf-40s1-22.info tf-40s1-22.patch 
Removed Files:
tf-40s1-21.info tf-40s1-21.patch 
Log Message:
Checking in --build-as-nobody and Xcode 2.1 fixes per maintainer request

--- tf-40s1-21.info DELETED ---

--- NEW FILE: tf-40s1-22.patch ---
diff -Naur tf-40s1old/unix/Config tf-40s1/unix/Config
--- tf-40s1old/unix/Config  Sat Mar  6 14:43:28 1999
+++ tf-40s1/unix/Config Fri Apr 19 00:19:26 2002
@@ -33,9 +33,9 @@
 #   even if an old version is currently in use.  You can remove
 #   the old version manually later when it is no longer in use.
 
-# TF="/usr/local/bin/tf-${TFVER}"
-# LIBDIR="/usr/local/lib/tf-${TFVER}-lib"
-# SYMLINK="/usr/local/bin/tf"
+TF="${FINK_BUILD}/bin/tf-${TFVER}"
+LIBDIR="${FINK_BUILD}/lib/tf-${TFVER}-lib"
+#SYMLINK="${FINK_BUILD}/bin/tf"
 
 
 ### Manual Page.
@@ -44,8 +44,8 @@
 # uses nroff format; set MANTYPE=cat if your man uses pre-formatted
 # vt100 "catman" pages.  Default is "cat".
 
-# MANTYPE="nroff"
-# MANPAGE="/usr/local/man/man1/tf.1"
+MANTYPE="nroff"
+MANPAGE="${FINK_BUILD}/share/man/man1/tf.1"
 
 
 ### Flags.
@@ -109,8 +109,8 @@
 # If unixmake told you to set CC=cc, be sure to uncomment the line below
 # by removing the leading "#".
 
-# CC=cc
-# CCFLAGS="-g"
+CC=cc
+CCFLAGS="-g -no-cpp-precomp"
 
 
 ### Stripping.
diff -Naur tf-40s1old/unix/tfconfig tf-40s1/unix/tfconfig
--- tf-40s1old/unix/tfconfigSat Mar  6 14:43:28 1999
+++ tf-40s1/unix/tfconfig   Fri Apr 19 01:18:01 2002
@@ -45,7 +45,7 @@
 TF="${TFDEV_TF}"
 FLAGS=''
 GNU_C=0
-LIBDIR="${TFDEV_LIBDIR}"
+LIBDIR="${FINK_LIBDIR}"
 LIBS=''
 MAILDIR=''
 # MAKE=''  ;# Use the value from the environment if there is one.
@@ -224,6 +224,7 @@
 
 echo 'To change these locations type "n" now and edit the unix/Config file.'
 while [ -z "$ans" ]; do
+break
 echo 'Continue? (y/n)'
 read ans;
 case "$ans" in
@@ -238,7 +239,7 @@
 
 rm -f ../src/Makefile ${AOUT}
 
-echo "#define LIBDIR \"${LIBDIR}\"" >&4
+echo "#define LIBDIR \"${FINK_LIBDIR}\"" >&4
 if [ -n "$MAILDIR" ]; then
 echo "#define MAILDIR\"${MAILDIR}\"" >&4
 else
diff -ur tf-40s1.bak/src/history.c tf-40s1/src/history.c
--- tf-40s1.bak/src/history.c   1999-03-06 14:43:24.0 -0800
+++ tf-40s1/src/history.c   2005-06-13 16:28:37.0 -0700
@@ -38,18 +38,6 @@
 #define LOCALSIZE  100 /* local history size */
 #define INPUTSIZE  100 /* command history buffer size */
 
-typedef struct History {   /* circular list of Alines, and logfile */
-struct Aline **alines;
-int size;  /* actual number of lines currently saved */
-int maxsize;   /* maximum number of lines that can be saved */
-int first; /* position of first line in circular array */
-int last;  /* position of last line in circular array */
-int index; /* current recall position */
-int total; /* total number of lines ever saved */
-TFILE *logfile;
-CONST char *logname;
-} History;
-
 #define empty(hist) (!(hist)->alines || !(hist)->size)
 
 static void FDECL(alloc_history,(History *hist, int maxsize));
diff -ur tf-40s1.bak/src/history.h tf-40s1/src/history.h
--- tf-40s1.bak/src/history.h   1999-03-06 14:43:24.0 -0800
+++ tf-40s1/src/history.h   2005-06-13 16:28:47.0 -0700
@@ -12,6 +12,18 @@
 
 # ifndef NO_HISTORY
 
+typedef struct History {   /* circular list of Alines, and logfile */
+struct Aline **alines;
+int size;  /* actual number of lines currently saved */
+int maxsize;   /* maximum number of lines that can be saved */
+int first; /* position of first line in circular array */
+int last;  /* position of last line in circular array */
+int index; /* current recall position */
+int total; /* total number of lines ever saved */
+TFILE *logfile;
+CONST char *logname;
+} History;
+
 extern void   NDECL(init_histories);
 extern struct History *FDECL(init_history,(struct History *hist, int maxsize));
 extern void   FDECL(free_history,(struct History *hist));

--- tf-40s1-21.patch DELETED ---

--- NEW FILE: tf-40s1-22.info ---
Package: tf 
Version: 40s1
Revision: 22
Source: http://ftp.tcp.com/pub/mud/Clients/tinyfugue/tf-%v.tar.gz
Source-MD5: db6fa9a1aac0b7f199567d81c4b5c81d
GCC: 3.3
CompileScript: true
InstallScript: <<
mkdir %i/bin
mkdir %i/lib
mkdir -p %i/share/man/man1
(export FINK_BUILD=%i FINK_LIBDIR=%P/lib/%n-%v-lib ; ./unixmake)
ln -s %n-%v %i/bin/%n
<<
#PostRmScript: rm %p/bin/%n
#PostInstScript: ln -s %p/bin/%n-%v %p/bin/%n
DocFiles: README CHANGES COPYING CREDITS
Patch: %f.patch
#
Description: TinyFugue, a popular MUSH and MUD client
DescDetail: <<
Tin

dists/10.3/unstable/main/finkinfo/net tf-40s1-22.info,NONE,1.1 tf-40s1-22.patch,NONE,1.1 tf-40s1-21.info,1.1,NONE tf-40s1-21.patch,1.1,NONE

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13391/10.3/unstable/main/finkinfo/net

Added Files:
tf-40s1-22.info tf-40s1-22.patch 
Removed Files:
tf-40s1-21.info tf-40s1-21.patch 
Log Message:
Checking in --build-as-nobody and Xcode 2.1 fixes per maintainer request

--- tf-40s1-21.info DELETED ---

--- NEW FILE: tf-40s1-22.patch ---
diff -Naur tf-40s1old/unix/Config tf-40s1/unix/Config
--- tf-40s1old/unix/Config  Sat Mar  6 14:43:28 1999
+++ tf-40s1/unix/Config Fri Apr 19 00:19:26 2002
@@ -33,9 +33,9 @@
 #   even if an old version is currently in use.  You can remove
 #   the old version manually later when it is no longer in use.
 
-# TF="/usr/local/bin/tf-${TFVER}"
-# LIBDIR="/usr/local/lib/tf-${TFVER}-lib"
-# SYMLINK="/usr/local/bin/tf"
+TF="${FINK_BUILD}/bin/tf-${TFVER}"
+LIBDIR="${FINK_BUILD}/lib/tf-${TFVER}-lib"
+#SYMLINK="${FINK_BUILD}/bin/tf"
 
 
 ### Manual Page.
@@ -44,8 +44,8 @@
 # uses nroff format; set MANTYPE=cat if your man uses pre-formatted
 # vt100 "catman" pages.  Default is "cat".
 
-# MANTYPE="nroff"
-# MANPAGE="/usr/local/man/man1/tf.1"
+MANTYPE="nroff"
+MANPAGE="${FINK_BUILD}/share/man/man1/tf.1"
 
 
 ### Flags.
@@ -109,8 +109,8 @@
 # If unixmake told you to set CC=cc, be sure to uncomment the line below
 # by removing the leading "#".
 
-# CC=cc
-# CCFLAGS="-g"
+CC=cc
+CCFLAGS="-g -no-cpp-precomp"
 
 
 ### Stripping.
diff -Naur tf-40s1old/unix/tfconfig tf-40s1/unix/tfconfig
--- tf-40s1old/unix/tfconfigSat Mar  6 14:43:28 1999
+++ tf-40s1/unix/tfconfig   Fri Apr 19 01:18:01 2002
@@ -45,7 +45,7 @@
 TF="${TFDEV_TF}"
 FLAGS=''
 GNU_C=0
-LIBDIR="${TFDEV_LIBDIR}"
+LIBDIR="${FINK_LIBDIR}"
 LIBS=''
 MAILDIR=''
 # MAKE=''  ;# Use the value from the environment if there is one.
@@ -224,6 +224,7 @@
 
 echo 'To change these locations type "n" now and edit the unix/Config file.'
 while [ -z "$ans" ]; do
+break
 echo 'Continue? (y/n)'
 read ans;
 case "$ans" in
@@ -238,7 +239,7 @@
 
 rm -f ../src/Makefile ${AOUT}
 
-echo "#define LIBDIR \"${LIBDIR}\"" >&4
+echo "#define LIBDIR \"${FINK_LIBDIR}\"" >&4
 if [ -n "$MAILDIR" ]; then
 echo "#define MAILDIR\"${MAILDIR}\"" >&4
 else
diff -ur tf-40s1.bak/src/history.c tf-40s1/src/history.c
--- tf-40s1.bak/src/history.c   1999-03-06 14:43:24.0 -0800
+++ tf-40s1/src/history.c   2005-06-13 16:28:37.0 -0700
@@ -38,18 +38,6 @@
 #define LOCALSIZE  100 /* local history size */
 #define INPUTSIZE  100 /* command history buffer size */
 
-typedef struct History {   /* circular list of Alines, and logfile */
-struct Aline **alines;
-int size;  /* actual number of lines currently saved */
-int maxsize;   /* maximum number of lines that can be saved */
-int first; /* position of first line in circular array */
-int last;  /* position of last line in circular array */
-int index; /* current recall position */
-int total; /* total number of lines ever saved */
-TFILE *logfile;
-CONST char *logname;
-} History;
-
 #define empty(hist) (!(hist)->alines || !(hist)->size)
 
 static void FDECL(alloc_history,(History *hist, int maxsize));
diff -ur tf-40s1.bak/src/history.h tf-40s1/src/history.h
--- tf-40s1.bak/src/history.h   1999-03-06 14:43:24.0 -0800
+++ tf-40s1/src/history.h   2005-06-13 16:28:47.0 -0700
@@ -12,6 +12,18 @@
 
 # ifndef NO_HISTORY
 
+typedef struct History {   /* circular list of Alines, and logfile */
+struct Aline **alines;
+int size;  /* actual number of lines currently saved */
+int maxsize;   /* maximum number of lines that can be saved */
+int first; /* position of first line in circular array */
+int last;  /* position of last line in circular array */
+int index; /* current recall position */
+int total; /* total number of lines ever saved */
+TFILE *logfile;
+CONST char *logname;
+} History;
+
 extern void   NDECL(init_histories);
 extern struct History *FDECL(init_history,(struct History *hist, int maxsize));
 extern void   FDECL(free_history,(struct History *hist));

--- tf-40s1-21.patch DELETED ---

--- NEW FILE: tf-40s1-22.info ---
Package: tf 
Version: 40s1
Revision: 22
Source: http://ftp.tcp.com/pub/mud/Clients/tinyfugue/tf-%v.tar.gz
Source-MD5: db6fa9a1aac0b7f199567d81c4b5c81d
GCC: 3.3
CompileScript: true
InstallScript: <<
mkdir %i/bin
mkdir %i/lib
mkdir -p %i/share/man/man1
(export FINK_BUILD=%i FINK_LIBDIR=%P/lib/%n-%v-lib ; ./unixmake)
ln -s %n-%v %i/bin/%n
<<
#PostRmScript: rm %p/bin/%n
#PostInstScript: ln -s %p/bin/%n-%v %p/bin/%n
DocFiles: README CHANGES COPYING CREDITS
Patch: %f.patch
#
Description: TinyFugue, a popular MUSH and MUD client
DescDetail: <<
TinyFugue, aka "tf", is a fle

dists/10.3/unstable/main/finkinfo/utils sudo.info,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29868/10.3/unstable/main/finkinfo/utils

Modified Files:
sudo.info 
Log Message:
build-as-nobody fix

Index: sudo.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/sudo.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sudo.info   21 Sep 2004 09:01:26 -  1.2
+++ sudo.info   14 Jun 2005 02:21:47 -  1.3
@@ -1,6 +1,6 @@
 Package: sudo
 Version: 1.6.8p1
-Revision: 11
+Revision: 12
 ###
 Source: ftp://ftp.sudo.ws/pub/sudo/sudo-%v.tar.gz
 Source-MD5: 7fa9649f327d2e92eb1a73da537759d5 
@@ -20,6 +20,7 @@
 ./configure %c
 make
 <<
+InstallScript: make install DESTDIR=%d
 ###
 Description: Grant certain users/groups superuser rights
 DescDetail: <<



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
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 sudo.info,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29868/10.4-transitional/unstable/main/finkinfo/utils

Modified Files:
sudo.info 
Log Message:
build-as-nobody fix

Index: sudo.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/sudo.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sudo.info   27 Apr 2005 03:26:49 -  1.1
+++ sudo.info   14 Jun 2005 02:21:47 -  1.2
@@ -1,6 +1,6 @@
 Package: sudo
 Version: 1.6.8p1
-Revision: 11
+Revision: 12
 ###
 Source: ftp://ftp.sudo.ws/pub/sudo/sudo-%v.tar.gz
 Source-MD5: 7fa9649f327d2e92eb1a73da537759d5 
@@ -20,6 +20,7 @@
 ./configure %c
 make
 <<
+InstallScript: make install DESTDIR=%d
 ###
 Description: Grant certain users/groups superuser rights
 DescDetail: <<



---
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/gnome libgtop.info,1.3,1.4 libgtop.patch,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11106/10.3/unstable/main/finkinfo/gnome

Added Files:
libgtop.info libgtop.patch 
Log Message:
Xcode 2.1 fixes

--- NEW FILE: libgtop.patch ---
diff -Naur libgtop-1.0.13.old/configure libgtop-1.0.13.new/configure
--- libgtop-1.0.13.old/configureTue Nov 27 07:50:58 2001
+++ libgtop-1.0.13.new/configureSun Aug 25 22:50:23 2002
@@ -5711,11 +5711,11 @@
 ;;
 
   darwin* | rhapsody*)
-allow_undefined_flag='-undefined suppress'
+allow_undefined_flag='-undefined dynamic_lookup'
 # FIXME: Relying on posixy $() will cause problems for
 #cross-compilation, but unfortunately the echo tests do not
 #yet detect zsh echo's removal of \ escapes.
-archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo 
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts 
-install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && 
echo $verstring)'
+archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo 
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts 
-install_name $rpath/$soname $tmp_verstring'
 # We need to add '_' to the symbols in $export_symbols first
 #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
 hardcode_direct=yes
@@ -10002,6 +10002,12 @@
  libgtop_use_machine_h=yes
[...2512 lines suppressed...]
 #defineDATA_SEGMENT_START  (GLOBAL_SHARED_DATA_SEGMENT)
 #define DATA_SEGMENT_END   (GLOBAL_SHARED_DATA_SEGMENT + 
SHARED_DATA_REGION_SIZE)
 
-typedef struct shared_info shared_table[SHARED_TABLE_SIZE];
-typedef struct shared_info shared_info;
 struct shared_info {
unsigned obj_id;
unsigned share_mode;
@@ -41,8 +39,10 @@
unsigned ref_count;
unsigned task_ref_count;
vm_size_t size;
-   shared_info *next;
+   struct shared_info *next;
 };
+typedef struct shared_info shared_table[SHARED_TABLE_SIZE];
+typedef struct shared_info shared_info;
 
 static void
 shared_table_init (shared_table table)

--- NEW FILE: libgtop.info ---
Package: libgtop
Version: 1.0.13
Revision: 23
BuildDepends: libiconv-dev, gettext-dev, libjpeg, libtiff, netpbm, audiofile, 
esound, glib, gtk+ (>= 1.2.10-20), giflib, imlib (>= 1.9.14-14), gnome-libs-dev 
(>= 1.4.2-19), guile-dev, orbit-dev (>= 0.5.17-15), readline (>= 4.3-5)
Depends: %N-shlibs (= %v-%r)
Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2
Source-MD5: a21dc87055a7010de7d2b6aa4eef9ba0
Patch: %n.patch
UpdatePoMakefile: true
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -fstrict-aliasing -funroll-loops
SetLIBS: -L%p/lib
ConfigureParams: --enable-hacker-mode --infodir=%p/share/info --disable-static 
--with-libgtop-smp=yes
InstallScript: make install DESTDIR=%d
SplitOff: <<
  Package: %N-shlibs
  Depends: gnome-libs (>= 1.4.2-19), orbit (>= 0.5.17-15), readline-shlibs, 
guile
  Replaces: %N (<= 1.0.13-4)
  Files: lib/libgtop*.*.dylib
  Shlibs: <<
%p/lib/libgtop.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_common.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_guile.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_guile_names.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_names.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_suid_common.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_sysdeps.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_sysdeps_suid.1.dylib 2.0.0 %n (>= 1.0.13-10)
  <<
  DocFiles: AUTHORS COPYING ChangeLog NEWS README RELNOTES*
<<
SplitOff2: <<
  Package: %N-dev
  BuildDependsOnly: True
  Depends: %N-shlibs (= %v-%r)
  Replaces: %N (<= 1.0.13-4)
  Files: include lib/libgtop*.dylib lib/*.la
  DocFiles: AUTHORS COPYING ChangeLog NEWS README RELNOTES*
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README RELNOTES*
#InfoDocs: libgtop.info
Description: System monitoring library
DescDetail: <<
libgtop provides applications with comprehensive real-time statistics
of the system they run on, e.g. load average, system uptime, running
processes and free disk space.
<<
DescPackaging: <<
Revision 5 is meant to be the successor to revision 2 currently in stable.
Revision 6 is the successor to revision 4 currently in unstable.

The Info documentation file doesn't have a directory entry, so
InfoDocs is not used for now.

Originally packaged by Masanori Sekino.
<<
DescPort: <<
Ported some sysdeps functions to Darwin.
<<
License: GPL
Maintainer: None 
Homepage: http://www.gnome.org/softwaremap/projects/libgtop/



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commit

dists/10.4-transitional/unstable/main/finkinfo/gnome libgtop.info,NONE,1.1 libgtop.patch,NONE,1.1

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11106/10.4-transitional/unstable/main/finkinfo/gnome

Added Files:
libgtop.info libgtop.patch 
Log Message:
Xcode 2.1 fixes

--- NEW FILE: libgtop.patch ---
diff -Naur libgtop-1.0.13.old/configure libgtop-1.0.13.new/configure
--- libgtop-1.0.13.old/configureTue Nov 27 07:50:58 2001
+++ libgtop-1.0.13.new/configureSun Aug 25 22:50:23 2002
@@ -5711,11 +5711,11 @@
 ;;
 
   darwin* | rhapsody*)
-allow_undefined_flag='-undefined suppress'
+allow_undefined_flag='-undefined dynamic_lookup'
 # FIXME: Relying on posixy $() will cause problems for
 #cross-compilation, but unfortunately the echo tests do not
 #yet detect zsh echo's removal of \ escapes.
-archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo 
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts 
-install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && 
echo $verstring)'
+archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo 
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts 
-install_name $rpath/$soname $tmp_verstring'
 # We need to add '_' to the symbols in $export_symbols first
 #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
 hardcode_direct=yes
@@ -10002,6 +10002,12 @@
  libgtop_use_machine_h=yes
[...2512 lines suppressed...]
 #defineDATA_SEGMENT_START  (GLOBAL_SHARED_DATA_SEGMENT)
 #define DATA_SEGMENT_END   (GLOBAL_SHARED_DATA_SEGMENT + 
SHARED_DATA_REGION_SIZE)
 
-typedef struct shared_info shared_table[SHARED_TABLE_SIZE];
-typedef struct shared_info shared_info;
 struct shared_info {
unsigned obj_id;
unsigned share_mode;
@@ -41,8 +39,10 @@
unsigned ref_count;
unsigned task_ref_count;
vm_size_t size;
-   shared_info *next;
+   struct shared_info *next;
 };
+typedef struct shared_info shared_table[SHARED_TABLE_SIZE];
+typedef struct shared_info shared_info;
 
 static void
 shared_table_init (shared_table table)

--- NEW FILE: libgtop.info ---
Package: libgtop
Version: 1.0.13
Revision: 23
BuildDepends: libiconv-dev, gettext-dev, libjpeg, libtiff, netpbm, audiofile, 
esound, glib, gtk+ (>= 1.2.10-20), giflib, imlib (>= 1.9.14-14), gnome-libs-dev 
(>= 1.4.2-19), guile-dev, orbit-dev (>= 0.5.17-15), readline (>= 4.3-5)
Depends: %N-shlibs (= %v-%r)
Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2
Source-MD5: a21dc87055a7010de7d2b6aa4eef9ba0
Patch: %n.patch
UpdatePoMakefile: true
NoSetLDFLAGS: true
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -fstrict-aliasing -funroll-loops
SetLIBS: -L%p/lib
ConfigureParams: --enable-hacker-mode --infodir=%p/share/info --disable-static 
--with-libgtop-smp=yes
InstallScript: make install DESTDIR=%d
SplitOff: <<
  Package: %N-shlibs
  Depends: gnome-libs (>= 1.4.2-19), orbit (>= 0.5.17-15), readline-shlibs, 
guile
  Replaces: %N (<= 1.0.13-4)
  Files: lib/libgtop*.*.dylib
  Shlibs: <<
%p/lib/libgtop.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_common.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_guile.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_guile_names.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_names.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_suid_common.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_sysdeps.1.dylib 2.0.0 %n (>= 1.0.13-10)
%p/lib/libgtop_sysdeps_suid.1.dylib 2.0.0 %n (>= 1.0.13-10)
  <<
  DocFiles: AUTHORS COPYING ChangeLog NEWS README RELNOTES*
<<
SplitOff2: <<
  Package: %N-dev
  BuildDependsOnly: True
  Depends: %N-shlibs (= %v-%r)
  Replaces: %N (<= 1.0.13-4)
  Files: include lib/libgtop*.dylib lib/*.la
  DocFiles: AUTHORS COPYING ChangeLog NEWS README RELNOTES*
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README RELNOTES*
#InfoDocs: libgtop.info
Description: System monitoring library
DescDetail: <<
libgtop provides applications with comprehensive real-time statistics
of the system they run on, e.g. load average, system uptime, running
processes and free disk space.
<<
DescPackaging: <<
Revision 5 is meant to be the successor to revision 2 currently in stable.
Revision 6 is the successor to revision 4 currently in unstable.

The Info documentation file doesn't have a directory entry, so
InfoDocs is not used for now.

Originally packaged by Masanori Sekino.
<<
DescPort: <<
Ported some sysdeps functions to Darwin.
<<
License: GPL
Maintainer: None 
Homepage: http://www.gnome.org/softwaremap/projects/libgtop/



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_

dists/10.3/stable/main/finkinfo/gnome libgtop.info,1.5,1.6 libgtop.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11106/10.3/stable/main/finkinfo/gnome

Modified Files:
libgtop.info libgtop.patch 
Log Message:
Xcode 2.1 fixes

Index: libgtop.patch
===
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/gnome/libgtop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgtop.patch   12 Dec 2003 20:12:20 -  1.1
+++ libgtop.patch   14 Jun 2005 20:02:27 -  1.2
@@ -2525,3 +2525,27 @@
 +  buf->uptime = now - boottime.tv_sec + 30;
 +  buf->flags = _glibtop_sysdeps_uptime;
 +}
+diff -ur libgtop-1.0.13.bak/sysdeps/darwin/procmem.c 
libgtop-1.0.13/sysdeps/darwin/procmem.c
+--- libgtop-1.0.13.bak/sysdeps/darwin/procmem.c2005-06-08 
15:15:26.0 -0700
 libgtop-1.0.13/sysdeps/darwin/procmem.c2005-06-13 12:29:28.0 
-0700
+@@ -32,8 +32,6 @@
+ #define   DATA_SEGMENT_START  (GLOBAL_SHARED_DATA_SEGMENT)
+ #define DATA_SEGMENT_END  (GLOBAL_SHARED_DATA_SEGMENT + 
SHARED_DATA_REGION_SIZE)
+ 
+-typedef struct shared_info shared_table[SHARED_TABLE_SIZE];
+-typedef struct shared_info shared_info;
+ struct shared_info {
+   unsigned obj_id;
+   unsigned share_mode;
+@@ -41,8 +39,10 @@
+   unsigned ref_count;
+   unsigned task_ref_count;
+   vm_size_t size;
+-  shared_info *next;
++  struct shared_info *next;
+ };
++typedef struct shared_info shared_table[SHARED_TABLE_SIZE];
++typedef struct shared_info shared_info;
+ 
+ static void
+ shared_table_init (shared_table table)

Index: libgtop.info
===
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/gnome/libgtop.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libgtop.info11 Dec 2004 15:03:31 -  1.5
+++ libgtop.info14 Jun 2005 20:02:27 -  1.6
@@ -1,6 +1,6 @@
 Package: libgtop
 Version: 1.0.13
-Revision: 22
+Revision: 23
 BuildDepends: libiconv-dev, gettext-dev, libjpeg, libtiff, netpbm, audiofile, 
esound, glib, gtk+ (>= 1.2.10-20), giflib, imlib (>= 1.9.14-14), gnome-libs-dev 
(>= 1.4.2-19), guile-dev, orbit-dev (>= 0.5.17-15), readline (>= 4.3-5)
 Depends: %N-shlibs (= %v-%r)
 Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/stable/main/finkinfo/gnome libgtop.info,1.1,1.2 libgtop.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11106/10.4-transitional/stable/main/finkinfo/gnome

Modified Files:
libgtop.info libgtop.patch 
Log Message:
Xcode 2.1 fixes

Index: libgtop.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/libgtop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgtop.patch   27 Apr 2005 03:38:48 -  1.1
+++ libgtop.patch   14 Jun 2005 20:02:45 -  1.2
@@ -2525,3 +2525,27 @@
 +  buf->uptime = now - boottime.tv_sec + 30;
 +  buf->flags = _glibtop_sysdeps_uptime;
 +}
+diff -ur libgtop-1.0.13.bak/sysdeps/darwin/procmem.c 
libgtop-1.0.13/sysdeps/darwin/procmem.c
+--- libgtop-1.0.13.bak/sysdeps/darwin/procmem.c2005-06-08 
15:15:26.0 -0700
 libgtop-1.0.13/sysdeps/darwin/procmem.c2005-06-13 12:29:28.0 
-0700
+@@ -32,8 +32,6 @@
+ #define   DATA_SEGMENT_START  (GLOBAL_SHARED_DATA_SEGMENT)
+ #define DATA_SEGMENT_END  (GLOBAL_SHARED_DATA_SEGMENT + 
SHARED_DATA_REGION_SIZE)
+ 
+-typedef struct shared_info shared_table[SHARED_TABLE_SIZE];
+-typedef struct shared_info shared_info;
+ struct shared_info {
+   unsigned obj_id;
+   unsigned share_mode;
+@@ -41,8 +39,10 @@
+   unsigned ref_count;
+   unsigned task_ref_count;
+   vm_size_t size;
+-  shared_info *next;
++  struct shared_info *next;
+ };
++typedef struct shared_info shared_table[SHARED_TABLE_SIZE];
++typedef struct shared_info shared_info;
+ 
+ static void
+ shared_table_init (shared_table table)

Index: libgtop.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/libgtop.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgtop.info27 Apr 2005 03:38:48 -  1.1
+++ libgtop.info14 Jun 2005 20:02:29 -  1.2
@@ -1,6 +1,6 @@
 Package: libgtop
 Version: 1.0.13
-Revision: 22
+Revision: 23
 BuildDepends: libiconv-dev, gettext-dev, libjpeg, libtiff, netpbm, audiofile, 
esound, glib, gtk+ (>= 1.2.10-20), giflib, imlib (>= 1.9.14-14), gnome-libs-dev 
(>= 1.4.2-19), guile-dev, orbit-dev (>= 0.5.17-15), readline (>= 4.3-5)
 Depends: %N-shlibs (= %v-%r)
 Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/stable/crypto/finkinfo mozilla.info,1.6,1.7 mozilla.patch,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/stable/crypto/finkinfo
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8430/10.3/stable/crypto/finkinfo

Modified Files:
mozilla.info mozilla.patch 
Log Message:
Xcode 2.1 fixes

Index: mozilla.patch
===
RCS file: /cvsroot/fink/dists/10.3/stable/crypto/finkinfo/mozilla.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mozilla.patch   11 Jan 2005 14:58:45 -  1.2
+++ mozilla.patch   16 Jun 2005 17:20:48 -  1.3
@@ -559,3 +559,14 @@
 -  echo skin,install,select,classic/1.0 >> 
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
 +# fix lator
 +# echo skin,install,select,classic/1.0 >> 
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
+diff -ur mozilla.bak/dist/private/nss/oiddata.h 
mozilla/dist/private/nss/oiddata.h
+--- mozilla.bak/security/nss/lib/pki1/oiddata.h2002-01-03 
21:22:07.0 -0800
 mozilla/security/nss/lib/pki1/oiddata.h2005-06-13 15:47:27.0 
-0700
+@@ -39,6 +39,7 @@
+ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ 
; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
+ #endif /* DEBUG */
+ 
++#include "pki1t.h"
+ #ifndef NSSPKI1T_H
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */

Index: mozilla.info
===
RCS file: /cvsroot/fink/dists/10.3/stable/crypto/finkinfo/mozilla.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mozilla.info20 Mar 2005 15:47:12 -  1.6
+++ mozilla.info16 Jun 2005 17:20:48 -  1.7
@@ -1,6 +1,6 @@
 Package: mozilla
 Version: 1.7.5
-Revision: 1
+Revision: 2
 GCC: 3.3
 Source: mirror:custom:mozilla/releases/%n%v/source/%n-source-%v.tar.bz2
 Source-MD5: e5994f3e801cd834966367c6a12f8aeb



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/stable/crypto/finkinfo mozilla.info,1.1,1.2 mozilla.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8430/10.4-transitional/stable/crypto/finkinfo

Modified Files:
mozilla.info mozilla.patch 
Log Message:
Xcode 2.1 fixes

Index: mozilla.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo/mozilla.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mozilla.patch   27 Apr 2005 03:29:14 -  1.1
+++ mozilla.patch   16 Jun 2005 17:20:49 -  1.2
@@ -559,3 +559,14 @@
 -  echo skin,install,select,classic/1.0 >> 
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
 +# fix lator
 +# echo skin,install,select,classic/1.0 >> 
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
+diff -ur mozilla.bak/dist/private/nss/oiddata.h 
mozilla/dist/private/nss/oiddata.h
+--- mozilla.bak/security/nss/lib/pki1/oiddata.h2002-01-03 
21:22:07.0 -0800
 mozilla/security/nss/lib/pki1/oiddata.h2005-06-13 15:47:27.0 
-0700
+@@ -39,6 +39,7 @@
+ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ 
; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
+ #endif /* DEBUG */
+ 
++#include "pki1t.h"
+ #ifndef NSSPKI1T_H
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */

Index: mozilla.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo/mozilla.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mozilla.info27 Apr 2005 03:29:14 -  1.1
+++ mozilla.info16 Jun 2005 17:20:49 -  1.2
@@ -1,6 +1,6 @@
 Package: mozilla
 Version: 1.7.5
-Revision: 1
+Revision: 2
 GCC: 3.3
 Source: mirror:custom:mozilla/releases/%n%v/source/%n-source-%v.tar.bz2
 Source-MD5: e5994f3e801cd834966367c6a12f8aeb



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/crypto/finkinfo mozilla.info,1.1,1.2 mozilla.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8430/10.4-transitional/unstable/crypto/finkinfo

Modified Files:
mozilla.info mozilla.patch 
Log Message:
Xcode 2.1 fixes

Index: mozilla.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/mozilla.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mozilla.patch   27 Apr 2005 03:07:10 -  1.1
+++ mozilla.patch   16 Jun 2005 17:20:49 -  1.2
@@ -559,3 +559,14 @@
 -  echo skin,install,select,classic/1.0 >> 
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
 +# fix lator
 +# echo skin,install,select,classic/1.0 >> 
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
+diff -ur mozilla.bak/dist/private/nss/oiddata.h 
mozilla/dist/private/nss/oiddata.h
+--- mozilla.bak/security/nss/lib/pki1/oiddata.h2002-01-03 
21:22:07.0 -0800
 mozilla/security/nss/lib/pki1/oiddata.h2005-06-13 15:47:27.0 
-0700
+@@ -39,6 +39,7 @@
+ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ 
; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
+ #endif /* DEBUG */
+ 
++#include "pki1t.h"
+ #ifndef NSSPKI1T_H
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */

Index: mozilla.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/mozilla.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mozilla.info27 Apr 2005 03:07:10 -  1.1
+++ mozilla.info16 Jun 2005 17:20:49 -  1.2
@@ -1,6 +1,6 @@
 Package: mozilla
 Version: 1.7.5
-Revision: 1
+Revision: 2
 GCC: 3.3
 Source: mirror:custom:mozilla/releases/%n%v/source/%n-source-%v.tar.bz2
 Source-MD5: e5994f3e801cd834966367c6a12f8aeb



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/crypto/finkinfo mozilla.info,1.11,1.12 mozilla.patch,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8430/10.3/unstable/crypto/finkinfo

Modified Files:
mozilla.info mozilla.patch 
Log Message:
Xcode 2.1 fixes

Index: mozilla.patch
===
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/mozilla.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mozilla.patch   7 Sep 2004 15:19:12 -   1.2
+++ mozilla.patch   16 Jun 2005 17:20:49 -  1.3
@@ -559,3 +559,14 @@
 -  echo skin,install,select,classic/1.0 >> 
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
 +# fix lator
 +# echo skin,install,select,classic/1.0 >> 
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
+diff -ur mozilla.bak/dist/private/nss/oiddata.h 
mozilla/dist/private/nss/oiddata.h
+--- mozilla.bak/security/nss/lib/pki1/oiddata.h2002-01-03 
21:22:07.0 -0800
 mozilla/security/nss/lib/pki1/oiddata.h2005-06-13 15:47:27.0 
-0700
+@@ -39,6 +39,7 @@
+ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ 
; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
+ #endif /* DEBUG */
+ 
++#include "pki1t.h"
+ #ifndef NSSPKI1T_H
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */

Index: mozilla.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/mozilla.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mozilla.info12 Mar 2005 17:47:11 -  1.11
+++ mozilla.info16 Jun 2005 17:20:49 -  1.12
@@ -1,6 +1,6 @@
 Package: mozilla
 Version: 1.7.5
-Revision: 1
+Revision: 2
 GCC: 3.3
 Source: mirror:custom:mozilla/releases/%n%v/source/%n-source-%v.tar.bz2
 Source-MD5: e5994f3e801cd834966367c6a12f8aeb



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/stable/main/finkinfo/languages fort77.info,1.1,1.2 fort77.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/languages
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7436/10.3/stable/main/finkinfo/languages

Modified Files:
fort77.info fort77.patch 
Log Message:
Avoid fork bomb

Index: fort77.patch
===
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.patch6 Feb 2004 23:02:19 -   1.1
+++ fort77.patch20 Jun 2005 17:21:40 -  1.2
@@ -1,7 +1,19 @@
-diff -ru fort77-1.18/fort77 fort77-1.18-patched/fort77
 fort77-1.18/fort77 Mon Apr 19 08:19:36 1999
-+++ fort77-1.18-patched/fort77 Fri Oct  3 21:42:38 2003
-@@ -191,7 +191,8 @@
+diff -ur fort77-1.18.old/fort77 fort77-1.18/fort77
+--- fort77-1.18.old/fort77 1999-04-19 05:19:36.0 -0700
 fort77-1.18/fort77 2005-06-20 10:18:58.0 -0700
+@@ -15,6 +15,11 @@
+ $debug = 0;
+ $cc = $ENV{'CC'} || 'cc';
+ 
++# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
++# when invoking the Fortran compiler.  We need to override this to
++# avoid getting stuck in a loop.
++$cc = "cc" if $cc =~ /fort77$/;
++
+ # Loop over all options; pull all options from @ARGV and put all
+ # arguments into @argv.This is needed because, apparently, UNIX
+ # compilers acceppt options anywhere on the command line.
+@@ -191,7 +196,8 @@
  
  push(@fopts,$nnflag);
  push(@copts,'-ffast-math') if $optimize && $fast_math;
@@ -11,7 +23,41 @@
  push(@fopts,@includes,"-I.");
  push(@fopts, @pfiles);
  
-@@ -253,7 +254,7 @@
+@@ -253,7 +259,7 @@
+ 
+   if ($cpp || ($ffile =~ /\.F$/)) {
+ # Backslashes at the end of comment lines confuse cpp...
+-  $pipe =  "| /lib/cpp -traditional " . 
++  $pipe =  '| /usr/bin/cpp | grep -v "#pragma" ' . 
+   join(' ',@cppopts) . " | f2c " .
+   join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
+   print STDERR "$0: Running \"$pipe\"" if $verbose;
+diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77
+--- fort77-1.18.old/tests/fort77   1999-04-19 05:19:36.0 -0700
 fort77-1.18/tests/fort77   2005-06-20 10:18:58.0 -0700
+@@ -15,6 +15,11 @@
+ $debug = 0;
+ $cc = $ENV{'CC'} || 'cc';
+ 
++# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
++# when invoking the Fortran compiler.  We need to override this to
++# avoid getting stuck in a loop.
++$cc = "cc" if $cc =~ /fort77$/;
++
+ # Loop over all options; pull all options from @ARGV and put all
+ # arguments into @argv.This is needed because, apparently, UNIX
+ # compilers acceppt options anywhere on the command line.
+@@ -191,7 +196,8 @@
+ 
+ push(@fopts,$nnflag);
+ push(@copts,'-ffast-math') if $optimize && $fast_math;
+-push(@cppopts,@includes);
++push(@cppopts,@includes,"-I/include");
++push(@lopts,"-L/lib");
+ push(@fopts,@includes,"-I.");
+ push(@fopts, @pfiles);
+ 
+@@ -253,7 +259,7 @@
  
if ($cpp || ($ffile =~ /\.F$/)) {
  # Backslashes at the end of comment lines confuse cpp...

Index: fort77.info
===
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/languages/fort77.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.info 6 Feb 2004 23:02:19 -   1.1
+++ fort77.info 20 Jun 2005 17:21:40 -  1.2
@@ -1,6 +1,6 @@
 Package: fort77
 Version: 1.18
-Revision: 16
+Revision: 17
 Description: Perl script to invoke f2c Fortran translator
 DescDetail: <<
  Can be used to compile Fortran, C and assembler code, 



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/languages fort77.info,1.1,1.2 fort77.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7436/10.3/unstable/main/finkinfo/languages

Modified Files:
fort77.info fort77.patch 
Log Message:
Avoid fork bomb

Index: fort77.patch
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.patch6 Feb 2004 23:01:42 -   1.1
+++ fort77.patch20 Jun 2005 17:21:40 -  1.2
@@ -1,7 +1,19 @@
-diff -ru fort77-1.18/fort77 fort77-1.18-patched/fort77
 fort77-1.18/fort77 Mon Apr 19 08:19:36 1999
-+++ fort77-1.18-patched/fort77 Fri Oct  3 21:42:38 2003
-@@ -191,7 +191,8 @@
+diff -ur fort77-1.18.old/fort77 fort77-1.18/fort77
+--- fort77-1.18.old/fort77 1999-04-19 05:19:36.0 -0700
 fort77-1.18/fort77 2005-06-20 10:18:58.0 -0700
+@@ -15,6 +15,11 @@
+ $debug = 0;
+ $cc = $ENV{'CC'} || 'cc';
+ 
++# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
++# when invoking the Fortran compiler.  We need to override this to
++# avoid getting stuck in a loop.
++$cc = "cc" if $cc =~ /fort77$/;
++
+ # Loop over all options; pull all options from @ARGV and put all
+ # arguments into @argv.This is needed because, apparently, UNIX
+ # compilers acceppt options anywhere on the command line.
+@@ -191,7 +196,8 @@
  
  push(@fopts,$nnflag);
  push(@copts,'-ffast-math') if $optimize && $fast_math;
@@ -11,7 +23,41 @@
  push(@fopts,@includes,"-I.");
  push(@fopts, @pfiles);
  
-@@ -253,7 +254,7 @@
+@@ -253,7 +259,7 @@
+ 
+   if ($cpp || ($ffile =~ /\.F$/)) {
+ # Backslashes at the end of comment lines confuse cpp...
+-  $pipe =  "| /lib/cpp -traditional " . 
++  $pipe =  '| /usr/bin/cpp | grep -v "#pragma" ' . 
+   join(' ',@cppopts) . " | f2c " .
+   join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
+   print STDERR "$0: Running \"$pipe\"" if $verbose;
+diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77
+--- fort77-1.18.old/tests/fort77   1999-04-19 05:19:36.0 -0700
 fort77-1.18/tests/fort77   2005-06-20 10:18:58.0 -0700
+@@ -15,6 +15,11 @@
+ $debug = 0;
+ $cc = $ENV{'CC'} || 'cc';
+ 
++# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
++# when invoking the Fortran compiler.  We need to override this to
++# avoid getting stuck in a loop.
++$cc = "cc" if $cc =~ /fort77$/;
++
+ # Loop over all options; pull all options from @ARGV and put all
+ # arguments into @argv.This is needed because, apparently, UNIX
+ # compilers acceppt options anywhere on the command line.
+@@ -191,7 +196,8 @@
+ 
+ push(@fopts,$nnflag);
+ push(@copts,'-ffast-math') if $optimize && $fast_math;
+-push(@cppopts,@includes);
++push(@cppopts,@includes,"-I/include");
++push(@lopts,"-L/lib");
+ push(@fopts,@includes,"-I.");
+ push(@fopts, @pfiles);
+ 
+@@ -253,7 +259,7 @@
  
if ($cpp || ($ffile =~ /\.F$/)) {
  # Backslashes at the end of comment lines confuse cpp...

Index: fort77.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/fort77.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.info 6 Feb 2004 23:01:42 -   1.1
+++ fort77.info 20 Jun 2005 17:21:40 -  1.2
@@ -1,6 +1,6 @@
 Package: fort77
 Version: 1.18
-Revision: 16
+Revision: 17
 Description: Perl script to invoke f2c Fortran translator
 DescDetail: <<
  Can be used to compile Fortran, C and assembler code, 



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/stable/main/finkinfo/languages fort77.info,1.1,1.2 fort77.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7436/10.4-transitional/stable/main/finkinfo/languages

Modified Files:
fort77.info fort77.patch 
Log Message:
Avoid fork bomb

Index: fort77.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.patch27 Apr 2005 03:40:33 -  1.1
+++ fort77.patch20 Jun 2005 17:21:41 -  1.2
@@ -1,7 +1,19 @@
-diff -ru fort77-1.18/fort77 fort77-1.18-patched/fort77
 fort77-1.18/fort77 Mon Apr 19 08:19:36 1999
-+++ fort77-1.18-patched/fort77 Fri Oct  3 21:42:38 2003
-@@ -191,7 +191,8 @@
+diff -ur fort77-1.18.old/fort77 fort77-1.18/fort77
+--- fort77-1.18.old/fort77 1999-04-19 05:19:36.0 -0700
 fort77-1.18/fort77 2005-06-20 10:18:58.0 -0700
+@@ -15,6 +15,11 @@
+ $debug = 0;
+ $cc = $ENV{'CC'} || 'cc';
+ 
++# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
++# when invoking the Fortran compiler.  We need to override this to
++# avoid getting stuck in a loop.
++$cc = "cc" if $cc =~ /fort77$/;
++
+ # Loop over all options; pull all options from @ARGV and put all
+ # arguments into @argv.This is needed because, apparently, UNIX
+ # compilers acceppt options anywhere on the command line.
+@@ -191,7 +196,8 @@
  
  push(@fopts,$nnflag);
  push(@copts,'-ffast-math') if $optimize && $fast_math;
@@ -11,7 +23,41 @@
  push(@fopts,@includes,"-I.");
  push(@fopts, @pfiles);
  
-@@ -253,7 +254,7 @@
+@@ -253,7 +259,7 @@
+ 
+   if ($cpp || ($ffile =~ /\.F$/)) {
+ # Backslashes at the end of comment lines confuse cpp...
+-  $pipe =  "| /lib/cpp -traditional " . 
++  $pipe =  '| /usr/bin/cpp | grep -v "#pragma" ' . 
+   join(' ',@cppopts) . " | f2c " .
+   join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
+   print STDERR "$0: Running \"$pipe\"" if $verbose;
+diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77
+--- fort77-1.18.old/tests/fort77   1999-04-19 05:19:36.0 -0700
 fort77-1.18/tests/fort77   2005-06-20 10:18:58.0 -0700
+@@ -15,6 +15,11 @@
+ $debug = 0;
+ $cc = $ENV{'CC'} || 'cc';
+ 
++# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
++# when invoking the Fortran compiler.  We need to override this to
++# avoid getting stuck in a loop.
++$cc = "cc" if $cc =~ /fort77$/;
++
+ # Loop over all options; pull all options from @ARGV and put all
+ # arguments into @argv.This is needed because, apparently, UNIX
+ # compilers acceppt options anywhere on the command line.
+@@ -191,7 +196,8 @@
+ 
+ push(@fopts,$nnflag);
+ push(@copts,'-ffast-math') if $optimize && $fast_math;
+-push(@cppopts,@includes);
++push(@cppopts,@includes,"-I/include");
++push(@lopts,"-L/lib");
+ push(@fopts,@includes,"-I.");
+ push(@fopts, @pfiles);
+ 
+@@ -253,7 +259,7 @@
  
if ($cpp || ($ffile =~ /\.F$/)) {
  # Backslashes at the end of comment lines confuse cpp...

Index: fort77.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages/fort77.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.info 27 Apr 2005 03:40:33 -  1.1
+++ fort77.info 20 Jun 2005 17:21:41 -  1.2
@@ -1,6 +1,6 @@
 Package: fort77
 Version: 1.18
-Revision: 16
+Revision: 17
 Description: Perl script to invoke f2c Fortran translator
 DescDetail: <<
  Can be used to compile Fortran, C and assembler code, 



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/languages fort77.info,1.1,1.2 fort77.patch,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/languages
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7436/10.4-transitional/unstable/main/finkinfo/languages

Modified Files:
fort77.info fort77.patch 
Log Message:
Avoid fork bomb

Index: fort77.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.patch27 Apr 2005 03:25:58 -  1.1
+++ fort77.patch20 Jun 2005 17:21:41 -  1.2
@@ -1,7 +1,19 @@
-diff -ru fort77-1.18/fort77 fort77-1.18-patched/fort77
 fort77-1.18/fort77 Mon Apr 19 08:19:36 1999
-+++ fort77-1.18-patched/fort77 Fri Oct  3 21:42:38 2003
-@@ -191,7 +191,8 @@
+diff -ur fort77-1.18.old/fort77 fort77-1.18/fort77
+--- fort77-1.18.old/fort77 1999-04-19 05:19:36.0 -0700
 fort77-1.18/fort77 2005-06-20 10:18:58.0 -0700
+@@ -15,6 +15,11 @@
+ $debug = 0;
+ $cc = $ENV{'CC'} || 'cc';
+ 
++# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
++# when invoking the Fortran compiler.  We need to override this to
++# avoid getting stuck in a loop.
++$cc = "cc" if $cc =~ /fort77$/;
++
+ # Loop over all options; pull all options from @ARGV and put all
+ # arguments into @argv.This is needed because, apparently, UNIX
+ # compilers acceppt options anywhere on the command line.
+@@ -191,7 +196,8 @@
  
  push(@fopts,$nnflag);
  push(@copts,'-ffast-math') if $optimize && $fast_math;
@@ -11,7 +23,41 @@
  push(@fopts,@includes,"-I.");
  push(@fopts, @pfiles);
  
-@@ -253,7 +254,7 @@
+@@ -253,7 +259,7 @@
+ 
+   if ($cpp || ($ffile =~ /\.F$/)) {
+ # Backslashes at the end of comment lines confuse cpp...
+-  $pipe =  "| /lib/cpp -traditional " . 
++  $pipe =  '| /usr/bin/cpp | grep -v "#pragma" ' . 
+   join(' ',@cppopts) . " | f2c " .
+   join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
+   print STDERR "$0: Running \"$pipe\"" if $verbose;
+diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77
+--- fort77-1.18.old/tests/fort77   1999-04-19 05:19:36.0 -0700
 fort77-1.18/tests/fort77   2005-06-20 10:18:58.0 -0700
+@@ -15,6 +15,11 @@
+ $debug = 0;
+ $cc = $ENV{'CC'} || 'cc';
+ 
++# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
++# when invoking the Fortran compiler.  We need to override this to
++# avoid getting stuck in a loop.
++$cc = "cc" if $cc =~ /fort77$/;
++
+ # Loop over all options; pull all options from @ARGV and put all
+ # arguments into @argv.This is needed because, apparently, UNIX
+ # compilers acceppt options anywhere on the command line.
+@@ -191,7 +196,8 @@
+ 
+ push(@fopts,$nnflag);
+ push(@copts,'-ffast-math') if $optimize && $fast_math;
+-push(@cppopts,@includes);
++push(@cppopts,@includes,"-I/include");
++push(@lopts,"-L/lib");
+ push(@fopts,@includes,"-I.");
+ push(@fopts, @pfiles);
+ 
+@@ -253,7 +259,7 @@
  
if ($cpp || ($ffile =~ /\.F$/)) {
  # Backslashes at the end of comment lines confuse cpp...

Index: fort77.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/languages/fort77.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fort77.info 27 Apr 2005 03:25:58 -  1.1
+++ fort77.info 20 Jun 2005 17:21:41 -  1.2
@@ -1,6 +1,6 @@
 Package: fort77
 Version: 1.18
-Revision: 16
+Revision: 17
 Description: Perl script to invoke f2c Fortran translator
 DescDetail: <<
  Can be used to compile Fortran, C and assembler code, 



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/stable/main/finkinfo/languages fort77.patch,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/languages
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5201/10.3/stable/main/finkinfo/languages

Modified Files:
fort77.patch 
Log Message:
Fix error in patch

Index: fort77.patch
===
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fort77.patch20 Jun 2005 17:21:40 -  1.2
+++ fort77.patch20 Jun 2005 18:21:38 -  1.3
@@ -32,37 +32,3 @@
join(' ',@cppopts) . " | f2c " .
join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
print STDERR "$0: Running \"$pipe\"" if $verbose;
-diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77
 fort77-1.18.old/tests/fort77   1999-04-19 05:19:36.0 -0700
-+++ fort77-1.18/tests/fort77   2005-06-20 10:18:58.0 -0700
-@@ -15,6 +15,11 @@
- $debug = 0;
- $cc = $ENV{'CC'} || 'cc';
- 
-+# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
-+# when invoking the Fortran compiler.  We need to override this to
-+# avoid getting stuck in a loop.
-+$cc = "cc" if $cc =~ /fort77$/;
-+
- # Loop over all options; pull all options from @ARGV and put all
- # arguments into @argv.This is needed because, apparently, UNIX
- # compilers acceppt options anywhere on the command line.
-@@ -191,7 +196,8 @@
- 
- push(@fopts,$nnflag);
- push(@copts,'-ffast-math') if $optimize && $fast_math;
--push(@cppopts,@includes);
-+push(@cppopts,@includes,"-I/include");
-+push(@lopts,"-L/lib");
- push(@fopts,@includes,"-I.");
- push(@fopts, @pfiles);
- 
-@@ -253,7 +259,7 @@
- 
-   if ($cpp || ($ffile =~ /\.F$/)) {
- # Backslashes at the end of comment lines confuse cpp...
--  $pipe =  "| /lib/cpp -traditional " . 
-+  $pipe =  '| /usr/bin/cpp | grep -v "#pragma" ' . 
-   join(' ',@cppopts) . " | f2c " .
-   join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
-   print STDERR "$0: Running \"$pipe\"" if $verbose;



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/stable/main/finkinfo/languages fort77.patch,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5201/10.4-transitional/stable/main/finkinfo/languages

Modified Files:
fort77.patch 
Log Message:
Fix error in patch

Index: fort77.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fort77.patch20 Jun 2005 17:21:41 -  1.2
+++ fort77.patch20 Jun 2005 18:21:38 -  1.3
@@ -32,37 +32,3 @@
join(' ',@cppopts) . " | f2c " .
join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
print STDERR "$0: Running \"$pipe\"" if $verbose;
-diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77
 fort77-1.18.old/tests/fort77   1999-04-19 05:19:36.0 -0700
-+++ fort77-1.18/tests/fort77   2005-06-20 10:18:58.0 -0700
-@@ -15,6 +15,11 @@
- $debug = 0;
- $cc = $ENV{'CC'} || 'cc';
- 
-+# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
-+# when invoking the Fortran compiler.  We need to override this to
-+# avoid getting stuck in a loop.
-+$cc = "cc" if $cc =~ /fort77$/;
-+
- # Loop over all options; pull all options from @ARGV and put all
- # arguments into @argv.This is needed because, apparently, UNIX
- # compilers acceppt options anywhere on the command line.
-@@ -191,7 +196,8 @@
- 
- push(@fopts,$nnflag);
- push(@copts,'-ffast-math') if $optimize && $fast_math;
--push(@cppopts,@includes);
-+push(@cppopts,@includes,"-I/include");
-+push(@lopts,"-L/lib");
- push(@fopts,@includes,"-I.");
- push(@fopts, @pfiles);
- 
-@@ -253,7 +259,7 @@
- 
-   if ($cpp || ($ffile =~ /\.F$/)) {
- # Backslashes at the end of comment lines confuse cpp...
--  $pipe =  "| /lib/cpp -traditional " . 
-+  $pipe =  '| /usr/bin/cpp | grep -v "#pragma" ' . 
-   join(' ',@cppopts) . " | f2c " .
-   join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
-   print STDERR "$0: Running \"$pipe\"" if $verbose;



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.3/unstable/main/finkinfo/languages fort77.patch,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5201/10.3/unstable/main/finkinfo/languages

Modified Files:
fort77.patch 
Log Message:
Fix error in patch

Index: fort77.patch
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fort77.patch20 Jun 2005 17:21:40 -  1.2
+++ fort77.patch20 Jun 2005 18:21:38 -  1.3
@@ -32,37 +32,3 @@
join(' ',@cppopts) . " | f2c " .
join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
print STDERR "$0: Running \"$pipe\"" if $verbose;
-diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77
 fort77-1.18.old/tests/fort77   1999-04-19 05:19:36.0 -0700
-+++ fort77-1.18/tests/fort77   2005-06-20 10:18:58.0 -0700
-@@ -15,6 +15,11 @@
- $debug = 0;
- $cc = $ENV{'CC'} || 'cc';
- 
-+# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
-+# when invoking the Fortran compiler.  We need to override this to
-+# avoid getting stuck in a loop.
-+$cc = "cc" if $cc =~ /fort77$/;
-+
- # Loop over all options; pull all options from @ARGV and put all
- # arguments into @argv.This is needed because, apparently, UNIX
- # compilers acceppt options anywhere on the command line.
-@@ -191,7 +196,8 @@
- 
- push(@fopts,$nnflag);
- push(@copts,'-ffast-math') if $optimize && $fast_math;
--push(@cppopts,@includes);
-+push(@cppopts,@includes,"-I/include");
-+push(@lopts,"-L/lib");
- push(@fopts,@includes,"-I.");
- push(@fopts, @pfiles);
- 
-@@ -253,7 +259,7 @@
- 
-   if ($cpp || ($ffile =~ /\.F$/)) {
- # Backslashes at the end of comment lines confuse cpp...
--  $pipe =  "| /lib/cpp -traditional " . 
-+  $pipe =  '| /usr/bin/cpp | grep -v "#pragma" ' . 
-   join(' ',@cppopts) . " | f2c " .
-   join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
-   print STDERR "$0: Running \"$pipe\"" if $verbose;



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4-transitional/unstable/main/finkinfo/languages fort77.patch,1.2,1.3

[Matthew Sachs]

Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/languages
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5201/10.4-transitional/unstable/main/finkinfo/languages

Modified Files:
fort77.patch 
Log Message:
Fix error in patch

Index: fort77.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/languages/fort77.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fort77.patch20 Jun 2005 17:21:41 -  1.2
+++ fort77.patch20 Jun 2005 18:21:39 -  1.3
@@ -32,37 +32,3 @@
join(' ',@cppopts) . " | f2c " .
join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
print STDERR "$0: Running \"$pipe\"" if $verbose;
-diff -ur fort77-1.18.old/tests/fort77 fort77-1.18/tests/fort77
 fort77-1.18.old/tests/fort77   1999-04-19 05:19:36.0 -0700
-+++ fort77-1.18/tests/fort77   2005-06-20 10:18:58.0 -0700
-@@ -15,6 +15,11 @@
- $debug = 0;
- $cc = $ENV{'CC'} || 'cc';
- 
-+# Programs which use GNU libtool 1.5 will set $ENV{CC} to "fort77"
-+# when invoking the Fortran compiler.  We need to override this to
-+# avoid getting stuck in a loop.
-+$cc = "cc" if $cc =~ /fort77$/;
-+
- # Loop over all options; pull all options from @ARGV and put all
- # arguments into @argv.This is needed because, apparently, UNIX
- # compilers acceppt options anywhere on the command line.
-@@ -191,7 +196,8 @@
- 
- push(@fopts,$nnflag);
- push(@copts,'-ffast-math') if $optimize && $fast_math;
--push(@cppopts,@includes);
-+push(@cppopts,@includes,"-I/include");
-+push(@lopts,"-L/lib");
- push(@fopts,@includes,"-I.");
- push(@fopts, @pfiles);
- 
-@@ -253,7 +259,7 @@
- 
-   if ($cpp || ($ffile =~ /\.F$/)) {
- # Backslashes at the end of comment lines confuse cpp...
--  $pipe =  "| /lib/cpp -traditional " . 
-+  $pipe =  '| /usr/bin/cpp | grep -v "#pragma" ' . 
-   join(' ',@cppopts) . " | f2c " .
-   join(' ',@fopts) . $debugcmd . "2>$xtmperrout > $cfile ";
-   print STDERR "$0: Running \"$pipe\"" if $verbose;



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.347,1.348

[Matthew Sachs]

Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9110

Modified Files:
ChangeLog 
Log Message:
* chown was missing a username (just had a group) in phase_install
when not building as nobody


Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -d -r1.347 -r1.348
--- ChangeLog   9 Jun 2005 19:03:34 -   1.347
+++ ChangeLog   24 Jun 2005 21:32:30 -  1.348
@@ -1,3 +1,8 @@
+2005-06-24  Matthew Sachs  <[EMAIL PROTECTED]>
+
+   * chown was missing a username (just had a group) in phase_install
+   when not building as nobody
+
 2005-06-09  Dave Morrison  <[EMAIL PROTECTED]>
 
* postinstall.pl.in: must use full path for 10.4 tree symlink; also,



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink PkgVersion.pm,1.421,1.422

[Matthew Sachs]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9110/perlmod/Fink

Modified Files:
PkgVersion.pm 
Log Message:
* chown was missing a username (just had a group) in phase_install
when not building as nobody


Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -d -r1.421 -r1.422
--- PkgVersion.pm   20 Jun 2005 05:14:04 -  1.421
+++ PkgVersion.pm   24 Jun 2005 21:32:31 -  1.422
@@ -2530,7 +2530,7 @@
if (Fink::Config::get_option("build_as_nobody")) {
$install_script .= "/usr/sbin/chown -R nobody:nobody \%d\n";
} else {
-   $install_script .= "/usr/sbin/chown -R :admin \%d\n";
+   $install_script .= "/usr/sbin/chown -R root:admin \%d\n";
}
# Run the script part we have so far
$self->run_script($install_script, "installing", 0, 0);



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.348,1.349

[Matthew Sachs]

Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30101

Modified Files:
ChangeLog 
Log Message:
Revert previous change; bootstrap still broken

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- ChangeLog   24 Jun 2005 21:32:30 -  1.348
+++ ChangeLog   24 Jun 2005 22:16:12 -  1.349
@@ -1,5 +1,10 @@
 2005-06-24  Matthew Sachs  <[EMAIL PROTECTED]>
 
+   * Revert previous change.  There's something deeper breaking
+   bootstrap, but I can't figure out what...
+
+2005-06-24  Matthew Sachs  <[EMAIL PROTECTED]>
+
* chown was missing a username (just had a group) in phase_install
when not building as nobody
 



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink cmplink,1.1,1.2

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27572

Modified Files:
cmplink 
Log Message:
Make output less ugly

Index: cmplink
===
RCS file: /cvsroot/fink/scripts/buildfink/cmplink,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmplink 11 May 2005 19:04:34 -  1.1
+++ cmplink 29 Jun 2005 02:02:40 -  1.2
@@ -18,8 +18,8 @@
 
 print "\n";
 while(<>) {
-   s!^(.*?):!$1:!;
-   s!$!!;
+   s!^(.*?):!$1:!;
+   s!$!!;
print $_;
 }
 print "\n";



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink Services.pm,1.171,1.172

[Matthew Sachs]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10063/perlmod/Fink

Modified Files:
Services.pm 
Log Message:
* Services.pm: When checking the GCC version, only test two
decimal places out (so we test for 4.0, not 4.0.0.)


Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- Services.pm 12 Jul 2005 19:10:51 -  1.171
+++ Services.pm 13 Jul 2005 02:16:47 -  1.172
@@ -1126,7 +1126,8 @@
'2.95' => '2',
'3.1' => '3',
'3.3' => '3.3',
-   '4.0.0' => '4.0'
+   '4.0.0' => '4.0',
+   '4.0.1' => '4.0',
);

sub gcc_select_arg {
@@ -1206,9 +1207,9 @@
 # Note: we no longer support 10.1 or 10.2-gcc3.1 in fink, we don't
 # specify default values for these.
 
-   my %osx_default = ('10.2' => '3.3', '10.3' => '3.3', '10.4' => '4.0.0');
-   my %darwin_default = ('6' => '3.3', '7' => '3.3', '8' => '4.0.0');
-   my %gcc_abi_default = ('2.95' => '2.95', '3.1' => '3.1', '3.3' => 
'3.3', '4.0.0' => '3.3');
+   my %osx_default = ('10.2' => '3.3', '10.3' => '3.3', '10.4' => '4.0');
+   my %darwin_default = ('6' => '3.3', '7' => '3.3', '8' => '4.0');
+   my %gcc_abi_default = ('2.95' => '2.95', '3.1' => '3.1', '3.3' => 
'3.3', '4.0' => '3.3');
 
my $sw_vers = get_sw_vers();
if ($sw_vers ne 0) {
@@ -1216,7 +1217,7 @@
$sw_vers =~ s/^(\d*\.\d*).*/$1/;
$gcc = $osx_default{$sw_vers};
} else {
-my $darwin_version = (uname())[2];
+   my $darwin_version = (uname())[2];
$current_system = "Darwin $darwin_version";
$darwin_version =~ s/^(\d*).*/$1/;
$gcc = $darwin_default{$darwin_version};
@@ -1230,6 +1231,9 @@
 
$gcc_select = gcc_selected() || '(unknown version)';
 
+   # We don't want to differentiate between 4.0.0 and 4.0.1 here
+   $gcc_select =~ s/(\d+\.\d+)\.\d+/$1/;
+
if ($gcc_select !~ /^$gcc/) {
my $gcc_name = gcc_select_arg($gcc);
$message =~ s/CURRENT_SYSTEM/$current_system/g;



---
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP, 
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.352,1.353

[Matthew Sachs]

Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10063

Modified Files:
ChangeLog 
Log Message:
* Services.pm: When checking the GCC version, only test two
decimal places out (so we test for 4.0, not 4.0.0.)


Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -d -r1.352 -r1.353
--- ChangeLog   12 Jul 2005 02:28:56 -  1.352
+++ ChangeLog   13 Jul 2005 02:16:47 -  1.353
@@ -1,3 +1,8 @@
+2005-07-12  Matthew Sachs  <[EMAIL PROTECTED]>
+
+   * Services.pm: When checking the GCC version, only test two
+   decimal places out (so we test for 4.0, not 4.0.0.)
+
 2005-07-11  Dave Vasilevsky  <[EMAIL PROTECTED]>
 
* VERSION: Make fink HEAD always >> 0.24.x, since that has already



---
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP, 
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.873.2.46,1.873.2.47 Services.pm,1.152.2.4,1.152.2.5

[Matthew Sachs]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14131

Modified Files:
  Tag: branch_0_24
ChangeLog Services.pm 
Log Message:
* Services.pm: Backport fix for looser checking of GCC version.


Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.152.2.4
retrieving revision 1.152.2.5
diff -u -d -r1.152.2.4 -r1.152.2.5
--- Services.pm 13 Jul 2005 02:09:31 -  1.152.2.4
+++ Services.pm 13 Jul 2005 02:24:10 -  1.152.2.5
@@ -1099,7 +1099,8 @@
'2.95' => '2',
'3.1' => '3',
'3.3' => '3.3',
-   '4.0.0' => '4.0'
+   '4.0.0' => '4.0',
+   '4.0.1' => '4.0'
);

sub gcc_select_arg {
@@ -1179,9 +1180,9 @@
 # Note: we no longer support 10.1 or 10.2-gcc3.1 in fink, we don't
 # specify default values for these.
 
-   my %osx_default = ('10.2' => '3.3', '10.3' => '3.3', '10.4' => '4.0.0');
-   my %darwin_default = ('6' => '3.3', '7' => '3.3', '8' => '4.0.0');
-   my %gcc_abi_default = ('2.95' => '2.95', '3.1' => '3.1', '3.3' => 
'3.3', '4.0.0' => '3.3');
+   my %osx_default = ('10.2' => '3.3', '10.3' => '3.3', '10.4' => '4.0');
+   my %darwin_default = ('6' => '3.3', '7' => '3.3', '8' => '4.0');
+   my %gcc_abi_default = ('2.95' => '2.95', '3.1' => '3.1', '3.3' => 
'3.3', '4.0' => '3.3');
 
my $sw_vers = get_sw_vers();
if ($sw_vers ne 0) {
@@ -1202,6 +1203,7 @@
    }
 
$gcc_select = gcc_selected() || '(unknown version)';
+   $gcc_select =~ s/(\d+\.\d+)\.\d+/$1/;
 
if ($gcc_select !~ /^$gcc/) {
my $gcc_name = gcc_select_arg($gcc);

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.873.2.46
retrieving revision 1.873.2.47
diff -u -d -r1.873.2.46 -r1.873.2.47
--- ChangeLog   13 Jul 2005 02:09:29 -  1.873.2.46
+++ ChangeLog   13 Jul 2005 02:24:08 -  1.873.2.47
@@ -1,3 +1,7 @@
+2005-07-12  Matthew Sachs  <[EMAIL PROTECTED]>
+
+   * Services.pm: Backport fix for looser checking of GCC version.
+
 2005-07-12  Dave Vasilevsky  <[EMAIL PROTECTED]>
 
* Services.pm, PkgVersion.pm: Backport fix for after Repair Perms screws



---
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP, 
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1050,1.1051

[Matthew Sachs]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15187

Modified Files:
ChangeLog 
Log Message:
* Services.pm: Looser checking of GCC version in enforce_gcc;
we don't want to differentiate between 4.0.0 and 4.0.1.


Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1050
retrieving revision 1.1051
diff -u -d -r1.1050 -r1.1051
--- ChangeLog   12 Jul 2005 17:48:40 -  1.1050
+++ ChangeLog   13 Jul 2005 02:26:00 -  1.1051
@@ -1,3 +1,8 @@
+2005-07-12  Matthew Sachs  <[EMAIL PROTECTED]>
+
+   * Services.pm: Looser checking of GCC version in enforce_gcc;
+   we don't want to differentiate between 4.0.0 and 4.0.1.
+
 2005-07-12  Dave Vasilevsky  <[EMAIL PROTECTED]>
 
* Bootstrap.pm: Install exactly the version that's being injected.



---
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP, 
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.16,1.17

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22924

Modified Files:
buildfink 
Log Message:
Add support for latest fink HEAD changes: ->{parent} may not be an object, in 
which case call ->get_parent() to get one

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- buildfink   9 Jun 2005 20:19:31 -   1.16
+++ buildfink   16 Jul 2005 01:49:44 -  1.17
@@ -821,7 +821,7 @@
}
 
if($pkgobj->{parent}) {
-   my $parent = $pkgobj->{parent}->get_name();
+   my $parent = ref($pkgobj->{parent}) ? 
$pkgobj->{parent}->get_name() : $pkgobj->get_parent()->get_name();
next if $got_families{$parent};
$got_families{$parent} = 1;
push @ret, $parent;



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.17,1.18

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13726

Modified Files:
buildfink 
Log Message:
Correctly determine whether to use old or new "get parent of package" 
API.


Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- buildfink   16 Jul 2005 01:49:44 -  1.17
+++ buildfink   21 Jul 2005 02:06:52 -  1.18
@@ -821,7 +821,7 @@
}
 
if($pkgobj->{parent}) {
-   my $parent = ref($pkgobj->{parent}) ? 
$pkgobj->{parent}->get_name() : $pkgobj->get_parent()->get_name();
+   my $parent = ref($pkgobj->{parent}) eq "HASH" ? 
$pkgobj->{parent}->get_name() : $pkgobj->get_parent()->get_name();
next if $got_families{$parent};
$got_families{$parent} = 1;
push @ret, $parent;



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

scripts/buildfink buildfink,1.18,1.19

[Matthew Sachs]

Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25734

Modified Files:
buildfink 
Log Message:
Try new API \(get_parent\) first

Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- buildfink   21 Jul 2005 02:06:52 -  1.18
+++ buildfink   21 Jul 2005 03:15:02 -  1.19
@@ -821,7 +821,8 @@
}
 
if($pkgobj->{parent}) {
-   my $parent = ref($pkgobj->{parent}) eq "HASH" ? 
$pkgobj->{parent}->get_name() : $pkgobj->get_parent()->get_name();
+   my $parent = $pkgobj->can("get_parent") ? 
$pkgobj->get_parent()->get_name() : $pkgobj->{parent}->get_name();
+
next if $got_families{$parent};
$got_families{$parent} = 1;
push @ret, $parent;



---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink Bootstrap.pm,1.117,1.118 ChangeLog,1.1090,1.1091

[Matthew Sachs]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28359/perlmod/Fink

Modified Files:
Bootstrap.pm ChangeLog 
Log Message:
* Don't fall through to 10.2 for i386-apple-darwin8.FOO for
values of FOO which we don't know about.



Index: Bootstrap.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Bootstrap.pm,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- Bootstrap.pm12 Aug 2005 19:15:49 -  1.117
+++ Bootstrap.pm19 Aug 2005 01:44:35 -  1.118
@@ -188,7 +188,12 @@
"this Fink release was made.  Prerelease versions " .
"of Mac OS X might work with Fink, but there are no " .
"guarantees.");
-   $distribution = "10.4-transitional";
+   if($ENV{FINK_NOTRANS}) {
+   &print_breaking("Using the non-transitional tree...");
+   $distribution = "10.4";
+   } else {
+   $distribution = "10.4-transitional";
+   }
} elsif ($host =~ /^i386-apple-darwin8\.[0-2]\.[0-1]/) {
&print_breaking("Fink is currently not supported on x86 ".
"Darwin. Various parts of Fink hardcode 'powerpc' ".
@@ -200,6 +205,17 @@
} else {
$distribution = "10.4-transitional";
}
+   } elsif ($host =~ /^i386-apple-darwin[8-9]\./) {
+   &print_breaking("This system was not released at the time " .
+   "this Fink release was made.  Prerelease versions " .
+   "of Mac OS X might work with Fink, but there are no " .
+   "guarantees.  Also, x86 is not currently supported.");
+   if($ENV{FINK_NOTRANS}) {
+   &print_breaking("Using the non-transitional tree...");
+   $distribution = "10.4";
+   } else {
+   $distribution = "10.4-transitional";
+   }
} elsif ($host =~ /^i386-apple-darwin7\.[0-2]\.[0-1]/) {
&print_breaking("Fink is currently not supported on x86 ".
"Darwin. Various parts of Fink hardcode 'powerpc' ".

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1090
retrieving revision 1.1091
diff -u -d -r1.1090 -r1.1091
--- ChangeLog   15 Aug 2005 02:11:01 -  1.1090
+++ ChangeLog   19 Aug 2005 01:44:36 -  1.1091
@@ -1,3 +1,8 @@
+2005-08-18  Matthew Sachs  <[EMAIL PROTECTED]>
+
+   * Don't fall through to 10.2 for i386-apple-darwin8.FOO for
+   values of FOO which we don't know about.
+
 2005-08-13  Daniel Macks  <[EMAIL PROTECTED]>
 
* Validation.pm: Catch misuse of -Wl,-framework in .pc files.



---
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