[cvs] fink/perlmod/Fink ChangeLog, 1.1455, 1.1456 Validation.pm, 1.250, 1.251

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9260/perlmod/Fink

Modified Files:
ChangeLog Validation.pm 
Log Message:
validate Shlibs fields in resultant .deb files

Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- Validation.pm   4 Mar 2007 22:03:14 -   1.250
+++ Validation.pm   20 Apr 2007 15:13:56 -  1.251
@@ -29,7 +29,7 @@
 use File::Find qw(find);
 use File::Path qw(rmtree);
 use File::Temp qw(tempdir);
-use File::Basename qw(basename);
+use File::Basename qw(basename dirname);
 
 use strict;
 use warnings;
@@ -1176,18 +1176,18 @@
$looks_good = 0;
}
my @shlib_deps = split /\s*\|\s*/, $shlibs_parts[2], -1;
-   # default value of $libarch, if absent, is "32"
+   # default value of $libarch, if absent, is "32"
my $libarch = "32";
-   # strip off the end of the last @shlib_deps entry (the stuff
-   # beyond the final close-paren), which should consist of digits
-   # and "-" only, and use as $libarch
+   # strip off the end of the last @shlib_deps entry (the 
stuff
+   # beyond the final close-paren), which should consist 
of digits
+   # and "-" only, and use as $libarch
if ($shlib_deps[$#shlib_deps] =~ 
/^(.*\))\s*([^\s\)]+)$/ ) {
$shlib_deps[$#shlib_deps] = $1;
$libarch = $2;
}
-   # This hack only allows one particular percent expansion in the
-   # $libarch field, because this subroutine doesn't do percent 
-   # expansions.  OK for now, but should be fixed eventually.
+   # This hack only allows one particular percent 
expansion in the
+   # $libarch field, because this subroutine doesn't do 
percent 
+   # expansions.  OK for now, but should be fixed 
eventually.
my $num_expand = {"type_num[-64bit]" => "64"};
$libarch = &expand_percent($libarch, $num_expand, 
$filename.' Package');
if (not ($libarch eq "32" or $libarch eq "64" or 
$libarch eq "32-64")) {
@@ -1699,6 +1699,46 @@
}
}
 
+   # check shlibs field
+   if (-f "$destdir/DEBIAN/shlibs") {
+   chomp(my $otool = `which otool 2>/dev/null`);
+   if (not -x $otool) {
+   print "Warning: Package has shlibs data but otool is 
not in the path; skipping shlibs validation.\n";
+   }
+   if (open (SHLIBS, "$destdir/DEBIAN/shlibs")) {
+   while (my $entry = ) {
+   chomp($entry);
+   $entry =~ s/^\s*(.*?)\s*$/$1/gs;
+   my @fields = split(/\s+/, $entry);
+   my $file = resolve_rooted_symlink($destdir, 
$fields[0]);
+   if (not defined $file) {
+   print "Error: Shlibs field specifies 
$fields[0], but it does not exist!\n";
+   } else {
+   $file =~ s/\'/\\\'/gs;
+   if (open (OTOOL, "otool -L '$file' |")) 
{
+   ; # skip the first line
+   my ($libname, $compat_version) 
=  =~ /^\s*(\/.+?)\s*\(compatibility version ([\d\.]+)/;
+   close (OTOOL);
+   
+   if ($fields[0] ne $libname) {
+   print "Error: File name 
'$fields[0]' specified in Shlibs does not match install_name '$libname\n";
+   $looks_good = 0;
+   }
+   if ($fields[1] ne 
$compat_version) {
+   print "Error: Shlibs 
field says compatibility version for $fields[0] should be $fields[1], but it is 
actually $compat_version.\n";
+   $looks_good = 0;
+   }
+   } else {
+   print "Warning: otool -L failed 
on $file.\n";
+   }
+   }
+   }
+   close (SHLIBS);

[cvs] dists/10.4/unstable/main/finkinfo/graphics pil-py.info, 1.6, 1.7 pil-py.patch, 1.2, 1.3

2007-04-20 Thread Jeff Whitaker
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21416

Modified Files:
pil-py.info pil-py.patch 
Log Message:
New upstream version.


Index: pil-py.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/pil-py.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pil-py.info 21 Nov 2006 06:12:49 -  1.6
+++ pil-py.info 20 Apr 2007 11:40:23 -  1.7
@@ -3,22 +3,18 @@
 Package: pil-py%type_pkg[python]
 Type: python (2.3 2.4 2.5)
 
-Version: 1.1.5
-Revision: 3
+Version: 1.1.6
+Revision: 1
 Description: Python Imaging Library
 DescDetail: <<
 The Python Imaging Library (PIL) adds image processing capabilities to
 your Python interpreter. This library supports many file formats, and
 provides powerful image processing and graphics capabilities.
 <<
-DescPort: <<
- tk 8.4 not supported, needs a patch to tkImaging.c to compile.
- lots of patches to help it find fink installed libs and headers.
-<<
 Source: http://effbot.org/downloads/Imaging-%v.tar.gz
-Source-MD5: a64512e39469213ced0d091b9eba76c0
-BuildDepends: tcltk-dev (>= 8.4.1-1) , libpng3, libjpeg
-Depends: python%type_pkg[python], tcltk (>= 8.4.1-1), libpng3-shlibs, 
libjpeg-shlibs
+Source-MD5: 3a9b5c20ca52f0a9900512d2c7347622
+BuildDepends: tcltk-dev (>= 8.4.1-1) , libpng3, libjpeg, freetype221
+Depends: python%type_pkg[python], tcltk (>= 8.4.1-1), libpng3-shlibs, 
libjpeg-shlibs, freetype221-shlibs
 SetCFLAGS: -I/usr/X11R6/include 
 Replaces: pil
 Provides: pil
@@ -29,6 +25,7 @@
 <<
 InstallScript: <<
  #!/bin/sh -ev
+ FREETYPE_ROOT=%p/lib/freetype221
  %p/bin/python%type_raw[python] setup.py install --root=%d
  mkdir -p %i/share/doc/%n
  cp -R Docs/ %i/share/doc/%n/html
@@ -42,7 +39,7 @@
  mv pilprint.py pilprint%type_raw[python].py
  mv pilfile.py pilfile%type_raw[python].py
 <<
-DocFiles: CHANGES-115 BUILDME CONTENTS README
+DocFiles: CHANGES BUILDME CONTENTS README
 License: OSI-Approved
 Homepage: http://www.pythonware.com/products/pil
 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>

Index: pil-py.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/pil-py.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pil-py.patch24 Sep 2006 15:24:05 -  1.2
+++ pil-py.patch20 Apr 2007 11:40:23 -  1.3
@@ -1,38 +1,37 @@
 Imaging/setup.py.orig  2006-09-24 06:20:39.0 -0600
-+++ Imaging/setup.py   2006-09-24 06:21:30.0 -0600
-@@ -119,11 +119,11 @@
+diff -urN Imaging-1.1.6/setup.py Imaging-1.1.6.new/setup.py
+--- Imaging-1.1.6/setup.py 2006-12-03 05:37:29.0 -0600
 Imaging-1.1.6.new/setup.py 2007-01-27 23:49:29.0 -0600
+@@ -34,7 +34,7 @@
+ #
+ # TIFF_ROOT = libinclude("/opt/tiff")
  
- if sys.platform == "darwin":
+-FREETYPE_ROOT = None
++FREETYPE_ROOT = libinclude("@PREFIX@/lib/freetype221")
+ JPEG_ROOT = None
+ TIFF_ROOT = None
+ ZLIB_ROOT = None
+@@ -131,14 +131,14 @@
+ 
+ elif sys.platform == "darwin":
  # attempt to make sure we pick freetype2 over other versions
 -add_directory(include_dirs, "/sw/include/freetype2")
 -add_directory(include_dirs, "/sw/lib/freetype2/include")
-+add_directory(include_dirs, "@PREFIX@/include/freetype2")
-+add_directory(include_dirs, "@PREFIX@/lib/freetype2/include")
++add_directory(include_dirs, "@PREFIX@/lib/freetype2/lib")
++add_directory(include_dirs, 
"@PREFIX@/lib/freetype2/include/freetype2/freetype")
  # fink installation directories
 -add_directory(library_dirs, "/sw/lib")
 -add_directory(include_dirs, "/sw/include")
 +add_directory(library_dirs, "@PREFIX@/lib")
 +add_directory(include_dirs, "@PREFIX@/include")
+ # darwin ports installation directories
+-add_directory(library_dirs, "/opt/local/lib")
+-add_directory(include_dirs, "/opt/local/include")
++#add_directory(library_dirs, "/opt/local/lib")
++#add_directory(include_dirs, "/opt/local/include")
  
+ add_directory(library_dirs, "/usr/local/lib")
  # FIXME: check /opt/stuff directories here?
- 
-@@ -177,11 +177,11 @@
- #
- # add standard directories
- 
--add_directory(library_dirs, "/usr/local/lib")
--add_directory(include_dirs, "/usr/local/include")
-+#add_directory(library_dirs, "/usr/local/lib")
-+#add_directory(include_dirs, "/usr/local/include")
- 
--add_directory(library_dirs, "/usr/lib")
--add_directory(include_dirs, "/usr/include")
-+#add_directory(library_dirs, "/usr/lib")
-+#add_directory(include_dirs, "/usr/include")
- 
- #
- # inser

[cvs] dists/10.4/stable/main/finkinfo/graphics freetype219.info, 1.4, 1.5 freetype219.patch, 1.1, 1.2

2007-04-20 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29819

Modified Files:
freetype219.info freetype219.patch 
Log Message:
latest version to stable


Index: freetype219.info
===
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/freetype219.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freetype219.info21 Nov 2006 06:10:02 -  1.4
+++ freetype219.info20 Apr 2007 13:20:43 -  1.5
@@ -1,44 +1,40 @@
 Package: freetype219
-Version: 2.1.9
-Revision: 1
+Version: 2.2.1
+Revision: 4
 Depends: %N-shlibs (= %v-%r)
 Conflicts: freetype219-hinting
 Replaces: freetype219-hinting
 BuildDependsOnly: True
 Source: mirror:sourceforge:freetype/freetype-%v.tar.bz2
-Source-MD5: ec1b903e4be5f073caa72458ea58c29c
+Source-MD5: 5b2f827082c544392a7701f7423f0781
 Patch: %n.patch
+NoSetCPPFLAGS: true
 NoSetMAKEFLAGS: true
 SetMAKEFLAGS: -j1
 CompileScript: <<
- make setup CFG="--prefix=%p/lib/%N"
- perl -pi.bak -e 's/^allow_undefined_flag.*/allow_undefined_flag=\"\"/' 
builds/unix/libtool
- make
+#!/bin/sh -ev
+   export CPATH=%p/include
+   ./configure --prefix=%p/lib/%N --with-old-mac-fonts 
--mandir=%p/share/man --infodir=%p/share/info
+   make
 <<
 InstallScript: <<
 #!/bin/sh -ev
- make install prefix=%i/lib/%N
- perl -pi -e 's,(dep.*%p/lib),$1/%N/lib,g' %i/lib/%N/lib/libfreetype.la
- rm -rf %i/lib/%N/share
- install -d -m 755 %i/share/doc/%N
- cp -pR docs/* %i/share/doc/%N/
+   make install DESTDIR="%d"
+   rm -rf %i/lib/%N/share
+   install -d -m 755 %i/share/doc/%N
+   cp -pR docs/* %i/share/doc/%N/
 <<
+
 SplitOff: <<
-  Package: %N-shlibs
-  Replaces:  freetype219-hinting-shlibs, freetype2 (<< 2.0.8-2)
-  Conflicts: freetype219-hinting-shlibs
-  Files: lib/%N/lib/libfreetype.6*dylib
-  Shlibs: %p/lib/%N/lib/libfreetype.6.dylib 10.0.0 %n (>= 2.1.9-1)
-  DocFiles: <<
-README src/autohint/CatharonLicense.txt
-src/pcf/readme:README.pcf
-  <<
-  Description: TrueType font rendering library, shared libs
-<<
-DocFiles: <<
- README src/autohint/CatharonLicense.txt
- src/pcf/readme:README.pcf
+   Package: %N-shlibs
+   Replaces:  freetype219-hinting-shlibs, freetype2 (<< 2.0.8-2)
+   Conflicts: freetype219-hinting-shlibs
+   Files: lib/%N/lib/libfreetype.6*dylib
+   Shlibs: %p/lib/%N/lib/libfreetype.6.dylib 10.0.0 %n (>= 2.1.9-1)
+   DocFiles: README docs/LICENSE.TXT
+   Description: TrueType font rendering library, shared libs
 <<
+DocFiles: ChangeLog* README
 Description: TrueType font rendering library, headers
 DescDetail: <<
 FreeType 2 is a library that provides access to and rendering of a
@@ -46,15 +42,21 @@
 and several bitmap font formats.
 <<
 DescUsage: <<
-Packages that need freetype2 versions 2.1.8 or 2.1.9,
-should builddepend on freetype219 and depend on freetype219-shlibs
-and make sure that configure finds the freetype-config script in
-%p/lib/freetype219/bin. The headers and libraries needed at build
-time are in %p/lib/freetype219/{include,lib}.
+Packages that need freetype2 versions 2.1.8 or higher should
+BuildDepend on freetype219 and depend on freetype219-shlibs
+and potentially make sure that configure finds the freetype-config
+script in %p/lib/freetype219/bin. The headers and libraries needed
+at build time are in %p/lib/freetype219/{include,lib}.
 <<
 DescPort: <<
- Previous versions by Christoph Pfisterer
+* Previous versions by Christoph Pfisterer
+* 2006-08-06 Benjamin Reed <[EMAIL PROTECTED]>
+  - updated to 2.2.1
+  - integrated patches from debian's freetype-2.2.1 for
+backwards-compatibility with 2.1.9 and earlier
+* 2006-11-14 Martin Costabel <[EMAIL PROTECTED]>
+  - integrated endianness fix from freetype CVS
 <<
 License: OSI-Approved
 Homepage: http://www.freetype.org/
-Maintainer: None <[EMAIL PROTECTED]>
+Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>

Index: freetype219.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/freetype219.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freetype219.patch   20 Jan 2006 20:12:53 -  1.1
+++ freetype219.patch   20 Apr 2007 13:20:43 -  1.2
@@ -1,23 +1,38 @@
-diff -uNr freetype-2.1.9/builds/unix/detect.mk 
freetype-2.1.9-new/builds/unix/detect.mk
 freetype-2.1.9/builds/unix/detect.mk   Tue Apr 13 04:35:05 2004
-+++ freetype-2.1.9-new/builds/unix/detect.mk   Thu Feb 24 17:02:56 2005
-@@ -20,7 +20,8 @@
-   #
-   is_unix := $(strip $(wildcard /sbin/init) \
-  $(wildcard /usr/sbin/init) \
-- $(wildcard /hurd/auth))
-+ $(wildcard /hurd/auth) \
-+ $(wildcard /sbin/launchd))
-   ifneq ($(is_unix),)
+diff -ruN freetype-2.2.1-orig/include/freetype/config/ftoption.

[cvs] dists/10.4/stable/main/finkinfo/text libkpathsea4.info,1.4,1.5

2007-04-20 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/text
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32540

Modified Files:
libkpathsea4.info 
Log Message:
latest version to stable


Index: libkpathsea4.info
===
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/libkpathsea4.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libkpathsea4.info   20 Dec 2006 00:15:19 -  1.4
+++ libkpathsea4.info   20 Apr 2007 13:27:50 -  1.5
@@ -1,9 +1,9 @@
 Package: libkpathsea4
 Version: 3.0
-Revision: 1002
+Revision: 1005
 Description: Complete distribution of the TeX typesetting system
 BuildDepends: <<
- t1lib5, libpng3 (>= 1:1.2.8-1), libwww, libncurses5 (>= 5.4-20041023-1006), 
tetex-texmf (>= 3.0-1)
+ t1lib5, libpng3 (>= 1:1.2.8-1), libwww, libncurses5 (>= 5.4-20041023-1006), 
tetex-texmf (>= 3.0-1), libiconv-dev
 <<
 BuildDependsOnly: true
 Depends: %N-shlibs (= %v-%r)
@@ -11,11 +11,21 @@
 Replaces: tetex-dev, tetex-base (<= 2.0.2-46), tetex-nox (<= 2.0.2-24)
 Source: 
ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/3.0/distrib/tetex-src-%v.tar.gz
 Source-MD5: 944a4641e79e61043fdaf8f38ecbb4b3
+Source2: 
http://fink.sodan.ecc.u-tokyo.ac.jp/~okayama/distfiles/tetex-%v-magstep-20060511.patch
+Source2-MD5: c88f4c99f3e984c0d3ff540373f2e359
+Source3: 
http://fink.sodan.ecc.u-tokyo.ac.jp/~okayama/distfiles/tetex-%v-libkanji-0.87.patch
+Source3-MD5: 5e260dc64c13d8cc41c68d1145ba958a
+Source4: http://sarovar.org/tracker/download.php/106/493/378/119/xputenv.c
+Source4-MD5: 9b271c52c4a591c23cacb81a2230c042
 PatchScript: <<
  sed 's|@PREFIX@|%p|g' < %a/tetex.patch | sed 's|@PACKAGE@|%n-%v-%r|g' | patch 
-p1
  perl -pi -e "s|hardcode_direct=yes|hardcode_direct=no|" texk/configure 
texk/kpathsea/configure utils/texinfo/configure 
  perl -pi -e 's,-flat_namespace -undefined suppress,-twolevel_namespace 
-undefined error,g' texk/configure texk/kpathsea/configure 
utils/texinfo/configure
  perl -pi -e 's,\*\.obj\),*.obj | *.dSYM),' texk/configure 
texk/kpathsea/configure utils/texinfo/configure
+ patch -p1 < ../tetex-%v-magstep-20060511.patch
+ patch -p1 < ../tetex-%v-libkanji-0.87.patch
+ cp ../xputenv.c texk/kpathsea/
+ sed -i.bak 's|-rpath|$(LIBS) -rpath|' texk/kpathsea/Makefile.in
 <<
 ConfigureParams: <<
  --without-texi2html --without-texinfo --enable-shared \
@@ -24,7 +34,8 @@
  --with-system-pnglib --with-system-t1lib --with-system-wwwlib \
  --with-system-zlib \
  --with-system-gd \
- --without-x 
+ --without-x \
+ --enable-kanji=UTF8 --enable-kanji-iconv
 <<
 CompileScript: <<
  cd texk; ./configure %c
@@ -40,6 +51,7 @@
 InfoDocs: kpathsea.info
 SplitOff: <<
  Package: %N-shlibs
+ Depends: libiconv
  Description: Shared libraries for a teTeX installation
  Files: lib/libkpathsea.*.dylib
  Shlibs: %p/lib/libkpathsea.4.dylib 5.0.0 %n (>= 3.0-1)


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[svn] commit: r775 - in /trunk/experimental: 10.3/main/finkinfo/database/libpqxx2.info 10.4/main/finkinfo/database/libpqxx2.info common/main/finkinfo/database/libpqxx2.info

2007-04-20 Thread ranger
Author: ranger
Date: Fri Apr 20 15:28:45 2007
New Revision: 775

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=775&repname=user%3a+ranger
Log:
disable dependency tracking

Modified:
trunk/experimental/10.3/main/finkinfo/database/libpqxx2.info
trunk/experimental/10.4/main/finkinfo/database/libpqxx2.info
trunk/experimental/common/main/finkinfo/database/libpqxx2.info

Modified: trunk/experimental/10.3/main/finkinfo/database/libpqxx2.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/database/libpqxx2.info&rev=775&repname=user%3a+ranger
==
--- trunk/experimental/10.3/main/finkinfo/database/libpqxx2.info (original)
+++ trunk/experimental/10.3/main/finkinfo/database/libpqxx2.info Fri Apr 20 
15:28:45 2007
@@ -34,7 +34,7 @@
 Patch: %n.patch
 PatchScript:   perl -pi -e 's,hardcode_direct=yes,hardcode_direct=no,g' 
configure
 
-ConfigureParams: --mandir=%p/share/man --enable-shared
+ConfigureParams: --mandir=%p/share/man --enable-shared 
--disable-dependency-tracking
 CompileScript: <<
 #!/bin/sh -ev
 

Modified: trunk/experimental/10.4/main/finkinfo/database/libpqxx2.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/database/libpqxx2.info&rev=775&repname=user%3a+ranger
==
--- trunk/experimental/10.4/main/finkinfo/database/libpqxx2.info (original)
+++ trunk/experimental/10.4/main/finkinfo/database/libpqxx2.info Fri Apr 20 
15:28:45 2007
@@ -34,7 +34,7 @@
 Patch: %n.patch
 PatchScript:   perl -pi -e 's,hardcode_direct=yes,hardcode_direct=no,g' 
configure
 
-ConfigureParams: --mandir=%p/share/man --enable-shared
+ConfigureParams: --mandir=%p/share/man --enable-shared 
--disable-dependency-tracking
 CompileScript: <<
 #!/bin/sh -ev
 

Modified: trunk/experimental/common/main/finkinfo/database/libpqxx2.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/libpqxx2.info&rev=775&repname=user%3a+ranger
==
--- trunk/experimental/common/main/finkinfo/database/libpqxx2.info (original)
+++ trunk/experimental/common/main/finkinfo/database/libpqxx2.info Fri Apr 20 
15:28:45 2007
@@ -20,7 +20,7 @@
 Conflicts: libpqxx
 Replaces: libpqxx, postgresql73-dev, postgresql73-ssl-dev, 
postgresql73-unified-dev, postgresql74-dev, postgresql74-ssl-dev, 
postgresql74-unified-dev, postgresql80-dev, postgresql80-ssl-dev, 
postgresql80-unified-dev, postgresql81-dev
 Provides: libpqxx2-dev
-ConfigureParams: --mandir=%p/share/man --enable-shared
+ConfigureParams: --mandir=%p/share/man --enable-shared 
--disable-dependency-tracking
 CompileScript: <<
 #!/bin/sh -ev
 


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.3/stable/main/finkinfo/utils clamav-0.88.7.info, NONE, 1.1 clamav.info, 1.16, 1.17 file.info, 1.7, 1.8

2007-04-20 Thread Remi Mommsen
Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/utils
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10843

Modified Files:
clamav.info file.info 
Added Files:
clamav-0.88.7.info 
Log Message:
Latest versions to stable

--- NEW FILE: clamav-0.88.7.info ---
Info3: <<
Package: clamav
Version: 0.88.7
Revision: 3
Description: Clam Anti-Virus scanner
DescDetail: <<
 Clam AntiVirus is an anti-virus scanner written from scratch. It is
 licensed under GNU GPL2 and uses the virus database from
 OpenAntiVirus, which is an another free anti-virus project. In
 contrast to the OpenAntiVirus which is written in Java, Clam
 AntiVirus is written entirely in C and is POSIX compliant.
<<
DescUsage: <<
 'clamscan' scans the current working directory for known
 viruses. See 'man clamscan' for details.

 For virus updates, run 'freshclam' from a shell prompt
 or in a cron script.
<<
SplitOff: <<
  Description: Shared libraries for ClamAV
  Package: %N-shlibs
  Depends: bzip2-shlibs, gmp-shlibs (>= 4.1.4-1)
  InstallScript: <<
/usr/bin/install -d -m 755 %i/lib
/bin/mv %I/lib/libclamav.1*.dylib %i/lib
  <<
  Shlibs: <<
%p/lib/libclamav.1.dylib 2.0.0 %n (>= 0.80-1)
  <<
<<
SplitOff2: <<
  Description: ClamAV daemon
  DescDetail: <<
Installs and runs the ClamAV daemon using the daemonic package.
  <<
  DescUsage: <<
In order to use the clamd daemon, you need to call 'clamdscan'
(note the d in contrast to the standard 'clamscan'
command).

You might want to edit %p/etc/clamd.conf to suit your
needs. Additionally, enable 'NotifyClamd' in
%p/etc/freshclam.conf such that the ClamAV daemon gets notified
about virus definition updates.
  <<
  Package: %N-daemon
  Depends: %N, daemonic, fink-obsolete-packages
  Files: <<
etc/clamd.conf
bin/clamdscan
sbin/clamd
  << 
  ConfFiles: %p/etc/clamd.conf
  DaemonicName: clamav
  DaemonicFile: <<
 
   ClamAV
   ClamAV anti-virus daemon
   
 %p/sbin/clamd
 %p/etc/clamd.conf
 %p/var/run/clamd.pid

 
  <<
  PostInstScript: <<
daemonic enable clamav
/Library/StartupItems/daemonic-clamav/daemonic-clamav start
  << 
  PreRmScript: <<
if [ $1 != "upgrade" ]; then
  daemonic remove clamav
fi
  <<
<<
SplitOff3: <<
  Description: Developer files for ClamAV
  Package: %N-dev
  Depends: %N (=%v-%r), pkgconfig, fink-obsolete-packages
  BuildDependsOnly: true
  InstallScript: <<
/bin/mv %I/include %I/lib %i 
  <<
  Files: bin/clamav-config
<<
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 34a9d58cf5bcb04dbe3eb32b5367a3f8
BuildDepends: gmp (>= 4.1.4-1), bzip2, bzip2-dev, fink-obsolete-packages
Depends: %N-shlibs (=%v-%r), passwd (>= 20030202-2), unrar
ConfigureParams: --mandir=%p/share/man --with-dbdir=%p/var/db/%n 
--sysconfdir=%p/etc --disable-dependency-tracking 
InstallScript: <<
 #!/bin/sh -ev
 /usr/bin/make install DESTDIR=%d

 for configfile in clamd.conf freshclam.conf ; do
   /usr/bin/sed 's/^Example/#Example/' etc/$configfile > %i/etc/$configfile
 done

 /usr/sbin/chown -R clamav:admin %i/var/db/%n
 /bin/chmod g+w %i/var/db/%n

 /usr/bin/install -d -m 755 %i/share/doc/%n
 /bin/mv docs/* %i/share/doc/%n
 (cd %i/share/doc/%n; /bin/rm -R Makefile Makefile.am Makefile.in man) || exit 1
 /usr/bin/install -d -m 755 %i/share/doc/%n/test/
 /bin/cp -r test/* %i/share/doc/%n/test/

 #Remove CVS directories
 /usr/bin/find %i -name "CVS" -type d -depth -exec rm -rf \{\} \;
<<
InfoTest: <<
 TestSuiteSize: small
 TestScript: <<
   #!/bin/sh -ev
   ( %b/clamscan/clamscan --unrar --database=%b/database %b/test/clam-error.rar 
) ;
   if [ $? -ne 1 ] ; then exit 2 ; fi
   ( %b/clamscan/clamscan --database=%b/database %b/test/clam.rar ) ;
   if [ $? -ne 1 ] ; then exit 2 ; fi
   ( %b/clamscan/clamscan --database=%b/database %b/test/clam.exe ) ;
   if [ $? -ne 1 ] ; then exit 2 ; fi
   ( %b/clamscan/clamscan --database=%b/database %b/test/clam.exe.bz2 ) ;
   if [ $? -ne 1 ] ; then exit 2 ; fi
   ( %b/clamscan/clamscan --database=%b/database %b/test/clam.zip ) ;
   if [ $? -ne 1 ] ; then exit 2 ; fi
   ( %b/clamscan/clamscan --database=%b/database %b/test/clam.cab ) ;
   if [ $? -ne 1 ] ; then exit 2 ; fi
 <<
<<
PreInstScript: <<
 # Remove old virus databases which are not removed by previous clamav packages
 if [ -f %p/var/db/%n/viruses.db ]; then
   echo "Removing old virus definitions %p/var/db/clamav/viruses.db"
   rm -f %p/var/db/%n/viruses.db
 fi
 if [ -f %p/var/db/%n/viruses.db2 ]; then
   echo "Removing old virus definitions %p/var/db/clamav/viruses.db2"
   rm -f %p/var/db/%n/viruses.db2
 fi
 if [ -d %p/share/%n ]; then
   echo "Removing old virus definitions directory %p/share/%n"
   rm -r %p/share/%n
 fi
<<
PostInstScript: <<
 # need to change permissions here as these files might already been
 # installed, in which case the permission are not adjusted
 /usr/sbin/chown -R clamav:admin %p/var/db/clamav
 /bin/chmod g+w %p/var/db/clamav
 /bin/chmo

[cvs] dists/10.4/stable/main/finkinfo/utils file.info,1.2,1.3

2007-04-20 Thread Remi Mommsen
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6271

Modified Files:
file.info 
Log Message:
Latest version to stable

Index: file.info
===
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/file.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- file.info   2 Jan 2007 18:29:45 -   1.2
+++ file.info   20 Apr 2007 13:43:59 -  1.3
@@ -1,5 +1,5 @@
 Package: file
-Version: 4.19
+Version: 4.20
 Revision: 1
 Description: Determine file type (magic)
 License: Restrictive/Distributable
@@ -41,7 +41,7 @@
  eur-de: http://www.go.dlr.de/fresh/unix/src/misc/
  eur-de: http://www.uni-koeln.de/ftp/util/
 <<
-Source-MD5: a61ef3aa8339d5987148089afde25f60
+Source-MD5: 402bdb26356791bd5d277099adacc006
 
 SplitOff: <<
  Package: %N-shlibs


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] fink/perlmod/Fink Validation.pm,1.251,1.252

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15773/perlmod/Fink

Modified Files:
Validation.pm 
Log Message:
fix special-case fink, and also better handling of bad links

Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- Validation.pm   20 Apr 2007 15:13:56 -  1.251
+++ Validation.pm   20 Apr 2007 15:29:42 -  1.252
@@ -1712,7 +1712,13 @@
my @fields = split(/\s+/, $entry);
my $file = resolve_rooted_symlink($destdir, 
$fields[0]);
if (not defined $file) {
-   print "Error: Shlibs field specifies 
$fields[0], but it does not exist!\n";
+   # fink is a special case, it has an 
shlibs field that provides system-shlibs
+   if ($deb_control->{package} ne 'fink') {
+   print "Error: Shlibs field 
specifies $fields[0], but it does not exist!\n";
+   $looks_good = 0;
+   }
+   } elsif (not -f $file) {
+   
} else {
$file =~ s/\'/\\\'/gs;
if (open (OTOOL, "otool -L '$file' |")) 
{
@@ -1758,9 +1764,11 @@
} else {
return resolve_rooted_symlink($destdir, dirname($file) 
. '/' . $link);
}
+   } elsif (-e $destdir . $file) {
+   return $destdir . $file;
}
 
-   return $destdir . $file;
+   return undef;
 }
 
 # implements somehting like Tie::IxHash STORE, but each value-set is


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] fink/perlmod/Fink Validation.pm,1.252,1.253

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28738/perlmod/Fink

Modified Files:
Validation.pm 
Log Message:
- if a file is a .dylib, .so, .bundle, or .jnilib, check if it's a
  DYLIB or not, if it is, add it to the list of installed dylibs and
  warn if it ends in .so or .bundle
- if a file is not a DYLIB, warn if it ends in .dylib
- if a file is a DYLIB, error if it's not in Shlibs


Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- Validation.pm   20 Apr 2007 15:29:42 -  1.252
+++ Validation.pm   20 Apr 2007 16:05:49 -  1.253
@@ -1338,6 +1338,7 @@
my $destdir = shift;  # %d, or its moral equivalent
my $val_prefix = shift;
 
+   chomp(my $otool = `which otool 2>/dev/null`);
my $basepath;   # %p
my $buildpath;  # BuildPath from fink.conf
# determine the base path
@@ -1356,7 +1357,7 @@
 
my @found_bad_dir;
my $installed_headers = 0;
-   my $installed_dylibs = 0;
+   my @installed_dylibs;
 
# the whole control module is loaded and pre-precessed before any 
actual validation
my $deb_control;# key:value of all %d/DEBIAN/control fields
@@ -1500,8 +1501,33 @@
if ($filename =~/^$basepath\/include\// && !-d 
$File::Find::name) {
$installed_headers = 1;
}
-   if ($filename =~/\.dylib$/) {
-   $installed_dylibs = 1;
+
+   if (-x $otool) {
+   if ($filename =~ /\.(dylib|jnilib|so|bundle)$/) {
+   my $file = $filename;
+   $file =~ s/\'/\\\'/gs;
+   if (open(OTOOL, "$otool -hv '$file' |"))
+   {
+   while (my $line = ) {
+   if (my ($type) = $line =~ 
/MH_MAGIC.*\s+DYLIB\s+/) {
+   if ($filename !~ 
/\.(dylib|jnilib)$/) {
+   print "Warning: 
$filename is a DYLIB but it does not end in .dylib or .jnilib.\n";
+   }
+   push(@installed_dylibs, 
$filename);
+   } elsif ($line =~ /MH_MAGIC/) {
+   if ($filename =~ 
/\.dylib$/) {
+   print "Warning: 
$filename ends in .dylib but is not of filetype DYLIB according to otool.\n";
+   }
+   }
+   }
+   close (OTOOL);
+   }
+   }
+   } else {
+   print "Warning: unable to locate otool, assuming any 
.dylib or .jnilib file is a DYLIB binary\n";
+   if ($filename =~/\.(dylib|jnilib)$/) {
+   push(@installed_dylibs, $filename);
+   }
}
 
# make sure scrollkeeper is being used according to its 
documentation
@@ -1665,7 +1691,7 @@
# does not record the BuildDependsOnly field, or with an old version
# which did not use the "Undefined" value for the BuildDependsOnly 
field,
# the warning is not issued
-   if ($installed_headers and $installed_dylibs) {
+   if ($installed_headers and @installed_dylibs) {
if (!exists $deb_control->{builddependsonly} or 
$deb_control->{builddependsonly} =~ /Undefined/) {
print "Error: Headers installed in $basepath/include, 
as well as a dylib, but package does not declare BuildDependsOnly to be true 
(or false)\n";
$looks_good = 0;
@@ -1699,9 +1725,9 @@
}
}
 
+   my %shlibs_entries;
# check shlibs field
if (-f "$destdir/DEBIAN/shlibs") {
-   chomp(my $otool = `which otool 2>/dev/null`);
if (not -x $otool) {
print "Warning: Package has shlibs data but otool is 
not in the path; skipping shlibs validation.\n";
}
@@ -1710,6 +1736,7 @@
chomp($entry);
$entry =~ s/^\s*(.*?)\s*$/$1/gs;
my @fields = split(/\s+/, $entry);
+   $shlibs_entries{$fields[0]} = [EMAIL PROTECTED];
my $file = resolve_rooted_symlink($destdir, 
$fields[0]);
 

[cvs] fink/perlmod/Fink Validation.pm,1.253,1.254

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4483

Modified Files:
Validation.pm 
Log Message:
print the compat version too

Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- Validation.pm   20 Apr 2007 16:05:49 -  1.253
+++ Validation.pm   20 Apr 2007 16:21:53 -  1.254
@@ -1786,7 +1786,7 @@
close (OTOOL);

if (not exists 
$shlibs_entries{$libname}) {
-   print "Error: package contains 
a dylib with no corresponding Shlibs entry ($dylib -> $libname)\n";
+   print "Error: package contains 
a dylib with no corresponding Shlibs entry ($dylib -> $libname 
$compat_version)\n";
$looks_good = 0;
}
}


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/libs/perlmods test-mockobject-pm.info, 1.7.2.1, 1.7.2.2

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/libs/perlmods

Modified Files:
  Tag: pangocairo-branch
test-mockobject-pm.info 
Log Message:
bugfixes from buildfink

Index: test-mockobject-pm.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/test-mockobject-pm.info,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- test-mockobject-pm.info 22 Feb 2007 13:09:25 -  1.7.2.1
+++ test-mockobject-pm.info 20 Apr 2007 16:25:29 -  1.7.2.2
@@ -45,7 +45,6 @@
./Build test
 <<
 
-UpdatePOD: true
 InstallScript: <<
./Build install
find %d -name .packlist -exec rm -rf {} \;


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/libs libxine1.info, 1.15.2.7, 1.15.2.8 poppler.patch, 1.2.2.2, 1.2.2.3

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/libs

Modified Files:
  Tag: pangocairo-branch
libxine1.info poppler.patch 
Log Message:
bugfixes from buildfink

Index: libxine1.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxine1.info,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -u -d -r1.15.2.7 -r1.15.2.8
--- libxine1.info   8 Apr 2007 16:57:43 -   1.15.2.7
+++ libxine1.info   20 Apr 2007 16:25:29 -  1.15.2.8
@@ -6,7 +6,7 @@
 Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
 
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.24-1), aalib, arts-dev (>= 1.4.0-2041), audiofile, 
bzip2-shlibs, dbus-dev (>= 1.0-1), esound, flac (>= 1.1.1-1011), freetype219, 
gconf2-dev (>= 2.16.1-1), gettext-bin, gettext-tools, glib2-dev (>= 2.12.0-1), 
gnome-vfs2-unified-dev (>= 1:2.17.91-1), imagemagick-dev (>= 6.1.8-1002) | 
imagemagick10-dev (>= 6.1.8-1002), lcms, libbonobo2-dev (>= 2.17.92-1), 
libcaca-dev, libcdio-dev, libgettext3-dev, libiconv-dev, libiso9660-dev, 
libjpeg, libmng2, libncurses5 (>= 5.4-20041023-1006), libogg, libpng3, 
libtheora0, libtiff, libtool14, libvcd-dev (>= 0.7.21-10), libvorbis0, libxml2, 
orbit2-dev (>= 2.14.7-2), pkgconfig (>= 0.21-1), popt, pth, qt3 (>= 
3.3.6-1027), sdl (>= 1.2.9-1001), slang, speex3, x11-dev
+BuildDepends: fink (>= 0.24-1), aalib, arts-dev (>= 1.4.0-2041), audiofile, 
bzip2-shlibs, libhowl-dev, dbus-dev (>= 1.0-1), esound, flac (>= 1.1.1-1011), 
freetype219, gconf2-dev (>= 2.16.1-1), gettext-bin, gettext-tools, glib2-dev 
(>= 2.12.0-1), gnome-vfs2-unified-dev (>= 1:2.17.91-1), imagemagick-dev (>= 
6.1.8-1002) | imagemagick10-dev (>= 6.1.8-1002), lcms, libbonobo2-dev (>= 
2.17.92-1), libcaca-dev, libcdio-dev, libgettext3-dev, libiconv-dev, 
libiso9660-dev, libjpeg, libmng2, libncurses5 (>= 5.4-20041023-1006), libogg, 
libpng3, libtheora0, libtiff, libtool14, libvcd-dev (>= 0.7.21-10), libvorbis0, 
libxml2, orbit2-dev (>= 2.14.7-2), pkgconfig (>= 0.21-1), popt, pth, qt3 (>= 
3.3.6-1027), sdl (>= 1.2.9-1001), slang, speex3, x11-dev
 Provides: libxine
 Conflicts: libxine, libxine-docs
 Replaces: libxine, libxine-shlibs, libxine-docs

Index: poppler.patch
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/poppler.patch,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- poppler.patch   28 Jan 2007 18:22:20 -  1.2.2.2
+++ poppler.patch   20 Apr 2007 16:25:29 -  1.2.2.3
@@ -10,19 +10,6 @@
  
  jpeg_incdir=NO
  for i in $jpeg_incdirs;
-diff -uNr poppler-0.5.0/splash/SplashFTFont.cc 
poppler-0.5.0-new/splash/SplashFTFont.cc
 poppler-0.5.0/splash/SplashFTFont.cc   2005-11-20 16:40:28.0 
-0500
-+++ poppler-0.5.0-new/splash/SplashFTFont.cc   2007-01-25 10:46:37.0 
-0500
-@@ -19,7 +19,8 @@
- 
- #include 
- #include FT_OUTLINE_H
--#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
-+#include FT_SIZES_H // needed for FT_New_Size decl
-+#include FT_GLYPH_H
- #include "goo/gmem.h"
- #include "SplashMath.h"
- #include "SplashGlyphBitmap.h"
 diff -uNr poppler-0.5.0/xpdfrc.poppler poppler-0.5.0-new/xpdfrc.poppler
 --- poppler-0.5.0/xpdfrc.poppler   1969-12-31 19:00:00.0 -0500
 +++ poppler-0.5.0-new/xpdfrc.poppler   2007-01-25 10:46:09.0 -0500


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/x11 openoffice.org.patch, 1.6, 1.6.2.1

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/x11

Modified Files:
  Tag: pangocairo-branch
openoffice.org.patch 
Log Message:
bugfixes from buildfink

Index: openoffice.org.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/openoffice.org.patch,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- openoffice.org.patch24 Mar 2006 16:57:07 -  1.6
+++ openoffice.org.patch20 Apr 2007 16:25:30 -  1.6.2.1
@@ -798,3 +798,87 @@
  
  ALL: $(MOZFILES)
  
+diff -uNr vcl/source/glyphs/gcach_ftyp.cxx vcl-new/source/glyphs/gcach_ftyp.cxx
+--- vcl/source/glyphs/gcach_ftyp.cxx   2006-01-25 06:39:36.0 -0500
 vcl-new/source/glyphs/gcach_ftyp.cxx   2007-04-14 16:29:43.0 
-0400
+@@ -90,21 +90,25 @@
+ #define strncasecmp strnicmp
+ #endif
+ 
+-#include "freetype/internal/ftobjs.h"
+-#include "freetype/internal/sfnt.h"
+-#include "freetype/internal/ftstream.h"
+-
+ #include 
+ #include 
+ #include 
+ 
+-#if defined( FT_NEXT_SHORT ) && !defined( NEXT_Short )
+-// Account for differing versions of freetype...
+-#define NEXT_Short( x )  FT_NEXT_SHORT( x )
+-#define NEXT_UShort( x ) FT_NEXT_USHORT( x )
+-#define NEXT_Long( x )   FT_NEXT_LONG( x )
+-#define NEXT_ULong( x )  FT_NEXT_ULONG( x )
+-#endif
++#define NEXT_Short( x )   \
++  ( x += 2,   \
++( (short)( (signed   char)x[-2] << 8 ) |  \
++   (unsigned char)x[-1]) )
++
++#define NEXT_UShort( x ) ( (unsigned short)NEXT_Short( x ) )
++
++#define NEXT_Long( x )\
++  ( x += 4,   \
++( ( (long)(signed   char)x[-4] << 24 ) |  \
++  ( (long)(unsigned char)x[-3] << 16 ) |  \
++  ( (long)(unsigned char)x[-2] <<  8 ) |  \
++(long)(unsigned char)x[-1] ) )
++
++#define NEXT_ULong( x )  ( (unsigned long)NEXT_Long( x ) )
+ 
+ // ---
+ 
+@@ -2070,7 +2074,16 @@
+ // TODO: wait till all compilers accept that calling conventions
+ // for functions are the same independent of implementation constness,
+ // then uncomment the const-tokens in the function interfaces below
+-static int FT_move_to( FT_Vector* /*const*/ p0, void* vpPolyArgs )
++// 
++// Starting with FreeType 2.2, the const-ness is actually needed - it has
++// been added to the function definitions and a cast from const to non-const
++// is never explicit.
++#if FTVERSION >= 2200
++#define FT_CONST const
++#else
++#define FT_CONST
++#endif
++static int FT_move_to( FT_Vector FT_CONST* p0, void* vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast(vpPolyArgs);
+ 
+@@ -2081,14 +2094,14 @@
+ return 0;
+ }
+ 
+-static int FT_line_to( FT_Vector* /*const*/ p1, void* vpPolyArgs )
++static int FT_line_to( FT_Vector FT_CONST* p1, void* vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast(vpPolyArgs);
+ rA.AddPoint( p1->x, p1->y, POLY_NORMAL );
+ return 0;
+ }
+ 
+-static int FT_conic_to( FT_Vector* /*const*/ p1, FT_Vector* /*const*/ p2, 
void* vpPolyArgs )
++static int FT_conic_to( FT_Vector FT_CONST* p1, FT_Vector FT_CONST* p2, void* 
vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast(vpPolyArgs);
+ 
+@@ -2105,7 +2118,7 @@
+ return 0;
+ }
+ 
+-static int FT_cubic_to( FT_Vector* /*const*/ p1, FT_Vector* /*const*/ p2, 
FT_Vector* /*const*/ p3, void* vpPolyArgs )
++static int FT_cubic_to( FT_Vector FT_CONST* p1, FT_Vector FT_CONST* p2, 
FT_Vector FT_CONST* p3, void* vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast(vpPolyArgs);
+ rA.AddPoint( p1->x, p1->y, POLY_CONTROL );


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/sci geda-gnetlist.info, 1.8.2.14, 1.8.2.15 geda-utils.info, 1.7.2.15, 1.7.2.16 nightfall.info, 1.2.2.4, 1.2.2.5 plplot.info, 1.16.2.7, 1.16.2.8

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/sci

Modified Files:
  Tag: pangocairo-branch
geda-gnetlist.info geda-utils.info nightfall.info plplot.info 
Log Message:
bugfixes from buildfink

Index: plplot.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/plplot.info,v
retrieving revision 1.16.2.7
retrieving revision 1.16.2.8
diff -u -d -r1.16.2.7 -r1.16.2.8
--- plplot.info 26 Mar 2007 15:03:30 -  1.16.2.7
+++ plplot.info 20 Apr 2007 16:25:29 -  1.16.2.8
@@ -2,7 +2,7 @@
 Version: 5.6.1
 Revision: 1006
 
-BuildDepends: readline5, freetype219 (>= 2.3.1-1), libiconv-dev, libncurses5, 
gd2, gd2-bin, libjpeg, libpng3, libiconv-dev, x11-dev, hdf5 (>= 1.6.5-1002), 
fftw3, system-java14-dev, aquaterm-dev (>= 1.0.0-1002), pango1-xft2-ft219-dev 
(>= 1.16.0-1), lasi-dev (>= 1.0.5-1005), gcc42, g95, xml-sax-expat-pm586, 
openjade, glib2-dev (>= 2.12.0-1)
+BuildDepends: fontconfig2-dev (>= 2.3.2-13), readline5, freetype219 (>= 
2.3.1-1), libiconv-dev, libncurses5, gd2, gd2-bin, libjpeg, libpng3, 
libiconv-dev, x11-dev, hdf5 (>= 1.6.5-1002), fftw3, system-java14-dev, 
aquaterm-dev (>= 1.0.0-1002), pango1-xft2-ft219-dev (>= 1.16.0-1), lasi-dev (>= 
1.0.5-1005), gcc42, g95, xml-sax-expat-pm586, openjade, glib2-dev (>= 2.12.0-1)
 Depends: %N-shlibs (= %v-%r), %N-dev (= %v-%r), freetype219-shlibs (>= 
2.3.1-1), libncurses5-shlibs, libiconv, tcltk, tcltk-shlibs, python, python25, 
numeric-py25, gd2-shlibs, libjpeg-shlibs, libpng3-shlibs, x11, pkgconfig (>= 
0.21-1), qhull, system-java14, tcltk-dev, aquaterm (>= 1.0.0-1002), octave, 
lasi (>= 1.0.5-1005), lasi-shlibs (>= 1.0.5-1005), glib2-shlibs (>= 2.12.0-1), 
pango1-xft2-ft219-shlibs (>= 1.16.0-1), gcc42-shlibs
 #BuildConflicts: ccache-default
 

Index: geda-gnetlist.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-gnetlist.info,v
retrieving revision 1.8.2.14
retrieving revision 1.8.2.15
diff -u -d -r1.8.2.14 -r1.8.2.15
--- geda-gnetlist.info  11 Apr 2007 15:25:00 -  1.8.2.14
+++ geda-gnetlist.info  20 Apr 2007 16:25:29 -  1.8.2.15
@@ -9,7 +9,7 @@
   gtk+2 (>= 2.10.0-1), atk1-shlibs (>= 1.17.0-1), pango1-xft2-ft219 (>= 
1.16.0-1)
 <<
 BuildDepends: <<
-  glitz, expat1, libjpeg, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev,
+  glitz, expat1, libjpeg, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, gd2,
   guile16-dev (>= 1.6.7-1010), libgeda (>= %v-0), geda-symbols,
   x11-dev, pkgconfig (>= 0.21-1), libiconv-dev, libgettext3-dev,
   glib2-dev (>= 2.12.0-1), gtk+2-dev (>= 2.10.0-1), atk1 (>= 1.17.0-1), 
pango1-xft2-ft219-dev (>= 1.16.0-1)

Index: geda-utils.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/geda-utils.info,v
retrieving revision 1.7.2.15
retrieving revision 1.7.2.16
diff -u -d -r1.7.2.15 -r1.7.2.16
--- geda-utils.info 11 Apr 2007 15:25:00 -  1.7.2.15
+++ geda-utils.info 20 Apr 2007 16:25:29 -  1.7.2.16
@@ -30,6 +30,7 @@
   freetype219 (>= 2.3.1-1),
   gd2,
   glib2-dev (>= 2.12.0-1), 
+  glitz,
   gtk+2-dev (>= 2.10.0-1),
   guile16-dev (>= 1.6.7-1010),
   libgeda (>= %v-0),

Index: nightfall.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/nightfall.info,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -d -r1.2.2.4 -r1.2.2.5
--- nightfall.info  15 Mar 2007 00:58:46 -  1.2.2.4
+++ nightfall.info  20 Apr 2007 16:25:29 -  1.2.2.5
@@ -53,8 +53,8 @@
   perl -pi -e 's,(.*program_invocation_name),//\1,' Light.[hc] LightGnome.c
 <<
 ###
-ConfigureParams: --disable-dependency-tracking --prefix=%p 
--mandir=%p/share/man --with-doc-prefix=%p/share/doc/%n 
--with-manual-prefix=%p/share/doc/%n --with-cfg-prefix=%p/etc/%n --with-gnuplot 
--disable-gnome
-InstallScript: make install DESTDIR=%d
+ConfigureParams: --disable-dependency-tracking --prefix=%p 
--mandir=%p/share/man --with-doc-prefix=%p/share/doc/%n 
--with-manual-prefix=%p/share/doc/%n --with-cfg-prefix=%p/etc/%n --with-gnuplot 
--disable-gnome 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+InstallScript: make -j1 install DESTDIR=%d
 ###
 ConfFiles: <<
%p/etc/%n/51_peg.cfg 


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sour

[cvs] dists/10.4/unstable/main/finkinfo/net etherape.info, 1.6.2.14, 1.6.2.15 rtorrent.info, 1.1.2.1, 1.1.2.2

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/net

Modified Files:
  Tag: pangocairo-branch
etherape.info rtorrent.info 
Log Message:
bugfixes from buildfink

Index: rtorrent.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/rtorrent.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- rtorrent.info   11 Apr 2007 15:24:59 -  1.1.2.1
+++ rtorrent.info   20 Apr 2007 16:25:29 -  1.1.2.2
@@ -7,7 +7,7 @@
 Maintainer: Michal Suchanek <[EMAIL PROTECTED]>
 
 Depends: libsigc++2-shlibs, libcurl4-shlibs, libncursesw5-shlibs, 
libtorrent11-shlibs
-BuildDepends: libsigc++2, libcurl4, pkgconfig, libncursesw5, libtorrent11
+BuildDepends: libsigc++2, libcurl4, pkgconfig, libncursesw5, libssh2, 
libtorrent11
 
 Source: http://libtorrent.rakshasa.no/downloads/%n-%v.tar.gz
 Source-MD5: 98b97730c36828e662a2355cb2b11309

Index: etherape.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/etherape.info,v
retrieving revision 1.6.2.14
retrieving revision 1.6.2.15
diff -u -d -r1.6.2.14 -r1.6.2.15
--- etherape.info   26 Mar 2007 15:03:29 -  1.6.2.14
+++ etherape.info   20 Apr 2007 16:25:29 -  1.6.2.15
@@ -2,7 +2,7 @@
 Version: 0.9.7
 Revision: 1002
 Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
-BuildDepends: glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, gtk+2-dev (>= 2.10.0-1), 
libpcap, libglade2 (>= 2.6.0-3), libgnome2-dev (>= 2.17.92-1), libgnomeui2-dev 
(>= 2.17.92-1), pkgconfig (>= 0.21-1), glib2-dev (>= 2.12.0-1), 
pango1-xft2-ft219-dev (>= 1.16.0-1), atk1 (>= 1.17.0-1), libxml2, orbit2-dev 
(>= 2.14.7-2), libbonobo2-dev (>= 2.17.92-1), gconf2-dev (>= 2.16.1-1), 
dbus-dev (>= 1.0-1), libhowl-dev, gnome-vfs2-unified-dev (>= 1:2.17.91-1), 
libgnomecanvas2-dev (>= 2.14.0-1), libart2, libbonoboui2-dev (>= 2.17.94-1), 
popt, gnome-keyring-dev (>= 0.7.92-1), libgettext3-dev, gettext-tools, 
libiconv-dev, x11-dev, libjpeg, audiofile
+BuildDepends: esound, glitz, expat1, libpng3, cairo (>= 1.2-1), 
fontconfig2-dev (>= 2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, gtk+2-dev 
(>= 2.10.0-1), libpcap, libglade2 (>= 2.6.0-3), libgnome2-dev (>= 2.17.92-1), 
libgnomeui2-dev (>= 2.17.92-1), pkgconfig (>= 0.21-1), glib2-dev (>= 2.12.0-1), 
pango1-xft2-ft219-dev (>= 1.16.0-1), atk1 (>= 1.17.0-1), libxml2, orbit2-dev 
(>= 2.14.7-2), libbonobo2-dev (>= 2.17.92-1), gconf2-dev (>= 2.16.1-1), 
dbus-dev (>= 1.0-1), libhowl-dev, gnome-vfs2-unified-dev (>= 1:2.17.91-1), 
libgnomecanvas2-dev (>= 2.14.0-1), libart2, libbonoboui2-dev (>= 2.17.94-1), 
popt, gnome-keyring-dev (>= 0.7.92-1), libgettext3-dev, gettext-tools, 
libiconv-dev, x11-dev, libjpeg, audiofile
 Depends: atk1-shlibs (>= 1.17.0-1), gtk+2 (>= 2.10.0-1), libpcap-shlibs, 
libgnome2 (>= 2.17.92-1), libgnomeui2 (>= 2.17.92-1), libgettext3-shlibs, 
libjpeg-shlibs, audiofile-shlibs
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
 Source-MD5: 7b5783090d92abe79634da4b582c6b48


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/graphics cairomm1.info, 1.1.2.3, 1.1.2.4

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/graphics

Modified Files:
  Tag: pangocairo-branch
cairomm1.info 
Log Message:
bugfixes from buildfink

Index: cairomm1.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/Attic/cairomm1.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- cairomm1.info   23 Jan 2007 13:53:29 -  1.1.2.3
+++ cairomm1.info   20 Apr 2007 16:25:28 -  1.1.2.4
@@ -6,7 +6,7 @@
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13), 
freetype219, glitz (>= 0.5.6-1), libgl-dev, libpng3, pkgconfig (>= 0.21-1), 
x11-dev, xft2-dev
+BuildDepends: expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13), 
freetype219, glitz (>= 0.5.6-1), libgl-dev, libjpeg, libpng3, libtiff, 
pkgconfig (>= 0.21-1), x11-dev, xft2-dev
 GCC: 4.0
 
 Source: http://cairographics.org/releases/cairomm-%v.tar.gz


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/x11-wm metacity-setup.info, 1.4.2.13, 1.4.2.14 xfcalendar.info, 1.1.2.8, 1.1.2.9 xfce-taskbar.info, 1.1.2.2, 1.1.2.3 xfmedia.info, 1.2.2.4, 1.2.2.5

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/x11-wm

Modified Files:
  Tag: pangocairo-branch
metacity-setup.info xfcalendar.info xfce-taskbar.info 
xfmedia.info 
Log Message:
bugfixes from buildfink

Index: xfmedia.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/xfmedia.info,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -d -r1.2.2.4 -r1.2.2.5
--- xfmedia.info2 Mar 2007 19:42:03 -   1.2.2.4
+++ xfmedia.info20 Apr 2007 16:25:30 -  1.2.2.5
@@ -5,9 +5,11 @@
 Source-MD5: 5ab3d25703d16ab4074dc63e677d0367
 BuildDepends: glib2-dev, libgettext3-dev, libiconv-dev, libxine, 
startup-notification-dev (>= 0.8-1)
 Depends: libxfce4mcs3-shlibs (>= 4.2.0), libxfcegui44-shlibs (>= 4.2.0), 
libxfce4util2-shlibs (>= 4.2.0), gtk+2-shlibs, atk1-shlibs (>= 1.17.0-1), 
pango1-xft2-shlibs, glib2-shlibs (>= 2.0.0), libiconv, gtk-xfce-engine (>= 
2.2), liboss1 (>=0.0.1), libxml2-shlibs, esound-shlibs (>= 0.2.32), 
audiofile-shlibs (>= 0.2.6)
-#Patch: %n.patch
-#SetCPPFLAGS: -I%p/include/liboss
-#SetLDFLAGS: -loss
+SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
+NoSetLDFLAGS: true
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib
+SetLIBS: -L%p/lib
+SetCFLAGS: -Os -pipe
 ConfigureParams: --mandir='%p/share/man' --infodir='%p/share/info' --with-x 
--with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --enable-shared 
--enable-static --disable-debug --enable-final --disable-dependency-tracking 
--disable-dbus 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 Description: Lightweight media player based on xine
 License: GPL

Index: xfcalendar.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/xfcalendar.info,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- xfcalendar.info 8 Apr 2007 16:57:44 -   1.1.2.8
+++ xfcalendar.info 20 Apr 2007 16:25:30 -  1.1.2.9
@@ -8,8 +8,8 @@
 eur-de: http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-4.2.3.2/src/
 <<
 Source-MD5: d2e2c8e010cca708295aeaf621086205
-BuildDepends: glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, x11-dev, gtk+2-dev (>= 
2.10.0-1), atk1 (>= 1.17.0-1), pango1-xft2-ft219-dev (>= 1.16.0-1), 
libxfce4mcs3-dev (>= 4.2.3), libxfce4util2-dev (>= 4.2.3), libxfcegui44-dev (>= 
4.2.3), glib2-dev (>= 2.12.0-1), libgettext3-dev, libiconv-dev, pkgconfig (>= 
0.21-1), dbh-dev
-Depends: libxfce4mcs3-shlibs (>= 4.2.3), libxfcegui44-shlibs (>= 4.2.3), 
libxfce4util2-shlibs (>= 4.2.3), gtk+2-shlibs (>= 2.10.0-1), atk1-shlibs (>= 
1.17.0-1), pango1-xft2-ft219-shlibs (>= 1.16.0-1), glib2-shlibs (>= 2.12.0-1), 
libiconv, gtk-xfce-engine, libgettext3-shlibs, dbh-shlibs
+BuildDepends: glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, x11-dev, gtk+2-dev (>= 
2.10.0-1), atk1 (>= 1.17.0-1), pango1-xft2-ft219-dev (>= 1.16.0-1), 
libxfce4mcs3-dev (>= 4.2.3), libxfce4util2-dev (>= 4.2.3), libxfcegui44-dev (>= 
4.2.3), glib2-dev (>= 2.12.0-1), libgettext3-dev, libiconv-dev, pkgconfig (>= 
0.21-1), dbh-dev, xfce-mcs-manager
+Depends: libxfce4mcs3-shlibs (>= 4.2.3), libxfcegui44-shlibs (>= 4.2.3), 
libxfce4util2-shlibs (>= 4.2.3), gtk+2-shlibs (>= 2.10.0-1), atk1-shlibs (>= 
1.17.0-1), pango1-xft2-ft219-shlibs (>= 1.16.0-1), glib2-shlibs (>= 2.12.0-1), 
libiconv, gtk-xfce-engine, libgettext3-shlibs, dbh-shlibs, xfce-mcs-manager
 ConfigureParams: --mandir='%p/share/man' --infodir='%p/share/info'  --with-x 
--with-data-dir='%p/share/xfce4' --with-conf-dir='%p/etc/xfce4' --disable-debug 
--enable-final --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 Description: Simple calendar application for Xfce
 InstallScript: <<

Index: xfce-taskbar.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/xfce-taskbar.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- xfce-taskbar.info   5 Mar 2007 22:52:30 -   1.1.2.2
+++ xfce-taskbar.info   20 Apr 2007 16:25:30 -  1.1.2.3
@@ -1,7 +1,6 @@
 Package: xfce-taskbar
 Version: 3.8.18
-Revision: 11
-Architecture: powerpc
+Re

[cvs] dists/10.4/unstable/main/finkinfo/text lilypond-devel.info, 1.14.2.11, 1.14.2.12 lilypond.info, 1.7.2.11, 1.7.2.12

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/text

Modified Files:
  Tag: pangocairo-branch
lilypond-devel.info lilypond.info 
Log Message:
bugfixes from buildfink

Index: lilypond.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond.info,v
retrieving revision 1.7.2.11
retrieving revision 1.7.2.12
diff -u -d -r1.7.2.11 -r1.7.2.12
--- lilypond.info   26 Mar 2007 15:03:30 -  1.7.2.11
+++ lilypond.info   20 Apr 2007 16:25:30 -  1.7.2.12
@@ -4,7 +4,7 @@
 Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
 GCC: 4.0
 BuildDepends: <<
-guile16-dev (>= 1.6.7-1010), libkpathsea4 | system-tetex, 
+guile16 (>= 1.6.7-1010), guile16-dev (>= 1.6.7-1010), libkpathsea4 | 
system-tetex, 
 libgettext3-dev, gettext-bin, gettext-tools, texinfo (>= 4.8-2), 
 mftrace (>= 1.2.4-1001), freetype219 (>= 2.3.1-1), 
 pango1-xft2-ft219-dev (>= 1.16.0-1), glib2-dev, bison (>= 2.0-1), 

Index: lilypond-devel.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond-devel.info,v
retrieving revision 1.14.2.11
retrieving revision 1.14.2.12
diff -u -d -r1.14.2.11 -r1.14.2.12
--- lilypond-devel.info 26 Mar 2007 15:03:30 -  1.14.2.11
+++ lilypond-devel.info 20 Apr 2007 16:25:29 -  1.14.2.12
@@ -4,7 +4,7 @@
 Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
 GCC: 4.0
 BuildDepends: <<
-guile18-dev, libkpathsea4 | system-tetex, 
+guile18, guile18-dev, libkpathsea4 | system-tetex, 
 libgettext3-dev, gettext-bin, gettext-tools, texinfo (>= 4.8-2), 
 mftrace (>= 1.2.4-1001), freetype219 (>= 2.3.1-1), 
 pango1-xft2-ft219-dev (>= 1.16.0-1), glib2-dev, bison (>= 2.0-1), 


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/editors abiword.info, 1.3.2.11, 1.3.2.12 winefish.info, 1.3.2.12, 1.3.2.13

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/editors

Modified Files:
  Tag: pangocairo-branch
abiword.info winefish.info 
Log Message:
bugfixes from buildfink

Index: winefish.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/winefish.info,v
retrieving revision 1.3.2.12
retrieving revision 1.3.2.13
diff -u -d -r1.3.2.12 -r1.3.2.13
--- winefish.info   2 Mar 2007 19:41:52 -   1.3.2.12
+++ winefish.info   20 Apr 2007 16:25:28 -  1.3.2.13
@@ -5,13 +5,13 @@
 Source-MD5: 63531e4dde7a53ab3a74e1152c7af1e9
 SourceDirectory: %n-%v
 Depends:  gtk+2-shlibs (>= 2.10.0-1), glib2-shlibs (>= 2.12.0-1), 
pango1-xft2-ft219-shlibs (>= 1.16.0-1), atk1-shlibs (>= 1.17.0-1), 
libgettext3-shlibs (>= 0.14.5-1), pcre-shlibs (>= 4.5-1), libgnomeui2-shlibs 
(>= 2.17.92-1), libbonoboui2-shlibs (>= 2.17.94-1), libgnomecanvas2-shlibs (>= 
2.14.0-1), libart2-shlibs (>= 2.3.17-1), libgnome2-shlibs (>= 2.17.92-1), 
gnome-vfs2-unified-shlibs (>= 1:2.17.91-1), aspell-shlibs (>= 0.50.5-2), 
libiconv (>= 1.10-6), libxml2-shlibs (>= 2.6.22-1), orbit2-shlibs (>= 
2.14.7-2), libbonobo2-shlibs (>= 2.17.92-1), gconf2-shlibs (>= 2.16.1-1), 
gnome-keyring-shlibs (>= 0.7.92-1), popt-shlibs (>= 1.7-6), x11-shlibs, 
tetex-base, desktop-file-utils
-BuildDepends: fontconfig2-dev (>= 2.3.2-13), freetype219 (>= 2.3.1-1), 
xft2-dev, pkgconfig (>= 0.21-1), gtk+2-dev (>= 2.10.0-1), glib2-dev (>= 
2.12.0-1), pango1-xft2-ft219-dev (>= 1.16.0-1), atk1 (>= 1.17.0-1), 
libgettext3-dev (>= 0.14.5-1), pcre (>= 4.5-1), pcre-bin (>= 4.5-1), 
libgnomeui2-dev (>= 2.17.92-1), libbonoboui2-dev (>= 2.17.94-1), 
libgnomecanvas2-dev (>= 2.14.0-1), libart2 (>= 2.3.17-1), libgnome2-dev (>= 
2.17.92-1), dbus-dev (>= 1.0-1), libhowl-dev, gnome-vfs2-unified-dev (>= 
1:2.17.91-1), aspell-dev (>= 0.50.5-2), libiconv-dev (>= 1.10-6), libxml2 (>= 
2.6.22-1), esound (>= 0.2.36-1), audiofile, orbit2-dev (>= 2.14.7-2), 
libbonobo2-dev (>= 2.17.92-1), gconf2-dev (>= 2.16.1-1), gnome-keyring-dev (>= 
0.7.92-1), libjpeg (>= 6b-16), popt (>= 1.7-6), gettext-tools (>= 0.14.5-2), 
gettext-bin (>= 0.14.5-1), x11-dev, tetex-base
+BuildDepends: expat1, glitz, cairo (>= 1.2-1), libpng3, fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, pkgconfig (>= 0.21-1), gtk+2-dev 
(>= 2.10.0-1), glib2-dev (>= 2.12.0-1), pango1-xft2-ft219-dev (>= 1.16.0-1), 
atk1 (>= 1.17.0-1), libgettext3-dev (>= 0.14.5-1), pcre (>= 4.5-1), pcre-bin 
(>= 4.5-1), libgnomeui2-dev (>= 2.17.92-1), libbonoboui2-dev (>= 2.17.94-1), 
libgnomecanvas2-dev (>= 2.14.0-1), libart2 (>= 2.3.17-1), libgnome2-dev (>= 
2.17.92-1), dbus-dev (>= 1.0-1), libhowl-dev, gnome-vfs2-unified-dev (>= 
1:2.17.91-1), aspell-dev (>= 0.50.5-2), libiconv-dev (>= 1.10-6), libxml2 (>= 
2.6.22-1), esound (>= 0.2.36-1), audiofile, orbit2-dev (>= 2.14.7-2), 
libbonobo2-dev (>= 2.17.92-1), gconf2-dev (>= 2.16.1-1), gnome-keyring-dev (>= 
0.7.92-1), libjpeg (>= 6b-16), popt (>= 1.7-6), gettext-tools (>= 0.14.5-2), 
gettext-bin (>= 0.14.5-1), x11-dev, tetex-base
 SetCFLAGS: -Os
 SetLDFLAGS: -bind_at_load
 ConfigureParams: --mandir=%p/share/man --disable-splash-screen 
--with-icon-path=%p/share/pixmaps 
--with-freedesktop_org-menu=%p/share/applications 
--with-freedesktop_org-mime=%p/share/mime --disable-update-databases 
--disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 InstallScript: <<
  #!/bin/sh -ev
- make install DESTDIR=%d
+ make -j1 install DESTDIR=%d
 <<
 PostInstScript: <<
  [ -x %p/bin/update-mime-database ] && update-mime-database %p/share/mime > 
/dev/null 2>&1 || :

Index: abiword.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/abiword.info,v
retrieving revision 1.3.2.11
retrieving revision 1.3.2.12
diff -u -d -r1.3.2.11 -r1.3.2.12
--- abiword.info8 Apr 2007 16:57:43 -   1.3.2.11
+++ abiword.info20 Apr 2007 16:25:28 -  1.3.2.12
@@ -10,6 +10,7 @@
gtk+2-shlibs (>= 2.10.0-1),
libgettext3-shlibs,
libglade2-shlibs (>= 2.6.0-3),
+   libgnomeprintui2.2-shlibs (>= 2.18.0-1),
libiconv,
libjpeg-shlibs,
libpng3-shlibs,


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/games bygfoot.info, 1.1.2.5, 1.1.2.6 dopewars.info, 1.4.2.6, 1.4.2.7 xscorch.info, 1.2, 1.2.2.1

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/main/finkinfo/games

Modified Files:
  Tag: pangocairo-branch
bygfoot.info dopewars.info xscorch.info 
Log Message:
bugfixes from buildfink

Index: bygfoot.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/bygfoot.info,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- bygfoot.info8 Apr 2007 16:57:43 -   1.1.2.5
+++ bygfoot.info20 Apr 2007 16:25:28 -  1.1.2.6
@@ -5,7 +5,7 @@
 License: GPL
 Maintainer: Gyozo Both <[EMAIL PROTECTED]>
 Depends: atk1-shlibs (>= 1.17.0-1), glib2-shlibs (>= 2.12.0-1), gtk+2-shlibs 
(>= 2.10.0-1), gettext-tools, libgettext3-shlibs, libiconv, 
pango1-xft2-ft219-shlibs (>= 1.16.0-1), x11-shlibs
-BuildDepends: cairo (>= 1.2-1), expat1, glitz, fontconfig2-dev (>= 2.3.2-13), 
freetype219 (>= 2.3.1-1), xft2-dev, atk1 (>= 1.17.0-1), glib2-dev (>= 
2.12.0-1), gtk+2-dev (>= 2.10.0-1), libgettext3-dev, libiconv-dev, 
pango1-xft2-ft219-dev (>= 1.16.0-1), pkgconfig (>= 0.21-1), x11-dev
+BuildDepends: libpng3, cairo (>= 1.2-1), expat1, glitz, fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, atk1 (>= 1.17.0-1), glib2-dev 
(>= 2.12.0-1), gtk+2-dev (>= 2.10.0-1), libgettext3-dev, libiconv-dev, 
pango1-xft2-ft219-dev (>= 1.16.0-1), pkgconfig (>= 0.21-1), x11-dev
 Source: mirror:sourceforge:%n/%n-%v.tar.bz2
 Source-MD5: db92d2f1e6b8a6fe8a12f5bac9379240
 ConfigureParams: --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config

Index: xscorch.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/xscorch.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- xscorch.info18 Jun 2006 22:36:12 -  1.2
+++ xscorch.info20 Apr 2007 16:25:28 -  1.2.2.1
@@ -2,7 +2,7 @@
 Version: 0.2.0
 Revision: 1
 Maintainer: Alexander Strange <[EMAIL PROTECTED]>
-BuildDepends: gtk+, gettext-dev, libiconv-dev
+BuildDepends: glib, gtk+, gettext-dev, libiconv-dev
 Depends: gtk+-shlibs
 Source: http://www.xscorch.org/releases/%n-%v.tar.gz 
 Source-MD5: 42862dbde1d0ebf87be30f7e04462a66
@@ -15,7 +15,7 @@
 gzcat ../xscorch-0.2.0-64bit.patch.gz | patch -p0
 <<
 ConfigureParams: --mandir=%p/share/man --enable-opt  --disable-sound 
--with-gnome --without-readline
-InstallScript: make install DESTDIR=%d
+InstallScript: make -j1 install DESTDIR=%d
 DocFiles: doc/AI doc/NOTES doc/NETWORK doc/xscorch.txt AUTHORS COPYING INSTALL 
NEWS README TODO 
 Description: Scorched Earth clone for X11
 DescDetail:<<

Index: dopewars.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/dopewars.info,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -d -r1.4.2.6 -r1.4.2.7
--- dopewars.info   8 Apr 2007 16:57:43 -   1.4.2.6
+++ dopewars.info   20 Apr 2007 16:25:28 -  1.4.2.7
@@ -3,7 +3,7 @@
 Revision: 1012
 ###
 Depends: atk1-shlibs (>= 1.17.0-1), audiofile-shlibs, esound-shlibs, 
glib2-shlibs (>= 2.12.0-1), gtk+2-shlibs (>= 2.10.0-1), gtk+2 (>= 2.10.0-1), 
libgettext3-shlibs, libiconv, libncurses5-shlibs, pango1-xft2-ft219-shlibs (>= 
1.16.0-1), sdl-shlibs, x11
-BuildDepends: atk1 (>= 1.17.0-1), audiofile, esound, fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), glib2-dev (>= 2.12.0-1), gtk+2-dev (>= 
2.10.0-1), libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, 
libncurses5, gtk-doc (>= 0.8-1), pango1-xft2-ft219-dev (>= 1.16.0-1), sdl, 
x11-dev, xft2-dev, pkgconfig (>= 0.21-1)
+BuildDepends: cairo (>= 1.2-1), glitz, expat1, libpng3, atk1 (>= 1.17.0-1), 
audiofile, esound, fontconfig2-dev (>= 2.3.2-13), freetype219 (>= 2.3.1-1), 
glib2-dev (>= 2.12.0-1), gtk+2-dev (>= 2.10.0-1), libgettext3-dev, gettext-bin, 
gettext-tools, libiconv-dev, libncurses5, gtk-doc (>= 0.8-1), 
pango1-xft2-ft219-dev (>= 1.16.0-1), sdl, x11-dev, xft2-dev, pkgconfig (>= 
0.21-1)
 ###
 #GCC: 4.0
 ###


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/crypto/finkinfo evolution-data-server.patch, 1.1, 1.1.2.1 openoffice.org.patch, 1.5, 1.5.2.1

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6130/crypto/finkinfo

Modified Files:
  Tag: pangocairo-branch
evolution-data-server.patch openoffice.org.patch 
Log Message:
bugfixes from buildfink

Index: evolution-data-server.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/evolution-data-server.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- evolution-data-server.patch 20 Jan 2006 20:16:55 -  1.1
+++ evolution-data-server.patch 20 Apr 2007 16:25:27 -  1.1.2.1
@@ -19,3 +19,24 @@
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
+diff -uNr evolution-data-server-1.10.1/configure 
evolution-data-server-1.10.1-new/configure
+--- evolution-data-server-1.10.1/configure 2007-04-09 08:48:16.0 
-0400
 evolution-data-server-1.10.1-new/configure 2007-04-14 16:52:12.0 
-0400
+@@ -25645,7 +25645,7 @@
+ #include 
+ #include 
+ #include 
+-#ifdef HAVE_GNU_GET_LIBC_VERSION
++#if 0
+ #include 
+ #endif
+ 
+@@ -25658,7 +25658,7 @@
+   size_t from_len = strlen (from), utf8_len = 20;
+   size_t utf8_real_len = strlen (utf8);
+ 
+-#ifdef HAVE_GNU_GET_LIBC_VERSION
++#if 0
+   /* glibc 2.1.2's iconv is broken in hard to test ways. */
+   if (!strcmp (gnu_get_libc_version (), "2.1.2"))
+   exit (1);

Index: openoffice.org.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/openoffice.org.patch,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- openoffice.org.patch24 Mar 2006 16:57:06 -  1.5
+++ openoffice.org.patch20 Apr 2007 16:25:27 -  1.5.2.1
@@ -798,3 +798,87 @@
  
  ALL: $(MOZFILES)
  
+diff -uNr vcl/source/glyphs/gcach_ftyp.cxx vcl-new/source/glyphs/gcach_ftyp.cxx
+--- vcl/source/glyphs/gcach_ftyp.cxx   2006-01-25 06:39:36.0 -0500
 vcl-new/source/glyphs/gcach_ftyp.cxx   2007-04-14 16:29:43.0 
-0400
+@@ -90,21 +90,25 @@
+ #define strncasecmp strnicmp
+ #endif
+ 
+-#include "freetype/internal/ftobjs.h"
+-#include "freetype/internal/sfnt.h"
+-#include "freetype/internal/ftstream.h"
+-
+ #include 
+ #include 
+ #include 
+ 
+-#if defined( FT_NEXT_SHORT ) && !defined( NEXT_Short )
+-// Account for differing versions of freetype...
+-#define NEXT_Short( x )  FT_NEXT_SHORT( x )
+-#define NEXT_UShort( x ) FT_NEXT_USHORT( x )
+-#define NEXT_Long( x )   FT_NEXT_LONG( x )
+-#define NEXT_ULong( x )  FT_NEXT_ULONG( x )
+-#endif
++#define NEXT_Short( x )   \
++  ( x += 2,   \
++( (short)( (signed   char)x[-2] << 8 ) |  \
++   (unsigned char)x[-1]) )
++
++#define NEXT_UShort( x ) ( (unsigned short)NEXT_Short( x ) )
++
++#define NEXT_Long( x )\
++  ( x += 4,   \
++( ( (long)(signed   char)x[-4] << 24 ) |  \
++  ( (long)(unsigned char)x[-3] << 16 ) |  \
++  ( (long)(unsigned char)x[-2] <<  8 ) |  \
++(long)(unsigned char)x[-1] ) )
++
++#define NEXT_ULong( x )  ( (unsigned long)NEXT_Long( x ) )
+ 
+ // ---
+ 
+@@ -2070,7 +2074,16 @@
+ // TODO: wait till all compilers accept that calling conventions
+ // for functions are the same independent of implementation constness,
+ // then uncomment the const-tokens in the function interfaces below
+-static int FT_move_to( FT_Vector* /*const*/ p0, void* vpPolyArgs )
++// 
++// Starting with FreeType 2.2, the const-ness is actually needed - it has
++// been added to the function definitions and a cast from const to non-const
++// is never explicit.
++#if FTVERSION >= 2200
++#define FT_CONST const
++#else
++#define FT_CONST
++#endif
++static int FT_move_to( FT_Vector FT_CONST* p0, void* vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast(vpPolyArgs);
+ 
+@@ -2081,14 +2094,14 @@
+ return 0;
+ }
+ 
+-static int FT_line_to( FT_Vector* /*const*/ p1, void* vpPolyArgs )
++static int FT_line_to( FT_Vector FT_CONST* p1, void* vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast(vpPolyArgs);
+ rA.AddPoint( p1->x, p1->y, POLY_NORMAL );
+ return 0;
+ }
+ 
+-static int FT_conic_to( FT_Vector* /*const*/ p1, FT_Vector* /*const*/ p2, 
void* vpPolyArgs )
++static int FT_conic_to( FT_Vector FT_CONST* p1, FT_Vector FT_CONST* p2, void* 
vpPolyArgs )
+ {
+ PolyArgs& rA = *reinterpret_cast(vpPolyArgs);
+ 
+@@ -2105,7 +2118,7 @@
+ return 0;
+ }
+ 
+-static int FT_cubic_to( FT_Vector* /*const*/ p1, FT_Vector* /*const*/ p2, 
FT_Vector* /*const*/ p3, void* vpPolyArgs )
++static int FT_cub

[cvs] dists/10.4/unstable/main/finkinfo/graphics pil-py.info,1.7,1.8

2007-04-20 Thread Jeff Whitaker
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32170

Modified Files:
pil-py.info 
Log Message:
change (nonexistant) freetype221 dep to freetype219


Index: pil-py.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/pil-py.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pil-py.info 20 Apr 2007 11:40:23 -  1.7
+++ pil-py.info 20 Apr 2007 17:34:04 -  1.8
@@ -13,8 +13,8 @@
 <<
 Source: http://effbot.org/downloads/Imaging-%v.tar.gz
 Source-MD5: 3a9b5c20ca52f0a9900512d2c7347622
-BuildDepends: tcltk-dev (>= 8.4.1-1) , libpng3, libjpeg, freetype221
-Depends: python%type_pkg[python], tcltk (>= 8.4.1-1), libpng3-shlibs, 
libjpeg-shlibs, freetype221-shlibs
+BuildDepends: tcltk-dev (>= 8.4.1-1) , libpng3, libjpeg, freetype219
+Depends: python%type_pkg[python], tcltk (>= 8.4.1-1), libpng3-shlibs, 
libjpeg-shlibs, freetype219-shlibs
 SetCFLAGS: -I/usr/X11R6/include 
 Replaces: pil
 Provides: pil
@@ -25,7 +25,7 @@
 <<
 InstallScript: <<
  #!/bin/sh -ev
- FREETYPE_ROOT=%p/lib/freetype221
+ FREETYPE_ROOT=%p/lib/freetype219
  %p/bin/python%type_raw[python] setup.py install --root=%d
  mkdir -p %i/share/doc/%n
  cp -R Docs/ %i/share/doc/%n/html


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/sci cadabra.info,1.1,1.2

2007-04-20 Thread Martin Costabel
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11727

Modified Files:
cadabra.info 
Log Message:
New version 0.111 from tracker.

Index: cadabra.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/cadabra.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cadabra.info12 Mar 2007 23:23:00 -  1.1
+++ cadabra.info20 Apr 2007 18:05:40 -  1.2
@@ -1,5 +1,5 @@
 Package: cadabra
-Version: 0.102
+Version: 0.111
 Revision: 1
 Description: Computer algebra system for field theory
 License: GPL
@@ -13,13 +13,13 @@
   glibmm2.4, breqn, applesystemfonts, gnome-icon-theme
 <<
 BuildDepends: <<
-  modglue, gtk+2-dev, x11-dev, pcre, gmp, libsigc++2, glib2-dev, 
+  modglue (>= 1.8-1), gtk+2-dev, x11-dev, pcre, gmp, libsigc++2, glib2-dev, 
   pango1-xft2-dev, atk1, glibmm2.4-dev, gtkmm2.4-dev
 <<
 
 # Unpack Phase:
 Source: http://www.aei.mpg.de/~peekas/cadabra/cadabra-%v.tar.gz
-Source-MD5: 9c22dfc8e2d9cd925af2ebc5d8ac053e
+Source-MD5: f3ff6339d22634340b4a9c60278184c1
 
 # Compile Phase:
 # GCC: 4.0
@@ -27,8 +27,8 @@
 # Install Phase:
 DocFiles: AUTHORS ChangeLog history COPYING
 InstallScript: << 
- # make test
- # make advtest
+# make test
+# make advtest
  make install DESTDIR=%d DEVDESTDIR=%d
  rm -fr %i/share/TeXmacs
  mkdir -p %i/share/doc/%n/examples


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] fink/perlmod/Fink Validation.pm,1.254,1.255

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv14168/perlmod/Fink

Modified Files:
Validation.pm 
Log Message:
need destdir for earlier otooling

Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- Validation.pm   20 Apr 2007 16:21:53 -  1.254
+++ Validation.pm   20 Apr 2007 18:12:01 -  1.255
@@ -1504,7 +1504,7 @@
 
if (-x $otool) {
if ($filename =~ /\.(dylib|jnilib|so|bundle)$/) {
-   my $file = $filename;
+   my $file = $destdir . $filename;
$file =~ s/\'/\\\'/gs;
if (open(OTOOL, "$otool -hv '$file' |"))
{


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] fink/perlmod/Fink Validation.pm,1.255,1.256

2007-04-20 Thread Benjamin Reed
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31589/perlmod/Fink

Modified Files:
Validation.pm 
Log Message:
don't check symlinks

Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- Validation.pm   20 Apr 2007 18:12:01 -  1.255
+++ Validation.pm   20 Apr 2007 20:17:07 -  1.256
@@ -1505,22 +1505,24 @@
if (-x $otool) {
if ($filename =~ /\.(dylib|jnilib|so|bundle)$/) {
my $file = $destdir . $filename;
-   $file =~ s/\'/\\\'/gs;
-   if (open(OTOOL, "$otool -hv '$file' |"))
-   {
-   while (my $line = ) {
-   if (my ($type) = $line =~ 
/MH_MAGIC.*\s+DYLIB\s+/) {
-   if ($filename !~ 
/\.(dylib|jnilib)$/) {
-   print "Warning: 
$filename is a DYLIB but it does not end in .dylib or .jnilib.\n";
-   }
-   push(@installed_dylibs, 
$filename);
-   } elsif ($line =~ /MH_MAGIC/) {
-   if ($filename =~ 
/\.dylib$/) {
-   print "Warning: 
$filename ends in .dylib but is not of filetype DYLIB according to otool.\n";
+   if (not -l $file) {
+   $file =~ s/\'/\\\'/gs;
+   if (open(OTOOL, "$otool -hv '$file' |"))
+   {
+   while (my $line = ) {
+   if (my ($type) = $line 
=~ /MH_MAGIC.*\s+DYLIB\s+/) {
+   if ($filename 
!~ /\.(dylib|jnilib)$/) {
+   print 
"Warning: $filename is a DYLIB but it does not end in .dylib or .jnilib.\n";
+   }
+   
push(@installed_dylibs, $filename);
+   } elsif ($line =~ 
/MH_MAGIC/) {
+   if ($filename 
=~ /\.dylib$/) {
+   print 
"Warning: $filename ends in .dylib but is not of filetype DYLIB according to 
otool.\n";
+   }
}
}
+   close (OTOOL);
}
-   close (OTOOL);
}
}
} else {


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] fink/perlmod/Fink ChangeLog, 1.1456, 1.1457 Validation.pm, 1.256, 1.257

2007-04-20 Thread Daniel Macks
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25889

Modified Files:
ChangeLog Validation.pm 
Log Message:
Don't keep stat()ing the otool executable.


Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- Validation.pm   20 Apr 2007 20:17:07 -  1.256
+++ Validation.pm   20 Apr 2007 22:50:40 -  1.257
@@ -1339,6 +1339,7 @@
my $val_prefix = shift;
 
chomp(my $otool = `which otool 2>/dev/null`);
+   undef $otool unless -x $otool;
my $basepath;   # %p
my $buildpath;  # BuildPath from fink.conf
# determine the base path
@@ -1502,7 +1503,7 @@
$installed_headers = 1;
}
 
-   if (-x $otool) {
+   if (defined $otool) {
if ($filename =~ /\.(dylib|jnilib|so|bundle)$/) {
my $file = $destdir . $filename;
if (not -l $file) {
@@ -1730,7 +1731,7 @@
my %shlibs_entries;
# check shlibs field
if (-f "$destdir/DEBIAN/shlibs") {
-   if (not -x $otool) {
+   if (not defined $otool) {
print "Warning: Package has shlibs data but otool is 
not in the path; skipping shlibs validation.\n";
}
if (open (SHLIBS, "$destdir/DEBIAN/shlibs")) {
@@ -1776,7 +1777,7 @@
 
for my $dylib (@installed_dylibs) {
next if (-l $destdir . $dylib);
-   if (-x $otool) {
+   if (defined $otool) {
my $dylib_temp = resolve_rooted_symlink($destdir, 
$dylib);
if (not defined $dylib_temp) {
print "Warning: unable to resolve symlink for 
$dylib.\n";

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1456
retrieving revision 1.1457
diff -u -d -r1.1456 -r1.1457
--- ChangeLog   20 Apr 2007 15:13:56 -  1.1456
+++ ChangeLog   20 Apr 2007 22:50:40 -  1.1457
@@ -1,3 +1,7 @@
+2007-04-20  Daniel Macks  <[EMAIL PROTECTED]>
+
+   * Validation.pm: pull stat($otool) out of a loop
+
 2007-04-20  Benjamin Reed  <[EMAIL PROTECTED]>
 
* Validation.pm: validate the Shlibs field for consistency


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/utils p7zip.info,1.2,1.3

2007-04-20 Thread ASARI Takashi
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21310/10.4/unstable/main/finkinfo/utils

Modified Files:
p7zip.info 
Log Message:
Version bumped. Thanks, Jean.

Index: p7zip.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/p7zip.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- p7zip.info  19 Feb 2006 00:34:55 -  1.2
+++ p7zip.info  21 Apr 2007 01:27:08 -  1.3
@@ -1,13 +1,13 @@
 Package: p7zip
-Version: 4.33
+Version: 4.44
 Revision: 1001
 GCC: 4.0
 Description: File archiver with highest compression ratio
 License: GPL/LGPL
-Maintainer: ASARI Takashi <[EMAIL PROTECTED]>
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 
 Source: mirror:sourceforge:%n/%n_%v_src_all.tar.bz2
-Source-MD5: 6333633173f6bcd851ed087402af60d2
+Source-MD5: 78b04bed16a1e7e91b5bf2f1f84ab811
 SourceDirectory: %n_%v
 
 PatchScript: /bin/cp -f makefile.macosx makefile.machine


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.3/unstable/main/finkinfo/utils p7zip.info,1.8,1.9

2007-04-20 Thread ASARI Takashi
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21310/10.3/unstable/main/finkinfo/utils

Modified Files:
p7zip.info 
Log Message:
Version bumped. Thanks, Jean.

Index: p7zip.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/p7zip.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- p7zip.info  19 Feb 2006 00:34:55 -  1.8
+++ p7zip.info  21 Apr 2007 01:27:08 -  1.9
@@ -1,13 +1,13 @@
 Package: p7zip
-Version: 4.33
+Version: 4.44
 Revision: 1
 GCC: 3.3
 Description: File archiver with highest compression ratio
 License: GPL/LGPL
-Maintainer: ASARI Takashi <[EMAIL PROTECTED]>
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 
 Source: mirror:sourceforge:%n/%n_%v_src_all.tar.bz2
-Source-MD5: 6333633173f6bcd851ed087402af60d2
+Source-MD5: 78b04bed16a1e7e91b5bf2f1f84ab811
 SourceDirectory: %n_%v
 
 PatchScript: /bin/cp -f makefile.macosx makefile.machine


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.3/unstable/main/finkinfo/utils p7zip.info,1.9,1.10

2007-04-20 Thread ASARI Takashi
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9526/10.3/unstable/main/finkinfo/utils

Modified Files:
p7zip.info 
Log Message:
Docs were spilled onto /usr/local at 4.44-1 -- Fixed.

Index: p7zip.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/p7zip.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- p7zip.info  21 Apr 2007 01:27:08 -  1.9
+++ p7zip.info  21 Apr 2007 02:23:33 -  1.10
@@ -1,6 +1,6 @@
 Package: p7zip
 Version: 4.44
-Revision: 1
+Revision: 2
 GCC: 3.3
 Description: File archiver with highest compression ratio
 License: GPL/LGPL
@@ -10,7 +10,10 @@
 Source-MD5: 78b04bed16a1e7e91b5bf2f1f84ab811
 SourceDirectory: %n_%v
 
-PatchScript: /bin/cp -f makefile.macosx makefile.machine
+PatchScript: <<
+  /usr/bin/sed -i.bak '9s|${DEST_HOME}|%i|' install.sh
+  /bin/cp -f makefile.macosx makefile.machine
+<<
 
 CompileScript: /usr/bin/make all2
 InstallScript: <<
@@ -18,10 +21,6 @@
   /usr/bin/sed -i.bak -e "2s|%i|%p|" %i/bin/7z
   /usr/bin/sed -i.bak -e "2s|%i|%p|" %i/bin/7za
   /bin/mv %i/bin/7z.bak %i/bin/7za.bak .
-  /usr/bin/install -m 755 -d %i/share/doc
-  /bin/cp -R DOCS %i/share/doc/%n
-  /usr/bin/find %i/share/doc/%n -type f | /usr/bin/xargs /bin/chmod 644
-  /usr/bin/find %i/share/doc -type d | /usr/bin/xargs /bin/chmod 755
 <<
 
 Homepage: http://p7zip.sourceforge.net/


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


[cvs] dists/10.4/unstable/main/finkinfo/utils p7zip.info,1.3,1.4

2007-04-20 Thread ASARI Takashi
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9526/10.4/unstable/main/finkinfo/utils

Modified Files:
p7zip.info 
Log Message:
Docs were spilled onto /usr/local at 4.44-1 -- Fixed.

Index: p7zip.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/p7zip.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- p7zip.info  21 Apr 2007 01:27:08 -  1.3
+++ p7zip.info  21 Apr 2007 02:23:33 -  1.4
@@ -1,6 +1,6 @@
 Package: p7zip
 Version: 4.44
-Revision: 1001
+Revision: 1002
 GCC: 4.0
 Description: File archiver with highest compression ratio
 License: GPL/LGPL
@@ -10,7 +10,10 @@
 Source-MD5: 78b04bed16a1e7e91b5bf2f1f84ab811
 SourceDirectory: %n_%v
 
-PatchScript: /bin/cp -f makefile.macosx makefile.machine
+PatchScript: <<
+  /usr/bin/sed -i.bak '9s|${DEST_HOME}|%i|' install.sh
+  /bin/cp -f makefile.macosx makefile.machine
+<<
 
 CompileScript: /usr/bin/make all2
 InstallScript: <<
@@ -18,10 +21,6 @@
   /usr/bin/sed -i.bak -e "2s|%i|%p|" %i/bin/7z
   /usr/bin/sed -i.bak -e "2s|%i|%p|" %i/bin/7za
   /bin/mv %i/bin/7z.bak %i/bin/7za.bak .
-  /usr/bin/install -m 755 -d %i/share/doc
-  /bin/cp -R DOCS %i/share/doc/%n
-  /usr/bin/find %i/share/doc/%n -type f | /usr/bin/xargs /bin/chmod 644
-  /usr/bin/find %i/share/doc -type d | /usr/bin/xargs /bin/chmod 755
 <<
 
 Homepage: http://p7zip.sourceforge.net/


-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits