[cvs] dists/10.4/unstable/main/finkinfo/sci tkgate.info, 1.2, 1.3 tkgate.patch, 1.1, 1.2

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19628

Modified Files:
tkgate.info tkgate.patch 
Log Message:
unbreak tkgate

Index: tkgate.patch
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/tkgate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tkgate.patch20 Jan 2006 20:30:41 -  1.1
+++ tkgate.patch25 Oct 2010 06:39:15 -  1.2
@@ -1,6 +1,6 @@
 diff -Naur tkgate-old/Imakefile tkgate-new/Imakefile
 tkgate-old/Imakefile   2005-07-25 10:04:47.0 -0400
-+++ tkgate-new/Imakefile   2005-07-25 10:07:45.0 -0400
+--- tkgate-old/Imakefile   2010-10-25 02:12:04.0 -0400
 tkgate-new/Imakefile   2010-10-25 02:15:41.0 -0400
 @@ -99,4 +99,4 @@
@echo All files from ${HOMEDIR}
  
@@ -8,8 +8,17 @@
 -  cp -r locale ${HOMEDIR}
 +  cp -r locale ${DESTDIR}${HOMEDIR}
 diff -Naur tkgate-old/config.h tkgate-new/config.h
 tkgate-old/config.h2005-07-25 10:04:47.0 -0400
-+++ tkgate-new/config.h2005-07-25 10:10:25.0 -0400
+--- tkgate-old/config.h2010-10-25 02:12:04.0 -0400
 tkgate-new/config.h2010-10-25 02:15:41.0 -0400
+@@ -39,7 +39,7 @@
+ /*
+   Tcl/Tk Version numbers to use.
+ */
+-#define TKGATE_TCLTK_VERSIONS 8.4 8.3 8.2 8.1 8.0
++#define TKGATE_TCLTK_VERSIONS 8.5 8.4 8.3 8.2 8.1 8.0
+ 
+ /*
+   Japanese Tcl/Tk Version numbers to use.
 @@ -52,13 +52,13 @@
double quotes and should be all one one line.  This list is used to
find X11, tcl and tk.

Index: tkgate.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/tkgate.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tkgate.info 31 Jan 2009 23:58:16 -  1.2
+++ tkgate.info 25 Oct 2010 06:39:15 -  1.3
@@ -1,26 +1,29 @@
 Package: tkgate
-Version: 1.8.6
-Revision: 11
+Version: 1.8.7
+Revision: 1
 Description: Digital circuit simulator
 License: GPL
 Maintainer: Dave Vasilevsky v...@users.sourceforge.net
 
-BuildDepends: fink (= 0.24.12), tcltk-dev
-Depends: tcltk
+BuildDepends: fink (= 0.24.12), tcltk-dev (= 8.5-1), tcltk-dev ( 8.6-1), 
xmkmf
+Depends: tcltk (= 8.5-1), tcltk ( 8.6-1)
 
 Source: ftp://gadoid.ices.cmu.edu/pub/%{Ni}/%{Ni}-%v.tgz
-Source-MD5: 85f619c1c7de23185b80f1512e91e28a
+Source-MD5: 628b5ca66283fc1473c9ef7300ae73c8
 
 PatchFile: %n.patch
-PatchFile-MD5: 3cf632f819d72535f270282215810ac3
+PatchFile-MD5: d2562332007dba4d9726c9a8ecb8427d
 PatchScript: 
-   perl -pi -e 's,(tail) +([+-]?[0-9]|[+-]\$),\1 \-n\2,g' configure
-   perl -pi -e 's,(head) +[+-]?([0-9]|\$),\1 \-n\2,g' configure
sed -e 's|@PREFIX@|%p|g' %{PatchFile} | patch -p1
 
 
+CompileScript: 
+   #!/bin/sh -ev
+   export PATH=%p/lib/xmkmf/bin:$PATH
+   %{default_script}
+
+
 InstallScript: 
-   find -iname makefile | xargs perl -i -pe 's/^(\s*INSTALLFLAGS).*/$1 = 
-c/g'
make install DESTDIR=%d
make install.man LIBDIR=%p/share DESTDIR=%d
 
@@ -30,8 +33,7 @@
config.h *BEFORE* running configure.
* DESTDIR missing from main IMakefile
* Package really doesn't like putting html docs anywhere normal
-   * Don't try to change owner/group
-   * Use standard arguments for head/tail
+   * Allow tcltk version 8.5
 
 
 DocFiles: COPYING README


--
Nokia and ATT present the 2010 Calling All Innovators-North America contest
Create new apps  games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/text groff.info,1.4,1.5

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21769/text

Modified Files:
groff.info 
Log Message:
Re-add accidentally-removed GCC field

Index: groff.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/groff.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- groff.info  24 Oct 2010 11:15:48 -  1.4
+++ groff.info  25 Oct 2010 06:50:30 -  1.5
@@ -1,6 +1,7 @@
 Package: groff
 Version: 1.20.1
-Revision: 1
+Revision: 2
+GCC: 4.0
 Maintainer: Dave Vasilevsky v...@users.sourceforge.net
 Source: gnu
 Source-MD5: 48fa768dd6fdeb7968041dd5ae8e2b02


--
Nokia and ATT present the 2010 Calling All Innovators-North America contest
Create new apps  games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/libs allegro4.info, 1.3, 1.4 allegro4.patch, 1.1, NONE

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5634/libs

Modified Files:
allegro4.info 
Removed Files:
allegro4.patch 
Log Message:
Allegro and liquidwar 5 updated, and work again

--- allegro4.patch DELETED ---

Index: allegro4.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/allegro4.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- allegro4.info   31 Jan 2009 23:58:15 -  1.3
+++ allegro4.info   24 Oct 2010 07:12:44 -  1.4
@@ -1,7 +1,6 @@
 Package: allegro4
-Version: 4.2.0-beta3
-Revision: 11
-Architecture: powerpc
+Version: 4.4.1.1
+Revision: 1
 Description: Cross-platform game programming library
 DescDetail: 
Allegro is a cross-platform game programming library for C/C++ 
developers
@@ -11,47 +10,61 @@
management functions, compressed datafile and a GUI.
 
 DescPort: 
-   Disable command-line utilities showing up in the dock
-
-DescPackaging: 
- Does not compile on intel
+   - Only builds 32-bit, since it needs QuickDraw (Carbon).
+   - Disable command-line utilities showing up in the dock.
 
 License: Public Domain
 Maintainer: Dave Vasilevsky v...@users.sourceforge.net
 Homepage: http://alleg.sourceforge.net/
 #
-BuildDepends: fink (= 0.24.12)
+Architecture: powerpc, i386
+BuildDepends: fink (= 0.24.12), cmake, libpng14, libvorbis0, libogg
 Depends: %N-shlibs (= %v-%r)
 BuildDependsOnly: True
 #
 Source: mirror:sourceforge:alleg/allegro-%v.tar.gz
-Source-MD5: 351c0fc676c433d439c3f482d5178448
-SourceDirectory: allegro-4.2.0
-#
-PatchFile: %n.patch
-PatchFile-MD5: 842adcfeac86ee1eedf898d0b8828b2a
-PatchScript: 
-   sed -e 's,@PREFIX@,%p,g' %{PatchFile} | patch -p1
-   perl -i -pe 's/ALLEGRO_USE_CONSOLE/ALLEGRO_OSX_NO_GUI/g' tools/*.c
-
+Source-MD5: 0f1cfff8f2cf88e5c91a667d9fd386ec
 #
+UseMaxBuildJobs: true
 CompileScript: 
-   ./fix.sh macosx --quick
+   cmake -DCMAKE_INSTALL_PREFIX=%p -DMANDIR=share/man -DINFODIR=share/info 
-DWANT_EXAMPLES=off .
make
 
-# Make directories, make install, install tools not copied by default, fix 
install paths (again)
 InstallScript: 
-   mkdir -p %i/lib %i/bin
-   make install INSTALLDIR=%i
-   make install-man INSTALLDIR=%i MAN_DIR=%i/share/man
-   cp 
tools/{dat2c,{exe,pat2,}dat,grabber,macosx/fixbundle,pack,rgbmap,textconv} 
%i/bin/
+   #!/bin/sh -ev
+   make -j1 install DESTDIR=%d
+   
+   # Fix doc dir
+   mkdir -p %i/share/doc
+   mv %i/doc/allegro* %i/share/doc/%n
+   rm -r %i/doc
+   
+   # Fix install_name, we should be compatible with 4.2
+   v3=`echo %v | perl -pe 's/((\d+\.){2}\d+).*/$1/'`
+   v2=`echo %v | perl -pe 's/((\d+\.){1}\d+).*/$1/'`
+   mv %i/lib/liballeg.$v3.dylib %i/lib/liballeg-$v3.dylib  
+   rm %i/lib/liballeg.*
+   ln -sfn liballeg-$v3.dylib %i/lib/liballeg-$v2.dylib
+   ln -sfn liballeg-$v2.dylib %i/lib/liballeg-4.dylib
+   ln -sfn liballeg-4.dylib %i/lib/liballeg.dylib
+   install_name_tool -id %p/lib/liballeg-4.dylib %i/lib/liballeg-4.dylib
+   for f in %i/bin/*; do
+   if file $f | grep Mach-O; then
+   install_name_tool -change liballeg.4.4.dylib 
%p/lib/liballeg-4.dylib $f
+   fi
+   done
+   
+   # Include fixbundle
+   cp tools/fixbundle %i/bin/
 
-DocFiles: AUTHORS CHANGES THANKS docs/txt/* docs/build/*
+InfoDocs: allegro.info
+DocFiles: AUTHORS CHANGES THANKS readme.txt docs/txt/license.txt 
 #
 SplitOff: 
Package: %N-shlibs
Replaces: %N ( 4.2.0-beta3-1)
+   Depends: libpng14-shlibs, libogg-shlibs
Files: lib/liballeg-4*.dylib
-   Shlibs: %p/lib/liballeg-4.dylib 4.0.0 %n (= 4.2.0-beta3-1)
-   DocFiles: AUTHORS CHANGES THANKS
+   Shlibs: %p/lib/liballeg-4.dylib 4.4.0 %n (= 4.4.1.1-1) 32
+   DocFiles: AUTHORS CHANGES THANKS readme.txt docs/txt/license.txt 
 


--
Nokia and ATT present the 2010 Calling All Innovators-North America contest
Create new apps  games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/games liquidwar.info, 1.3, 1.4 liquidwar.patch, 1.1, NONE

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5634/games

Modified Files:
liquidwar.info 
Removed Files:
liquidwar.patch 
Log Message:
Allegro and liquidwar 5 updated, and work again

--- liquidwar.patch DELETED ---

Index: liquidwar.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/liquidwar.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- liquidwar.info  16 Jul 2010 11:19:49 -  1.3
+++ liquidwar.info  24 Oct 2010 07:12:44 -  1.4
@@ -1,7 +1,7 @@
 Package: liquidwar
-Version: 5.6.2
-Revision: 12
-Architecture: powerpc
+Version: 5.6.4
+Revision: 1
+Architecture: powerpc, i386
 Description: Unique multiplayer wargame
 DescDetail: 
Liquid War is a unique multiplayer wargame. Its rules are truly original
@@ -11,23 +11,33 @@
support.
 
 DescPort: 
-   - Force tools to build for console use, so they don't pop up in dock.
-   - Remove bitfields to work around bug in Apple's GCC 4
+   - Fix assembly for OS X's assembler.
+   - Fullscreen mode only works with native 256-color graphics, which are
+   not available on 10.5 and later.
 
 License: GPL
 Maintainer: Dave Vasilevsky v...@users.sourceforge.net
 Homepage: http://www.ufoot.org/liquidwar/
 #
-Depends: allegro4-shlibs (= 4.2.0-beta3-11)
-BuildDepends: allegro4 (= 4.2.0-beta3-11), fink (= 0.24.12-1)
+Depends: allegro4-shlibs (= 4.4.1.1-1)
+BuildDepends: fink (= 0.24.12-1), allegro4 (= 4.4.1.1-1), libpng14, 
libvorbis0, libogg
 #
-Source: http://liquidwar.sunsite.dk/archive/%n-%v.tar.gz
-Source-MD5: 981c5f00ddf2364c7b9d31fea82852be
+Source: http://www.ufoot.org/download/%n/v5/%v/%n-%v.tar.gz
+Source-MD5: 6917dd1026e6685404ffbd086f8ba374
 #
 SetCFLAGS: -DALLEGRO_UNIX
-PatchFile: %n.patch
-PatchFile-MD5: abf7921c46d5815cc56aec67edeeaabb
-InstallScript: make install DESTDIR=%d
+PatchScript: 
+   # Assembler doesn't support .equ, long-loops
+   perl -i -pe 's/^\s*\.equ/.set/; s/loopl\s+(\S+)/decl %%ecx\njne $1/' 
src/*.s
+
+# Liquidwar has strange ideas about what assembler args should be
+ConfigureParams: --disable-doc-pdf --disable-doc-ps
+CompileScript: 
+   ./configure %c
+   make CMD_AS='gcc -c' GAMEDIR=%p/bin DATADIR=%p/share/%n
+
+# Don't put things in %p/games!
+InstallScript: make install_nolink DESTDIR=%d GAMEDIR=%p/bin 
DATADIR=%p/share/%n
 #
 DocFiles: COPYING README
 InfoDocs: liquidwar.info.gz
\ No newline at end of file


--
Nokia and ATT present the 2010 Calling All Innovators-North America contest
Create new apps  games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/text groff.info,1.3,1.4

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24615

Modified Files:
groff.info 
Log Message:
Builds again

Index: groff.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/groff.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- groff.info  5 Mar 2007 22:53:30 -   1.3
+++ groff.info  24 Oct 2010 11:15:48 -  1.4
@@ -1,13 +1,12 @@
 Package: groff
-Version: 1.19.1
-Revision: 1012
-GCC: 4.0
+Version: 1.20.1
+Revision: 1
 Maintainer: Dave Vasilevsky v...@users.sourceforge.net
 Source: gnu
-Source-MD5: 57d155378640c12a80642664dfdfc892
+Source-MD5: 48fa768dd6fdeb7968041dd5ae8e2b02
 BuildDepends: x11-dev
 DocFiles: BUG-REPORT COPYING NEWS PROBLEMS README
-ConfigureParams: --mandir=%i/share/man/ --infodir=%i/share/info
+ConfigureParams: --mandir=%p/share/man/ --infodir=%p/share/info 
--with-appresdir=%p/etc/app-defaults
 Description: GNU document formatting system
 DescDetail: 
 Groff (GNU Troff) is a document processor which reads plain text mixed
@@ -19,28 +18,18 @@
 - gxditview is derived from xditview (MIT license - BSD style), with
modifications in the public domain.
 
-InfoDocs: groff
-
-Depends: netpbm-bin, psutils
+InfoDocs: groff.info
+Depends: netpbm-bin, psutils, ghostscript
 NoSetMAKEFLAGS: true
 SetMAKEFLAGS: -j1
 CompileScript: 
 #!/bin/sh -ev
 PERLPATH=/usr/bin/perl ./configure %c
 make
-cd src/xditview
-xmkmf
-which gccmakedep | sed -e 's,i386,ppc,g'  gccmakedep
-chmod a+x gccmakedep
-PATH=`pwd`:$PATH
-make depend
-make
 
 InstallScript: 
-make install prefix=%i INSTALL_INFO=echo
-install -m 755 src/xditview/gxditview %i/bin
-install -m 644 src/xditview/gxditview._man %i/share/man/man1/gxditview.1
-ln -s %v %i/share/%n/current
+   make install DESTDIR=%d INSTALL_INFO=echo
+   rm %i/lib/charset.alias
 
 DescPackaging: 
   Avoid dependency mess if /sw/bin/perl exists at compile-time
@@ -52,6 +41,6 @@
Package: gxditview
Files: bin/gxditview share/man/man1/gxditview.1 
Depends: x11, %N
-   DocFiles: src/xditview/README src/xditview/gxditview.1.html
+   DocFiles: src/devices/xditview/README
License: BSD
 


--
Nokia and ATT present the 2010 Calling All Innovators-North America contest
Create new apps  games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/utils osxutils.info, 1.3, 1.4 osxutils.patch, 1.1, 1.2

[Dave Vasilevsky]

 google %p/bin/google-osxutils -10 
--slave %p/share/man/man1/google.1 google.1 %p/share/man/man1/google-osxutils.1
+update-alternatives --install %p/bin/google google %p/bin/google-osxutils -10
 
 PreRmScript: if [ $1 != upgrade ]; then update-alternatives --remove google 
%p/bin/google-osxutils; fi
-DescPort: 
-Previous version maintained by Carsten Klapp. Uses update-alternatives to 
resolve conflict with surfraw.
-
-Maintainer: Dave Vasilevsky v...@users.sourceforge.net
+Maintainer: Dave Vasilevsky f...@vasilevsky.ca

Index: osxutils.patch
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/osxutils.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- osxutils.patch  20 Jan 2006 20:32:32 -  1.1
+++ osxutils.patch  24 Oct 2010 00:01:59 -  1.2
@@ -1,9 +1,19 @@
-diff -Naur osxutils-old/src/fileinfo.c osxutils-new/src/fileinfo.c
 osxutils-old/src/fileinfo.c2004-12-19 17:57:45.0 -0500
-+++ osxutils-new/src/fileinfo.c2005-06-06 04:36:41.0 -0400
-@@ -199,6 +199,15 @@
- 
+diff -Naur osxutils/cpath/cpath osxutils-new/cpath/cpath
+--- osxutils/cpath/cpath   2005-06-12 10:37:41.0 -0400
 osxutils-new/cpath/cpath   2010-10-23 19:46:12.0 -0400
+@@ -1,3 +1,3 @@
+ #!/bin/sh
  
[...1783 lines suppressed...]
+-foreach $argnum ($cnt .. $#ARGV)
+-{
+-   $cnt = 1;
+-   @path_segs = split(/\//, $ARGV[$argnum]);
+-   while (-e $ENV{HOME}/.Trash/$path_segs[$#path_segs])
+-   {
+-$path_segs[$#path_segs] .=  copy $cnt;
++my $trash = catfile($ENV{HOME}, '.Trash');
++foreach my $arg (@ARGV) {
++   my $cnt = 1;
++   my $base = basename($arg);
++   my $tname = catfile($trash, $base);
++   while (-e $tname) {
++   $tname = catfile($trash, $base copy $cnt);
++   ++$cnt;
+}
+-   system(mv '$ARGV[$argnum]' '$ENV{HOME}/.Trash/$path_segs[$#path_segs]');
++   move($arg, $tname);
+ }
+\ No newline at end of file


--
Nokia and ATT present the 2010 Calling All Innovators-North America contest
Create new apps  games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/games teg-themes.info, 1.4, 1.5 teg.info, 1.12, 1.13

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17749

Modified Files:
teg-themes.info teg.info 
Log Message:
also fix email

Index: teg.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/teg.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- teg.info20 Oct 2010 08:42:56 -  1.12
+++ teg.info20 Oct 2010 09:00:39 -  1.13
@@ -3,7 +3,7 @@
 Revision: 1
 Description: Strategy game similar to Risk
 License: GPL
-Maintainer: Dave Vasilevsky v...@users.sourceforge.net
+Maintainer: Dave Vasilevsky f...@vasilevsky.ca
 
 Depends: 
libgnomeui2-shlibs (= 2.24.2-3),

Index: teg-themes.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/teg-themes.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- teg-themes.info 20 Oct 2010 08:42:56 -  1.4
+++ teg-themes.info 20 Oct 2010 09:00:39 -  1.5
@@ -3,7 +3,7 @@
 Revision: 3
 Description: Extra themes for TEG
 License: Restrictive/Distributable
-Maintainer: Dave Vasilevsky v...@users.sourceforge.net
+Maintainer: Dave Vasilevsky f...@vasilevsky.ca
 
 Depends: teg
 


--
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/games teg-themes.info, 1.3, 1.4 teg.info, 1.11, 1.12 teg.patch, 1.2, 1.3

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14548

Modified Files:
teg-themes.info teg.info teg.patch 
Log Message:
teg works again

Index: teg.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/teg.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- teg.info23 Apr 2010 14:23:03 -  1.11
+++ teg.info20 Oct 2010 08:42:56 -  1.12
@@ -1,145 +1,107 @@
 Package: teg
-Version: 0.11.1
-Revision: 1016
+Version: 0.11.2
+Revision: 1
 Description: Strategy game similar to Risk
 License: GPL
 Maintainer: Dave Vasilevsky v...@users.sourceforge.net
 
 Depends: 
-   expat1-shlibs,
-   atk1-shlibs (= 1.20.0-1),
-   audiofile-shlibs,
-   esound-bin (= 0.2.38-1),
-   esound-shlibs (= 0.2.38-1),
-   gconf2 (= 2.20.0-1),
-   gconf2-shlibs (= 2.20.0-1),
-   glib2-shlibs (= 2.14.0-1),
-   gnome-keyring-shlibs (= 0.8.1-1),
-   gnome-vfs2-unified-shlibs (= 1:2.20.0-1),
-   gtk+2-shlibs (= 2.12.0-1),
-   libart2-shlibs,
-   libbonobo2-shlibs (= 2.20.0-1),
-   libbonoboui2-shlibs (= 2.20.0-1),
-   libgnome2-shlibs (= 2.20.0-1),
-   libgnomeui2-shlibs (= 2.20.0-1),
-   libgnomecanvas2-shlibs (= 2.20.0-1),
-   libiconv,
-   libjpeg-shlibs,
+   libgnomeui2-shlibs (= 2.24.2-3),
+   atk1-shlibs (= 1.28.0-1),
+   cairo-shlibs (= 1.8.8-3),
+   fontconfig2-shlibs (= 2.8.0-4),
+   freetype219-shlibs (= 2.3.12-1),
+   gconf2-shlibs (= 2.28.0-1),
+   glib2-shlibs (= 2.22.0-1),
+   gnome-keyring-shlibs (= 2.28.0-1),
+   gnome-vfs2-unified-shlibs (= 1:2.24.2-1),
+   gtk+2-shlibs (= 2.18.0-1),
+   libart2-shlibs (= 2.3.16-1),
+   libbonobo2-shlibs (= 2.24.2-1),
+   libbonoboui2-shlibs (= 2.24.1-2),
+   libglade2-shlibs (= 2.6.4-4),
+   libgnome2-shlibs (= 2.28.0-1),
+   libgnomecanvas2-shlibs (= 2.26.0-3),
libxml2-shlibs (= 2.6.30-1),
-   orbit2-shlibs (= 2.14.9-1),
-   pango1-xft2-ft219-shlibs (= 1.18.4-4),
-   popt-shlibs,
-   readline5-shlibs (= 5.0-1004),
-   x11,
-   libgettext3-shlibs,
-   rarian-compat,
+   orbit2-shlibs (= 2.14.17-2),
+   pango1-xft2-ft219 (= 1.24.5-4),

-   ggz-client-libs,
-   ggz-server-shlibs
+   x11-shlibs,
+   libgettext8-shlibs,
+   readline5-shlibs,
+   popt-shlibs,
+   gconf2 (= 2.28.0-1),
+   rarian-compat
 
 
 BuildDepends: 
-   atk1 (= 1.20.0-1),
-   audiofile,
-   cairo (= 1.6-1),
-   esound (= 0.2.38-1),
-   expat1,
-   fink (= 0.24.12-1),
-   fontconfig2-dev (= 2.4.1-1),
-   freetype219 (= 2.3.5-1),
-   gconf2-dev (= 2.20.0-1),
-   libgettext3-dev,
-   glib2-dev (= 2.14.0-1),
+   libgnomeui2-dev (= 2.24.2-3),
+   atk1 (= 1.28.0-1),
+   cairo (= 1.8.8-3),
+   fontconfig2-dev (= 2.8.0-4),
+   freetype219 (= 2.3.12-1),
+   gconf2-dev (= 2.28.0-1),
+   glib2-dev (= 2.22.0-1),
glitz,
-   gnome-keyring-dev (= 0.8.1-1),
-   dbus-dev (= 1.0-1), gnome-vfs2-unified-dev (= 1:2.20.0-1),
-   gtk+2-dev (= 2.14.3-1),
-   intltool40,
-   libart2,
-   libbonobo2-dev (= 2.20.0-1),
-   libbonoboui2-dev (= 2.20.0-1),
-   libgnome2-dev (= 2.20.0-1),
-   libgnomeui2-dev (= 2.20.0-1),
-   libgnomecanvas2-dev (= 2.20.0-1),
+   gnome-keyring-dev (= 2.28.0-1),
+   gnome-vfs2-unified-dev (= 1:2.24.2-1),
+   gtk+2-dev (= 2.18.0-1),
+   libart2 (= 2.3.16-1),
+   libbonobo2-dev (= 2.24.2-1),
+   libbonoboui2-dev (= 2.24.1-2),
+   libglade2 (= 2.6.4-4),
+   libgnome2-dev (= 2.28.0-1),
+   libgnomecanvas2-dev (= 2.26.0-3),
libiconv-dev,
-   libjpeg,
-   libpng3, 
libxml2 (= 2.6.30-1),
-   orbit2-dev (= 2.14.9-1),
-   pango1-xft2-ft219-dev (= 1.18.4-4),
-   pixman (= 0.10.0-1),
-   pkgconfig (= 0.21-1),
-   popt,
-   readline5 (= 5.0-1004),
+   orbit2-dev (= 2.14.17-2),
+   pango1-xft2-ft219-dev (= 1.24.5-4),
+   pixman (= 0.16.0-1),
+   pkgconfig (= 0.23),
+
+   fink (= 0.24.12-1),
x11-dev,
-   xft2-dev,
-   
-   libggz (= 0.0.11-1) | libggz-crypto (= 0.0.11-1),
-   ggz-client-libs-dev (= 0.0.11-1),
-   ggz-server-dev  (= 0.0.11-1),
-   ggz-server  (= 0.0.11-1)
+   libgettext8-dev,
+   intltool40,
+   readline5,
+   popt
 
 
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 85db29710452c3c4829e506481deaca0
-
-SetCPPFLAGS: -DMACOSX
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
-ConfigureParams: --with-readline --enable-ggz=yes --with-ggzdmod-dir=%p 
--with-ggzmod-dir=%p -with-ggzconfig=%p/bin --with-ggzd-confdir=%p/etc/ggzd 
--disable-dependency-tracking 
PKG_CONFIG_PATH=%p/lib/pango

[cvs] dists/10.4/unstable/main/finkinfo/utils bsdiff.info,1.1,1.2

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18685

Modified Files:
bsdiff.info 
Log Message:
compiles again

Index: bsdiff.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/bsdiff.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bsdiff.info 20 Jan 2006 20:32:32 -  1.1
+++ bsdiff.info 20 Oct 2010 09:06:58 -  1.2
@@ -1,17 +1,20 @@
 Package: bsdiff
-Version: 4.2
-Revision: 11
-Maintainer: Dave Vasilevsky v...@users.sourceforge.net
-Source: mirror:master:%n-%v.tar.gz
-DocFiles: LICENSE
+Version: 4.3
+Revision: 1
+Maintainer: Dave Vasilevsky f...@vasilevsky.ca
+Source: http://www.daemonology.net/%n/%n-%v.tar.gz
+Source-MD5: e6d812394f0e0ecc8d5df255aa1db22a
 Description: Better diff generator for binary files
 License: BSD
-PatchScript: perl -i -pe 's,/usr/bin/bzip2,%p/bin/bzip2,g' *.c
+PatchScript: perl -i -pe 'print #include sys/types.h\n if $.==1' bspatch.c
+BuildDepends: bzip2-dev
 CompileScript: bsdmake
 InstallScript: 
install -d -m 755 %i/bin %i/share/man/man1
install -m 755 bsdiff bspatch %i/bin/
install -m 644 bsdiff.1 bspatch.1 %i/share/man/man1/
 
+DescPort: 
+   Fix missing header
+
 Homepage: http://www.daemonology.net/bsdiff/
-Source-MD5: 9f582a77eb76d116d82d1ad268ef48fa


--
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] fink/perlmod/Fink ChangeLog, 1.1625, 1.1626 PkgVersion.pm, 1.634, 1.635

[Dave Vasilevsky]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1380/perlmod/Fink

Modified Files:
ChangeLog PkgVersion.pm 
Log Message:
Fix full_trees for prefices like /foo/bar/iggy

Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -d -r1.634 -r1.635
--- PkgVersion.pm   11 May 2009 21:57:10 -  1.634
+++ PkgVersion.pm   28 Jun 2009 09:58:29 -  1.635
@@ -622,7 +622,8 @@

# determine the full package tree, eg: [ qw(stable 
main) ]
# front (removed): '', %p, 'fink', 'dists'
-   $self-{_full_trees} = [ [ @parts[4..$finkinfo_index-1] 
] ];
+   my $skip = () = ($basepath =~ m,[^/]+,g); # count 
components of prefix
+   $self-{_full_trees} = [ [ 
@parts[(3+$skip)..$finkinfo_index-1] ] ];
}
} else {
# for dummy descriptions generated from dpkg status data alone

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1625
retrieving revision 1.1626
diff -u -d -r1.1625 -r1.1626
--- ChangeLog   22 Jun 2009 16:12:35 -  1.1625
+++ ChangeLog   28 Jun 2009 09:58:29 -  1.1626
@@ -1,3 +1,8 @@
+2009-06-28  Dave Vasilevsky  v...@users.sourceforge.net
+
+   * PkgVersion.pm: Calculate full_trees correctly when prefix has
+   multiple directory components.
+
 2009-06-22  Benjamin Reed  rangerr...@users.sourceforge.net
 
* Validation.pm: Allow @executable_path and friends to be private libs


--
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] fink/perlmod/Fink ChangeLog, 1.1592.2.14, 1.1592.2.15 Services.pm, 1.227.2.1, 1.227.2.2

[Dave Vasilevsky]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21664/perlmod/Fink

Modified Files:
  Tag: branch_0_29
ChangeLog Services.pm 
Log Message:
Fix typo in dpkg_lockwait

Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.227.2.1
retrieving revision 1.227.2.2
diff -u -d -r1.227.2.1 -r1.227.2.2
--- Services.pm 8 May 2009 17:40:45 -   1.227.2.1
+++ Services.pm 13 May 2009 12:26:07 -  1.227.2.2
@@ -1829,8 +1829,8 @@
 =cut
 
 sub dpkg_lockwait {
-   if (-f Fink::Config::basepath/bin/dpkg-lockwait) {
-   Fink::Config::basepath/bin/dpkg-lockwait;
+   if (-f $Fink::Config::basepath/bin/dpkg-lockwait) {
+   $Fink::Config::basepath/bin/dpkg-lockwait;
} else {
get_path('dpkg');
}

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1592.2.14
retrieving revision 1.1592.2.15
diff -u -d -r1.1592.2.14 -r1.1592.2.15
--- ChangeLog   13 May 2009 02:22:34 -  1.1592.2.14
+++ ChangeLog   13 May 2009 12:26:07 -  1.1592.2.15
@@ -1,3 +1,7 @@
+2009-05-13  Dave Vasilevsky  v...@users.sourceforge.net
+
+   * Services.pm: Fix typo in dpkg_lockwait.
+
 2009-05-12  Dave Morrison  d...@finkproject.org
 
* Bootstrap.pm: recognize 10.5.7


--
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image 
processing features enabled. http://p.sf.net/sfu/kodak-com
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] fink/perlmod/Fink ChangeLog, 1.1617, 1.1618 Services.pm, 1.228, 1.229

[Dave Vasilevsky]

Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21068/perlmod/Fink

Modified Files:
ChangeLog Services.pm 
Log Message:
Fix typo in dpkg_lockwait

Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- Services.pm 8 May 2009 17:39:36 -   1.228
+++ Services.pm 13 May 2009 12:21:31 -  1.229
@@ -1829,8 +1829,8 @@
 =cut
 
 sub dpkg_lockwait {
-   if (-f Fink::Config::basepath/bin/dpkg-lockwait) {
-   Fink::Config::basepath/bin/dpkg-lockwait;
+   if (-f $Fink::Config::basepath/bin/dpkg-lockwait) {
+   $Fink::Config::basepath/bin/dpkg-lockwait;
} else {
get_path('dpkg');
}

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1617
retrieving revision 1.1618
diff -u -d -r1.1617 -r1.1618
--- ChangeLog   13 May 2009 02:22:57 -  1.1617
+++ ChangeLog   13 May 2009 12:21:31 -  1.1618
@@ -1,3 +1,7 @@
+2009-05-13  Dave Vasilevsky  v...@users.sourceforge.net
+
+   * Services.pm: Fix typo in dpkg_lockwait.
+
 2009-05-12  Dave Morrison  d...@finkproject.org
 
* Bootstrap.pm: recognize 10.5.7


--
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image 
processing features enabled. http://p.sf.net/sfu/kodak-com
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/libs/perlmods http-proxy-pm.info, 1.4, 1.5

[Dave Vasilevsky]

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

Modified Files:
http-proxy-pm.info 
Log Message:
add 5.8.8 variant

Index: http-proxy-pm.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/http-proxy-pm.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- http-proxy-pm.info  16 Jun 2007 22:45:14 -  1.4
+++ http-proxy-pm.info  28 Nov 2007 04:47:40 -  1.5
@@ -6,7 +6,7 @@
 Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4, 
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
 Source: mirror:cpan:authors/id/B/BO/BOOK/HTTP-Proxy-%v.tar.gz
 Source-MD5: 71402530846f6f3c2eff460241b8ece9
-Type: perl (5.8.1 5.8.4 5.8.6)
+Type: perl (5.8.1 5.8.4 5.8.6 5.8.8)
 UpdatePOD: true
 Depends: perl%type_pkg[perl]-core, libwww-pm%type_pkg[perl]
 DocFiles: Changes MANIFEST META.yml README COPYRIGHT


-
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/net tcpflow.patch, NONE, 1.1 tcpflow.info, 1.4, 1.5

[Dave Vasilevsky]

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

Modified Files:
tcpflow.info 
Added Files:
tcpflow.patch 
Log Message:
patch to fix leopard bug; repair validation errors

--- NEW FILE: tcpflow.patch ---
diff -Naur tcpflow-0.21/src/main.c tcpflow-new/src/main.c
--- tcpflow-0.21/src/main.c 2003-08-07 03:35:24.0 -0400
+++ tcpflow-new/src/main.c  2007-11-14 09:17:20.0 -0500
@@ -68,7 +68,7 @@
 int no_promisc = 0;
 int bytes_per_flow = 0;
 int max_flows = 0;
-int max_desired_fds = 0;
+int max_desired_fds = MAX_FD_GUESS;
 int console_only = 0;
 int strip_nonprint = 0;
 
@@ -152,7 +152,7 @@
   if ((max_desired_fds = atoi(optarg))  (NUM_RESERVED_FDS + 2)) {
DEBUG(1) (warning: -f flag must be used with argument = %d,
  NUM_RESERVED_FDS + 2);
-   max_desired_fds = 0;
+   max_desired_fds = MAX_FD_GUESS;
   }
   break;
 case 'h':

Index: tcpflow.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/tcpflow.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tcpflow.info12 Feb 2007 19:51:14 -  1.4
+++ tcpflow.info14 Nov 2007 14:26:48 -  1.5
@@ -1,16 +1,31 @@
 Package: tcpflow
 Version: 0.21
-Revision: 1
-Depends: libpcap
+Revision: 2
+Depends: libpcap-shlibs
+BuildDepends: fink (= 0.24.12), libpcap
 UpdateConfigGuess: true
+PatchFile: %n.patch
+PatchFile-MD5: 9688f3ae498238e1666bf57400714ab6
 Source: http://www.circlemud.org/pub/jelson/tcpflow/%n-%v.tar.gz
 InstallScript: make install DESTDIR=%d
 ConfigureParams: --mandir='${prefix}/share/man' 
--infodir='${prefix}/share/info'
-Description: Captures data transmitted as part of TCP connections
+Description: Captures data transmitted in TCP connections
 DescDetail: 
-tcpflow is a program that captures data transmitted as part of TCP connections 
(flows), and stores the data in a way that is convenient for protocol analysis 
or debugging. A program like 'tcpdump' shows a summary of packets seen on the 
wire, but usually doesn't store the data that's actually being transmitted. In 
contrast, tcpflow reconstructs the actual data streams and stores each flow in 
a separate file for later analysis. 
+tcpflow is a program that captures data transmitted as part of TCP
+connections (flows), and stores the data in a way that is convenient for
+protocol analysis or debugging. A program like 'tcpdump' shows a summary of
+packets seen on the wire, but usually doesn't store the data that's actually
+being transmitted. In contrast, tcpflow reconstructs the actual data streams
+and stores each flow in a separate file for later analysis. 
 
-tcpflow understands sequence numbers and will correctly reconstruct data 
streams regardless of retransmissions or out-of-order delivery. However, it 
currently does not understand IP fragments; flows containing IP fragments will 
not be recorded properly. 
+tcpflow understands sequence numbers and will correctly reconstruct data
+streams regardless of retransmissions or out-of-order delivery. However,
+it currently does not understand IP fragments; flows containing IP fragments
+will not be recorded properly. 
+
+DescPort: 
+   Would give 'calling setrlimit: Invalid argument' on Leopard.
+   Fix according to: 
http://www.entropy.ch/phpbb2/viewtopic.php?t=2881sid=32825fe6b6b6308373d01dfbf149b3e6
 
 Maintainer: None [EMAIL PROTECTED]
 Homepage: http://www.circlemud.org/~jelson/software/tcpflow/


-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now  http://get.splunk.com/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/libs/perlmods interpolation-pm.info, 1.4, 1.5

[Dave Vasilevsky]

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

Modified Files:
interpolation-pm.info 
Log Message:
new upstream; perl 5.8.8

Index: interpolation-pm.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/interpolation-pm.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- interpolation-pm.info   16 Jun 2007 22:45:14 -  1.4
+++ interpolation-pm.info   12 Nov 2007 01:54:35 -  1.5
@@ -1,7 +1,7 @@
 Info2: 
 Package: interpolation-pm%type_pkg[perl]
-Version: 0.70.1
-Revision: 12
+Version: 0.71
+Revision: 1
 Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
 Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4, 
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
 ###
@@ -11,10 +11,9 @@
 Conflicts: interpolation-pm (= 0.69-1), interpolation-pm581 ( 0.70.1-11)
 ###
 Source: mirror:cpan:authors/id/J/JE/JENDA/Interpolation-%v.tar.gz
-Source-MD5: 65f94ef06117d7a2a99852c16fbedded
-SourceDirectory: Interpolation-0.70
+Source-MD5: 6afe3cdb282b2752b87fd86d895a1749
 ###
-Type: perl (5.8.1 5.8.4 5.8.6)
+Type: perl (5.8.1 5.8.4 5.8.6 5.8.8)
 UpdatePOD: true
 ###
 DocFiles: Changes MANIFEST README


-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now  http://get.splunk.com/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/libs/perlmods devel-smallprof-pm.info, 1.2, 1.3

[Dave Vasilevsky]

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

Modified Files:
devel-smallprof-pm.info 
Log Message:
10.5 ok

Index: devel-smallprof-pm.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/devel-smallprof-pm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- devel-smallprof-pm.info 17 Feb 2006 01:39:16 -  1.2
+++ devel-smallprof-pm.info 11 Feb 2007 18:21:14 -  1.3
@@ -11,7 +11,7 @@
 BuildDepends: fink (= 0.20.1-1)
 Depends: perl%type_pkg[perl]-core, time-hires-pm%type_pkg[perl]
 
-Type: perl (5.8.1 5.8.4 5.8.6)
+Type: perl (5.8.1 5.8.4 5.8.6 5.8.8)
 UpdatePOD: true
 DocFiles: Changes MANIFEST README TODO
 Description: Per-line Perl profiler


-
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=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

[cvs] fink/10.4 unzip.patch,NONE,1.1 unzip.info,1.1,1.2

[Dave Vasilevsky]

Update of /cvsroot/fink/fink/10.4
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9142

Modified Files:
unzip.info 
Added Files:
unzip.patch 
Log Message:
fix direntry issue in leper

Index: unzip.info
===
RCS file: /cvsroot/fink/fink/10.4/unzip.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unzip.info  20 Jan 2006 20:59:55 -  1.1
+++ unzip.info  8 Feb 2007 14:22:00 -   1.2
@@ -32,3 +32,5 @@
 InstallScript: make -f unix/Makefile install BINDIR=%i/bin 
MANDIR=%i/share/man/man1
 Suggests: zip
 
+# Fix for 10.5 (stop 'struct direntry' name conflict)
+Patch: %n.patch

--- NEW FILE: unzip.patch ---
--- unzip-5.52/unix/unix.c  2005-02-26 14:43:42.0 -0500
+++ unzip-5.52/new  2007-02-08 08:05:58.0 -0500
@@ -53,7 +53,13 @@
 #endif
 
 #ifdef DIRENT
+#  ifdef __APPLE__
+#define direntry apple_direntry
+#  endif
 #  include dirent.h
+#  ifdef __APPLE__
+#undef direntry
+#  endif
 #else
 #  ifdef SYSV
 #ifdef SYSNDIR


-
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=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

[cvs] dists/10.4/unstable/main/finkinfo/text diction.info, 1.1, 1.1.2.1

[Dave Vasilevsky]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3441

Modified Files:
  Tag: pangocairo-branch
diction.info 
Log Message:
update diction, tracker #1510492

Index: diction.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/diction.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- diction.info20 Jan 2006 20:32:31 -  1.1
+++ diction.info15 Jan 2007 13:10:27 -  1.1.2.1
@@ -1,10 +1,10 @@
 Package: diction
-Version: 1.02
-Revision: 12
+Version: 1.10-rc4
+Revision: 1
 Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
 DocFiles: COPYING INSTALL NEWS README
-Source: http://www.moria.de/~michael/diction/diction.tar.gz
-SourceDirectory: diction-%v
+Source: http://www.moria.de/~michael/%n/%n-%v.tar.gz
+SourceDirectory: diction-1.10
 UpdateConfigGuess: true
 ConfigureParams: mandir=%i/share/man
 Description: Identifies diction and style errors
@@ -20,4 +20,6 @@
 
 Homepage: http://www.gnu.org/software/diction/diction.html
 License: GPL
-Source-MD5: e50fd9139d47b1f146b1342293825f19
+Source-MD5: d66fdce94f1101a4e570e02aa0315eaf
+
+


-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

[cvs] fink ChangeLog,1.447,1.448 fink.conf.5.in,1.39,1.40

[Dave Vasilevsky]

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

Modified Files:
ChangeLog fink.conf.5.in 
Log Message:
notification fixups; allow multiple notifiers

Index: fink.conf.5.in
===
RCS file: /cvsroot/fink/fink/fink.conf.5.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- fink.conf.5.in  16 Sep 2006 23:37:12 -  1.39
+++ fink.conf.5.in  8 Dec 2006 12:35:14 -   1.40
@@ -376,7 +376,7 @@
 .Pa $HOME/.ccache, 
 potentially putting root-owned files into your home directory.
 .It Cm NotifyPlugin: Ar plugin
-Specify a notification plugin to tell you when packages have been 
installed/uninstalled.
+Specify a space-separated list of notification plugins, to tell you when 
packages have been installed/uninstalled.
 Defaults to
 .Pa Growl
 (requires Mac::Growl to operate).  The available plugins are listed in the 
output of

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -d -r1.447 -r1.448
--- ChangeLog   7 Dec 2006 17:53:46 -   1.447
+++ ChangeLog   8 Dec 2006 12:35:14 -   1.448
@@ -1,3 +1,7 @@
+2006-12-08 Dave Vasilevsky [EMAIL PROTECTED]
+
+   * fink.conf.5.in: Document multi-notification.
+   
 2006-12-07  Dave Morrison  [EMAIL PROTECTED]
 
* bootstrap: Set up properly for distributions which use .info files


-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

[cvs] fink/perlmod/Fink ChangeLog,1.1414,1.1415 Notify.pm,1.18,1.19

[Dave Vasilevsky]

/perlmod/Fink/ChangeLog,v
retrieving revision 1.1414
retrieving revision 1.1415
diff -u -d -r1.1414 -r1.1415
--- ChangeLog   8 Dec 2006 03:33:00 -   1.1414
+++ ChangeLog   8 Dec 2006 12:35:14 -   1.1415
@@ -1,3 +1,12 @@
+2006-12-08 Dave Vasilevsky [EMAIL PROTECTED]
+
+   * Notify.pm: Allow multiple notifiers (or none). Also allow
+   case-insensitive NotifyPlugin spec.
+   * Notify/Growl.pm, Notify/Quicksilver.pm, Notify/Say.pm, 
Notify/Syslog.pm:
+   Make strict. Miscellaneous fixes.
+   * Notify/Growl.pm: Fix strictness problems. How did this ever work
+   before!?
+   
 2006-12-07  Daniel Macks  [EMAIL PROTECTED]
 
* PkgVersion.pm: Only check first alternative in each OR set for


-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/web libapreq2.patch,NONE,1.1 libapreq2.info,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
libapreq2.info 
Added Files:
libapreq2.patch 
Log Message:
fix bug on intel

--- NEW FILE: libapreq2.patch ---
diff -Naur libapreq2-2.07/library/t/util.c libapreq2-2.07-0001/library/t/util.c
--- libapreq2-2.07/library/t/util.c 2006-01-03 14:52:10.0 -0500
+++ libapreq2-2.07-0001/library/t/util.c2006-04-04 07:17:11.0 
-0400
@@ -92,7 +92,7 @@
 char src1[] = %C3%80%E3%82%a2; /* A_GRAVE KATAKANA_A as utf8 */
 char src2[] = pound%A3;/* latin-1 */
 char src3[] = euro%80;/* cp-1252 */
-char expect[6];
+char expect[7];
 
 AT_int_eq(apreq_decode(expect, elen, src1, sizeof(src1) -1),
   APR_SUCCESS);

Index: libapreq2.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/libapreq2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libapreq2.info  29 Mar 2006 02:00:11 -  1.1
+++ libapreq2.info  4 Apr 2006 22:40:58 -   1.2
@@ -15,12 +15,12 @@
 Source: mirror:apache:httpd/libapreq/libapreq2-%v.tar.gz
 Source-MD5: 6f2e5e4a14e8b190dead0fe91fc13080
 
+# Test is broken (buffer overrun)
+Patch: %n.patch
+
 PatchScript: 
#!/bin/sh -ev

-   # Tests break with optimization
-   perl -i -pe 's/^(CFLAGS\s*=.*)/$1 -O0/' library/t/Makefile.in
-   
# Don't test the module. It requires mod-perl2-pm5*, and we don't want 
to
# force any particular variant of it.
perl -i -pe 's/^(test:.*)module_test/$1/' Makefile.in



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/gnome meld.info,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
meld.info 
Log Message:
fix broken versioned dep

Index: meld.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/meld.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- meld.info   28 Jan 2006 22:10:33 -  1.2
+++ meld.info   29 Mar 2006 22:02:03 -  1.3
@@ -28,7 +28,7 @@
 Homepage: http://meld.sourceforge.net/
 License: GPL
 Maintainer: Daniel Macks [EMAIL PROTECTED]
-Depends: x11, python23(= 1:2.4.2-1004), gnome-python2-py23, pyorbit2-py23, 
pygtk2-py23, scrollkeeper
+Depends: x11, python23(= 1:2.3.5-1124), gnome-python2-py23, pyorbit2-py23, 
pygtk2-py23, scrollkeeper
 BuildDepends: x11-dev, pygtk2-py23-dev, gettext-bin, gettext-tools, intltool
 Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2
 Source-MD5: ccde817f0396d39e9e40f31a3a7611f6



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.417,1.418 postinstall.pl.in,1.36,1.37

[Dave Vasilevsky]

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

Modified Files:
ChangeLog postinstall.pl.in 
Log Message:
make scanpackages run on postinstall, when it's the first time the user is 
running with AutoScanpackages

Index: postinstall.pl.in
===
RCS file: /cvsroot/fink/fink/postinstall.pl.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- postinstall.pl.in   3 Jan 2006 20:14:46 -   1.36
+++ postinstall.pl.in   29 Mar 2006 23:00:43 -  1.37
@@ -30,7 +30,7 @@
 use lib @PREFIX@/lib/perl5;
 
 use Fink::Bootstrap qw(check_host);
-use Fink::Services qw(read_config execute);
+use Fink::Services qw(read_config execute apt_available);
 use Fink::CLI qw(print_breaking prompt_boolean);
 
 use Fink::Config qw($config);
@@ -237,6 +237,26 @@
  
 }
 
+# If a user upgrades to a new fink with AutoScanpackages, we'd rather do the
+# first (uncached, long) scan in postinst than at the end of the user's next
+# build.
+sub pre_scanpackages {
+   my $autoscan = !$config-has_param(AutoScanpackages)
+   || $config-param_boolean(AutoScanpackages);
+   return 0 unless $autoscan  apt_available;
+
+   require Fink::Scanpackages;
+   my $cache = Fink::Scanpackages-default_cache;
+   return 0 if -e $cache; # we already ran scanpackages at some point
+   
+   print STDERR Caching your binary packages...this may take a while.\n;
+   
+   # Don't use the PDB, we don't want to trigger an index now
+   require Fink::Engine;
+   Fink::Engine::scanpackages({ pdb = 0 });
+   return 1;
+}
+pre_scanpackages();
 
 if ($configNeedsUpdate) {
   print_breaking(\nThis fink version introduces new settings stored in the  
.

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -d -r1.417 -r1.418
--- ChangeLog   28 Mar 2006 20:01:27 -  1.417
+++ ChangeLog   29 Mar 2006 23:00:43 -  1.418
@@ -1,3 +1,9 @@
+2006-03-29  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * postinstall.pl.in: If AutoScanpackages is about to be turned on for 
the
+   first time, pre-scan the user's debs rather than surprising them at the
+   end of the next build.
+
 2006-03-28  Daniel Macks  [EMAIL PROTECTED]
 
* bootstrap.pl: FinkVersion.pm::default_binary_version now returns



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1313,1.1314 Engine.pm,1.370,1.371 PkgVersion.pm,1.545,1.546 Scanpackages.pm,1.9,1.10

[Dave Vasilevsky]

: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1313
retrieving revision 1.1314
diff -u -d -r1.1313 -r1.1314
--- ChangeLog   29 Mar 2006 17:30:49 -  1.1313
+++ ChangeLog   29 Mar 2006 23:00:44 -  1.1314
@@ -1,3 +1,9 @@
+2006-03-29  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * Scanpackages.pm: Provide a way to get the path to the default cache.
+   * Engine.pm: Make Engine::scanpackages more flexible.
+   * Engine.pm, PkgVersion.pm: Accommodate changes to Engine::scanpackages.
+
 2006-03-29  Dave Morrison  [EMAIL PROTECTED]
 
* Config.pm: Avoid circular dependency



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/gnome libgnomeui2.info,1.4,1.5

[Dave Vasilevsky]

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

Modified Files:
libgnomeui2.info 
Log Message:
put libgnome.so in shlibs

Index: libgnomeui2.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgnomeui2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libgnomeui2.info7 Feb 2006 17:46:14 -   1.4
+++ libgnomeui2.info30 Mar 2006 00:22:05 -  1.5
@@ -1,6 +1,6 @@
 Package: libgnomeui2
 Version: 2.12.1
-Revision: 1001
+Revision: 1002
 Depends: %N-shlibs (= %v-%r), atk1-shlibs (= 1.6.0-1), audiofile-shlibs (= 
0.2.5-1), esound-bin (= 0.2.34-1), esound-shlibs (= 0.2.34-1), gconf2 (= 
2.6.0-1), gnome-keyring, libgettext3-shlibs, glib2 (= 2.6.6-), 
gnome-vfs2-ssl (= 2.7.3-1) | gnome-vfs2 (= 2.7.3-1), gtk+2 (= 2.6.0-1), 
libart2-shlibs (= 2.3.16-1), libbonobo2 (= 2.6.0-1), libbonoboui2 (= 
2.6.0-1), libglade2-shlibs (= 2.3.6-1), libgnome2 (= 2.6.0-1), 
libgnomecanvas2 (= 2.6.0-1), libiconv, libxml2-shlibs (= 2.6.7-1), orbit2 (= 
2.10.0-1), pango1-xft2 (= 1.4.0-1), popt-shlibs, libjpeg-shlibs
 Conflicts: gnome-libs ( 1.4.1.6)
 BuildDepends: glib2-dev (= 2.6.6-), atk1 (= 1.6.0-1), pango1-xft2-dev 
(= 1.4.0-1), gtk+2-dev (= 2.6.0-1), gtk+2 (= 2.6.0-1), orbit2-dev (= 
2.10.0-1), libxml2 (= 2.6.7-1), libglade2 (= 2.3.6-1), libbonobo2-dev (= 
2.6.0-1), libart2 (= 2.3.16-1), libgnomecanvas2-dev (= 2.6.0-1), gconf2-dev 
(= 2.6.0-1), gnome-vfs2-ssl-dev (= 2.7.3-1) | gnome-vfs2-dev (= 2.7.3-1), 
libgnome2-dev (= 2.6.0-1), libbonoboui2-dev (= 2.6.0-1), esound (= 0.2.34), 
audiofile (= 0.2.5), pkgconfig, gtk-doc (= 1.2-1), popt, gnome-keyring-dev 
(= 0.4.3-1), libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, 
x11-dev, libjpeg
@@ -25,7 +25,7 @@
 SplitOff: 
   Package: %N-shlibs
   Depends: atk1-shlibs (= 1.6.0-1), audiofile-shlibs (= 0.2.5-1), 
esound-shlibs (= 0.2.34-1), gconf2 (= 2.6.0-1), gnome-keyring, 
libgettext3-shlibs, glib2 (= 2.6.6-), gnome-vfs2-ssl (= 2.7.3-1) | 
gnome-vfs2 (= 2.7.3-1), gtk+2 (= 2.6.0-1), libart2-shlibs (= 2.3.16-1), 
libbonobo2 (= 2.6.0-1), libbonoboui2 (= 2.6.0-1), libglade2-shlibs (= 
2.3.6-1), libgnome2 (= 2.6.0-1), libgnomecanvas2 (= 2.6.0-1), libiconv, 
libxml2-shlibs (= 2.6.7-1), orbit2 (= 2.10.0-1), pango1-xft2 (= 1.4.0-1), 
popt-shlibs, libjpeg-shlibs, x11
-  Files: lib/libgnomeui-2.*.dylib
+  Files: lib/libgnomeui-2.*.dylib lib/libglade/2.0/libgnome.so
   Shlibs: %p/lib/libgnomeui-2.0.dylib 1201.0.0 %n (= 2.12.0-1)
   RunTimeVars: GNOME_DISABLE_CRASH_DIALOG: 1
   DocFiles: AUTHORS COPYING* ChangeLog 
libgnomeui/ChangeLog:ChangeLog.libgnomeui po/ChangeLog:ChangeLog.po NEWS README



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/web libapreq2-pm.info,NONE,1.1 libapreq2.info,NONE,1.1 mod-perl2-pm.info,NONE,1.1

[Dave Vasilevsky]

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

Added Files:
libapreq2-pm.info libapreq2.info mod-perl2-pm.info 
Log Message:
adding mod-perl2

--- NEW FILE: libapreq2-pm.info ---
Info2: 
Package: libapreq2-pm%type_pkg[perl]
Version: 2.07
Revision: 1000
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
DocFiles: Changes FAQ.pod INSTALL LICENSE MANIFEST META.yml NOTICE 
PREREQUISITES README STATUS
Description: Perl modules for libapreq2
DescDetail: 
The perl APIs Apache::Request and Apache::Cookie are the
lightweight mod_perl analogs of the CGI and CGI::Cookie perl modules
of libapreq2.

License: OSI-Approved
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
Homepage: http://httpd.apache.org/apreq/
UpdatePOD: true

Type: perl (5.8.1 5.8.4 5.8.6)

BuildDepends: fink (= 0.20.3), extutils-xsbuilder-pm, libapreq2 (= %v-%r), 
mod-perl2-pm%type_pkg[perl]-dev (= 2.0.2-1000), apr-ssl (= 0.9.7-1011) | apr 
(= 0.9.7-1011), openldap23-dev, libiconv-dev, cyrus-sasl2-dev (= 2.1.21-1), 
gdbm3, expat (= 1.95.3-1), db43-ssl (= 4.3.29-1001) | db43 (= 4.3.29-1001), 
apache2-ssl-dev (= 2.0.55-1010) | apache2-dev (= 2.0.55-1010)
Depends: perl%type_pkg[perl]-core, mod-perl2-pm%type_pkg[perl] (= 2.0.2-1000), 
libapreq2-shlibs (= %v-%r)

Source: mirror:apache:httpd/libapreq/libapreq2-%v.tar.gz
Source-MD5: 6f2e5e4a14e8b190dead0fe91fc13080

PatchScript: 
#!/bin/sh -ev

# We only want the glue
perl -i -pe 's,^(SUBDIRS\s*=.*),SUBDIRS = glue,' Makefile.in

# libap2req is already installed, so use it
perl -i -pe 's,\$base_dir/(apreq2-config),$1,' glue/perl/Makefile.PL


CompileScript: 
#!/bin/sh -ev

# Need full path to perl
PERL=`which perl%type_raw[perl]`

# Put arch in $archname
eval `perl%type_raw[perl] -V:archname`

# Need to pass apxs location, MakeMaker opts
./configure --prefix=%p --enable-perl-glue \
--with-mm-opts=PERL=$PERL PREFIX=%p \
INSTALLPRIVLIB=%p/lib/perl5/%type_raw[perl] \
INSTALLARCHLIB=%p/lib/perl5/%type_raw[perl]/$archname \
INSTALLSITELIB=%p/lib/perl5/%type_raw[perl] \
INSTALLSITEARCH=%p/lib/perl5/%type_raw[perl]/$archname \
INSTALLMAN1DIR=%p/lib/perl5/%type_raw[perl]/man/man1 \
INSTALLMAN3DIR=%p/lib/perl5/%type_raw[perl]/man/man3 \

INSTALLSITEMAN1DIR=%p/lib/perl5/%type_raw[perl]/man/man1 \

INSTALLSITEMAN3DIR=%p/lib/perl5/%type_raw[perl]/man/man3 \
INSTALLBIN=%p/bin INSTALLSITEBIN=%p/bin 
INSTALLSCRIPT=%p/bin \
--with-apache2-apxs=%p/sbin/apxs --with-perl=$PERL

make


InstallScript: 
#!/bin/sh -ev
make install DESTDIR=%d
rm -r %i/bin # He says they've already got one!



--- NEW FILE: libapreq2.info ---
Package: libapreq2
Version: 2.07
Revision: 1000
DocFiles: Changes FAQ.pod INSTALL LICENSE MANIFEST META.yml NOTICE 
PREREQUISITES README STATUS
Description: Library for parsing HTTP data
License: OSI-Approved
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
Homepage: http://httpd.apache.org/apreq/

# Does not use any C++ symbols
BuildDepends: apr-ssl (= 0.9.7-1011) | apr (= 0.9.7-1011), openldap23-dev, 
libiconv-dev, cyrus-sasl2-dev (= 2.1.21-1), gdbm3, expat (= 1.95.3-1), 
db43-ssl (= 4.3.29-1001) | db43 (= 4.3.29-1001), apache2-ssl-dev (= 
2.0.55-1010) | apache2-dev (= 2.0.55-1010)
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true

Source: mirror:apache:httpd/libapreq/libapreq2-%v.tar.gz
Source-MD5: 6f2e5e4a14e8b190dead0fe91fc13080

PatchScript: 
#!/bin/sh -ev

# Tests break with optimization
perl -i -pe 's/^(CFLAGS\s*=.*)/$1 -O0/' library/t/Makefile.in

# Don't test the module. It requires mod-perl2-pm5*, and we don't want 
to
# force any particular variant of it.
perl -i -pe 's/^(test:.*)module_test/$1/' Makefile.in

DescPackaging: 
User may see an error about missing Apache::Test, it's harmless.

DescDetail: 
libapreq is a safe, standards-compliant, high-performance library 
used for parsing HTTP cookies, query-strings and POST data.  The 
original version (libapreq-1.X) was designed by Lincoln Stein and Doug 
MacEachern.

DescUsage: 
To enable mod_apreq, run as root:
  
  apxs -a -e -n apreq %p/lib/apache2/modules/mod_apreq2.so

Use -A instead of -a to disable it.

The perl APIs Apache::Request and Apache::Cookie are available in the packages
libapreq2-pm581, libapreq2-pm584, libapreq2-pm586.


ConfigureParams: --disable-perl-glue
CompileScript: 
./configure %c
make
make test

InstallScript: make install DESTDIR=%d

SplitOff: 
Package: %N-shlibs
Files: lib/libapreq2.*.dylib

dists/10.4/unstable/main/finkinfo/libs/perlmods extutils-xsbuilder-pm.info,NONE,1.1

[Dave Vasilevsky]

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

Added Files:
extutils-xsbuilder-pm.info 
Log Message:
adding mod-perl2

--- NEW FILE: extutils-xsbuilder-pm.info ---
Package: extutils-xsbuilder-pm
Version: 0.27
Revision: 1
###
###
Source: mirror:cpan:authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%v.tar.gz
Source-MD5: 6e1f1c8207b598166dc7a06d633db308
###
Type: perl
###
UpdatePOD: true
###
DocFiles: MANIFEST META.yml README
###
Description: Automatic XS glue code generation
DescDetail: 
ExtUtils::XSBuilder is a set modules to parse C header files and create XS
glue code and documentation out of it. Idealy this allows to write an
interface to a C library without coding a line. Since no C-API is ideal,
some adjuments are necessary most of the time. So to use this module you
must still be familar with C and XS programming, but it removes a lot of
stupid work and copypaste from you. Also when the C API changes, most
of the time you only have to rerun XSBuilder to get your new Perl API.

###
License: Artistic/GPL
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
Homepage: http://search.cpan.org/dist/ExtUtils-XSBuilder
Depends: rec-descent-pm, tie-ixhash-pm



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/sound faac.info,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
faac.info 
Log Message:
add comment re: c++

Index: faac.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/faac.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- faac.info   13 Feb 2006 22:27:04 -  1.1
+++ faac.info   27 Mar 2006 08:26:30 -  1.2
@@ -1,6 +1,8 @@
 Package: faac
 Version: 1.24+cvs20041018
 Revision: 1012
+
+# Only the mp4v2 lib has C++ symbols
 GCC: 4.0
 
 Maintainer: Dave Vasilevsky [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/sound faad.patch,NONE,1.1 faad.info,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
faad.info 
Added Files:
faad.patch 
Log Message:
gcc 4 ok

Index: faad.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/faad.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- faad.info   7 Feb 2006 20:46:31 -   1.2
+++ faad.info   27 Mar 2006 08:27:53 -  1.3
@@ -1,16 +1,16 @@
 Package: faad
 Version: 2.0.0
-Revision: 1012
-Architecture: powerpc
+Revision: 1013
 ###
-Depends: libfaad1-shlibs, libmp4v21-shlibs
-BuildDepends: id3lib4-dev (= 3.8.3-1014), libtool14, xmms, libiconv-dev, 
gettext-dev, gtk+, glib, automake1.8, gcc3.3
+Depends: libfaad1-shlibs (= %v-%r), libmp4v21-shlibs (= %v-%r)
+BuildDepends: id3lib4-dev (= 3.8.3-1014), libtool14, xmms, libiconv-dev, 
gettext-dev, gtk+, glib, automake1.8
 ###
 Source: mirror:sourceforge:faac/faad2-2.0.tar.gz
 Source-MD5: 1a6f79365f2934a4888b210ef47a3a07
 SourceDirectory: faad2
 ###
-GCC: 3.3
+# Only libmp4v21-{dev,shlibs} has C++ symbols
+GCC: 4.0
 ###
 PatchScript: 
   echo SUBDIRS = libfaad common frontend plugins  Makefile.am
@@ -25,6 +25,7 @@
   perl -pi -e 's,[EMAIL PROTECTED]@,\$\(top_srcdir\)/common/mp4v2/libmp4v2.la 
[EMAIL PROTECTED]@,g' frontend/Makefile.in
   perl -pi -e 's,[EMAIL PROTECTED]@,\$\(top_srcdir\)/common/mp4v2/libmp4v2.la 
[EMAIL PROTECTED]@,g' plugins/xmms/Makefile.in
 
+Patch: %n.patch
 ###
 NoSetLDFLAGS: true
 SetLIBS: -L%p/lib
@@ -33,10 +34,6 @@
 ###
 DocFiles: AUTHORS COPYING NEWS README* TODO
 ###
-CompileScript: 
-  export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
-  make CC=gcc-3.3 CXX=g++-3.3
-
 InstallScript: 
   make install DESTDIR=%d
 
@@ -106,12 +103,6 @@
 
 ###
 Description: FAAC audio library
-DescPackaging: 
- This version is compiled with g++-3.3, even in the 10.4 tree.  If it is
- ever updated to a more recent compiler, the group of packages avidemux,
- faad, and ffmpeg (and any packages which depend on any of them) must all
- be updated at the same time.
-
 DescDetail: 
   FAAC is an Advanced Audio Coder (MPEG2-AAC, MPEG4-AAC). The goal of FAAC is
   to explore the possibilities of AAC and exceed the quality of the currentlyi

--- NEW FILE: faad.patch ---
diff -ru faad2.orig/common/mp4ff/mp4ff.c faad2/common/mp4ff/mp4ff.c
--- faad2.orig/common/mp4ff/mp4ff.c 2004-01-11 10:52:18.0 -0500
+++ faad2/common/mp4ff/mp4ff.c  2006-03-23 21:38:27.0 -0500
@@ -87,7 +87,7 @@
 if (ff) free(ff);
 }
 
-static void mp4ff_track_add(mp4ff_t *f)
+void mp4ff_track_add(mp4ff_t *f)
 {
 f-total_tracks++;
 
diff -ru faad2.orig/common/mp4v2/mp4property.h faad2/common/mp4v2/mp4property.h
--- faad2.orig/common/mp4v2/mp4property.h   2003-06-29 17:41:00.0 
-0400
+++ faad2/common/mp4v2/mp4property.h2006-03-23 21:30:38.0 -0500
@@ -58,7 +58,7 @@
return m_name;
}
 
-   virtual MP4PropertyType GetType() = NULL; 
+   virtual MP4PropertyType GetType() = 0; 
 
bool IsReadOnly() {
return m_readOnly;
@@ -74,17 +74,17 @@
m_implicit = value;
}
 
-   virtual u_int32_t GetCount() = NULL;
-   virtual void SetCount(u_int32_t count) = NULL;
+   virtual u_int32_t GetCount() = 0;
+   virtual void SetCount(u_int32_t count) = 0;
 
virtual void Generate() { /* default is a no-op */ };
 
-   virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL;
+   virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0;
 
-   virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL;
+   virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0;
 
virtual void Dump(FILE* pFile, u_int8_t indent,
-   bool dumpImplicits, u_int32_t index = 0) = NULL;
+   bool dumpImplicits, u_int32_t index = 0) = 0;
 
virtual bool FindProperty(const char* name,
MP4Property** ppProperty, u_int32_t* pIndex = NULL);
diff -ru faad2.orig/common/mp4v2/rtphint.h faad2/common/mp4v2/rtphint.h
--- faad2.orig/common/mp4v2/rtphint.h   2003-06-29 17:41:00.0 -0400
+++ faad2/common/mp4v2/rtphint.h2006-03-23 21:31:01.0 -0500
@@ -35,8 +35,8 @@
return m_pPacket;
}
 
-   virtual u_int16_t GetDataSize() = NULL;
-   virtual void GetData(u_int8_t* pDest) = NULL;
+   virtual u_int16_t GetDataSize() = 0;
+   virtual void GetData(u_int8_t* pDest) = 0;
 
MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
 
diff -ru faad2.orig/libfaad/common.h faad2/libfaad/common.h
--- faad2.orig/libfaad/common.h 2004-02-06 07:55:24.0 -0500
+++ faad2/libfaad/common.h  2006-03-23 21:27:29.0 -0500
@@ -307,6 +307,8 @@
 }
 return i;
 }
+  #elif (defined(__i386__)  defined(__APPLE_CC__))
+#define HAS_LRINTF

dists/10.4/unstable/main/finkinfo/graphics ffmpeg.patch,NONE,1.1 ffmpeg.info,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
ffmpeg.info 
Added Files:
ffmpeg.patch 
Log Message:
gcc 4 ok, also not a c++ package!

Index: ffmpeg.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/ffmpeg.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ffmpeg.info 23 Jan 2006 05:07:14 -  1.2
+++ ffmpeg.info 27 Mar 2006 08:30:04 -  1.3
@@ -1,9 +1,9 @@
 Package: ffmpeg
 Version: 0.4.9-pre1
-Revision: 1011
-Architecture: powerpc
+Revision: 1012
 ###
-BuildDepends: a52dec-dev, imlib2, lame-dev, libfaad1-dev, libmp4v21-dev, 
libogg, libpostproc1, libvorbis0, sdl (= 1.2.9-1001), gcc3.3
+# No C++ symbols used
+BuildDepends: a52dec-dev, imlib2, lame-dev, libfaad1-dev, libmp4v21-dev, 
libogg, libpostproc1, libvorbis0, sdl (= 1.2.9-1001)
 Depends: a52dec, faad, lame, a52dec-shlibs, imlib2-shlibs, lame-shlibs, 
libavcodec1-shlibs, libavformat1-shlibs, libogg-shlibs, libvorbis0-shlibs, 
sdl-shlibs (= 1.2.9-1001)
 ###
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
@@ -66,12 +66,11 @@
   ### Fix for 10.4
   perl -pi -e 's,APPLE,NOTAPPLE,g' libavformat/tcp.c
 
-###
-GCC: 3.3
+Patch: %n.patch
 ###
 DocFiles: COPYING CREDITS Changelog INSTALL README doc/*.html doc/*.txt
 ###
-ConfigureParams: --cc=gcc-3.3 --extra-libs=-L%p/lib -la52 
--extra-cflags=-force_cpusubtype_ALL -Wno-sign-compare -maltivec -fno-common 
--enable-gpl --enable-mp3lame --enable-vorbis --enable-pp --enable-shared-pp 
--powerpc-perf-enable --disable-faac --enable-faad --enable-faadbin 
--enable-a52 --enable-a52bin --enable-shared --mandir=%p/share/man 
--disable-mmx --disable-audio-beos --disable-v4l --disable-dv1394
+ConfigureParams: --extra-libs=-L%p/lib -la52 (%m = powerpc) 
--extra-cflags=-force_cpusubtype_ALL -Wno-sign-compare -maltivec -fno-common 
(%m = i386) --extra-cflags=-force_cpusubtype_ALL -Wno-sign-compare -fno-common 
-DPIC --enable-gpl --enable-mp3lame --enable-vorbis --enable-pp 
--enable-shared-pp (%m = powerpc) --powerpc-perf-enable --disable-faac 
--enable-faad --enable-faadbin --enable-a52 --enable-a52bin --enable-shared 
--mandir=%p/share/man --disable-mmx --disable-audio-beos --disable-v4l 
--disable-dv1394
 ###
 InstallScript: 
   make install prefix=%i mandir=%i/share/man
@@ -99,7 +98,7 @@
 
 SplitOff2: 
   Package: libavcodec1-dev
-  Depends: libavcodec1-shlibs
+  Depends: libavcodec1-shlibs (= %v-%r)
   Conflicts: ffmpeg ( 0.4.6-1)
   Replaces: ffmpeg ( 0.4.6-1)
   BuildDependsOnly: true
@@ -124,7 +123,7 @@
 
 SplitOff4: 
   Package: libavformat1-dev
-  Depends: libavformat1-shlibs
+  Depends: libavformat1-shlibs (= %v-%r)
   BuildDependsOnly: true
   Files: 
 include/ffmpeg/avformat.h
@@ -184,12 +183,6 @@
 
 ###
 Description: Tool to convert video file formats
-DescPackaging: 
- This version is compiled with g++-3.3, even in the 10.4 tree.  If it is
- ever updated to a more recent compiler, the group of packages avidemux,
- faad, and ffmpeg (and any packages which depend on any of them) must all
- be updated at the same time.
-
 DescDetail: 
   FFMpeg is a complete and free Internet live audio and video broadcasting
   solution for Linux/Unix. It also includes a digital VCR. It can encode in

--- NEW FILE: ffmpeg.patch ---
diff -ru ffmpeg-0.4.9-pre1.orig/libavcodec/ac3tab.h 
ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h
--- ffmpeg-0.4.9-pre1.orig/libavcodec/ac3tab.h  2004-06-26 06:08:49.0 
-0400
+++ ffmpeg-0.4.9-pre1/libavcodec/ac3tab.h   2006-03-23 22:39:30.0 
-0500
@@ -4,10 +4,10 @@
  */
 
 /* possible frequencies */
-static const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
+const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
 
 /* possible bitrates */
-static const uint16_t ac3_bitratetab[19] = {
+const uint16_t ac3_bitratetab[19] = {
 32, 40, 48, 56, 64, 80, 96, 112, 128, 
 160, 192, 224, 256, 320, 384, 448, 512, 576, 640 
 };
@@ -15,7 +15,7 @@
 /* AC3 MDCT window */
 
 /* MDCT window */
-static const int16_t ac3_window[256] = {
+const int16_t ac3_window[256] = {
 4,7,   12,   16,   21,   28,   34,   42,
51,   61,   72,   84,   97,  111,  127,  145,
   164,  184,  207,  231,  257,  285,  315,  347,
@@ -144,27 +144,27 @@
 15, 15, 15, 15,
 };
 
-static const uint8_t sdecaytab[4]={ 
+const uint8_t sdecaytab[4]={ 
 0x0f, 0x11, 0x13, 0x15,
 };
 
-static const uint8_t fdecaytab[4]={ 
+const uint8_t fdecaytab[4]={ 
 0x3f, 0x53, 0x67, 0x7b, 
 };
 
-static const uint16_t sgaintab[4]= { 
+const uint16_t sgaintab[4]= { 
 0x540, 0x4d8, 0x478, 0x410,
 };
 
-static const uint16_t dbkneetab[4]= { 
+const uint16_t dbkneetab[4]= { 
 0x000, 0x700, 0x900, 0xb00,
 };
 
-static const uint16_t floortab[8]= { 
+const uint16_t floortab[8]= { 
 0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800,
 };
 
-static const uint16_t 

dists/10.4/stable/main/finkinfo/database sqlite3.info,NONE,1.1 sqlite3.patch,NONE,1.1

[Dave Vasilevsky]

-symbols[i]-name,i);
+  snprintf(pattern,sizeof pattern,#define %s%-30s 
%2d\n,prefix,lemp-symbols[i]-name,i);
   if( strcmp(line,pattern) ) break;
 }
 fclose(in);

--- NEW FILE: sqlite3.info ---
Package: sqlite3
Version: 3.2.8
Revision: 1001

Description: Embedded SQL database, version 3
DescDetail: 
SQLite is a C library that implements an embeddable SQL database engine.
Programs that link with the SQLite library can have SQL database access
without running a separate RDBMS process. The distribution comes with a
standalone command-line access program ( sqlite ) that can be used to
administer an SQLite database and which serves as an example of how to
use the SQLite library.


License: Public Domain 
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
Homepage: http://www.sqlite.org/

DocFiles: README VERSION www/copyright-release.html LICENSE

Depends: %N-shlibs (= %v-%r), readline5-shlibs (= 5.0-1004)
BuildDepends: readline5 (= 5.0-1004), libncurses5 (= 5.4-20041023-1006), 
tcltk ( 8.5), tcltk-dev ( 8.5)
# Does NOT conflict with package sqlite

# Patch so that 'make test' works and the lemon binary is buffer overflow
# safe if we ever decide to install at (Debian and Ubuntu installs it).
Patch: %n.patch
PatchScript: head -n 10 src/sqlite.h.in  LICENSE
ConfigureParams: --with-tcl=%p/lib --enable-threadsafe
CompileScript: 
#!/bin/sh -ev
config_TARGET_READLINE_LIBS='-L%p/lib -lreadline -lncurses' \
./configure %c
make
make doc

# Don't actually run the test suite, it's LONG
# make fulltest

InstallScript: 
#!/bin/sh -ev
TCLLIBPATH=%p/lib/tcl8.4 make install DESTDIR=%d
perl -i -pe 's,%i,%p,g' %i/lib/tcl8.4/sqlite3/pkgIndex.tcl


SetCPPFLAGS: -I%p/include/readline
SetCFLAGS: -Os

Source: http://sqlite.org/sqlite-%v.tar.gz
Source-MD5: 9f2c014aaa46565b8163e047166a5686

SplitOff:  
Package: %N-shlibs
Description: Embedded SQL database (shared libraries)
DocFiles: README VERSION www/copyright-release.html LICENSE
Shlibs: %p/lib/libsqlite3.0.dylib 9.0.0 %n (= 3.0.8-1)
Files: lib/libsqlite3.0.8.6.dylib lib/libsqlite3.0.dylib


SplitOff2:  
Package: %N-dev
Description: Embedded SQL database (include files and linkable libraries)
Depends: %N-shlibs (= %v-%r)
# Does NOT conflict with sqlite-dev, strangely enough

DocFiles: README VERSION www/copyright-release.html LICENSE
BuildDependsOnly: True
Files: 
include
lib/libsqlite3.la
lib/libsqlite3.a
lib/libsqlite3.dylib
lib/pkgconfig



SplitOff3: 
Package: %N-tcl
Description: Embedded SQL database (Tcl/Tk bindings)
Depends: %N-shlibs (= %v-%r), tcltk ( 8.5)
Conflicts: %N-tcltk
Replaces: %N-tcltk

DocFiles: README VERSION www/copyright-release.html LICENSE
Shlibs: %p/lib/tcl8.4/sqlite3/libtclsqlite3.dylib 9.0.0 %n (= 3.2.2-11)
Files: lib/tcl8.4


SplitOff4: 
Package: %N-doc
Description: Embedded SQL database (HTML documentation)
DocFiles: doc/* README VERSION www/copyright-release.html LICENSE




---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/graphics avidemux.patch,NONE,1.1 avidemux.info,1.3,1.4

[Dave Vasilevsky]

retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- avidemux.info   3 Feb 2006 16:41:50 -   1.3
+++ avidemux.info   28 Mar 2006 01:06:03 -  1.4
@@ -1,7 +1,6 @@
 Package: avidemux
 Version: 2.0.40
-Revision: 1012
-Architecture: powerpc
+Revision: 1013
 
 Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
 Homepage: http://fixounet.free.fr/avidemux
@@ -10,17 +9,17 @@
 Source: http://download.berlios.de/%N/%N-%v.tar.gz
 Source-MD5: eed30487a2ae62f927c8a84dbc889e6d
 
-GCC: 3.3
+Patch: %n.patch
 
-SetCC: gcc-3.3
-SetCXX: g++-3.3
+GCC: 4.0
 
 # From configure.darwin
-ConfigureParams: --with-debug --with-extra-includes=%p/include 
--with-extra-libs=%p/lib --enable-altivec
+ConfigureParams: --with-debug --with-extra-includes=%p/include 
--with-extra-libs=%p/lib (%m = powerpc) --enable-altivec
 
 # For undefined symbols
 SetLDFLAGS: -lSystemStubs
 
+# We only depend on the non-C++ parts of faad and faac
 Depends: 
gtk+2-shlibs, atk1-shlibs, glib2-shlibs (= 2.6.6-), 
pango1-xft2-shlibs,
libiconv, libgettext3-shlibs,
@@ -28,33 +27,30 @@
libgnugetopt-shlibs,
x11, freetype2-shlibs | freetype2-hinting-shlibs,
sdl-shlibs (= 1.2.9-1001),
-   arts-shlibs,
-   libmad-shlibs, lame-shlibs, libfaad1-shlibs, faac-shlibs, a52dec-shlibs,
+   arts-shlibs (= 1.5.1-1021),
+   libmad-shlibs, lame-shlibs, libfaad1-shlibs,
+   faac-shlibs, a52dec-shlibs,
libvorbis-shlibs, libogg-shlibs,
xvidcore-shlibs (= 1.0.0-1)
 
 BuildDepends: 
-   pkgconfig, gcc3.3,
+   pkgconfig,
gtk+2-dev, atk1, glib2-dev (= 2.6.6-), pango1-xft2-dev,
libiconv-dev, libgettext3-dev,
libxml2,
libgnugetopt,
x11-dev, freetype2-dev | freetype2-hinting-dev,
sdl (= 1.2.9-1001),
-   arts-dev,
-   libmad, lame-dev, libfaad1-dev, faac-dev, a52dec-dev, libvorbis0, 
libogg,
-   xvidcore (= 1.0.0-1), libavcodec1-dev, ffmpeg-dev
+   arts-dev (= 1.5.1-1021),
+   libmad, lame-dev, libfaad1-dev,
+   faac-dev, a52dec-dev, libvorbis0, libogg,
+   xvidcore (= 1.0.0-1), libavcodec1-dev,
+   ffmpeg-dev
 
 
 DocFiles: AUTHORS COPYING ChangeLog History INSTALL README TODO
 
 Description: Graphical video-editing tool
-DescPackaging: 
- This version is compiled with g++-3.3, even in the 10.4 tree.  If it is
- ever updated to a more recent compiler, the group of packages avidemux,
- faad, and ffmpeg (and any packages which depend on any of them) must all
- be updated at the same time.
-
 DescDetail: 
 Can understand MPEG and DivX; cut, crop and filter video; and re-encode to
 AVI or MPEG. Also has a command-line mode.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/libs apr.info,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
apr.info 
Log Message:
no c++ symbols

Index: apr.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/apr.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apr.info29 Jan 2006 17:34:11 -  1.1
+++ apr.info28 Mar 2006 05:20:21 -  1.2
@@ -11,7 +11,6 @@
 BuildDependsOnly: True
 Conflicts: apr-ssl, svn-client ( 0.14.3-1), apache2 ( 2.0.47-1), libapr1
 Replaces: apr-ssl, libapr1
-GCC: 4.0
 
 # Unpack Phase:
 Source: mirror:custom:httpd-2.0.55.tar.bz2



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/crypto/finkinfo apr-ssl.info,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
apr-ssl.info 
Log Message:
no c++ symbols

Index: apr-ssl.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/apr-ssl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apr-ssl.info29 Jan 2006 17:34:11 -  1.1
+++ apr-ssl.info28 Mar 2006 05:20:52 -  1.2
@@ -11,7 +11,6 @@
 BuildDependsOnly: True
 Conflicts: apr, svn-client ( 0.14.3-1), apache2 ( 2.0.47-1), libapr1
 Replaces: apr, libapr1
-GCC: 4.0
 
 # Unpack Phase:
 Source: mirror:custom:httpd-2.0.55.tar.bz2



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/web apache2.info,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
apache2.info 
Log Message:
remove extra gcc field

Index: apache2.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/apache2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apache2.info29 Jan 2006 19:28:10 -  1.1
+++ apache2.info28 Mar 2006 07:51:32 -  1.2
@@ -5,6 +5,8 @@
 Conflicts: apache, apache2 (= 2.0.47-1), apache2-ssl
 Replaces: apache, apache2 (= 2.0.47-1), apache2-ssl
 Provides: httpd
+###
+# No C++ symbols used from these libs
 BuildDepends: apr (= 0.9.7-1011), db43 (= 4.3.29-1001), expat (= 1.95.6-2), 
gdbm3, libiconv-dev
 Depends: %N-mpm-worker (= %v-%r) | %N-mpm-perchild (= %v-%r) | %N-mpm-prefork 
(= %v-%r) | %N-mpm-leader (= %v-%r) | %N-mpm-threadpool (= %v-%r), %N-common (= 
%v-%r)
 ###
@@ -28,8 +30,6 @@
   perl -pi -e 's,gawk mawk nawk awk,awk mawk nawk gawk,g' srclib/apr/configure
 
 ###
-GCC: 4.0
-###
 NoSetLDFLAGS: true
 SetLIBS: -L%p/lib
 ###



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1306,1.1307 Engine.pm,1.368,1.369

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Engine.pm 
Log Message:
fix Yet Another Dep Engine Bug

Index: Engine.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -d -r1.368 -r1.369
--- Engine.pm   24 Mar 2006 15:19:43 -  1.368
+++ Engine.pm   27 Mar 2006 03:01:46 -  1.369
@@ -1620,6 +1620,7 @@
if ($item-[OP] == $OP_REBUILD || $item-[OP] == $OP_BUILD || 
not $item-[PKGVER]-is_present()) {
unless ($item-[OP] == $OP_INSTALL and 
$item-[PKGVER]-is_installed()) {
$willbuild = 1;
+   $to_be_rebuilt{$pkgname} = 1;
 
# validate the .info if desired
if (Fink::Config::get_option(maintainermode)) 
{

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1306
retrieving revision 1.1307
diff -u -d -r1.1306 -r1.1307
--- ChangeLog   24 Mar 2006 23:23:32 -  1.1306
+++ ChangeLog   27 Mar 2006 03:01:46 -  1.1307
@@ -1,3 +1,9 @@
+2006-03-26  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * Engine.pm: Pre-calculate some of %to_be_rebuilt, to fix the case 
where:
+   - a parent doesn't need a build, but a splitoff requires it, AND
+   - the splitoff is considered by PACKAGELOOP after the parent
+
 2006-03-24  Dave Vasilevsky  [EMAIL PROTECTED]
 
* PkgVersion.pm: Hardcode path to unversioned perl.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1307,1.1308 Config.pm,1.74,1.75

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Config.pm 
Log Message:
use defaults for options

Index: Config.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Config.pm,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- Config.pm   22 Mar 2006 19:50:18 -  1.74
+++ Config.pm   27 Mar 2006 05:08:38 -  1.75
@@ -203,16 +203,18 @@
 
 =cut
 
+my %option_defaults = (
+   map( { $_ = 0 } qw(dontask interactive verbosity keep_build keep_root
+   build_as_nobody maintainermode showversion use_binary) ),
+   map ( { $_ = [] } qw(include_trees exclude_trees) ),
+   map( { $_ = -1 } qw(use_binary) ),
+);
+
 sub parse_options {
my $class = shift;
my @args = @_;

-   my %opts = (
-   map( { $_ = 0 } qw(dontask interactive verbosity keep_build 
keep_root
-   build_as_nobody maintainermode showversion) ),
-   map ( { $_ = [] } qw(include_trees exclude_trees) ),
-   map( { $_ = -1 } qw(use_binary) ),
-   );
+   my %opts = %option_defaults;

my $comlen =  14;
get_options('', [
@@ -819,7 +821,9 @@
 
 sub get_option {
my $option = shift;
-   my $default = shift || 0;
+   my $default = shift;
+   $default = $option_defaults{$option} unless defined $default;
+   $default = 0 unless defined $default;
 
if (exists $options{lc $option}) {
return $options{lc $option};

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1307
retrieving revision 1.1308
diff -u -d -r1.1307 -r1.1308
--- ChangeLog   27 Mar 2006 03:01:46 -  1.1307
+++ ChangeLog   27 Mar 2006 05:08:37 -  1.1308
@@ -1,3 +1,7 @@
+2006-03-27  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * Config.pm: Use defaults for options.
+
 2006-03-26  Dave Vasilevsky  [EMAIL PROTECTED]
 
* Engine.pm: Pre-calculate some of %to_be_rebuilt, to fix the case 
where:



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/kde filelight.info,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
filelight.info 
Log Message:
gcc 4 ok

Index: filelight.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/filelight.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- filelight.info  14 Mar 2006 22:23:30 -  1.2
+++ filelight.info  25 Mar 2006 11:31:15 -  1.3
@@ -1,6 +1,6 @@
 Package: filelight
 Version: 1.0-beta6
-Revision: 1011
+Revision: 1012
 Description: Prettier graphical disk usage utility
 License: GPL
 Homepage: http://www.methylblue.com/filelight/index.php
@@ -19,6 +19,7 @@
don't exist on OS X.
- Don't find /dev and /.vol virtual volumes.
- Consider AFP to be remote
+   - Case sensitivity in Config.h/config.h

Bug fixes:
- Don't call guessIconName() on deleted Disk.
@@ -27,65 +28,55 @@
- Use doubles (not ints) in sincos(). Make function static to 
avert
multiple defs.
- createAboutData() should allow caller to manage memory.
-   
-   Build system:
-   - Modify build_helper.sh so build dies if a signal is caught, 
using
-   check_success.sh wrapper.
 
 DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+Source: http://www.methylblue.com/%{Ni}/packages/%{Ni}-%v.tar.bz2
+Source-MD5: 42d887e9df66ec3d16a59c2a778eaf73
 
-
-Depends: kdebase3-ssl (= 3.5.1-1021) | kdebase3 (= 3.5.1-1021)
-BuildDepends: arts-dev (= 1.4.0-11), autoconf2.5 (= 2.58-1), automake1.9, 
cctools (= 446-1) | cctools-single-module, fink (= 0.20.2.1-1), freetype219, 
kdelibs3-ssl-dev (= 3.5.1-1021) | kdelibs3-dev (= 3.5.1-1021), libart2, 
libjpeg, libpng3 (= 1.2.5-4), qt3 (= 3.3.5-1023), x11-dev, libidn, 
libiconv-dev, gettext-dev, gettext-tools, gcc3.3
+Depends: kdebase3-unified (= 3.4.3-1021), libgettext3-shlibs, libiconv, 
libjpeg-shlibs
+BuildDepends: arts-dev (= 1.4.3-1021), autoconf2.5, automake1.7, cctools (= 
446-1) | cctools-single-module, fink (= 0.20.2.1-1), freetype219, 
kdelibs3-unified-dev (= 3.4.3-1021), libart2, libidn, libpng3 (= 1.2.5-4), 
qt3 (= 3.3.5-1026), x11-dev, libgettext3-dev, libiconv-dev, libjpeg
 BuildConflicts: unsermake
 GCC: 4.0
-Architecture: powerpc
-
-Source: http://www.methylblue.com/%{Ni}/packages/%{Ni}-%v.tar.bz2
-Source-MD5: 42d887e9df66ec3d16a59c2a778eaf73
-SourceDirectory: %n-%v
 CustomMirror: 
   nam-US: http://ranger.befunk.com/fink
   nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
   nam-CA: http://www.southofheaven.net/befunk
 
-Source2: mirror:custom:kde-admindir-3.4.1.tar.bz2
-Source2-MD5: 0388fc87fa950791209ad4ab791b32cd
+Source2: mirror:custom:kde-admindir-full-3.5.1.tar.bz2
 Source2ExtractDir: %n-%v
-
+Source2-MD5: 61a3b92c484d2404a6a7033ad4214688
 PatchScript: 
- sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1 
- perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g; 
s,HAVE_GCC_VISIBILITY=1,HAVE_GCC_VISIBILITY=0,g; s,-fvisibility=hidden 
-fvisibility-inlines-hidden,,g;' admin/*
+   sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1 
+   perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g' admin/*.*
+   echo KDE_ENABLE_HIDDEN_VISIBILITY  configure.in.in
+   
+   mv src/part/Config.h src/part/PartConfig.h
+   find src/part -type f | xargs perl -i -pe 's/Config\.h/PartConfig.h/g'
 
-
 NoSetCPPFLAGS: true
-SetCPPFLAGS: -g -O0
 NoSetLDFLAGS: true
-ConfigureParams: --includedir=%p/include --libdir=%p/lib --prefix=%p 
--with-qt-dir=%p --with-qt-includes=%p/include/qt --with-extra-libs=%p/lib 
--with-extra-includes=%p/include --enable-mt --with-pic --enable-rpath 
--enable-shared=yes --enable-static=no --mandir=%i/share/man --with-xinerama 
--with-pam --disable-final
-
+ConfigureParams: --with-distribution='Fink/Mac OS X'
 CompileScript: 
-#!/bin/sh -e
-
-  export HOME=/tmp
-  export PREFIX=%p
-  . ./environment-helper.sh
-  export lt_cv_sys_max_cmd_len=65536
+#!/bin/sh -ev
 
-  export CC=gcc-3.3 CXX=g++-3.3
+   export HOME=/tmp
+   export PREFIX=%p
+   . ./environment-helper.sh
+   export lt_cv_sys_max_cmd_len=65536
+   echo $CONFIGURE_PARAMS
 
-  ./build-helper.sh cvs   %N %v %r make -f admin/Makefile.common cvs
-  ./build-helper.sh configure %N %v %r ./configure %c
-  ./build-helper.sh make  %N %v %r make all all_libraries=$ALL_LIBRARIES
+   ./build-helper.sh cvs   %N %v %r make -f admin/Makefile.common cvs
+   ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
+   ./build-helper.sh make  %N %v %r make all 
all_libraries=$ALL_LIBRARIES
 
-
 InstallScript: 
-#!/bin/sh -e
+#!/bin/sh -ev
 
-  export 

dists/10.4/unstable/main/finkinfo/kde filelight.info,1.3,1.4

[Dave Vasilevsky]

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

Modified Files:
filelight.info 
Log Message:
jpeg not needed

Index: filelight.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/filelight.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- filelight.info  25 Mar 2006 11:31:15 -  1.3
+++ filelight.info  25 Mar 2006 12:00:45 -  1.4
@@ -1,6 +1,6 @@
 Package: filelight
 Version: 1.0-beta6
-Revision: 1012
+Revision: 1013
 Description: Prettier graphical disk usage utility
 License: GPL
 Homepage: http://www.methylblue.com/filelight/index.php
@@ -33,8 +33,8 @@
 Source: http://www.methylblue.com/%{Ni}/packages/%{Ni}-%v.tar.bz2
 Source-MD5: 42d887e9df66ec3d16a59c2a778eaf73
 
-Depends: kdebase3-unified (= 3.4.3-1021), libgettext3-shlibs, libiconv, 
libjpeg-shlibs
-BuildDepends: arts-dev (= 1.4.3-1021), autoconf2.5, automake1.7, cctools (= 
446-1) | cctools-single-module, fink (= 0.20.2.1-1), freetype219, 
kdelibs3-unified-dev (= 3.4.3-1021), libart2, libidn, libpng3 (= 1.2.5-4), 
qt3 (= 3.3.5-1026), x11-dev, libgettext3-dev, libiconv-dev, libjpeg
+Depends: kdebase3-unified (= 3.4.3-1021), libgettext3-shlibs, libiconv
+BuildDepends: arts-dev (= 1.4.3-1021), autoconf2.5, automake1.7, cctools (= 
446-1) | cctools-single-module, fink (= 0.20.2.1-1), freetype219, 
kdelibs3-unified-dev (= 3.4.3-1021), libart2, libidn, libpng3 (= 1.2.5-4), 
qt3 (= 3.3.5-1026), x11-dev, libgettext3-dev, libiconv-dev
 BuildConflicts: unsermake
 GCC: 4.0
 CustomMirror: 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/kde filelight.info,1.4,1.5

[Dave Vasilevsky]

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

Modified Files:
filelight.info 
Log Message:
also gettext-tools

Index: filelight.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/filelight.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- filelight.info  25 Mar 2006 12:00:45 -  1.4
+++ filelight.info  25 Mar 2006 12:40:32 -  1.5
@@ -34,7 +34,7 @@
 Source-MD5: 42d887e9df66ec3d16a59c2a778eaf73
 
 Depends: kdebase3-unified (= 3.4.3-1021), libgettext3-shlibs, libiconv
-BuildDepends: arts-dev (= 1.4.3-1021), autoconf2.5, automake1.7, cctools (= 
446-1) | cctools-single-module, fink (= 0.20.2.1-1), freetype219, 
kdelibs3-unified-dev (= 3.4.3-1021), libart2, libidn, libpng3 (= 1.2.5-4), 
qt3 (= 3.3.5-1026), x11-dev, libgettext3-dev, libiconv-dev
+BuildDepends: arts-dev (= 1.4.3-1021), autoconf2.5, automake1.7, cctools (= 
446-1) | cctools-single-module, fink (= 0.20.2.1-1), freetype219, 
kdelibs3-unified-dev (= 3.4.3-1021), libart2, libidn, libpng3 (= 1.2.5-4), 
qt3 (= 3.3.5-1026), x11-dev, libgettext3-dev, gettext-tools, libiconv-dev
 BuildConflicts: unsermake
 GCC: 4.0
 CustomMirror: 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/kde kdirstat.info,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
kdirstat.info 
Log Message:
gcc 4 ok

Index: kdirstat.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdirstat.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kdirstat.info   22 Jan 2006 21:28:13 -  1.2
+++ kdirstat.info   25 Mar 2006 13:18:46 -  1.3
@@ -1,7 +1,6 @@
 Package: kdirstat
 Version: 2.4.3
-Revision: 1011
-Architecture: powerpc
+Revision: 1012
 Description: Graphical disk usage utility
 License: GPL/LGPL
 Homepage: http://kdirstat.sourceforge.net/
@@ -17,57 +16,50 @@
local scan is on. This includes resource forks and xattrs.
 
 DocFiles: AUTHORS COPYING* CREDITS ChangeLog INSTALL README TODO
-
-
-Depends: kdebase3-ssl (= 3.4.0-11) | kdebase3 (= 3.4.0-11)
-BuildDepends: arts-dev (= 1.4.0-11), autoconf2.5 (= 2.58-1), automake1.9, 
cctools (= 446-1) | cctools-single-module, fink (= 0.20.2.1-1), freetype219, 
kdelibs3-ssl-dev (= 3.4.0-11) | kdelibs3-dev (= 3.4.0-11), libart2, libjpeg, 
libpng3 (= 1.2.5-4), qt3 (= 3.3.5-1023), x11-dev, libidn, libiconv-dev, 
gettext-dev, gettext-tools, gcc3.3
-BuildConflicts: unsermake
-GCC: 3.3
-
 Source: http://kdirstat.sourceforge.net/download/%n-%v.tar.bz2
 Source-MD5: 044789b98d8f2c92227a31cc758a7587
-SourceDirectory: %n-%v
+
+Depends: kdebase3-unified (= 3.4.3-1021), libgettext3-shlibs, libiconv
+BuildDepends: arts-dev (= 1.4.3-1021), autoconf2.5, automake1.7, cctools (= 
446-1) | cctools-single-module, fink (= 0.20.2.1-1), freetype219, 
kdelibs3-unified-dev (= 3.4.3-1021), libart2, libidn, libpng3 (= 1.2.5-4), 
qt3 (= 3.3.5-1026), x11-dev, libgettext3-dev, gettext-tools, libiconv-dev
+BuildConflicts: unsermake
+GCC: 4.0
 CustomMirror: 
   nam-US: http://ranger.befunk.com/fink
   nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
   nam-CA: http://www.southofheaven.net/befunk
 
-Source2: mirror:custom:kde-admindir-3.4.1.tar.bz2
-Source2-MD5: 0388fc87fa950791209ad4ab791b32cd
+Source2: mirror:custom:kde-admindir-full-3.5.1.tar.bz2
 Source2ExtractDir: %n-%v
-
+Source2-MD5: 61a3b92c484d2404a6a7033ad4214688
 PatchScript: 
- sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1 
- perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g; 
s,HAVE_GCC_VISIBILITY=1,HAVE_GCC_VISIBILITY=0,g; s,-fvisibility=hidden 
-fvisibility-inlines-hidden,,g;' admin/*
+   sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1 
+   perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g' admin/*.*
+   echo KDE_ENABLE_HIDDEN_VISIBILITY  configure.in.in
 
-
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
-ConfigureParams: --includedir=%p/include --libdir=%p/lib --prefix=%p 
--with-qt-dir=%p --with-qt-includes=%p/include/qt --with-extra-libs=%p/lib 
--with-extra-includes=%p/include --enable-mt --with-pic --enable-rpath 
--enable-shared=yes --enable-static=no --mandir=%i/share/man --with-xinerama 
--with-pam --disable-final
-
+ConfigureParams: --with-distribution='Fink/Mac OS X'
 CompileScript: 
-#!/bin/sh -e
-
-  export HOME=/tmp
-  export PREFIX=%p
-  . ./environment-helper.sh
-  export lt_cv_sys_max_cmd_len=65536
+#!/bin/sh -ev
 
-  export CC=gcc-3.3 CXX=g++-3.3
+   export HOME=/tmp
+   export PREFIX=%p
+   . ./environment-helper.sh
+   export lt_cv_sys_max_cmd_len=65536
+   echo $CONFIGURE_PARAMS
 
-  ./build-helper.sh cvs   %N %v %r make -f admin/Makefile.common cvs
-  ./build-helper.sh configure %N %v %r ./configure %c
-  ./build-helper.sh make  %N %v %r make all all_libraries=$ALL_LIBRARIES
+   ./build-helper.sh cvs   %N %v %r make -f admin/Makefile.common cvs
+   ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
+   ./build-helper.sh make  %N %v %r make all 
all_libraries=$ALL_LIBRARIES
 
-
 InstallScript: 
-#!/bin/sh -e
+#!/bin/sh -ev
 
-  export PREFIX=%p
-  . ./environment-helper.sh
+   export PREFIX=%p
+   . ./environment-helper.sh
 
-  ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
+   ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
 
-  mkdir -p %i/share/doc/installed-packages
-  touch %i/share/doc/installed-packages/%N
+   mkdir -p %i/share/doc/installed-packages
+   touch %i/share/doc/installed-packages/%N
 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list

dists/10.4/unstable/main/finkinfo/games teg-themes.info,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
teg-themes.info 
Log Message:
placify our buildfink overloards

Index: teg-themes.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/teg-themes.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- teg-themes.info 20 Jan 2006 20:25:01 -  1.1
+++ teg-themes.info 25 Mar 2006 14:18:23 -  1.2
@@ -1,6 +1,6 @@
 Package: teg-themes
 Version: 1.0
-Revision: 1
+Revision: 2
 Description: Extra themes for TEG
 License: Restrictive/Distributable
 Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
@@ -17,6 +17,8 @@
 Source3-MD5: 0311a98e55fe3f4fc323540e5b7a15a3
 Source3Directory: tworld
 
+# Get rid of backup ~ file
+PatchScript: rm 'teg_theme.xml~'
 CompileScript: echo No compilation necessary
 InstallScript: 
#!/bin/sh -ev



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1305,1.1306 PkgVersion.pm,1.544,1.545

[Dave Vasilevsky]

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

Modified Files:
ChangeLog PkgVersion.pm 
Log Message:
hardcode unversioned perl location

Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -d -r1.544 -r1.545
--- PkgVersion.pm   23 Mar 2006 23:11:43 -  1.544
+++ PkgVersion.pm   24 Mar 2006 23:23:32 -  1.545
@@ -4684,7 +4684,13 @@
 
### PERL= needs a full path or you end up with
### perlmods trying to run ../perl$perlversion
-   my $perlcmd = get_path('perl'.$perlversion);
+   my $perlcmd;
+   if ($perlversion) {
+   $perlcmd = get_path('perl'.$perlversion);
+   } else {
+   # Hardcode so it doesn't change as packages are installed, 
removed
+   $perlcmd = /usr/bin/perl;
+   }
 
if (exists $perl_archname_cache{$perlcmd}) {
return (@{$perl_archname_cache{$perlcmd}});

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1305
retrieving revision 1.1306
diff -u -d -r1.1305 -r1.1306
--- ChangeLog   24 Mar 2006 19:30:30 -  1.1305
+++ ChangeLog   24 Mar 2006 23:23:32 -  1.1306
@@ -1,3 +1,7 @@
+2006-03-24  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * PkgVersion.pm: Hardcode path to unversioned perl.
+
 2006-03-24  Daniel Macks  [EMAIL PROTECTED]
 
* Bootstrap.pm: tar doesn't need --exclude since fink_packages is



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink/Finally - New directory

[Dave Vasilevsky]

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

Log Message:
Directory /cvsroot/fink/fink/perlmod/Fink/Finally added to the repository




---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1298,1.1299 Engine.pm,1.365,1.366 Finally.pm,1.3,1.4 PkgVersion.pm,1.543,1.544

[Dave Vasilevsky]

 nothing by default
 }
 
-=item cancel
+=back
 
-  $fin-cancel;
+=head1 SIMPLE CLEANUP
 
-Do not allow this finalizer to run.
+A subclass Fink::Finally::Simple is provided to make safe cleanup available
+when a subclass is overkill.
+
+=over 4
+
+=item new
+
+  my $finally = Fink::Finally::Simple-new($code);
+
+Create a new simple cleanup object.
+
+The code-ref I$code will be called to clean up. It will be provided with
+a ref to this object as its only argument.
 
 =cut
 
-sub cancel {
+package Fink::Finally::Simple;
+use base 'Fink::Finally';
+
+sub initialize {
+   my ($self, $code) = @_;
+   die Fink::Finally::Simple initializer requires a code-ref\n
+   unless ref($code)  ref($code) eq 'CODE';
+   
+   $self-{_code} = $code;
+   $self-SUPER::initialize();
+}
+
+sub finalize {
my ($self) = @_;
-   delete $self-{_primed};
+   $self-{_code}-($self);
 }
 
 =back

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1298
retrieving revision 1.1299
diff -u -d -r1.1298 -r1.1299
--- ChangeLog   23 Mar 2006 03:52:47 -  1.1298
+++ ChangeLog   23 Mar 2006 23:11:39 -  1.1299
@@ -1,3 +1,14 @@
+2006-03-23  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * Finally.pm: Use a pretty OO interface.
+   * Finally/BuildConflicts.pm: New module for BuildConflicts removal and
+   restoration.
+   * Finally/Buildlock.pm: New module for buildlock setting and clearing.
+   * Engine.pm: Remove add_finalizer interface, move BuildConflicts removal
+   to Finally/BuildConflicts.pm 
+   * PkgVersion.pm: Add method is_bootstrapping, move buildlock stuff to
+   Finally/Buildlock.pm. New scapackages stuff in END.
+
 2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
 
* CLI.pm: Add logging to capture, fix open-modes problem. 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/CLI ChangeLog,1.3,1.4 capture.t,1.3,1.4

[Dave Vasilevsky]

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

Modified Files:
ChangeLog capture.t 
Log Message:
new Finally work

Index: capture.t
===
RCS file: /cvsroot/fink/fink/t/CLI/capture.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- capture.t   23 Mar 2006 17:45:07 -  1.3
+++ capture.t   23 Mar 2006 23:11:44 -  1.4
@@ -60,9 +60,10 @@
my ($out, $inner);
capture {
capture { print inner } \$inner;
+   print outer;
} \$out;
is($inner, inner, nesting - stdout intercepted);
-   is($out, , nesting - stdout not propagated);
+   is($out, outer, nesting - stdout not propagated);
 }
 
 # stderr propagation. Wow, this is a hairy test!
@@ -70,9 +71,10 @@
my ($out, $err, $inner);
capture {
capture { print inner; print STDERR err } \$inner;
+   print outer;
} \$out, \$err;
is($inner, inner, stderr propagation - stdout intercepted);
-   is($out, , stderr propagation - stdout not propagated);
+   is($out, outer, stderr propagation - stdout not propagated);
is($err, err, stderr propagation - stderr propagated);
 }  
 

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/t/CLI/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog   23 Mar 2006 17:45:07 -  1.3
+++ ChangeLog   23 Mar 2006 23:11:44 -  1.4
@@ -1,3 +1,7 @@
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * capture.t: Be more careful about propagation tests.
+
 2006-03-23  Daniel Macks  [EMAIL PROTECTED]
 
* capture.t: Work around a bug in Test::Harness



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/Finally buildlocks.t,NONE,1.1 ChangeLog,1.3,1.4 finally.t,1.3,1.4

[Dave Vasilevsky]

  1.4
@@ -1,3 +1,9 @@
+2006-03-23  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * finally.t: Add tests for OO API.
+   * buildlocks.t: Moved from ../PkgVersion/buildlocks.t, modified for
+   Fink::Finally::Buildlock.
+
 2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
 
* finally.t: Test whether we keep the exit status.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink/Finally BuildConflicts.pm,NONE,1.1 Buildlock.pm,NONE,1.1

[Dave Vasilevsky]

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

Added Files:
BuildConflicts.pm Buildlock.pm 
Log Message:
new Finally work

--- NEW FILE: Buildlock.pm ---
# -*- mode: Perl; tab-width: 4; -*-
#
# Fink::Finally::Buildlock module
#
# Fink - a package manager that downloads source and installs it
# Copyright (c) 2006 The Fink Package Manager Team
#
# 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.
#

package Fink::Finally::Buildlock;
use base 'Fink::Finally';

use warnings;
use strict;

use POSIX   qw(strftime);

use Fink::Command   qw(mkdir_p rm_rf rm_f);
use Fink::Configqw($basepath $debarch $config $buildpath);
use Fink::PkgVersion;

use Fink::Services  qw( lock_wait lol2pkglist execute dpkg_lockwait
apt_available   );

=head1 NAME

Fink::Finally::Buildlock - Ensure that builds don't interfere.

=head1 DESCRIPTION

Buildlocks are designed to prevent concurrent fink processes from interfering 
with each other's dependencies.

For example, if one fink process is compiling a package foo that has a 
build-time dependency on the package bar-dev, that fink process will set a 
build-lock that prevents another fink (or dpkg or apt or...) from removing the 
bar-dev package until the first fink process finishes building the package foo. 
In addition, buildlocks prevent concurrent builds of any given package 
(name-version-revision) to prevent the build processes from over-writing each 
other's files.

See Lhttp://wiki.opendarwin.org/index.php/Fink:buildlocks for more
information.

=head1 CLASS METHODS

=over 4

=item new

  my $bl = Fink::Finally::Buildlock-new($pv);

Put a buildlock on the Fink::PkgVersion object I$pv. The lock will be
removed when I$bl goes out of scope.

=cut

# create an exclusive lock for the %f of the parent using dpkg
sub initialize {
my ($self, $pv) = @_;

# allow over-ride
return if Fink::Config::get_option(no_buildlock);

# lock on parent pkg
$pv = $pv-get_parent if $pv-has_parent;
$self-{_pv} = $pv;

# bootstrapping occurs before we have package-management tools
# needed for buildlocking. If you're bootstrapping into a location
# that already has a running fink, you already know you're gonne
# hose whatever may be running under that fink...
return if $pv-is_bootstrapping;

# The plan: get an exlusive lock for %n-%v-%r_$timestamp that
# automatically goes away when this fink process quit. Install a
# %n-%v-%r package that prohibits removal of itself if that lock
# is present.  It's always safe to attempt to remove all installed
# buildlock pkgs since they can each determine if these locks are
# dead.  Attempting to install a lockpkg for the same %n-%v-%r
# will cause existing one to attempt to be removed, which will
# fail iff its lock is still alive. Fallback to the newer pkg's
# prerm is okay because that will also be blocked by its own live
# lock.

print Setting runtime build-lock...\n;

my $lockdir = $basepath/var/run/fink/buildlock;
mkdir_p $lockdir or
die can't create $lockdir directory for buildlocks\n;

my $timestamp = strftime %Y.%m.%d-%H.%M.%S, localtime;
my $lockfile = $self-{_lockfile} = $lockdir . '/' . $pv-get_fullname()
. _$timestamp.lock;
my $lock_FH = $self-{_lock_fh} = lock_wait($lockfile, exclusive = 1);

my $pkgname = $pv-get_name();
my $pkgvers = $pv-get_fullversion();
my $lockpkg = $self-{_lockpkg} = 'fink-buildlock-' . 
$pv-get_fullname();

my $destdir = Fink::PkgVersion-get_install_directory($lockpkg);

if (not -d $destdir/DEBIAN) {
mkdir_p $destdir/DEBIAN or
die can't create directory for control files for 
package $lockpkg\n;
}

# generate dpkg control file

my $control = EOF;
Package: $lockpkg
Source: fink
Version: $timestamp
Section: unknown
Installed-Size: 0
Architecture: $debarch
Description: Package compile-time lockfile
 This package represents the compile-time dependencies of a
 package 

fink/t/PkgVersion ChangeLog,1.4,1.5 buildlocks.t,1.1,NONE

[Dave Vasilevsky]

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

Modified Files:
ChangeLog 
Removed Files:
buildlocks.t 
Log Message:
new Finally work

--- buildlocks.t DELETED ---

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/t/PkgVersion/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog   31 Aug 2005 04:28:31 -  1.4
+++ ChangeLog   23 Mar 2006 23:11:44 -  1.5
@@ -1,3 +1,8 @@
+2006-03-23  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * buildlocks.t: Move to ../Finally/buildlocks.t, since buildlocks are 
now
+   handled by Fink::Finally::Buildlock.
+
 2005-08-29  Dave Vasilevsky  [EMAIL PROTECTED]
 
* get_perl.t, get_ruby.t, get_splitoffs.t, non_consecutive_source.t:



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.411,1.412 install.sh,1.43,1.44

[Dave Vasilevsky]

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

Modified Files:
ChangeLog install.sh 
Log Message:
new Finally work

Index: install.sh
===
RCS file: /cvsroot/fink/fink/install.sh,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- install.sh  22 Mar 2006 09:27:23 -  1.43
+++ install.sh  23 Mar 2006 23:11:39 -  1.44
@@ -39,7 +39,8 @@
 chmod 755 $basepath
 
 for dir in bin \
-   lib lib/perl5 lib/perl5/Fink lib/perl5/Fink/{Text,Notify,Checksum} \
+   lib lib/perl5 lib/perl5/Fink \
+   lib/perl5/Fink/{Text,Notify,Checksum,Finally} \
lib/fink lib/fink/update \
etc etc/dpkg \
share share/doc share/doc/fink \
@@ -67,7 +68,7 @@
 done
 
 # copy all perl modules
-for subdir in . Fink Fink/{Text,Notify,Checksum} ; do
+for subdir in . Fink Fink/{Text,Notify,Checksum,Finally} ; do
   for file in perlmod/${subdir}/*.pm ; do
 if [ -f $file ]; then
   install -c -p -m 644 $file $basepath/lib/perl5/$subdir
@@ -113,10 +114,31 @@
--section 3 $pm $basepath/share/man/man3/$1.3pm
 }
 manify_bin fink-scanpackages 8
-for p in Fink Fink::{Base,Bootstrap,Checksum,CLI,Command,Config,Configure} \
-   
Fink::{Engine,FinkVersion,Notify,Package,PkgVersion,Scanpackages} \
-   Fink::{Services,Shlibs,SysState,VirtPackage,Finally} \
-   Fink::Text::{DelimMatch,ParseWords}; do
+for p in \
+   Fink\
+   Fink::Base  \
+   Fink::Bootstrap \
+   Fink::Checksum  \
+   Fink::CLI   \
+   Fink::Command   \
+   Fink::Config\
+   Fink::Configure \
+   Fink::Engine\
+   Fink::Finally   \
+   Fink::Finally::BuildConflicts   \
+   Fink::Finally::Buildlock\
+   Fink::FinkVersion   \
+   Fink::Notify\
+   Fink::Package   \
+   Fink::PkgVersion\
+   Fink::Scanpackages  \
+   Fink::Services  \
+   Fink::Shlibs\
+   Fink::SysState  \
+   Fink::Text::DelimMatch  \
+   Fink::Text::ParseWords  \
+   Fink::VirtPackage   \
+   ; do
manify_pm $p
 done
 

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -d -r1.411 -r1.412
--- ChangeLog   22 Mar 2006 09:27:23 -  1.411
+++ ChangeLog   23 Mar 2006 23:11:39 -  1.412
@@ -1,3 +1,7 @@
+2006-03-23  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * install.sh: Include perlmod/Fink/Finally in installation dirs.
+
 2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
 
* install.sh: Include Fink::Finally in manpages.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1299,1.1300 Engine.pm,1.366,1.367

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Engine.pm 
Log Message:
remove implicit dep on essential, if there are any problems cirdan will fix them

Index: Engine.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- Engine.pm   23 Mar 2006 23:11:42 -  1.366
+++ Engine.pm   24 Mar 2006 00:11:51 -  1.367
@@ -1446,8 +1446,7 @@

my ($pkgspec, $package, $pkgname, $item, $dep);
my ($all_installed, $any_installed);
-   my (%deps, @queue, @deplist, @requested, @additionals, @elist);
-   my ($ep);
+   my (%deps, @queue, @deplist, @requested, @additionals);
my ($answer, $s);
my (%to_be_rebuilt, %already_activated);
 
@@ -1534,13 +1533,6 @@
return;
}
 
-   # resolve dependencies for essential packages
-   @elist = Fink::Package-list_essential_packages();
-   foreach $ep (@elist) {
-   # no virtual packages here
-   $ep = [ Fink::Package-package_by_name($ep)-get_all_versions() 
];
-   }
-
# recursively expand dependencies
my %ok_versions;# versions of each pkg that are ok to use
my %conflicts;  # pkgname = list of conflicts
@@ -1598,11 +1590,6 @@

# Do not use BuildConflicts for packages which are not 
going to be built!
}
-   # add essential packages (being careful about packages whose 
parent is essential)
-   # dev-tools is not Essential but it must not depend on 
essentials because essentials must implicitly BDep:dev-tools
-   if (not $item-[PKGVER]-built_with_essential and 
$item-[PKGVER]-get_name() ne 'dev-tools') {
-   push @deplist, @elist;
-   }

foreach $dep (@deplist) {
choose_pkgversion(\%deps, [EMAIL PROTECTED], $item, 
\%ok_versions, @$dep);

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -d -r1.1299 -r1.1300
--- ChangeLog   23 Mar 2006 23:11:39 -  1.1299
+++ ChangeLog   24 Mar 2006 00:11:51 -  1.1300
@@ -1,5 +1,10 @@
 2006-03-23  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Engine.pm: Remove implicit depends on essential, if there are any
+   problems cirdan will fix them :-)
+
+2006-03-23  Dave Vasilevsky  [EMAIL PROTECTED]
+
* Finally.pm: Use a pretty OO interface.
* Finally/BuildConflicts.pm: New module for BuildConflicts removal and
restoration.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1289,1.1290 Engine.pm,1.362,1.363

[Dave Vasilevsky]

) = @_;
+   
+   my %removals;
+   for my $rpv (map { @$_ } values %$conflicts) {
+   my $rname = $rpv-get_name;
+   next if $removals{$rname};
+   
+   my $item = $deps-{$rname};
+   my $will_inst = $item  ($item-[PKGVER] eq $rpv)
+($item-[OP] == $OP_INSTALL || $item-[OP] == 
$OP_REINSTALL);
+   $removals{$rname} = 1 if $will_inst || $rpv-is_installed;
+   }
+   return sort keys %removals;
+}
+
+=item remove_buildconflicts
+
+  my $finally = remove_buildconflicts @pvs;
+
+Remove the BuildConflicts of a package, and return a Fink::Finally cleanup
+task that can restore them.
+
+=cut
+
+sub remove_buildconflicts {
+   my ($pvs) = @_;
+   
+   my @must_remove = grep { $_-is_installed } @$pvs;
+   my @cant_restore = grep { !$_-is_present } @must_remove;
+   
+   if ([EMAIL PROTECTED]) {
+   return Fink::Finally-new(sub { }); # Do nothing
+   } elsif (@cant_restore) {
+   die_breaking The following packages must be temporarily 
removed, but 
+   . there are no .debs to restore them from:\n  
+   . join(' ', sort map { $_-get_name } @cant_restore);
+   } else {
+   my @names = sort map { $_-get_name } @must_remove;
+   my $names = join(' ', @names);
+   my $recover = sub {
+   print_breaking_stderr Restoring removed 
BuildConflicts:\n 
+   .  $names;
+   Fink::PkgVersion::phase_activate([EMAIL PROTECTED]);
+   };
+   
+   print_breaking_stderr Temporarily removing BuildConflicts:\n 
$names;
+   Fink::PkgVersion::phase_deactivate([EMAIL PROTECTED]);
+   
+   return Fink::Finally-new($recover);
+   }
+}
+
 =back
 
 =cut

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1289
retrieving revision 1.1290
diff -u -d -r1.1289 -r1.1290
--- ChangeLog   22 Mar 2006 05:41:19 -  1.1289
+++ ChangeLog   22 Mar 2006 08:54:05 -  1.1290
@@ -1,5 +1,9 @@
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Engine.pm: New BuildConflicts routine that should work.
+
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
* Engine.pm: De-blockify finalize.
* Engine.pm, PkgVersion.pm: Add a finally to remove buildlocks on build
failure.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.410,1.411 install.sh,1.42,1.43

[Dave Vasilevsky]

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

Modified Files:
ChangeLog install.sh 
Log Message:
include Fink::Finally manpage

Index: install.sh
===
RCS file: /cvsroot/fink/fink/install.sh,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- install.sh  17 Mar 2006 06:42:07 -  1.42
+++ install.sh  22 Mar 2006 09:27:23 -  1.43
@@ -107,7 +107,7 @@
--section $2 $1 $basepath/share/man/man$2/$1.$2
 }
 function manify_pm () {
-   echo   $1
+   echo   $1.3pm
pm=`echo $1 | perl -ne 'chomp; s,::,/,g; print perlmod/$_.pm'`
pod2man --center Fink documentation --release Fink $version \
--section 3 $pm $basepath/share/man/man3/$1.3pm
@@ -115,7 +115,7 @@
 manify_bin fink-scanpackages 8
 for p in Fink Fink::{Base,Bootstrap,Checksum,CLI,Command,Config,Configure} \

Fink::{Engine,FinkVersion,Notify,Package,PkgVersion,Scanpackages} \
-   Fink::{Services,Shlibs,SysState,VirtPackage} \
+   Fink::{Services,Shlibs,SysState,VirtPackage,Finally} \
Fink::Text::{DelimMatch,ParseWords}; do
manify_pm $p
 done

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -d -r1.410 -r1.411
--- ChangeLog   22 Mar 2006 01:04:16 -  1.410
+++ ChangeLog   22 Mar 2006 09:27:23 -  1.411
@@ -1,3 +1,7 @@
+2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * install.sh: Include Fink::Finally in manpages.
+
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
* fink.8.in: Update ancient docs for 'fink scanpackages'.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/Finally ChangeLog,1.1,1.2 finally.t,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
ChangeLog finally.t 
Log Message:
finalizers should not run in forks

Index: finally.t
===
RCS file: /cvsroot/fink/fink/t/Finally/finally.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- finally.t   22 Mar 2006 04:00:33 -  1.1
+++ finally.t   22 Mar 2006 18:17:01 -  1.2
@@ -5,6 +5,9 @@
 use Test::More 'no_plan';
 use File::Temp qw(tempfile);
 
+use Fink::Services qw(lock_wait);
+use Fink::Command  qw(touch);
+
 BEGIN { use_ok 'Fink::Finally'; }
 
 # bad args
@@ -62,7 +65,7 @@
 my $finally = Fink::Finally-new(sub { print cleanup\n });
 exit 0;
 SCRIPT
-   my ($fh, $fname) = tempfile(.capture.);
+   my ($fh, $fname) = tempfile(capture.);
print $fh $script;
close $fh;

@@ -85,3 +88,23 @@
} # out of scope
is($x, 0, 'cancellation');
 }
+
+# fork doesn't run in subproc
+{
+   my $dummy;
+   ($dummy, my $file) = tempfile(capture.fork.);
+   touch($file);
+   
+   {
+   my $fork; # did we fork or not?
+   my $fin = Fink::Finally-new(sub { unlink $file });
+   
+   $fork = fork;
+   if ($fork) {
+   wait;
+   ok(-f $file, fork doesn't run in subproc);
+   }
+   }
+}
+
+   

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/t/Finally/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog   22 Mar 2006 04:00:33 -  1.1
+++ ChangeLog   22 Mar 2006 18:17:01 -  1.2
@@ -1,3 +1,7 @@
+2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * finally.t: Test what happens when we fork.
+
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
* NEW DIRECTORY, finally.t: Test Fink::Finally.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1291,1.1292 Finally.pm,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Finally.pm 
Log Message:
finalizers should not run in forks

Index: Finally.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Finally.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Finally.pm  22 Mar 2006 04:00:31 -  1.1
+++ Finally.pm  22 Mar 2006 18:17:01 -  1.2
@@ -70,6 +70,7 @@
die A Finally needs some code to run!\n
unless defined $code  ref($code) eq 'CODE';
$self-{_code} = $code;
+   $self-{_pid} = $$;
$self-{_primed} = 1; # ready to go
 }
 
@@ -85,6 +86,8 @@
 
 sub run {
my ($self) = @_;
+   delete $self-{_primed}
+   if $self-{_primed}  $$ != $self-{_pid}; # Don't run in forks
return unless $self-{_primed};

{$self-{_code}}();

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1291
retrieving revision 1.1292
diff -u -d -r1.1291 -r1.1292
--- ChangeLog   22 Mar 2006 17:05:54 -  1.1291
+++ ChangeLog   22 Mar 2006 18:17:00 -  1.1292
@@ -1,3 +1,7 @@
+2006-03-22  Daniel Macks  [EMAIL PROTECTED]
+
+   * Finally.pm: Don't run in forks.
+
 2006-03-21  Daniel Macks  [EMAIL PROTECTED]
 
* Engine.pm: In -m mode, validate .info of deps also, not just



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1292,1.1293 Config.pm,1.73,1.74

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Config.pm 
Log Message:
apt fix

Index: Config.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Config.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- Config.pm   22 Mar 2006 05:41:19 -  1.73
+++ Config.pm   22 Mar 2006 19:50:18 -  1.74
@@ -559,6 +559,10 @@
 
 sub write_sources_list {
my $self = shift;
+   
+   # Bail out if no etc/apt exists
+   return unless -d $basepath/etc/apt;
+   
my $basepath = $self-param(Basepath);
my $path = $basepath/etc/apt/sources.list;
 

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1292
retrieving revision 1.1293
diff -u -d -r1.1292 -r1.1293
--- ChangeLog   22 Mar 2006 18:17:00 -  1.1292
+++ ChangeLog   22 Mar 2006 19:50:18 -  1.1293
@@ -1,4 +1,8 @@
-2006-03-22  Daniel Macks  [EMAIL PROTECTED]
+2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * Config.pm: Don't whine if etc/apt doesn't exist.
+
+2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
 
* Finally.pm: Don't run in forks.
 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink Bootstrap.pm,1.136,1.137 ChangeLog,1.1295,1.1296 Finally.pm,1.2,1.3

[Dave Vasilevsky]

 = Fink::Checksum-new('MD5');
my $md5 = $md5obj-get_checksum($tarball);

Index: Finally.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Finally.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Finally.pm  22 Mar 2006 18:17:01 -  1.2
+++ Finally.pm  22 Mar 2006 22:46:53 -  1.3
@@ -90,8 +90,13 @@
if $self-{_primed}  $$ != $self-{_pid}; # Don't run in forks
return unless $self-{_primed};

+   # Preserve exit status
+   my $status = $?;
+   
{$self-{_code}}();
delete $self-{_primed};
+   
+   $? = $status;
 }
 
 sub DESTROY {

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1295
retrieving revision 1.1296
diff -u -d -r1.1295 -r1.1296
--- ChangeLog   22 Mar 2006 21:26:44 -  1.1295
+++ ChangeLog   22 Mar 2006 22:46:53 -  1.1296
@@ -1,3 +1,9 @@
+2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * Finally.pm: Don't change the exit status!
+   * Bootstrap.pm: Fix intermitting inability to inject. Remove obsolete
+   function get_packageversion.
+
 2006-03-22  Daniel Macks  [EMAIL PROTECTED]
 
* SelfUpdate.pm: Engine doesn't export, so don't import its functions



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/Finally ChangeLog,1.2,1.3 finally.t,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
ChangeLog finally.t 
Log Message:
Finally fix and injecting fix

Index: finally.t
===
RCS file: /cvsroot/fink/fink/t/Finally/finally.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- finally.t   22 Mar 2006 18:17:01 -  1.2
+++ finally.t   22 Mar 2006 22:46:54 -  1.3
@@ -5,11 +5,24 @@
 use Test::More 'no_plan';
 use File::Temp qw(tempfile);
 
-use Fink::Services qw(lock_wait);
+use Fink::CLI qw(capture);
+use Fink::Services qw(lock_wait execute);
 use Fink::Command  qw(touch);
 
 BEGIN { use_ok 'Fink::Finally'; }
 
+sub run_script {
+   my $script = shift;
+   my ($out, $ret);
+   
+   $script = #!/usr/bin/perl\nuse Fink::Finally;\n$script;
+   local $ENV{PERL5LIB} = join(':', @INC);
+   capture {
+   $ret = execute($script, quiet = 1, delete_tempfile = -1);
+   } \$out, \$out;
+   return wantarray ? ($out, $ret) : $out;
+}  
+
 # bad args
 {
eval { Fink::Finally-new };
@@ -18,35 +31,35 @@
ok($@, 'bad args - not a code ref');
 }
 
-# explicit cleanup
+# explicit run
 {
my $x = 0;
my $finally = Fink::Finally-new(sub { $x++ });
$finally-run;
-   is($x, 1, 'explicit cleanup');
+   is($x, 1, 'explicit run');
 }
 
-# automatic cleanup
+# run when we fall out of scope
 {
my $x = 0;
{
my $finally = Fink::Finally-new(sub { $x++ });
}
-   is($x, 1, 'automatic cleanup');
+   is($x, 1, 'run when we fall out of scope');
 }
 
-# exceptional cleanup
+# run when an exception is thrown
 {
my $x = 0;
eval {
my $finally = Fink::Finally-new(sub { $x++ });
die exception!;
};
-   ok($@, 'exceptional cleanup - exception thrown');
-   is($x, 1, 'exceptional cleanup - executed');
+   ok($@, 'run when an exception is thrown - exception thrown');
+   is($x, 1, 'run when an exception is thrown - executed');
 }
 
-# run once
+# only run once
 {
my $x = 0;
{
@@ -55,30 +68,19 @@
$finally-run;
# out of scope = automatic run
}
-   is($x, 1, 'run once');
+   is($x, 1, 'only run once');
 }
 
-# cleanup on exit
+# run on exit()
 {
-   my $script = 'SCRIPT';
-use Fink::Finally;
+   my $out = run_script 'SCRIPT';
 my $finally = Fink::Finally-new(sub { print cleanup\n });
 exit 0;
 SCRIPT
-   my ($fh, $fname) = tempfile(capture.);
-   print $fh $script;
-   close $fh;
-   
-   local $ENV{PERL5LIB} = join(':', @INC);
-   open my $subproc, '-|', perl $fname or die Can't open subproc: $!;
-   my $out = join('', $subproc);
-   close $subproc;
-   
-   is($out, cleanup\n, cleanup on exit);
-   unlink $fname;
+   is($out, cleanup\n, run on exit());
 }
 
-# cancellation
+# cancelled finalizers don't run
 {
my $x = 0;
{
@@ -86,10 +88,11 @@
$fin-cancel;
$fin-run;
} # out of scope
-   is($x, 0, 'cancellation');
+   is($x, 0, cancelled finalizers don't run);
 }
 
-# fork doesn't run in subproc
+
+# fork doesn't run Finally objects in the subproc
 {
my $dummy;
($dummy, my $file) = tempfile(capture.fork.);
@@ -102,9 +105,21 @@
$fork = fork;
if ($fork) {
wait;
-   ok(-f $file, fork doesn't run in subproc);
+   ok(-f $file, fork doesn't run Finally objects in the 
subproc);
+   } else {
+   exit 0;
}
}
 }
 
+# exit status unchanged
+{
+   my ($out, $status) = run_script 'SCRIPT';
+my $finally = Fink::Finally-new(sub { system(echo finalizer) });
+exit 2;
+SCRIPT
+   is($out, finalizer\n, 'exit status unchanged - finalizer ran');
+   is($status, 2, 'exit status unchanged - correct status');
+}
+


Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/t/Finally/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog   22 Mar 2006 18:17:01 -  1.2
+++ ChangeLog   22 Mar 2006 22:46:54 -  1.3
@@ -1,5 +1,9 @@
 2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * finally.t: Test whether we keep the exit status.
+
+2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
+
* finally.t: Test what happens when we fork.
 
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]



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

scripts/srcdist ChangeLog,NONE,1.1 dist-module.pl,1.4,1.5

[Dave Vasilevsky]

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

Modified Files:
dist-module.pl 
Added Files:
ChangeLog 
Log Message:
use new args to modify_description

--- NEW FILE: ChangeLog ---
2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]

* dist-module.pl: Use the new arguments to 
Fink::Bootstrap::modify_description.

Index: dist-module.pl
===
RCS file: /cvsroot/fink/scripts/srcdist/dist-module.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dist-module.pl  3 Jan 2006 19:37:50 -   1.4
+++ dist-module.pl  22 Mar 2006 22:47:06 -  1.5
@@ -31,7 +31,7 @@
 
 ### configuration
 
-my $cvsroot=':ext:[EMAIL PROTECTED]:/cvsroot/fink';
+my $cvsroot=':ext:[EMAIL PROTECTED]:/cvsroot/fink';
 my $distribution = 10.3;  #default value
 
 ### init
@@ -136,7 +136,7 @@
 print Creating package description file $modulename.info$suffix:\n;
 $revision = ${$revisions}{$distro};
 
-modify_description($tmpdir/$fullname/$modulename.info.in,$tmpdir/$modulename.info$suffix,$tmpdir/$fullname.tar.gz,$tmpdir/$fullname,mirror:custom:fink/%n-%v.tar.gz,$distribution,$coda);
+modify_description($tmpdir/$fullname/$modulename.info.in,$tmpdir/$modulename.info$suffix,$tmpdir/$fullname.tar.gz,$tmpdir/$fullname,mirror:custom:fink/%n-%v.tar.gz,$distribution,$coda,$version,$revision);
 
 }
 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink CLI.pm,1.41,1.42 ChangeLog,1.1297,1.1298

[Dave Vasilevsky]

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

Modified Files:
CLI.pm ChangeLog 
Log Message:
fix open-modes issue

Index: CLI.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/CLI.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- CLI.pm  21 Mar 2006 20:53:26 -  1.41
+++ CLI.pm  23 Mar 2006 03:52:47 -  1.42
@@ -24,7 +24,8 @@
 package Fink::CLI;
 
 use Carp;
-use Fcntl qw(:seek);
+use File::Temp qw(tempfile);
+use Fcntl qw(:seek :DEFAULT);
 use IO::Handle;
 
 use strict;
@@ -667,35 +668,56 @@
 
 =cut
 
+{ # Simple logging, for when normal out/err aren't available
+   my $capterr_dir = '/tmp'; # set to undef for production, path for debug
+   my $capterr;
+   if (defined $capterr_dir) {
+   ($capterr) = tempfile(capture.X, DIR = $capterr_dir,
+   UNLINK = 0);
+   $capterr-autoflush(1);
+   }
+   sub _fh_log { print $capterr @_, \n\n if defined $capterr }
+}
+   
+# Die, printing to a log FH (in addition to stderr)
+sub _fh_die {
+   my $msg = shift;
+   _fh_log(Carp::longmess($msg));
+   die $msg;
+}
+
+# Save a filehandle
 # my $saved = _fh_save \*FH;
 sub _fh_save {
my ($fh, $scalar) = @_;
-   die Argument must be a scalar ref
+   _fh_die Argument must be a scalar ref
unless ref($scalar)  ref($scalar) eq 'SCALAR';
-   open my $save, '', $fh or die Can't save filehandle: $!;
-   close $fh or die Can't temporarily close filehandle: $!;
+   open my $save, '', $fh or _fh_die Can't save filehandle: $!;
+   close $fh or _fh_die Can't temporarily close filehandle: $!;
return $save;
 }
 
+# Reading a filehandle, then restore to the saved FH 
 # _fh_restore \*FH, $save, \$read_into;  Last arg optional
 sub _fh_restore {
my ($fh, $save, $into) = @_;
if (defined $into) {
-   $fh-flush or die Can't flush: $!;
-   seek $fh, 0, SEEK_SET or die Can't seek: $!;
+   $fh-flush or _fh_die Can't flush: $!;
+   seek $fh, 0, SEEK_SET or _fh_die Can't seek: $!;
$$into = join('', $fh);
-   die Can't read filehandle: $! if $fh-error;
+   _fh_die Can't read filehandle: $! if $fh-error;
}
-   close $fh or die Can't close filehandle: $!;
+   close $fh or _fh_die Can't close filehandle: $!;

-   # It appears perl ignores more permissive modes for STD*, so '+' is ok
-   open $fh, '+', $save or die Can't reopen filehandle: $!;
-   close $save or die Can't close saved filehandle: $!;
+   # Try not to use an excessive open mode
+   my $mode = (fcntl($save, F_GETFL, 0)  O_RDWR) ? '+' : '';
+   open $fh, $mode, $save or _fh_die Can't reopen filehandle: $!;
+   close $save or _fh_die Can't close saved filehandle: $!;
 }  
 
 sub capture ($;$) {
my ($code, $out, $err, @toomany) = @_;
-   die Too many arguments! if @toomany;
+   _fh_die Too many arguments! if @toomany;
my ($die, $ret, $setupok);
my $array = wantarray;

@@ -703,15 +725,15 @@
my ($savout, $saverr);
if (defined $out) {
$savout = _fh_save(*STDOUT{IO}, $out); # ok to die
-   open STDOUT, '+', undef or die Can't reopen STDOUT: $!;
+   open STDOUT, '+', undef or _fh_die Can't reopen STDOUT: $!;
}
eval { # cleanup stdout if error within this block
if (defined $err) {
$saverr = _fh_save(*STDERR{IO}, $err);
if ($out eq $err) {
-   open STDERR, '', STDOUT or die Can't merge 
STDERR: $!;
+   open STDERR, '', STDOUT or _fh_die Can't 
merge STDERR: $!;
} else {
-   open STDERR, '+', undef or die Can't reopen 
STDERR: $!;
+   open STDERR, '+', undef or _fh_die Can't 
reopen STDERR: $!;
}
}
$setupok = 1; # Now ok to save output
@@ -728,7 +750,7 @@
_fh_restore(*STDOUT{IO}, $savout, $setupok ? $out : ()) if defined 
$savout;

# Finish up
-   die $die if $die;
+   _fh_die $die if $die;
return $array ? @$ret : $ret;
 }
 

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1297
retrieving revision 1.1298
diff -u -d -r1.1297 -r1.1298
--- ChangeLog   22 Mar 2006 23:25:24 -  1.1297
+++ ChangeLog   23 Mar 2006 03:52:47 -  1.1298
@@ -1,3 +1,7 @@
+2006-03-22  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * CLI.pm: Add logging to capture, fix open-modes problem. 
+
 2006-03-22  Benjamin Reed  [EMAIL

fink/perlmod/Fink CLI.pm,1.42,1.43

[Dave Vasilevsky]

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

Modified Files:
CLI.pm 
Log Message:
typo

Index: CLI.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/CLI.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- CLI.pm  23 Mar 2006 03:52:47 -  1.42
+++ CLI.pm  23 Mar 2006 03:53:20 -  1.43
@@ -669,7 +669,7 @@
 =cut
 
 { # Simple logging, for when normal out/err aren't available
-   my $capterr_dir = '/tmp'; # set to undef for production, path for debug
+   my $capterr_dir = undef; # set to undef for production, path for debug
my $capterr;
if (defined $capterr_dir) {
($capterr) = tempfile(capture.X, DIR = $capterr_dir,



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/CLI - New directory

[Dave Vasilevsky]

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

Log Message:
Directory /cvsroot/fink/fink/t/CLI added to the repository




---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/CLI ChangeLog,NONE,1.1 capture.t,NONE,1.1

[Dave Vasilevsky]

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

Added Files:
ChangeLog capture.t 
Log Message:
CLI::capture

--- NEW FILE: capture.t ---
#!/usr/bin/perl
use warnings;
use strict;

use Test::More 'no_plan';
use File::Temp qw(tempfile);

BEGIN { use_ok 'Fink::CLI', 'capture'; }

# too many args
{
my ($out, $err, $extra);
eval { capture { print not ok\n } \$out, \$err, \$extra };
ok($@, too many args - is an error);
is($out, undef, too many args - no output);
is($err, undef, too many args - no err output);
}

# basic stdout
{
my $out;
capture { print not ok\n } \$out;
is($out, not ok\n, basic stdout);
}

# bad stdout arg
{
my $out = foo;
eval { capture { print not ok\n } $out };
ok($@, bad stdout arg - is an error);
is($out, foo, bad stdout arg - value remains the same);
}

# side effects
{
my ($out, $side);
capture { $side = foo; print not ok\n } \$out;
is($side, foo, side effects);
}

# basic stderr
{
my ($out, $err);
capture { print not ok\n; print STDERR not ok\n } \$out, \$err;
is($out, not ok\n, basic stderr - stdout captured);
is($err, not ok\n, basic stderr - stderr captured);
}

# bad stderr arg
{
my ($out, $err) = (foo, bar);
eval { capture { print not ok\n } \$out, $err };
ok($@, bad stderr arg - is an error);
is($out, foo, bad stderr arg - out value remains the same);
is($err, bar, bad stderr arg - err value remains the same);
}

# nesting
{
my ($out, $inner);
capture {
capture { print inner } \$inner;
} \$out;
is($inner, inner, nesting - stdout intercepted);
is($out, , nesting - stdout not propagated);
}

# stderr propagation. Wow, this is a hairy test!
{
my ($out, $err, $inner);
capture {
capture { print inner; print STDERR err } \$inner;
} \$out, \$err;
is($inner, inner, stderr propagation - stdout intercepted);
is($out, , stderr propagation - stdout not propagated);
is($err, err, stderr propagation - stderr propagated);
}   

# wantarray
{
my ($out);
my $scalar = capture { grep /foo/, qw(foo bar foobar) } \$out;
is($scalar, 2, wantarray - scalar return);
my @array = capture { grep /foo/, qw(foo bar foobar) } \$out;
is_deeply([EMAIL PROTECTED], [ qw(foo foobar) ], wantarray - array 
return);
}

# die
{
my ($out, $err);
eval { capture {
print before;
die test\n;
print STDERR after;
} \$out, \$err };
is($@, test\n, die - exception thrown);
is($out, before, die - retain prints from before);
is($err, , die - no prints from after);
}

# subprocess
{
my ($out, $err);
capture {
system(ls nonexistent);
system(echo Hello World!);
} \$out, \$err;
is($out, Hello World!\n, subprocess - stdout);
like($err, qr/No such file/i, subprocess - stderr);
}

# perl output
{
my ($out, $err, $x);
capture {
my $foo = foo;
$x = $foo + 3;
} \$out, \$err;
is($out, , perl output - stdout);
like($err, qr/numeric/i, perl output - stderr);
}

# merge
{
my ($out);
capture {
print foo;
print STDERR bar;
print iggy;
} \$out, \$out;
is($out, foobariggy, merge);
}

# clean failure
{
# To test that STDOUT is still connected to real STDOUT after error,
# must run in a subproc
my $script = 'SCRIPT';
use Fink::CLI qw(capture);
$err = foo;
eval { capture { print not ok\n } \$out, $err };
print sesame;
SCRIPT
my ($fh, $fname) = tempfile(.capture.);
print $fh $script;
close $fh;

local $ENV{PERL5LIB} = join(':', @INC);
open my $subproc, '-|', perl $fname or die Can't open subproc: $!;
my $out = join('', $subproc);
close $subproc;

is($out, sesame, clean failure - stdout remains ok);
unlink $fname;
}

--- NEW FILE: ChangeLog ---
2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]

* NEW DIRECTORY: Test Fink::CLI.
* capture.t: Test Fink::CLI::capture.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink CLI.pm,1.39,1.40 ChangeLog,1.1279,1.1280

[Dave Vasilevsky]

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

Modified Files:
CLI.pm ChangeLog 
Log Message:
CLI::capture

Index: CLI.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/CLI.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- CLI.pm  3 Jan 2006 20:14:46 -   1.39
+++ CLI.pm  21 Mar 2006 19:20:53 -  1.40
@@ -24,6 +24,8 @@
 package Fink::CLI;
 
 use Carp;
+use Fcntl qw(:seek);
+use IO::Handle;
 
 use strict;
 use warnings;
@@ -43,7 +45,7 @@
  prompt prompt_boolean 
prompt_selection
  print_optionlist
  get_term_width should_skip_prompt
- word_wrap);
+ word_wrap capture);
 }
 our @EXPORT_OK;
 
@@ -653,6 +655,83 @@
return $width;
 }
 
+=item capture
+
+  my $return = capture { BLOCK }, \$out, \$err;
+
+Executes BLOCK, but intercepts STDOUT and STDERR, putting them into the
+arguments $out and $err. The return value is simply the BLOCK's return value.
+
+If $out and $err point to the same scalar, STDOUT and STDERR will have their
+outputs merged.
+
+=cut
+
+# my $saved = _fh_save \*FH;
+sub _fh_save {
+   my ($fh, $scalar) = @_;
+   die Argument must be a scalar ref
+   unless ref($scalar)  ref($scalar) eq 'SCALAR';
+   open my $save, '', $fh or die Can't save filehandle: $!;
+   close $fh or die Can't temporarily close filehandle: $!;
+   return $save;
+}
+
+# _fh_restore \*FH, $save, \$read_into;  Last arg optional
+sub _fh_restore {
+   my ($fh, $save, $into) = @_;
+   if (defined $into) {
+   $fh-flush or die Can't flush: $!;
+   seek $fh, 0, SEEK_SET or die Can't seek: $!;
+   $$into = join('', $fh);
+   die Can't read filehandle: $! if $fh-error;
+   }
+   close $fh or die Can't close filehandle: $!;
+   
+   # It appears perl ignores more permissive modes for STD*, so '+' is ok
+   open $fh, '+', $save or die Can't reopen filehandle: $!;
+   close $save or die Can't close saved filehandle: $!;
+}  
+
+sub capture (@) {
+   my ($code, $out, $err, @toomany) = @_;
+   die Too many arguments! if @toomany;
+   my ($die, $ret, $setupok);
+   my $array = wantarray;
+   
+   # Setup the filehandles
+   my ($savout, $saverr);
+   if (defined $out) {
+   $savout = _fh_save(*STDOUT{IO}, $out); # ok to die
+   open STDOUT, '+', undef or die Can't reopen STDOUT: $!;
+   }
+   eval { # cleanup stdout if error within this block
+   if (defined $err) {
+   $saverr = _fh_save(*STDERR{IO}, $err);
+   if ($out eq $err) {
+   open STDERR, '', STDOUT or die Can't merge 
STDERR: $!;
+   } else {
+   open STDERR, '+', undef or die Can't reopen 
STDERR: $!;
+   }
+   }
+   $setupok = 1; # Now ok to save output
+   
+   # Run!
+   eval { $ret = $array ? [ $code() ] : scalar($code()) };
+   $die ||= $@;
+   
+   # Tear down
+   _fh_restore(*STDERR{IO}, $saverr, $setupok  $out eq $err ? () 
: $err)
+   if defined $saverr;
+   };
+   $die ||= $@;
+   _fh_restore(*STDOUT{IO}, $savout, $setupok ? $out : ()) if defined 
$savout;
+   
+   # Finish up
+   die $die if $die;
+   return $array ? @$ret : $ret;
+}
+
 =back
 
 =cut

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1279
retrieving revision 1.1280
diff -u -d -r1.1279 -r1.1280
--- ChangeLog   21 Mar 2006 06:30:14 -  1.1279
+++ ChangeLog   21 Mar 2006 19:20:53 -  1.1280
@@ -1,4 +1,8 @@
-2006-03-21  Daniel Macks  [EMAIL PROTECTED]
+2006-03-20  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * CLI.pm: New function capture, to hijack STDOUT and STDERR.
+
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
* FinkVersion.pm.in: Collapse copy/pasted code into a loop.
 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink CLI.pm,1.40,1.41 ChangeLog,1.1280,1.1281

[Dave Vasilevsky]

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

Modified Files:
CLI.pm ChangeLog 
Log Message:
prototype fix

Index: CLI.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/CLI.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- CLI.pm  21 Mar 2006 19:20:53 -  1.40
+++ CLI.pm  21 Mar 2006 20:53:26 -  1.41
@@ -693,7 +693,7 @@
close $save or die Can't close saved filehandle: $!;
 }  
 
-sub capture (@) {
+sub capture ($;$) {
my ($code, $out, $err, @toomany) = @_;
die Too many arguments! if @toomany;
my ($die, $ret, $setupok);

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1280
retrieving revision 1.1281
diff -u -d -r1.1280 -r1.1281
--- ChangeLog   21 Mar 2006 19:20:53 -  1.1280
+++ ChangeLog   21 Mar 2006 20:53:26 -  1.1281
@@ -1,4 +1,8 @@
-2006-03-20  Dave Vasilevsky  [EMAIL PROTECTED]
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * CLI.pm: Adjust prototype for capture.
+
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
* CLI.pm: New function capture, to hijack STDOUT and STDERR.
 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/CLI ChangeLog,1.1,1.2 capture.t,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
ChangeLog capture.t 
Log Message:
prototype fix

Index: capture.t
===
RCS file: /cvsroot/fink/fink/t/CLI/capture.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- capture.t   21 Mar 2006 19:20:54 -  1.1
+++ capture.t   21 Mar 2006 20:53:26 -  1.2
@@ -10,7 +10,7 @@
 # too many args
 {
my ($out, $err, $extra);
-   eval { capture { print not ok\n } \$out, \$err, \$extra };
+   eval 'capture { print not ok\n } \$out, \$err, \$extra';
ok($@, too many args - is an error);
is($out, undef, too many args - no output);
is($err, undef, too many args - no err output);

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/t/CLI/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog   21 Mar 2006 19:20:54 -  1.1
+++ ChangeLog   21 Mar 2006 20:53:26 -  1.2
@@ -1,4 +1,8 @@
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * capture.t: Make 'too many args' test compile at runtime.
+
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
* NEW DIRECTORY: Test Fink::CLI.
* capture.t: Test Fink::CLI::capture.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1281,1.1282 Scanpackages.pm,1.8,1.9

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Scanpackages.pm 
Log Message:
start using capture

Index: Scanpackages.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Scanpackages.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Scanpackages.pm 20 Mar 2006 05:14:12 -  1.8
+++ Scanpackages.pm 21 Mar 2006 21:05:35 -  1.9
@@ -26,6 +26,7 @@
 use warnings;
 use strict;
 
+use Fink::CLI qw(capture);
 use Fink::Command qw(mkdir_p);
 use Fink::Services qw(latest_version);
 
@@ -349,23 +350,6 @@
return \%control;
 }
 
-# Don't let an operation print to stdout or stderr
-#
-# _quietly($coderef);
-sub _quietly {
-   my ($coderef) = @_;
-   
-   open my $oldout, '', STDOUT;
-   open my $olderr, '', STDERR;
-   open STDOUT, '', '/dev/null';
-   open STDERR, '', '/dev/null';
-   $coderef();
-   open STDOUT, '', $oldout;
-   open STDERR, '', $olderr;
-   close $oldout;
-   close $olderr;
-}
-
 # Make sure Fink is configured
 #
 # $sp-_ensure_fink;
@@ -392,9 +376,10 @@
require Fink::Package;

print STDERR Loading Fink package database\n if 
$self-{verbosity};
-   _quietly(sub {
+   my $dummy;
+   capture {
Fink::Package-require_packages;
-   });
+   } \$dummy, \$dummy;
$self-{_pdb_loaded} = 1;
}
 }

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -d -r1.1281 -r1.1282
--- ChangeLog   21 Mar 2006 20:53:26 -  1.1281
+++ ChangeLog   21 Mar 2006 21:05:35 -  1.1282
@@ -1,5 +1,9 @@
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Scanpackages.pm: Use CLI::capture to shut up Fink::Package.
+
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
* CLI.pm: Adjust prototype for capture.
 
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1282,1.1283 Engine.pm,1.358,1.359 PkgVersion.pm,1.537,1.538

[Dave Vasilevsky]

--- Engine.pm   19 Mar 2006 09:27:48 -  1.358
+++ Engine.pm   21 Mar 2006 22:57:53 -  1.359
@@ -2214,7 +2214,7 @@
printf %s:\n, $_;
print map {  $_=.$value-{$_}.\n } sort 
keys %$value;
} elsif ($_ eq 'trees') {
-   printf %s: %s\n, $_, join(' ', 
$pkg-get_trees);
+   printf %s: %s\n, $_, join(' ', 
$pkg-get_full_trees);
} else {
die Unknown field $_\n;
}

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1282
retrieving revision 1.1283
diff -u -d -r1.1282 -r1.1283
--- ChangeLog   21 Mar 2006 21:05:35 -  1.1282
+++ ChangeLog   21 Mar 2006 22:57:53 -  1.1283
@@ -1,5 +1,15 @@
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * PkgVersion.pm:
+   - Store the full tree (stable/main) instead of just the first
+   component (stable).
+   - Remove in_tree, it's unused.
+   * Engine.pm: Use the full tree in dumpinfo.
+   
+   *** THIS IS A DB FORMAT CHANGE, RUN index -f OR EXPECT BREAKAGE ***
+
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
* Scanpackages.pm: Use CLI::capture to shut up Fink::Package.
 
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1284,1.1285 PkgVersion.pm,1.538,1.539

[Dave Vasilevsky]

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

Modified Files:
ChangeLog PkgVersion.pm 
Log Message:
woops, don't break things

Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -d -r1.538 -r1.539
--- PkgVersion.pm   21 Mar 2006 22:57:57 -  1.538
+++ PkgVersion.pm   21 Mar 2006 23:33:16 -  1.539
@@ -539,7 +539,6 @@
# path handling
if ($filename) {
@parts = split(/\//, $filename);
-   shift @parts if $parts[0] eq ''; # scrap detritus from leading /
pop @parts; # remove filename
$self-{_patchpath} = join(/, @parts);
for ($finkinfo_index = $#parts;
@@ -570,7 +569,8 @@
}

# determine the full package tree, eg: [ qw(stable 
main) ]
-   $self-{_full_trees} = [ [ @parts[3..$finkinfo_index-1] 
] ];
+   # front (removed): '', %p, 'fink', 'dists'
+   $self-{_full_trees} = [ [ @parts[4..$finkinfo_index-1] 
] ];
}
} else {
# for dummy descriptions generated from dpkg status data alone

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1284
retrieving revision 1.1285
diff -u -d -r1.1284 -r1.1285
--- ChangeLog   21 Mar 2006 23:03:23 -  1.1284
+++ ChangeLog   21 Mar 2006 23:33:16 -  1.1285
@@ -1,3 +1,7 @@
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * PkgVersion.pm: Don't break everything.
+
 2006-03-21  Dave Morrison  [EMAIL PROTECTED]
 
* FinkVersion.pm.in: new function default_binary_version



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1286,1.1287 Engine.pm,1.359,1.360 Services.pm,1.202,1.203

[Dave Vasilevsky]

);
+   }
}
}
 }
@@ -1862,11 +1896,12 @@
}
}

-   # Default to AutoScanpackages: True
+   # Default to true
my $autoscan = !$config-has_param(AutoScanpackages)
|| $config-param_boolean(AutoScanpackages);
-   if ($willbuild  $autoscan) {
-   cmd_scanpackages(1);
+   if ($willbuild  $autoscan  apt_available) {
+   scanpackages(1);
+   aptget_update(1);
}
 }
 

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1286
retrieving revision 1.1287
diff -u -d -r1.1286 -r1.1287
--- ChangeLog   22 Mar 2006 00:09:30 -  1.1286
+++ ChangeLog   22 Mar 2006 01:04:19 -  1.1287
@@ -1,3 +1,8 @@
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * Services.pm: New function apt_available, to check if apt is around.
+   * Engine.pm: Make things work with apt uninstalled.
+
 2006-03-21  Dave Morrison  [EMAIL PROTECTED]
 
* PkgVersion.pm: when an error is generated on Intel hardware, warn 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.409,1.410 fink.8.in,1.53,1.54

[Dave Vasilevsky]

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

Modified Files:
ChangeLog fink.8.in 
Log Message:
make things work without apt installed

Index: fink.8.in
===
RCS file: /cvsroot/fink/fink/fink.8.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- fink.8.in   30 Jan 2006 22:13:48 -  1.53
+++ fink.8.in   22 Mar 2006 01:04:18 -  1.54
@@ -488,9 +488,9 @@
 is the default.
 .El
 .It Cm scanpackages Op Ar tree...
-Calls
-.Xr dpkg-scanpackages 8
-with the specified trees.
+Updates the
+.Xr apt-get 8
+database of debs in the specified trees.
 .It Cm cleanup Ar [mode(s) and options]
 Removes obsolete and temporary files. This can reclaim large amounts of
 disk space. One or more modes must be specified:

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -d -r1.409 -r1.410
--- ChangeLog   21 Mar 2006 23:11:02 -  1.409
+++ ChangeLog   22 Mar 2006 01:04:16 -  1.410
@@ -1,3 +1,7 @@
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * fink.8.in: Update ancient docs for 'fink scanpackages'.
+
 2006-03-21  Dave Morrison  [EMAIL PROTECTED]
 
* bootstrap.sh: generate a new FinkVersion.pm on every bootstrap run



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/Finally - New directory

[Dave Vasilevsky]

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

Log Message:
Directory /cvsroot/fink/fink/t/Finally added to the repository




---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/t/Finally ChangeLog,NONE,1.1 finally.t,NONE,1.1

[Dave Vasilevsky]

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

Added Files:
ChangeLog finally.t 
Log Message:
new finalizer mechanism

--- NEW FILE: finally.t ---
#!/usr/bin/perl
use warnings;
use strict;

use Test::More 'no_plan';
use File::Temp qw(tempfile);

BEGIN { use_ok 'Fink::Finally'; }

# bad args
{
eval { Fink::Finally-new };
ok($@, 'bad args - no args');
eval { Fink::Finally-new('not code') };
ok($@, 'bad args - not a code ref');
}

# explicit cleanup
{
my $x = 0;
my $finally = Fink::Finally-new(sub { $x++ });
$finally-run;
is($x, 1, 'explicit cleanup');
}

# automatic cleanup
{
my $x = 0;
{
my $finally = Fink::Finally-new(sub { $x++ });
}
is($x, 1, 'automatic cleanup');
}

# exceptional cleanup
{
my $x = 0;
eval {
my $finally = Fink::Finally-new(sub { $x++ });
die exception!;
};
ok($@, 'exceptional cleanup - exception thrown');
is($x, 1, 'exceptional cleanup - executed');
}

# run once
{
my $x = 0;
{
my $finally = Fink::Finally-new(sub { $x++ });
$finally-run;
$finally-run;
# out of scope = automatic run
}
is($x, 1, 'run once');
}

# cleanup on exit
{
my $script = 'SCRIPT';
use Fink::Finally;
my $finally = Fink::Finally-new(sub { print cleanup\n });
exit 0;
SCRIPT
my ($fh, $fname) = tempfile(.capture.);
print $fh $script;
close $fh;

local $ENV{PERL5LIB} = join(':', @INC);
open my $subproc, '-|', perl $fname or die Can't open subproc: $!;
my $out = join('', $subproc);
close $subproc;

is($out, cleanup\n, cleanup on exit);
unlink $fname;
}

# cancellation
{
my $x = 0;
{
my $fin = Fink::Finally-new(sub { $x++ });
$fin-cancel;
$fin-run;
} # out of scope
is($x, 0, 'cancellation');
}

--- NEW FILE: ChangeLog ---
2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]

* NEW DIRECTORY, finally.t: Test Fink::Finally.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink Finally.pm,NONE,1.1 ChangeLog,1.1287,1.1288 Engine.pm,1.360,1.361 PkgVersion.pm,1.541,1.542

[Dave Vasilevsky]

,
# 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.
#

package Fink::Finally;
use base 'Fink::Base';

use warnings;
use strict;

=head1 NAME

Fink::Finally - Run cleanup code unconditionally.

=head1 DESCRIPTION

Usually cleanup code runs explicitly, but sometimes exceptions can cause it
to be bypassed. Fink::Finally allows such code to be executed even if an
exception occurs.

=head1 SYNOPSIS

  use Fink::Finally;

  # $fin runs even if an exception is thrown
  my $fin = Fink::Finally-new(sub { ... });

  function_which_might_die();

  $fin-run;

=head1 METHODS

=over 4

=item new

  my $fin = Fink::Finally-new(sub { ... });

Create a finalizer to run the given cleanup code.

The code will run either when C$finally-run is called, or when I$fin goes
out of scope. The return value of the code is not accessible, since the caller
may not get a chance to explictly call Irun.

=cut

sub initialize {
my ($self, $code) = @_;
$self-SUPER::initialize;

die A Finally needs some code to run!\n
unless defined $code  ref($code) eq 'CODE';
$self-{_code} = $code;
$self-{_primed} = 1; # ready to go
}

=item run

  $fin-run;

Explicitly run the cleanup code in this finalizer.

If called multiple times, only the first will actually do anything.

=cut

sub run {
my ($self) = @_;
return unless $self-{_primed};

{$self-{_code}}();
delete $self-{_primed};
}

sub DESTROY {
$_[0]-run;
}

=item cancel

  $fin-cancel;

Do not allow this finalizer to run.

=cut

sub cancel {
my ($self) = @_;
delete $self-{_primed};
}

=back

=cut

1;

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1287
retrieving revision 1.1288
diff -u -d -r1.1287 -r1.1288
--- ChangeLog   22 Mar 2006 01:04:19 -  1.1287
+++ ChangeLog   22 Mar 2006 04:00:29 -  1.1288
@@ -1,5 +1,14 @@
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Finally.pm: New way to create cleanup functions.
+   * Engine.pm: Adapt to new Finally, add 'finalizer' method to schedule a
+   function to run when process finishes.
+   * Engine.pm, PkgVersion.pm: Move AutoScanpackages to happen just after
+   buildlock removal for each package. The apt-get update is only run at 
the
+   end of a build, using the new finalizer mechanism.
+
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
* Services.pm: New function apt_available, to check if apt is around.
* Engine.pm: Make things work with apt uninstalled.
 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1288,1.1289 Config.pm,1.72,1.73 Engine.pm,1.361,1.362 PkgVersion.pm,1.542,1.543

[Dave Vasilevsky]

 for it
# - only include life-time dependencies
@@ -1623,7 +1620,6 @@
@deplist = $item-[PKGVER]-resolve_depends(0, 
Depends, $forceoff);

# Do not use BuildConflicts for packages which are not 
going to be built!
-#  @conlist = $item-[PKGVER]-resolve_depends(0, 
Conflicts, $forceoff);
}
# add essential packages (being careful about packages whose 
parent is essential)
# dev-tools is not Essential but it must not depend on 
essentials because essentials must implicitly BDep:dev-tools

Index: Config.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Config.pm,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- Config.pm   17 Mar 2006 06:42:07 -  1.72
+++ Config.pm   22 Mar 2006 05:41:19 -  1.73
@@ -209,8 +209,9 @@

my %opts = (
map( { $_ = 0 } qw(dontask interactive verbosity keep_build 
keep_root
-   use_binary build_as_nobody maintainermode showversion) 
),
+   build_as_nobody maintainermode showversion) ),
map ( { $_ = [] } qw(include_trees exclude_trees) ),
+   map( { $_ = -1 } qw(use_binary) ),
);

my $comlen =  14;
@@ -908,7 +909,7 @@
my $runtime_request = get_option(use_binary);
my $binary_request;
 
-   if ($runtime_request == -1) {
+   if ($runtime_request == 0) { # --no-use-binary-dist
$binary_request = 0;
} elsif ($runtime_request == 1) {
$binary_request = 1;

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1288
retrieving revision 1.1289
diff -u -d -r1.1288 -r1.1289
--- ChangeLog   22 Mar 2006 04:00:29 -  1.1288
+++ ChangeLog   22 Mar 2006 05:41:19 -  1.1289
@@ -1,5 +1,12 @@
 2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Engine.pm: De-blockify finalize.
+   * Engine.pm, PkgVersion.pm: Add a finally to remove buildlocks on build
+   failure.
+   * Config.pm: Make --no-use-binary-dist actually work.
+
+2006-03-21  Dave Vasilevsky  [EMAIL PROTECTED]
+
* Finally.pm: New way to create cleanup functions.
* Engine.pm: Adapt to new Finally, add 'finalizer' method to schedule a
function to run when process finishes.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1276,1.1277 Services.pm,1.201,1.202

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Services.pm 
Log Message:
POSIX breakage

Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- Services.pm 19 Mar 2006 22:19:30 -  1.201
+++ Services.pm 20 Mar 2006 18:35:39 -  1.202
@@ -28,7 +28,7 @@
 use Fink::Command  qw(rm_f);
 use Fink::CLI  qw(word_wrap get_term_width print_breaking_stderr);
 
-use POSIX qw(uname tmpnam :errno_h);
+use POSIX qw(:errno_h uname tmpnam);
 use Fcntl qw(:flock);
 use Getopt::Long;
 use Data::Dumper;

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1276
retrieving revision 1.1277
diff -u -d -r1.1276 -r1.1277
--- ChangeLog   20 Mar 2006 05:14:11 -  1.1276
+++ ChangeLog   20 Mar 2006 18:35:37 -  1.1277
@@ -1,5 +1,9 @@
 2006-03-20  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Services.pm: Try to fix errno_h breakage on 10.3.
+
+2006-03-20  Dave Vasilevsky  [EMAIL PROTECTED]
+
* PkgVersion.pm: Remove stray 'use DB_File'.
* Scanpackages.pm: Ensure we load the correct DB_File.
 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/libs libevent1.info,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
libevent1.info 
Log Message:
add docfiles

Index: libevent1.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libevent1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libevent1.info  20 Mar 2006 07:49:25 -  1.1
+++ libevent1.info  20 Mar 2006 23:55:23 -  1.2
@@ -1,6 +1,6 @@
 Package: libevent1
 Version: 1.1a
-Revision: 1
+Revision: 2
 Description: Event notification library, version 1
 License: BSD
 Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
@@ -37,4 +37,5 @@
Package: %N-shlibs
Files: lib/libevent.*.dylib
Shlibs: %p/lib/libevent.1.dylib 2.0.0 %n (= 1.1a-1)
+   DocFiles: README
 
\ No newline at end of file



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/libs/perlmods json-pm.info,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
json-pm.info 
Log Message:
forgot arch

Index: json-pm.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/json-pm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- json-pm.info17 Mar 2006 22:24:30 -  1.1
+++ json-pm.info21 Mar 2006 02:49:57 -  1.2
@@ -12,6 +12,7 @@
 Source-MD5: ce014285642a10e3321ea79d60b6fdf1
 
 Type: perl (5.8.1 5.8.4 5.8.6)
+Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
 UpdatePOD: true
 
 Depends: libwww-pm%type_pkg[perl], test-simple-pm%type_pkg[perl]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1278,1.1279 FinkVersion.pm.in,1.30,1.31

[Dave Vasilevsky]

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

Modified Files:
ChangeLog FinkVersion.pm.in 
Log Message:
collapse code

Index: FinkVersion.pm.in
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/FinkVersion.pm.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- FinkVersion.pm.in   3 Jan 2006 20:14:46 -   1.30
+++ FinkVersion.pm.in   21 Mar 2006 06:30:14 -  1.31
@@ -112,31 +112,23 @@
 
 sub pkginfo_version {
my $pv = 0;
-   my ($fn, $v);
-# first, look in the new location for stamp files
-   foreach $fn (glob($basepath/fink/dists/stamp-*)) {
-   if ($fn =~ m{/stamp-rsync}) {
-   return rsync;
-   } elsif ($fn =~ m{/stamp-cvs}) {
-   return cvs;
-   } elsif ($fn =~ m{/stamp-rel-(.+)$}) {
-   $v = $1;
-   $pv = $v if ($v gt $pv);
-   }
-   }
-# if we haven't returned yet, and we didn't set the value of $v, look in the 
old location
-   if (not defined $v) {
-   foreach $fn (glob($basepath/fink/stamp-*)) {
-   if ($fn =~ m{/stamp-rsync}) {
-   return rsync;
-   } elsif ($fn =~ m{/stamp-cvs}) {
-   return cvs;
-   } elsif ($fn =~ m{/stamp-rel-(.+)$}) {
-   $v = $1;
-   $pv = $v if ($v gt $pv);
+   
+   # first check the new place, then the old place
+   my @places = ($basepath/fink/dists, $basepath/fink);
+   for my $place (@places) {
+   for my $fn (glob($place/stamp-*)) {
+   if ($fn =~ m{/stamp-rsync}) {
+   return rsync;
+   } elsif ($fn =~ m{/stamp-cvs}) {
+   return cvs;
+   } elsif ($fn =~ m{/stamp-rel-(.+)$}) {
+   my $v = $1;
+   $pv = $v if ($v gt $pv);
+   }
}
-   }
+   last if $pv ne '0'; # stop after the first useful place
}
+   
$pv = distribution_version() if $pv eq 0;
return $pv;
 }

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1278
retrieving revision 1.1279
diff -u -d -r1.1278 -r1.1279
--- ChangeLog   21 Mar 2006 05:02:14 -  1.1278
+++ ChangeLog   21 Mar 2006 06:30:14 -  1.1279
@@ -1,5 +1,9 @@
 2006-03-21  Daniel Macks  [EMAIL PROTECTED]
 
+   * FinkVersion.pm.in: Collapse copy/pasted code into a loop.
+
+2006-03-21  Daniel Macks  [EMAIL PROTECTED]
+
* Validation.pm: Catch another .pc syntax that triggers a bug.
 
 2006-03-20  Dave Vasilevsky  [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.404,1.405 lockwait.in,1.5,1.6

[Dave Vasilevsky]

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

Modified Files:
ChangeLog lockwait.in 
Log Message:
graceful failure for locking

Index: lockwait.in
===
RCS file: /cvsroot/fink/fink/lockwait.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lockwait.in 18 Oct 2005 23:09:15 -  1.5
+++ lockwait.in 19 Mar 2006 08:50:47 -  1.6
@@ -30,7 +30,8 @@
#   short   l_whence;   /* type of l_start */
#   };
my $struct_flock = pack(iss, (0, 0), (0, 0), 0, F_WRLCK, 
SEEK_SET);
-   unless (fcntl(LOCK, F_SETLK, $struct_flock)) {
+   my $lock_ok = fcntl(LOCK, F_SETLK, $struct_flock);
+   unless ($lock_ok || $! == EOPNOTSUPP || $! == ENOLCK) {
die lockwait: Can't get lock: $! unless $! == EAGAIN || $! == 
EACCES;

my $msg = $timeout ? up to $timeout seconds  : ;
@@ -50,7 +51,10 @@
}
print STDERR done.\n;
}
-   print STDERR Got the lock\n if $debug;
+   print STDERR Got the lock\n if $debug  $lock_ok;
+   print STDERR WARNING: No locking is available on this filesystem.\n .
+   To ensure safety, do not run multiple instances 
simultaneously.\n
+   if !$lock_ok;

print STDERR Clear close-on-exec, so exec'ed process gets the lock\n
if $debug;

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -d -r1.404 -r1.405
--- ChangeLog   18 Mar 2006 23:56:03 -  1.404
+++ ChangeLog   19 Mar 2006 08:50:47 -  1.405
@@ -1,3 +1,7 @@
+2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * lockwait.in: Fail gracefully if locking is not supported.
+
 2006-03-18  Dave Vasilevsky  [EMAIL PROTECTED]
 
* fink-scanpackages.in: Indicate the prefix explicitly, so we don't have



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/gnome gtkhtml1.1.info,1.3,1.4 gtkhtml1.1.patch,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
gtkhtml1.1.info gtkhtml1.1.patch 
Log Message:
no more gcc 3.3

Index: gtkhtml1.1.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtkhtml1.1.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtkhtml1.1.info 15 Feb 2006 00:17:17 -  1.3
+++ gtkhtml1.1.info 19 Mar 2006 08:52:48 -  1.4
@@ -1,11 +1,11 @@
 Package: gtkhtml1.1
 Version: 1.1.7
-Revision: 1013
+Revision: 1014
 Architecture: powerpc
 Source: mirror:gnome:sources/gtkhtml/1.1/gtkhtml-%v.tar.bz2
 Source-MD5: 83cd60ab9a108d2a0d65b3bf760affa4
 Depends: %N-shlibs (= %v-%r), libghttp-shlibs, control-center-shlibs (= 
1.4.0.5-16)
-BuildDepends: audiofile, libglade, glib, gdk-pixbuf, x11, gnome-libs-dev (= 
1.4.2-19), libghttp, gconf (= 1.0.9-21), gconf-dev (= 1.0.9-21), oaf-dev (= 
0.6.10-22), bonobo-dev (= 1.0.20-13), control-center-dev (= 1.4.0.5-16), 
gal21 (= 0.22-1014), gnome-print-dev (= 0.36-11), gtk-doc, readline (= 
4.3-1028), orbit-dev (= 0.5.17-15), imlib (= 1.9.14-14), esound, popt, 
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev, gcc3.3
+BuildDepends: audiofile, libglade, glib, gdk-pixbuf, x11, gnome-libs-dev (= 
1.4.2-19), libghttp, gconf (= 1.0.9-21), gconf-dev (= 1.0.9-21), oaf-dev (= 
0.6.10-22), bonobo-dev (= 1.0.20-13), control-center-dev (= 1.4.0.5-16), 
gal21 (= 0.22-1014), gnome-print-dev (= 0.36-11), gtk-doc, readline (= 
4.3-1028), orbit-dev (= 0.5.17-15), imlib (= 1.9.14-14), esound, popt, 
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev
 Replaces: gtkhtml
 Conflicts: gtkhtml
 Patch: %n.patch
@@ -13,8 +13,6 @@
 SetCPPFLAGS: -no-cpp-precomp
 SetCFLAGS: -O3 -fstrict-aliasing -funroll-loops
 ConfigureParams: --with-gconf --with-bonobo
-SetCC: gcc-3.3
-SetCXX: g++-3.3
 InstallScript: 
 make install DESTDIR=%d
 rm -rf %i/share/control-center/capplets

Index: gtkhtml1.1.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtkhtml1.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gtkhtml1.1.patch20 Jan 2006 20:25:02 -  1.1
+++ gtkhtml1.1.patch19 Mar 2006 08:52:48 -  1.2
@@ -1,6 +1,6 @@
-diff -Naur gtkhtml-1.1.6.old/components/html-editor/Makefile.in 
gtkhtml-1.1.6.new/components/html-editor/Makefile.in
 gtkhtml-1.1.6.old/components/html-editor/Makefile.in   Thu Nov  7 
06:05:57 2002
-+++ gtkhtml-1.1.6.new/components/html-editor/Makefile.in   Wed Nov 13 
03:12:23 2002
+diff -Naur gtkhtml-1.1.7-0001/components/html-editor/Makefile.in 
gtkhtml-1.1.7-0002/components/html-editor/Makefile.in
+--- gtkhtml-1.1.7-0001/components/html-editor/Makefile.in  2002-12-05 
13:02:57.0 -0500
 gtkhtml-1.1.7-0002/components/html-editor/Makefile.in  2006-03-19 
02:44:54.0 -0500
 @@ -177,7 +177,7 @@
  
  
@@ -249,9 +249,9 @@
  @[EMAIL PROTECTED]:
  @[EMAIL PROTECTED]:
  @EDITOR_SHLIB_FALSE@  mv $(DESTDIR)$(bindir)/gnome-gtkhtml-editor 
$(DESTDIR)$(bindir)/[EMAIL PROTECTED]@
-diff -Naur gtkhtml-1.1.6.old/components/html-editor/Spell-common.c 
gtkhtml-1.1.6.new/components/html-editor/Spell-common.c
 gtkhtml-1.1.6.old/components/html-editor/Spell-common.cWed Nov  6 
06:09:06 2002
-+++ gtkhtml-1.1.6.new/components/html-editor/Spell-common.cWed Nov 13 
02:59:34 2002
+diff -Naur gtkhtml-1.1.7-0001/components/html-editor/Spell-common.c 
gtkhtml-1.1.7-0002/components/html-editor/Spell-common.c
+--- gtkhtml-1.1.7-0001/components/html-editor/Spell-common.c   2002-11-14 
11:35:21.0 -0500
 gtkhtml-1.1.7-0002/components/html-editor/Spell-common.c   2006-03-19 
02:44:54.0 -0500
 @@ -3,7 +3,7 @@
   */
  
@@ -261,9 +261,9 @@
  
  #if ( (TC_IMPL_TC_CORBA_sequence_CORBA_string_0 == 'S') \
   (TC_IMPL_TC_CORBA_sequence_CORBA_string_1 == 'p') \
-diff -Naur gtkhtml-1.1.6.old/components/html-editor/Spell-skels.c 
gtkhtml-1.1.6.new/components/html-editor/Spell-skels.c
 gtkhtml-1.1.6.old/components/html-editor/Spell-skels.c Wed Nov  6 
06:09:06 2002
-+++ gtkhtml-1.1.6.new/components/html-editor/Spell-skels.c Wed Nov 13 
02:59:34 2002
+diff -Naur gtkhtml-1.1.7-0001/components/html-editor/Spell-skels.c 
gtkhtml-1.1.7-0002/components/html-editor/Spell-skels.c
+--- gtkhtml-1.1.7-0001/components/html-editor/Spell-skels.c2002-11-14 
11:35:21.0 -0500
 gtkhtml-1.1.7-0002/components/html-editor/Spell-skels.c2006-03-19 
02:44:54.0 -0500
 @@ -3,7 +3,7 @@
   */
  
@@ -273,9 +273,9 @@
  
  void
  _ORBIT_GNOME_Spell_Dictionary_Error_marshal(GIOPSendBuffer *
-diff -Naur gtkhtml-1.1.6.old/components/html-editor/Spell-stubs.c 
gtkhtml-1.1.6.new/components/html-editor/Spell-stubs.c
 

fink/perlmod/Fink ChangeLog,1.1273,1.1274 Engine.pm,1.357,1.358 Package.pm,1.170,1.171 PkgVersion.pm,1.535,1.536 Services.pm,1.199,1.200

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Engine.pm Package.pm PkgVersion.pm Services.pm 
Log Message:
remove redundant locking

Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- Services.pm 19 Mar 2006 08:50:48 -  1.199
+++ Services.pm 19 Mar 2006 09:27:48 -  1.200
@@ -34,6 +34,7 @@
 use Data::Dumper;
 use File::Find;
 use File::Spec;
+use File::Temp qw(tempfile);
 use Storable; # safe in the modern world
 
 use strict;
@@ -68,7 +69,7 @@
  store_rename fix_gcc_repairperms
  spec2struct spec2string get_options
  $VALIDATE_HELP $VALIDATE_ERROR 
$VALIDATE_OK
- find_subpackages lock_store 
lock_retrieve);
+ find_subpackages);
 }
 our @EXPORT_OK;
 
@@ -1798,10 +1799,10 @@
 
 sub store_rename {
my ($ref, $file) = @_;
-   my $tmp = ${file}.tmp;
+   my ($dummy, $tmp) = tempfile($file.X);

return 0 unless eval { require Storable };
-   if (lock_store($ref, $tmp)) {
+   if (Storable::store($ref, $tmp)) {
unless (rename $tmp, $file) {
print_breaking_stderr(Error: could not activate 
temporary file $tmp: $!);
return 0;
@@ -2208,29 +2209,6 @@
return @found;
 }
 
-=item lock_store, lock_retrieve
-
-Identical to Storable::lock_store and Storable::lock_retrieve, except that
-they fail gracefully when locking is unavailable.
-
-=cut
-
-sub lock_store {
-   my ($data, $file) = @_;
-   my $fh = lock_wait($file, exclusive = 1);
-   my $ret = Storable::store($data, $file);
-   close $fh;
-   return $ret;
-}
-
-sub lock_retrieve {
-   my ($file) = @_;
-   my $fh = lock_wait($file, shared = 1);
-   my $ret = Storable::retrieve($file);
-   close $fh;
-   return $ret;
-}
-
 =back
 
 =cut

Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -d -r1.535 -r1.536
--- PkgVersion.pm   19 Mar 2006 08:50:48 -  1.535
+++ PkgVersion.pm   19 Mar 2006 09:27:48 -  1.536
@@ -31,7 +31,7 @@
  get_arch get_system_perl_version
  get_path eval_conditional 
enforce_gcc
  dpkg_lockwait aptget_lockwait 
lock_wait
- store_rename lock_retrieve);
+ store_rename);
 use Fink::CLI qw(print_breaking print_breaking_stderr rejoin_text
 prompt_boolean prompt_selection
 should_skip_prompt die_breaking);
@@ -171,7 +171,7 @@
 #  print Loading PkgVersion  . $self-get_fullname .  
from: $file\n;
eval {
local $SIG{INT} = 'IGNORE'; # No user interrupts
-   $loaded = lock_retrieve($file);
+   $loaded = Storable::retrieve($file);
};
if ($@ || !defined $loaded) {
die It appears that part of Fink's package 
database is corrupted 

Index: Engine.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -d -r1.357 -r1.358
--- Engine.pm   19 Mar 2006 08:50:47 -  1.357
+++ Engine.pm   19 Mar 2006 09:27:48 -  1.358
@@ -27,7 +27,7 @@
  pkglist2lol cleanup_lol
  execute expand_percent
  count_files get_arch
- call_queue_clear call_queue_add 
lock_wait
+ call_queue_clear call_queue_add
  dpkg_lockwait aptget_lockwait 
store_rename get_options
  $VALIDATE_HELP);
 use Fink::CLI qw(print_breaking print_breaking_stderr

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1273
retrieving revision 1.1274
diff -u -d -r1.1273 -r1.1274
--- ChangeLog   19 Mar 2006 08:50:47 -  1.1273
+++ ChangeLog   19 Mar 2006 09:27:48 -  1.1274
@@ -1,5 +1,10 @@
 2006-03-19  Dave Vasilevsky

fink ChangeLog,1.405,1.406 fink.info.in,1.32,1.33

[Dave Vasilevsky]

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

Modified Files:
ChangeLog fink.info.in 
Log Message:
postinst robustness + store_rename permissions

Index: fink.info.in
===
RCS file: /cvsroot/fink/fink/fink.info.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- fink.info.in8 Feb 2006 22:35:09 -   1.32
+++ fink.info.in19 Mar 2006 22:19:30 -  1.33
@@ -34,7 +34,7 @@
 
 PreRmScript: 
  # clean up package indexes
- touch %p/var/lib/fink/finkinfodb/invalidate
+ [ -d %p/var/lib/fink/finkinfodb ]  touch 
%p/var/lib/fink/finkinfodb/invalidate
  rm -f %p/var/lib/fink/index.db
  rm -f %p/var/lib/fink/index.db.lock
  rm -f %p/var/lib/fink/infolist

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -d -r1.405 -r1.406
--- ChangeLog   19 Mar 2006 08:50:47 -  1.405
+++ ChangeLog   19 Mar 2006 22:19:29 -  1.406
@@ -1,5 +1,9 @@
 2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * fink.info.in: Don't puke if there's no DB.
+
+2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
+
* lockwait.in: Fail gracefully if locking is not supported.
 
 2006-03-18  Dave Vasilevsky  [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1274,1.1275 Services.pm,1.200,1.201

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Services.pm 
Log Message:
postinst robustness + store_rename permissions

Index: Services.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- Services.pm 19 Mar 2006 09:27:48 -  1.200
+++ Services.pm 19 Mar 2006 22:19:30 -  1.201
@@ -1803,6 +1803,7 @@

return 0 unless eval { require Storable };
if (Storable::store($ref, $tmp)) {
+   chmod 0644, $tmp; # Should be world-readable
unless (rename $tmp, $file) {
print_breaking_stderr(Error: could not activate 
temporary file $tmp: $!);
return 0;

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1274
retrieving revision 1.1275
diff -u -d -r1.1274 -r1.1275
--- ChangeLog   19 Mar 2006 09:27:48 -  1.1274
+++ ChangeLog   19 Mar 2006 22:19:30 -  1.1275
@@ -1,5 +1,9 @@
 2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Services.pm: Make store_rename create world-readable files.
+
+2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
+
* Engine.pm, Package.pm, PkgVersion.pm, Services.pm: Remove redundant
locking.
 



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.406,1.407 fink.info.in,1.33,1.34

[Dave Vasilevsky]

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

Modified Files:
ChangeLog fink.info.in 
Log Message:
woops

Index: fink.info.in
===
RCS file: /cvsroot/fink/fink/fink.info.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- fink.info.in19 Mar 2006 22:19:30 -  1.33
+++ fink.info.in19 Mar 2006 22:21:35 -  1.34
@@ -34,7 +34,7 @@
 
 PreRmScript: 
  # clean up package indexes
- [ -d %p/var/lib/fink/finkinfodb ]  touch 
%p/var/lib/fink/finkinfodb/invalidate
+ [ \! -d %p/var/lib/fink/finkinfodb ] || touch 
%p/var/lib/fink/finkinfodb/invalidate
  rm -f %p/var/lib/fink/index.db
  rm -f %p/var/lib/fink/index.db.lock
  rm -f %p/var/lib/fink/infolist

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -d -r1.406 -r1.407
--- ChangeLog   19 Mar 2006 22:19:29 -  1.406
+++ ChangeLog   19 Mar 2006 22:21:35 -  1.407
@@ -1,5 +1,9 @@
 2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * fink.info.in: Actually need to complete successfully.
+
+2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
+
* fink.info.in: Don't puke if there's no DB.
 
 2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/gnome gtkhtml.info,1.5,1.6 gtkhtml.patch,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
gtkhtml.info gtkhtml.patch 
Log Message:
gcc 4 ok

Index: gtkhtml.patch
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gtkhtml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gtkhtml.patch   20 Jan 2006 20:25:02 -  1.1
+++ gtkhtml.patch   19 Mar 2006 23:04:28 -  1.2
@@ -1,6 +1,6 @@
-diff -Naur gtkhtml-1.0.2.old/components/html-editor/Makefile.in 
gtkhtml-1.0.2.new/components/html-editor/Makefile.in
 gtkhtml-1.0.2.old/components/html-editor/Makefile.in   Wed Mar 20 
02:29:02 2002
-+++ gtkhtml-1.0.2.new/components/html-editor/Makefile.in   Wed Jun 12 
21:41:49 2002
+diff -Naur gtkhtml-1.0.2/components/html-editor/Makefile.in 
gtkhtml-1.0.2-0001/components/html-editor/Makefile.in
+--- gtkhtml-1.0.2/components/html-editor/Makefile.in   2002-03-19 
12:29:02.0 -0500
 gtkhtml-1.0.2-0001/components/html-editor/Makefile.in  2006-03-19 
16:52:32.0 -0500
 @@ -153,13 +153,13 @@
  IDLS =Editor.idl
  
@@ -55,9 +55,9 @@
  
  @XML_I18N_MERGE_OAF_RULE@
  
-diff -Naur gtkhtml-1.0.2.old/components/html-editor/Spell-common.c 
gtkhtml-1.0.2.new/components/html-editor/Spell-common.c
 gtkhtml-1.0.2.old/components/html-editor/Spell-common.cTue Mar 19 
02:02:52 2002
-+++ gtkhtml-1.0.2.new/components/html-editor/Spell-common.cWed Jun 12 
21:41:49 2002
+diff -Naur gtkhtml-1.0.2/components/html-editor/Spell-common.c 
gtkhtml-1.0.2-0001/components/html-editor/Spell-common.c
+--- gtkhtml-1.0.2/components/html-editor/Spell-common.c2002-03-18 
12:02:52.0 -0500
 gtkhtml-1.0.2-0001/components/html-editor/Spell-common.c   2006-03-19 
16:52:32.0 -0500
 @@ -3,7 +3,7 @@
   */
  
@@ -67,9 +67,9 @@
  
  #if ( (TC_IMPL_TC_CORBA_sequence_CORBA_string_0 == 'S') \
   (TC_IMPL_TC_CORBA_sequence_CORBA_string_1 == 'p') \
-diff -Naur gtkhtml-1.0.2.old/components/html-editor/Spell-skels.c 
gtkhtml-1.0.2.new/components/html-editor/Spell-skels.c
 gtkhtml-1.0.2.old/components/html-editor/Spell-skels.c Tue Mar 19 
02:02:52 2002
-+++ gtkhtml-1.0.2.new/components/html-editor/Spell-skels.c Wed Jun 12 
21:41:49 2002
+diff -Naur gtkhtml-1.0.2/components/html-editor/Spell-skels.c 
gtkhtml-1.0.2-0001/components/html-editor/Spell-skels.c
+--- gtkhtml-1.0.2/components/html-editor/Spell-skels.c 2002-03-18 
12:02:52.0 -0500
 gtkhtml-1.0.2-0001/components/html-editor/Spell-skels.c2006-03-19 
16:52:32.0 -0500
 @@ -3,7 +3,7 @@
   */
  
@@ -79,9 +79,9 @@
  
  void
  _ORBIT_GNOME_Spell_Dictionary_Error_marshal(GIOPSendBuffer *
-diff -Naur gtkhtml-1.0.2.old/components/html-editor/Spell-stubs.c 
gtkhtml-1.0.2.new/components/html-editor/Spell-stubs.c
 gtkhtml-1.0.2.old/components/html-editor/Spell-stubs.c Tue Mar 19 
02:02:52 2002
-+++ gtkhtml-1.0.2.new/components/html-editor/Spell-stubs.c Wed Jun 12 
21:41:49 2002
+diff -Naur gtkhtml-1.0.2/components/html-editor/Spell-stubs.c 
gtkhtml-1.0.2-0001/components/html-editor/Spell-stubs.c
+--- gtkhtml-1.0.2/components/html-editor/Spell-stubs.c 2002-03-18 
12:02:52.0 -0500
 gtkhtml-1.0.2-0001/components/html-editor/Spell-stubs.c2006-03-19 
16:52:32.0 -0500
 @@ -3,7 +3,7 @@
   */
  
@@ -91,9 +91,9 @@
  
  void
  _ORBIT_GNOME_Spell_Dictionary_Error_demarshal(GIOPRecvBuffer *
-diff -Naur gtkhtml-1.0.2.old/components/html-editor/control-data.h 
gtkhtml-1.0.2.new/components/html-editor/control-data.h
 gtkhtml-1.0.2.old/components/html-editor/control-data.hTue Mar 19 
01:56:08 2002
-+++ gtkhtml-1.0.2.new/components/html-editor/control-data.hWed Jun 12 
21:41:49 2002
+diff -Naur gtkhtml-1.0.2/components/html-editor/control-data.h 
gtkhtml-1.0.2-0001/components/html-editor/control-data.h
+--- gtkhtml-1.0.2/components/html-editor/control-data.h2002-03-18 
11:56:08.0 -0500
 gtkhtml-1.0.2-0001/components/html-editor/control-data.h   2006-03-19 
16:52:32.0 -0500
 @@ -37,7 +37,7 @@
  #include link.h
  #include rule.h
@@ -103,9 +103,20 @@
  
  struct _GtkHTMLControlData {
GtkHTML*html;
-diff -Naur gtkhtml-1.0.2.old/components/http-storage-module/Makefile.in 
gtkhtml-1.0.2.new/components/http-storage-module/Makefile.in
 gtkhtml-1.0.2.old/components/http-storage-module/Makefile.in   Wed Mar 
20 02:29:04 2002
-+++ gtkhtml-1.0.2.new/components/http-storage-module/Makefile.in   Wed Jun 
12 21:41:49 2002
+diff -Naur gtkhtml-1.0.2/components/html-editor/popup.c 
gtkhtml-1.0.2-0001/components/html-editor/popup.c
+--- gtkhtml-1.0.2/components/html-editor/popup.c   2002-03-18 
11:56:09.0 -0500
 gtkhtml-1.0.2-0001/components/html-editor/popup.c  2006-03-19 
16:53:04.0 -0500
+@@ -446,6 +446,7 @@
+   ADD_PROP 

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

[Dave Vasilevsky]

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

Modified Files:
gnome-core.info gnome-core.patch 
Log Message:
gcc 4 ok

Index: gnome-core.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-core.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gnome-core.patch24 Jan 2006 08:25:28 -  1.1
+++ gnome-core.patch20 Mar 2006 03:48:10 -  1.2
@@ -1,93 +1,252 @@
-diff -Naur gnome-core-1.4.1.old/applets/desk-guide/gwmthumbnail.c 
gnome-core-1.4.1.new/applets/desk-guide/gwmthumbnail.c
 gnome-core-1.4.1.old/applets/desk-guide/gwmthumbnail.c Fri Oct 26 
18:12:47 2001
-+++ gnome-core-1.4.1.new/applets/desk-guide/gwmthumbnail.c Tue Jan 28 
23:20:47 2003
-@@ -29,23 +29,29 @@
+diff -Naur gnome-core-1.4.1-0001/applets/desk-guide/gwmthumbnail.c 
gnome-core-1.4.1-0002/applets/desk-guide/gwmthumbnail.c
+--- gnome-core-1.4.1-0001/applets/desk-guide/gwmthumbnail.c2001-10-26 
05:12:47.0 -0400
 gnome-core-1.4.1-0002/applets/desk-guide/gwmthumbnail.c2006-03-19 
21:50:02.0 -0500
+@@ -18,35 +18,38 @@
+  */
+ #include  gwmthumbnail.h
+ 
+-
+ #define   USE_SHM // FIXME
+ 
+ #define   EPSILON (1.0/65536.0)   /* 16bit EPSILON should be good 
enough */
  
+-
+ /* --- defines --- */
+ #define   SHM_IMAGE_HEIGHT(32)
  
+-
  /* --- Gdk  GdkPixbuf compat prototypes --- */
+-GdkImage*   gdk_image_get(GdkWindow *window,
 +static
- GdkImage*   gdk_image_get(GdkWindow *window,
++GdkImage*   s_gdk_image_get(GdkWindow *window,
  gint   x,
  gint   y,
  gint   width,
  gint   height);
+-GdkColormap*  gdk_window_get_colormap  (GdkWindow *window);
+-GdkVisual*gdk_window_get_visual(GdkWindow *window);
+-GdkImage*   gdk_image_new_shared_with_pixmap (GdkWindow  *window,
 +static
- GdkColormap*  gdk_window_get_colormap  (GdkWindow *window);
++GdkColormap*  s_gdk_window_get_colormap(GdkWindow *window);
 +static
- GdkVisual*gdk_window_get_visual(GdkWindow *window);
++GdkVisual*s_gdk_window_get_visual  (GdkWindow *window);
 +static
- GdkImage*   gdk_image_new_shared_with_pixmap (GdkWindow  *window,
++GdkImage*   s_gdk_image_new_shared_with_pixmap (GdkWindow  *window,
  gintwidth,
  gintheight,
  GdkPixmap **pixmap_p);
+-GdkPixbuf*  gdk_pixbuf_from_image(GdkImage*image,
 +static
- GdkPixbuf*  gdk_pixbuf_from_image(GdkImage*image,
++GdkPixbuf*  s_gdk_pixbuf_from_image(GdkImage*image,
  guintx,
  guinty,
  guintwidth,
  guintheight,
  GdkColormap *cmap);
+-voidgdk_pixbuf_copy_from_image   (GdkPixbuf   *pixbuf,
 +static
- voidgdk_pixbuf_copy_from_image   (GdkPixbuf   *pixbuf,
++voids_gdk_pixbuf_copy_from_image   (GdkPixbuf   *pixbuf,
  guintdest_x,
  guintdest_y,
-@@ -537,7 +543,7 @@
+ GdkImage*image,
+@@ -56,7 +59,6 @@
+ guintheight,
+ GdkColormap *cmap);
+ 
+-
+ /* --- structures --- */
+ typedef struct _ThumbSize ThumbSize;
+ struct _ThumbSize
+@@ -67,12 +69,10 @@
+   guint  height;
+ };
+ 
+-
+ /* --- variables --- */
+ static gboolean gwm_thumb_nails_enabled = FALSE;
+ static GSList  *gwm_thumb_nails = NULL;
+ 
+-
+ /* --- functions --- */
+ void
+ gwm_thumb_nails_set_active (gboolean thumb_nails_enabled)
+@@ -276,7 +276,7 @@
+   static GdkPixmap *shm_pixmap = NULL;
+   gint swidth = gdk_screen_width ();
+   gint sheight = gdk_screen_height ();
+-  GdkColormap *cmap = gdk_window_get_colormap (drawable);
++  GdkColormap *cmap = s_gdk_window_get_colormap (drawable);
+   GdkPixbuf *shot_pixbuf = NULL;
+   GdkVisual *visual;
+ 
+@@ -286,15 +286,15 @@
+*/
+ 
+   if (!shm_image)
+-shm_image = gdk_image_new_shared_with_pixmap (NULL, swidth, 
SHM_IMAGE_HEIGHT, shm_pixmap);
++shm_image = 

fink ChangeLog,1.407,1.408 lockwait.in,1.6,1.7

[Dave Vasilevsky]

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

Modified Files:
ChangeLog lockwait.in 
Log Message:
fix faulty logic in lockwait

Index: lockwait.in
===
RCS file: /cvsroot/fink/fink/lockwait.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lockwait.in 19 Mar 2006 08:50:47 -  1.6
+++ lockwait.in 20 Mar 2006 04:32:56 -  1.7
@@ -40,7 +40,7 @@
local $SIG{ALRM} = sub { die alarm\n };
alarm $timeout if $timeout;
print STDERR Waiting for lock, timeout = $timeout\n 
if $debug;
-   fcntl(LOCK, F_SETLKW, $struct_flock) or
+   ($lock_ok = fcntl(LOCK, F_SETLKW, $struct_flock)) or
die lockwait: Can't get lock or wait: $!;
alarm 0;
};

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -d -r1.407 -r1.408
--- ChangeLog   19 Mar 2006 22:21:35 -  1.407
+++ ChangeLog   20 Mar 2006 04:32:56 -  1.408
@@ -1,5 +1,9 @@
 2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * lockwait.in: Fix faulty logic.
+
+2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
+
* fink.info.in: Actually need to complete successfully.
 
 2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

3rdparty/dpkg/dpkg-deb build.c,1.4,1.5

[Dave Vasilevsky]

Update of /cvsroot/fink/3rdparty/dpkg/dpkg-deb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16014/dpkg-deb

Modified Files:
build.c 
Log Message:
wow my logic sucks today

Index: build.c
===
RCS file: /cvsroot/fink/3rdparty/dpkg/dpkg-deb/build.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build.c 19 Mar 2006 02:53:57 -  1.4
+++ build.c 20 Mar 2006 05:00:33 -  1.5
@@ -222,8 +222,8 @@
 }
 for (field= checkedinfo-available.arbs; field; field= field-next) {
   /* Don't warn for fink-owned fields */
-  if (strncmp(BuildDependsOnly,field-name,16) == 0 ||
-  strncmp(Fink-,field-name,5) == 0) {
+  if (strncmp(BuildDependsOnly,field-name,16) != 0 
+  strncmp(Fink-,field-name,5) != 0) {
 fprintf(stderr, _(warning, `%s' contains user-defined field `%s'\n),
   controlfile, field-name);
 warns++;



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1275,1.1276 PkgVersion.pm,1.536,1.537 Scanpackages.pm,1.7,1.8

[Dave Vasilevsky]

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

Modified Files:
ChangeLog PkgVersion.pm Scanpackages.pm 
Log Message:
DB_File compatibility fix (thanks Daniel Johnson!)

Index: Scanpackages.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Scanpackages.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Scanpackages.pm 19 Mar 2006 04:06:26 -  1.7
+++ Scanpackages.pm 20 Mar 2006 05:14:12 -  1.8
@@ -29,12 +29,18 @@
 use Fink::Command qw(mkdir_p);
 use Fink::Services qw(latest_version);
 
+use Config;
 use Cwd;
-use DB_File;
 use File::Find;
 use File::Temp qw(tempfile);
 use Storable qw(nfreeze thaw);
 
+# Ensure that we load a compatible DB_File
+{
+   local @INC = @Config{qw(privlib archlib)};
+   require DB_File;
+}
+
 =head1 NAME
 
 Fink::Scanpackages - Pure-perl .deb scanner.

Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -d -r1.536 -r1.537
--- PkgVersion.pm   19 Mar 2006 09:27:48 -  1.536
+++ PkgVersion.pm   20 Mar 2006 05:14:11 -  1.537
@@ -52,7 +52,6 @@
 use Fink::Checksum;
 
 use POSIX qw(uname strftime);
-use DB_File;
 use Hash::Util;
 use File::Basename qw(dirname basename);
 use Carp qw(confess);

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1275
retrieving revision 1.1276
diff -u -d -r1.1275 -r1.1276
--- ChangeLog   19 Mar 2006 22:19:30 -  1.1275
+++ ChangeLog   20 Mar 2006 05:14:11 -  1.1276
@@ -1,3 +1,8 @@
+2006-03-20  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * PkgVersion.pm: Remove stray 'use DB_File'.
+   * Scanpackages.pm: Ensure we load the correct DB_File.
+
 2006-03-19  Dave Vasilevsky  [EMAIL PROTECTED]
 
* Services.pm: Make store_rename create world-readable files.



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/gnome libcroco3.info,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
libcroco3.info 
Log Message:
update

Index: libcroco3.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libcroco3.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libcroco3.info  3 Feb 2006 16:41:50 -   1.2
+++ libcroco3.info  20 Mar 2006 07:17:51 -  1.3
@@ -1,6 +1,6 @@
 Package: libcroco3
-Version: 0.6.0
-Revision: 1011
+Version: 0.6.1
+Revision: 1001
 
 License: LGPL
 Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
@@ -13,7 +13,7 @@
 Homepage: ftp://ftp.gnome.org/pub/GNOME/sources/libcroco/
 
 Source: mirror:gnome:sources/libcroco/0.6/libcroco-%v.tar.bz2
-Source-MD5: 78fb2bf78d469df83b1fc94ce196c1c4
+Source-MD5: b0975bd01eb11964f1b3f254f267a43d
 
 PatchScript: 
   perl -pi.bak -e 's,need_relink=yes,need_relink=no,g' ltmain.sh



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/libs libevent1.info,NONE,1.1 libevent1.patch,NONE,1.1 libevent.info,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
libevent.info 
Added Files:
libevent1.info libevent1.patch 
Log Message:
new major rev

--- NEW FILE: libevent1.patch ---
diff -Naur libevent-1.1a/configure libevent-1.1a-0001/configure
--- libevent-1.1a/configure 2005-06-12 13:59:22.0 -0400
+++ libevent-1.1a-0001/configure2006-03-08 22:11:29.0 -0500
@@ -21592,13 +21592,7 @@
 cat conftest.$ac_ext _ACEOF
 /* end confdefs.h.  */
 
-int
-main ()
-{
 void foo() { const char *cp = __func__; }
-  ;
-  return 0;
-}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo $as_me:$LINENO: \$ac_compile\) 5
@@ -21639,13 +21633,7 @@
 cat conftest.$ac_ext _ACEOF
 /* end confdefs.h.  */
 
-int
-main ()
-{
 void foo() { const char *cp = __FUNCTION__; }
-  ;
-  return 0;
-}
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo $as_me:$LINENO: \$ac_compile\) 5

--- NEW FILE: libevent1.info ---
Package: libevent1
Version: 1.1a
Revision: 1
Description: Event notification library, version 1
License: BSD
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]

Source: http://www.monkey.org/~provos/libevent-%v.tar.gz
Source-MD5: 6cc776458ecaf9247550863702a44d7c

# Must modify libevent.info as well!
Conflicts: libevent
Replaces: libevent

BuildDependsOnly: true
Depends: %N-shlibs (= %v-%r)
ConfigureParams: --mandir=%p/share/man

# Fix nested functions
Patch: %n.patch

# I hate libtool's -release flag
PatchScript: perl -i -pe 's/-release\s\S+\s//' Makefile.in

InstallScript: make install DESTDIR=%d

Homepage: www.monkey.org/~provos/libevent/
DescDetail: 
 The libevent API provides a mechanism to execute a callback function when
 a specific event occurs on a file descriptor or after a timeout has been
 reached. Furthermore, libevent also supports callbacks due to signals or
 regular timeouts.

DocFiles: README

SplitOff: 
Package: %N-shlibs
Files: lib/libevent.*.dylib
Shlibs: %p/lib/libevent.1.dylib 2.0.0 %n (= 1.1a-1)

Index: libevent.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libevent.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libevent.info   13 Mar 2006 16:08:26 -  1.2
+++ libevent.info   20 Mar 2006 07:49:25 -  1.3
@@ -5,6 +5,9 @@
 License: BSD
 Maintainer: rayg [EMAIL PROTECTED]
 
+Conflicts: libevent1
+Replaces: libevent1
+
 BuildDependsOnly: true
 
 Source: http://www.monkey.org/~provos/%n-%v.tar.gz



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

dists/10.4/unstable/main/finkinfo/libs/perlmods number-format-pm.info,NONE,1.1 svn-web-pm.info,NONE,1.1 template-plugin-number-format-pm.info,NONE,1.1 text-diff-html-pm.info,NONE,1.1

[Dave Vasilevsky]

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

Added Files:
number-format-pm.info svn-web-pm.info 
template-plugin-number-format-pm.info text-diff-html-pm.info 
Log Message:
new packages

--- NEW FILE: svn-web-pm.info ---
Info2: 
Package: svn-web-pm%type_pkg[perl]
Version: 0.43
Revision: 1
Type: perl (5.8.1 5.8.4 5.8.6)
Description: Subversion repository web frontend
License: Artistic/GPL
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]

DescDetail: 
Currently works only with Apache 1. A version compatible with Apache 2
is in process upstream.


BuildDepends: module-build-pm%type_pkg[perl]
Depends: 
exception-class-pm%type_pkg[perl],
locale-maketext-lexicon-pm%type_pkg[perl],
locale-maketext-simple-pm,
svn-ssl-swig-pm%type_pkg[perl] | svn-swig-pm%type_pkg[perl],
text-diff-html-pm,
template-plugin-number-format-pm%type_pkg[perl],
xml-rss-pm%type_pkg[perl],
yaml-pm


Source: mirror:cpan:authors/id/N/NI/NIKC/SVN-Web-%v.tar.gz
Source-MD5: d993f0e1e1a3aa8d6332b9732ce51404

CompileScript: 
#!/bin/sh -ev
exec 21
perlversion=%type_raw[perl]
eval `perl$perlversion -V:archname`
perl$perlversion Build.PL \
--install_path arch=%i/lib/perl5/$perlversion/$archname \
--install_path bin=%i/bin \
--install_path bindoc=%i/lib/perl5/%type_raw[perl]/man/man1 \
--install_path lib=%i/lib/perl5/$perlversion \
--install_path libdoc=%i/lib/perl5/%type_raw[perl]/man/man3 \
--install_path script=%i/bin
./Build
./Build test


InstallScript: 
#!/bin/sh -ev
./Build install
mv %i/bin/svnweb-install %i/bin/svnweb-install%type_raw[perl]
mv %i/bin/svnweb-server %i/bin/svnweb-server%type_raw[perl]

PostInstScript: 
update-alternatives \
--install \
%p/bin/svnweb-install \
svnweb-install \
%p/bin/svnweb-install%type_raw[perl] \
%type_pkg[perl] \
--slave \
%p/bin/svnweb-server \
svnweb-server \
%p/bin/svnweb-server%type_raw[perl]

PreRmScript: 
update-alternatives --remove svnweb-install \
%p/bin/svnweb-install%type_raw[perl]



UpdatePOD: True
DocFiles: CHANGES.pod CONTRIBUTING.pod README SIGNATURE TODO UPDATING.pod

Homepage: http://search.cpan.org/dist/SVN-Web/


--- NEW FILE: text-diff-html-pm.info ---
Package: text-diff-html-pm
Version: 0.04
Revision: 1
Type: perl
Description: XHTML format for Text::Diff::Unified
License: Artistic/GPL
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]

BuildDepends: module-build-pm586
Depends: text-diff-pm

Source: mirror:cpan:authors/id/D/DW/DWHEELER/Text-Diff-HTML-%v.tar.gz
Source-MD5: cd8a50dd2f9d90be1f949906441035c1

CompileScript: 
#!/bin/sh -ev
exec 21
perl$perlversion Build.PL \
--install_path arch=%i/lib/perl5 \
--install_path bin=%i/bin \
--install_path bindoc=%i/share/man/man1 \
--install_path lib=%i/lib/perl5 \
--install_path libdoc=%i/share/man/man3 \
--install_path script=%i/bin
./Build
./Build test


InstallScript: 
#!/bin/sh -ev
./Build install

UpdatePOD: True
DocFiles: README

Homepage: http://search.cpan.org/dist/Text-Diff-HTML/

--- NEW FILE: number-format-pm.info ---
Package: number-format-pm
Version: 1.45
Revision: 1
Type: perl
Description: Perl extension for formatting numbers
License: Artistic
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]

Source: mirror:cpan:authors/id/W/WR/WRW/Number-Format-%v.tar.gz
Source-MD5: 6b349dd339aac5e3acf233a02262a734

UpdatePOD: True
DocFiles: CHANGES TODO README

Homepage: http://search.cpan.org/dist/Number-Format/

--- NEW FILE: template-plugin-number-format-pm.info ---
Info2: 

Package: template-plugin-number-format-pm%type_pkg[perl]
Version: 1.01
Revision: 1
Type: perl (5.8.1 5.8.4 5.8.6)
Description: Plugin/filter interface to Number::Format
License: Artistic/GPL
Maintainer: Dave Vasilevsky [EMAIL PROTECTED]

Depends: 
number-format-pm,
template-pm%type_pkg[perl] | template-notex-pm%type_pkg[perl]


InstallScript: 
#!/bin/sh -ev
%{default_script}
mv %i/share/man %i/lib/perl5/%type_raw[perl]


Source: 
mirror:cpan:authors/id/D/DA/DARREN/Template-Plugin-Number-Format-%v.tar.gz
Source-MD5: 0822bca562c536abc3450cebd66c83f1

UpdatePOD: True

Homepage: http://search.cpan.org/dist/Template-Plugin-Number-Format/




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

fink/perlmod/Fink ChangeLog,1.1267,1.1268 Scanpackages.pm,1.2,1.3

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Scanpackages.pm 
Log Message:
now it should actually work, grrr

Index: Scanpackages.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Scanpackages.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Scanpackages.pm 18 Mar 2006 22:28:12 -  1.2
+++ Scanpackages.pm 18 Mar 2006 22:42:15 -  1.3
@@ -511,7 +511,7 @@
} else {
unless ($tried++) { # Mebbe corrupt?
unlink $self-{db};
-   next;
+   redo;
}
warn WARNING: Can't open DB: $!\n;
}

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1267
retrieving revision 1.1268
diff -u -d -r1.1267 -r1.1268
--- ChangeLog   18 Mar 2006 22:28:12 -  1.1267
+++ ChangeLog   18 Mar 2006 22:42:15 -  1.1268
@@ -1,5 +1,9 @@
 2006-03-18  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Scanpackages.pm: Maybe I should brush up on my perl one of these 
days...
+
+2006-03-18  Dave Vasilevsky  [EMAIL PROTECTED]
+
* Scanpackages.pm: Don't go nuts when there's an invalid scanpackages.db
 
 2006-03-18  Benjamin Reed  [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink/perlmod/Fink ChangeLog,1.1268,1.1269 Scanpackages.pm,1.3,1.4

[Dave Vasilevsky]

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

Modified Files:
ChangeLog Scanpackages.pm 
Log Message:
some prefix fixes

Index: Scanpackages.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Scanpackages.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Scanpackages.pm 18 Mar 2006 22:42:15 -  1.3
+++ Scanpackages.pm 18 Mar 2006 23:56:03 -  1.4
@@ -96,6 +96,12 @@
 
 An integer. If non-zero, various messages will be printed. The default is 1.
 
+=item prefix
+
+The prefix where dpkg-deb can be found. This defaults to the Fink prefix, but
+supplying this option explicitly may allow scanpackages to run even without
+a properly configured Fink.
+
 =back
 
 =item scan
@@ -311,8 +317,9 @@
 sub _control {
my ($self, $path) = @_;

-   my (%control, $field);;
-   open CONTROL, '-|', 'dpkg-deb', '-f', $path
+   my (%control, $field);
+   my $dpkgdeb = $self-_prefix . /bin/dpkg-deb;
+   open CONTROL, '-|', $dpkgdeb, '-f', $path
or die SKIPPING: Can't read control for '$path': $!\n;
eval {
while (CONTROL) {
@@ -553,6 +560,18 @@
$self-finish;
 }
 
+# Get the prefix to find dpkg-deb
+#
+# my $prefix = $self-_prefix;
+sub _prefix {
+   my ($self) = @_;
+   unless (exists $self-{_prefix}) {
+   $self-_ensure_fink;
+   $self-{_prefix} = $Fink::Config::basepath;
+   }
+   return $self-{_prefix};
+}
+
 
  Deal with different versions of Fink
 

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1268
retrieving revision 1.1269
diff -u -d -r1.1268 -r1.1269
--- ChangeLog   18 Mar 2006 22:42:15 -  1.1268
+++ ChangeLog   18 Mar 2006 23:56:03 -  1.1269
@@ -1,5 +1,9 @@
 2006-03-18  Dave Vasilevsky  [EMAIL PROTECTED]
 
+   * Scanpackages.pm: Run the dpkg-deb in the current prefix.
+
+2006-03-18  Dave Vasilevsky  [EMAIL PROTECTED]
+
* Scanpackages.pm: Maybe I should brush up on my perl one of these 
days...
 
 2006-03-18  Dave Vasilevsky  [EMAIL PROTECTED]



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

fink ChangeLog,1.403,1.404 fink-scanpackages.in,1.1,1.2

[Dave Vasilevsky]

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

Modified Files:
ChangeLog fink-scanpackages.in 
Log Message:
some prefix fixes

Index: fink-scanpackages.in
===
RCS file: /cvsroot/fink/fink/fink-scanpackages.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fink-scanpackages.in17 Mar 2006 06:42:06 -  1.1
+++ fink-scanpackages.in18 Mar 2006 23:56:03 -  1.2
@@ -89,7 +89,7 @@
 use Getopt::Long;
 use Pod::Usage;
 
-my %opts = (verbosity  = 1);
+my %opts = (verbosity = 1, prefix = $PREFIX);
 my ($help, $man, $bad) = (0, 0, 0);
 
 Getopt::Long::Configure('bundling');

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -d -r1.403 -r1.404
--- ChangeLog   17 Mar 2006 19:56:32 -  1.403
+++ ChangeLog   18 Mar 2006 23:56:03 -  1.404
@@ -1,3 +1,8 @@
+2006-03-18  Dave Vasilevsky  [EMAIL PROTECTED]
+
+   * fink-scanpackages.in: Indicate the prefix explicitly, so we don't have
+   to load Fink.
+
 2006-03-17  Dave Vasilevsky  [EMAIL PROTECTED]
 
* fink-scanpackages.in: New program to substitute for apt-ftparchive and



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

3rdparty/dpkg/man/C cleanup-info.8,1.2,1.3 dpkg-deb.1,1.2,1.3 dpkg-divert.8,1.2,1.3 dpkg-query.1,1.2,1.3 dpkg-source.1,1.2,1.3 dpkg-split.1,1.2,1.3 dpkg-statoverride.8,1.2,1.3 dpkg.1,1.2,1.3 dpkg.cfg.

[Dave Vasilevsky]

Update of /cvsroot/fink/3rdparty/dpkg/man/C
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17374/man/C

Modified Files:
cleanup-info.8 dpkg-deb.1 dpkg-divert.8 dpkg-query.1 
dpkg-source.1 dpkg-split.1 dpkg-statoverride.8 dpkg.1 
dpkg.cfg.5 dselect.1 dselect.cfg.5 install-info.8 
update-alternatives.8 
Log Message:
more patch minimization. still not sure what to do about md5sum

Index: install-info.8
===
RCS file: /cvsroot/fink/3rdparty/dpkg/man/C/install-info.8,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- install-info.8  17 Mar 2006 02:29:34 -  1.2
+++ install-info.8  19 Mar 2006 02:53:57 -  1.3
@@ -156,7 +156,7 @@
 be located in
 .IR infodir .
 The default is
-.BR @PREFIX@/share/info .
+.BR /usr/info .
 .TP
 .BI \-\-align= nnn  [deprecated]
 Specifies that the first line of the description should be indented at
@@ -266,8 +266,6 @@
 processing steps are shown.
 .SH SEE ALSO
 emacs(1), info(1), gzip(1)
-.SH AUTHOR
-Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
 .SH COPYRIGHT
 Copyright 1994, Ian Jackson.
 .B install\-info

Index: cleanup-info.8
===
RCS file: /cvsroot/fink/3rdparty/dpkg/man/C/cleanup-info.8,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cleanup-info.8  17 Mar 2006 02:29:34 -  1.2
+++ cleanup-info.8  19 Mar 2006 02:53:57 -  1.3
@@ -34,7 +34,7 @@
 Output version and exit successfully.
 .SH FILES
 .TP
-.I @PREFIX@/share/info/dir or dirname/dir
+.I /usr/info/dir or dirname/dir
 The info directory file. The lock file is named the same, with .lock suffix.
 .SH BUGS
 Probably many.
@@ -43,7 +43,6 @@
 .BR info (1).
 .SH AUTHOR
 Copyright (C) 1996 Kim-Minh Kaplan.
-Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
 .sp
 This is free software; see the GNU General Public Licence
 version 2 or later for copying conditions.  There is NO warranty.

Index: update-alternatives.8
===
RCS file: /cvsroot/fink/3rdparty/dpkg/man/C/update-alternatives.8,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- update-alternatives.8   17 Mar 2006 02:29:34 -  1.2
+++ update-alternatives.8   19 Mar 2006 02:53:57 -  1.3
@@ -4,7 +4,7 @@
 .\ 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.  There is NO WARRANTY.  You can
-.\ find the GNU GPL in @PREFIX@/share/common-licenses/GPL on any Debian 
system.
+.\ find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
 .TH UPDATE\-ALTERNATIVES 8 19 January 1998 Debian Project dpkg utilities
 .SH NAME
 update\-alternatives - maintain symbolic links determining default commands
@@ -79,13 +79,13 @@
 .BR nvi (1)
 are both installed on the system, the alternatives system will cause
 the generic name
-.I @PREFIX@/bin/editor
+.I /usr/bin/editor
 to refer to
-.I @PREFIX@/bin/nvi
+.I /usr/bin/nvi
 by default.  The system administrator can override this and cause
 it
 to refer to
-.I @PREFIX@/bin/ed
+.I /usr/bin/ed
 instead,
 and the alternatives system will not alter this setting until explicitly
 requested to do so.
@@ -97,7 +97,7 @@
 which in turn is a symbolic link to the actual file referenced.
 This is done so that the system administrator's changes can be confined
 within the
-.I @PREFIX@/etc
+.I /etc
 directory: the FHS (q.v.) gives reasons why this is a Good Thing.
 .PP
 When each package
@@ -117,9 +117,9 @@
 of the
 .BR vi (1)
 editor are installed, the man page referenced by
-.I @PREFIX@/share/man/man1/vi.1
+.I /usr/share/man/man1/vi.1
 should correspond to the executable referenced by
-.IR @PREFIX@/bin/vi .
+.IR /usr/bin/vi .
 .B update\-alternatives
 handles this by means of
 .I master
@@ -183,7 +183,7 @@
 .TP
 generic name
 A name, like
-.IR @PREFIX@/bin/editor ,
+.IR /usr/bin/editor ,
 which refers, via the alternatives system, to one of a number of
 files of similar function.
 .TP
@@ -198,12 +198,12 @@
 .TP
 alternatives directory
 A directory, by default
-.IR @PREFIX@/etc/alternatives ,
+.IR /etc/alternatives ,
 containing the symlinks.
 .TP
 administrative directory
 A directory, by default
-.IR @PREFIX@/var/lib/dpkg/alternatives ,
+.IR /var/lib/dpkg/alternatives ,
 containing
 .BR update\-alternatives '
 state information.
@@ -400,13 +400,13 @@
 mode.
 .SH FILES
 .TP
-.I @PREFIX@/etc/alternatives/
+.I /etc/alternatives/
 The default alternatives directory.
 Can be overridden by the
 .B \-\-altdir
 option.
 .TP
-.I @PREFIX@/var/lib/dpkg/alternatives/
+.I /var/lib/dpkg/alternatives/
 The default administration directory.
 Can be overridden by the
 .B \-\-admindir
@@ -443,7 +443,7 @@
 This is 

3rdparty/dpkg/dpkg-split Makefile.in,1.2,1.3

[Dave Vasilevsky]

Update of /cvsroot/fink/3rdparty/dpkg/dpkg-split
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17374/dpkg-split

Modified Files:
Makefile.in 
Log Message:
more patch minimization. still not sure what to do about md5sum

Index: Makefile.in
===
RCS file: /cvsroot/fink/3rdparty/dpkg/dpkg-split/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in 17 Mar 2006 02:29:33 -  1.2
+++ Makefile.in 19 Mar 2006 02:53:57 -  1.3
@@ -236,7 +236,7 @@
queue.c \
split.c
 
-dpkg_split_LDADD = $(LIBINTL) ../lib/libdpkg.a ../getopt/libopt.a
+dpkg_split_LDADD = $(LIBINTL) ../lib/libdpkg.a
 pkglib_SCRIPTS = mksplit
 EXTRA_DIST = mksplit.pl
 CLEANFILES = $(pkglib_SCRIPTS)



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

3rdparty/dpkg Makefile.in,1.1.1.1,1.2

[Dave Vasilevsky]

Update of /cvsroot/fink/3rdparty/dpkg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17374

Modified Files:
Makefile.in 
Log Message:
more patch minimization. still not sure what to do about md5sum

Index: Makefile.in
===
RCS file: /cvsroot/fink/3rdparty/dpkg/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.in 17 Mar 2006 01:54:07 -  1.1.1.1
+++ Makefile.in 19 Mar 2006 02:53:56 -  1.2
@@ -230,7 +230,6 @@
 @[EMAIL PROTECTED] = dselect
 SUBDIRS = \
intl \
-   getopt \
lib \
src \
$(MAYBE_DSELECT) \



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

3rdparty/dpkg/src Makefile.in,1.2,1.3

[Dave Vasilevsky]

Update of /cvsroot/fink/3rdparty/dpkg/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17374/src

Modified Files:
Makefile.in 
Log Message:
more patch minimization. still not sure what to do about md5sum

Index: Makefile.in
===
RCS file: /cvsroot/fink/3rdparty/dpkg/src/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in 17 Mar 2006 02:29:34 -  1.2
+++ Makefile.in 19 Mar 2006 02:53:57 -  1.3
@@ -84,7 +84,7 @@
query.$(OBJEXT)
 dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS)
 dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I../getopt
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 @[EMAIL PROTECTED] = ./$(DEPDIR)/archives.Po ./$(DEPDIR)/cleanup.Po \
@@ -256,14 +256,14 @@
update.c
 
 dpkg_LDADD = \
-   $(LIBINTL) ../lib/libdpkg.a ../getopt/libopt.a $(ZLIB_LIBS) $(BZ2_LIBS) 
$(SELINUX_LIBS)
+   $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
 
 dpkg_query_SOURCES = \
errors.c \
filesdb.c filesdb.h \
query.c
 
-dpkg_query_LDADD = $(LIBINTL) ../lib/libdpkg.a ../getopt/libopt.a
+dpkg_query_LDADD = $(LIBINTL) ../lib/libdpkg.a
 all: all-am
 
 .SUFFIXES:



---
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=lnkkid=110944bid=241720dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits