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

Modified Files:
      Tag: pangocairo-branch
        connect.info gtk-gnutella.info libcurl4.info libcurl4.patch 
        postfix.info postfix.patch 
Log Message:
merge from head

Index: connect.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/connect.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- connect.info        5 Mar 2007 19:55:52 -0000       1.2.2.1
+++ connect.info        30 Apr 2007 02:48:27 -0000      1.2.2.2
@@ -5,7 +5,7 @@
 License: GPL
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 # Downloaded from http://www.taiyo.co.jp/~gotoh/ssh/connect.c
-Source: http://distfiles.hnd.jp.asi.finkmirrors.net/%n-%v.c.gz
+Source: http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/%n-%v.c.gz
 NoSourceDirectory: true
 Source-MD5: e84811ec39b51111c14875ed5f53baf9
 PatchScript: <<

Index: gtk-gnutella.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/gtk-gnutella.info,v
retrieving revision 1.6.2.10
retrieving revision 1.6.2.11
diff -u -d -r1.6.2.10 -r1.6.2.11
--- gtk-gnutella.info   2 Mar 2007 19:42:01 -0000       1.6.2.10
+++ gtk-gnutella.info   30 Apr 2007 02:48:27 -0000      1.6.2.11
@@ -1,13 +1,13 @@
 Package: gtk-gnutella
-Version: 0.96.1
-Revision: 1002
+Version: 0.96.3
+Revision: 4
 Maintainer: H. Todd Fujinaka <[EMAIL PROTECTED]>
 Source: mirror:sourceforge:%n/%n-%v.tar.bz2  
 Source-MD5: 6529379cc105c1e98f501a67e8e875fd
-Depends: gtk+2-shlibs (>= 2.10.0-1), libxml2-shlibs, libglade2-shlibs (>= 
2.6.0-3), atk1-shlibs (>= 1.17.0-1), gdk-pixbuf-shlibs, glib2-shlibs (>= 
2.12.0-1), libiconv, intltool (>= 0.35.5-1), pango1-xft2-ft219-shlibs (>= 
1.16.0-1), pth2-shlibs
-BuildDepends: glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>= 
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, glib2-dev (>= 2.12.0-1), 
gtk+2-dev (>= 2.10.0-1), libxml2, gawk, libglade2 (>= 2.6.0-3), atk1 (>= 
1.17.0-1), gdk-pixbuf, pango1-xft2-ft219-dev (>= 1.16.0-1), libiconv-dev, 
pkgconfig (>= 0.21-1), pth2-dev
+Depends: dbus-shlibs, gtk+2-shlibs (>= 2.10.0-1), libxml2-shlibs, 
libglade2-shlibs (>= 2.6.0-3), atk1-shlibs (>= 1.17.0-1), glib2-shlibs (>= 
2.12.0-1), libiconv, intltool (>= 0.35.5-1), pango1-xft2-ft219-shlibs (>= 
1.16.0-1), pth2-shlibs
+BuildDepends: glitz, dbus-dev, expat1, libpng3, cairo (>= 1.2-1), 
fontconfig2-dev (>= 2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, glib2-dev 
(>= 2.12.0-1), gtk+2-dev (>= 2.10.0-1), libxml2, gawk, libglade2 (>= 2.6.0-3), 
atk1 (>= 1.17.0-1), pango1-xft2-ft219-dev (>= 1.16.0-1), libiconv-dev, 
pkgconfig (>= 0.21-1), pth2-dev
 CompileScript: <<
-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 sh Configure  -d -e -r 
-s -D prefix="%p" -D 'gtkversion=2' -D privlib='%p/share/gtk-gnutella' -D 
sysman='%p/share/man' -D libpth='%p/lib /usr/lib' -Doffficial=true
+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 sh Configure  -d -e -r 
-s -D prefix="%p" -D 'gtkversion=2' -D privlib='%p/share/gtk-gnutella' -D 
sysman='%p/share/man' -D libpth='%p/lib /usr/lib' -Doffficial=true -A 
define:zlib=yes -Dldflags='-lz'
 <<
 InstallScript: <<
   make install INSTALL_PREFIX=%d

Index: postfix.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/postfix.info,v
retrieving revision 1.12.2.6
retrieving revision 1.12.2.7
diff -u -d -r1.12.2.6 -r1.12.2.7
--- postfix.info        11 Apr 2007 15:24:59 -0000      1.12.2.6
+++ postfix.info        30 Apr 2007 02:48:27 -0000      1.12.2.7
@@ -108,7 +108,7 @@
 Source-MD5: 45c56b112a6cd9ba08ac99dfd734ea9d
 
 PatchFile: %{ni}.patch
-PatchFile-MD5: 57bab4ac93a4f9561fbed212ba696885
+PatchFile-MD5: 31684b35b796746b483b36191a250abf
 PatchScript: <<
 sed 's|@FINKPREFIX@|%p|g ' <%{PatchFile} | patch -p1
 perl -pi.bak -e's,/(etc|var/spool)/postfix,%p/\1/postfix,g; 
s,/etc/aliases,%p/etc/postfix/aliases,g' man/man1/* man/man5/* man/man8/* 
conf/* html/*.html README_FILES/*

Index: libcurl4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libcurl4.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- libcurl4.patch      22 Feb 2007 13:09:25 -0000      1.1.2.2
+++ libcurl4.patch      30 Apr 2007 02:48:27 -0000      1.1.2.3
@@ -1,190 +1,26 @@
-diff -ru curl-7.16.1.orig/curl-config.in curl-7.16.1/curl-config.in
---- curl-7.16.1.orig/curl-config.in    2006-05-02 18:48:22.000000000 -0400
-+++ curl-7.16.1/curl-config.in 2007-01-29 14:06:21.000000000 -0500
-@@ -181,7 +181,7 @@
-               ;;
- 
-     --libs)
--              echo [EMAIL PROTECTED]@ -lcurl @LDFLAGS@ @LIBS@
-+              echo @LDFLAGS@ [EMAIL PROTECTED]@ -lcurl @LIBS@
-               ;;
+diff -ru curl-7.16.2.orig/curl-config.in curl-7.16.2/curl-config.in
+--- curl-7.16.2.orig/curl-config.in    2007-02-18 04:41:27.000000000 -0500
++++ curl-7.16.2/curl-config.in 2007-04-11 10:23:59.000000000 -0400
+@@ -187,9 +187,9 @@
+          CURLLIBDIR=""
+       fi
+       if test "[EMAIL PROTECTED]@" = "Xyes"; then
+-        echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
++        echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@
+       else
+-        echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
++        echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBS@
+       fi
+       ;;
  
-     *)
-diff -ru curl-7.16.1.orig/libcurl.pc.in curl-7.16.1/libcurl.pc.in
---- curl-7.16.1.orig/libcurl.pc.in     2007-01-02 07:14:21.000000000 -0500
-+++ curl-7.16.1/libcurl.pc.in  2007-01-29 14:06:21.000000000 -0500
+diff -ru curl-7.16.2.orig/libcurl.pc.in curl-7.16.2/libcurl.pc.in
+--- curl-7.16.2.orig/libcurl.pc.in     2007-02-18 04:41:27.000000000 -0500
++++ curl-7.16.2/libcurl.pc.in  2007-04-11 10:24:28.000000000 -0400
 @@ -33,6 +33,6 @@
  URL: http://curl.haxx.se/
  Description: Library to transfer files with ftp, http, etc.
  Version: @VERSION@
--Libs: -L${libdir} -lcurl @LDFLAGS@
--Libs.private: @LIBS@
-+Libs: -L${libdir} -lcurl
-+Libs.private: @LDFLAGS@ @LIBS@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
++Libs: @LDFLAGS@ -L${libdir} -lcurl @LIBS@
+ Libs.private: @LIBCURL_LIBS@ @LIBS@
  Cflags: -I${includedir}
-diff -ru curl-7.16.1.orig/tests/libtest/Makefile.am 
curl-7.16.1/tests/libtest/Makefile.am
---- curl-7.16.1.orig/tests/libtest/Makefile.am 2007-01-29 05:09:06.000000000 
-0500
-+++ curl-7.16.1/tests/libtest/Makefile.am      2007-01-29 14:09:54.000000000 
-0500
-@@ -133,11 +133,11 @@
- lib526_CFLAGS = -DLIB526
- lib526_DEPENDENCIES = $(DEPENDENCIES)
- 
--lib527_SOURCES = lib526.c $(SUPPORTFILES)
-+lib527_SOURCES = lib526.c $(SUPPORTFILES) $(TIMEVAL)
- lib527_CFLAGS = -DLIB527
- lib527_DEPENDENCIES = $(DEPENDENCIES)
- 
--lib529_SOURCES = lib525.c $(SUPPORTFILES)
-+lib529_SOURCES = lib525.c $(SUPPORTFILES) $(TIMEVAL)
- lib529_CFLAGS = -DLIB529
- lib529_DEPENDENCIES = $(DEPENDENCIES)
- 
-@@ -145,7 +145,7 @@
- lib530_CFLAGS = -DLIB530
- lib530_DEPENDENCIES = $(DEPENDENCIES)
- 
--lib532_SOURCES = lib526.c $(SUPPORTFILES)
-+lib532_SOURCES = lib526.c $(SUPPORTFILES) $(TIMEVAL)
- lib532_CFLAGS = -DLIB532
- lib532_DEPENDENCIES = $(DEPENDENCIES)
- 
-diff -ru curl-7.16.1.orig/tests/libtest/Makefile.in 
curl-7.16.1/tests/libtest/Makefile.in
---- curl-7.16.1.orig/tests/libtest/Makefile.in 2007-01-29 05:11:37.000000000 
-0500
-+++ curl-7.16.1/tests/libtest/Makefile.in      2007-01-29 14:10:21.000000000 
-0500
-@@ -143,21 +143,27 @@
- lib526_OBJECTS = $(am_lib526_OBJECTS)
- lib526_LDADD = $(LDADD)
- am__objects_5 = lib527-first.$(OBJEXT)
--am_lib527_OBJECTS = lib527-lib526.$(OBJEXT) $(am__objects_5)
-+am__objects_6 = lib527-timeval.$(OBJEXT)
-+am_lib527_OBJECTS = lib527-lib526.$(OBJEXT) $(am__objects_5) \
-+      $(am__objects_6)
- lib527_OBJECTS = $(am_lib527_OBJECTS)
- lib527_LDADD = $(LDADD)
--am__objects_6 = lib529-first.$(OBJEXT)
--am_lib529_OBJECTS = lib529-lib525.$(OBJEXT) $(am__objects_6)
-+am__objects_7 = lib529-first.$(OBJEXT)
-+am__objects_8 = lib529-timeval.$(OBJEXT)
-+am_lib529_OBJECTS = lib529-lib525.$(OBJEXT) $(am__objects_7) \
-+      $(am__objects_8)
- lib529_OBJECTS = $(am_lib529_OBJECTS)
- lib529_LDADD = $(LDADD)
--am__objects_7 = lib530-first.$(OBJEXT)
--am__objects_8 = lib530-timeval.$(OBJEXT)
--am_lib530_OBJECTS = lib530-lib530.$(OBJEXT) $(am__objects_7) \
--      $(am__objects_8)
-+am__objects_9 = lib530-first.$(OBJEXT)
-+am__objects_10 = lib530-timeval.$(OBJEXT)
-+am_lib530_OBJECTS = lib530-lib530.$(OBJEXT) $(am__objects_9) \
-+      $(am__objects_10)
- lib530_OBJECTS = $(am_lib530_OBJECTS)
- lib530_LDADD = $(LDADD)
--am__objects_9 = lib532-first.$(OBJEXT)
--am_lib532_OBJECTS = lib532-lib526.$(OBJEXT) $(am__objects_9)
-+am__objects_11 = lib532-first.$(OBJEXT)
-+am__objects_12 = lib532-timeval.$(OBJEXT)
-+am_lib532_OBJECTS = lib532-lib526.$(OBJEXT) $(am__objects_11) \
-+      $(am__objects_12)
- lib532_OBJECTS = $(am_lib532_OBJECTS)
- lib532_LDADD = $(LDADD)
- am_lib533_OBJECTS = lib533.$(OBJEXT) $(am__objects_1) $(am__objects_2)
-@@ -457,16 +463,16 @@
- lib526_SOURCES = lib526.c $(SUPPORTFILES) $(TIMEVAL)
- lib526_CFLAGS = -DLIB526
- lib526_DEPENDENCIES = $(DEPENDENCIES)
--lib527_SOURCES = lib526.c $(SUPPORTFILES)
-+lib527_SOURCES = lib526.c $(SUPPORTFILES) $(TIMEVAL)
- lib527_CFLAGS = -DLIB527
- lib527_DEPENDENCIES = $(DEPENDENCIES)
--lib529_SOURCES = lib525.c $(SUPPORTFILES)
-+lib529_SOURCES = lib525.c $(SUPPORTFILES) $(TIMEVAL)
- lib529_CFLAGS = -DLIB529
- lib529_DEPENDENCIES = $(DEPENDENCIES)
- lib530_SOURCES = lib530.c $(SUPPORTFILES) $(TIMEVAL)
- lib530_CFLAGS = -DLIB530
- lib530_DEPENDENCIES = $(DEPENDENCIES)
--lib532_SOURCES = lib526.c $(SUPPORTFILES)
-+lib532_SOURCES = lib526.c $(SUPPORTFILES) $(TIMEVAL)
- lib532_CFLAGS = -DLIB532
- lib532_DEPENDENCIES = $(DEPENDENCIES)
- lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TIMEVAL)
-@@ -652,13 +658,16 @@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
- @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
-@@ -769,6 +778,20 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib527_CFLAGS) $(CFLAGS) -c -o lib527-first.obj 
`if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) 
'$(srcdir)/first.c'; fi`
- 
-+lib527-timeval.o: $(top_srcdir)/lib/timeval.c
[EMAIL PROTECTED]@      if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib527_CFLAGS) $(CFLAGS) -MT lib527-timeval.o -MD 
-MP -MF "$(DEPDIR)/lib527-timeval.Tpo" -c -o lib527-timeval.o `test -f 
'$(top_srcdir)/lib/timeval.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/timeval.c; 
\
[EMAIL PROTECTED]@      then mv -f "$(DEPDIR)/lib527-timeval.Tpo" 
"$(DEPDIR)/lib527-timeval.Po"; else rm -f "$(DEPDIR)/lib527-timeval.Tpo"; exit 
1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$(top_srcdir)/lib/timeval.c' 
object='lib527-timeval.o' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib527_CFLAGS) $(CFLAGS) -c -o lib527-timeval.o 
`test -f '$(top_srcdir)/lib/timeval.c' || echo 
'$(srcdir)/'`$(top_srcdir)/lib/timeval.c
-+
-+lib527-timeval.obj: $(top_srcdir)/lib/timeval.c
[EMAIL PROTECTED]@      if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib527_CFLAGS) $(CFLAGS) -MT lib527-timeval.obj 
-MD -MP -MF "$(DEPDIR)/lib527-timeval.Tpo" -c -o lib527-timeval.obj `if test -f 
'$(top_srcdir)/lib/timeval.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/timeval.c'; 
else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/timeval.c'; fi`; \
[EMAIL PROTECTED]@      then mv -f "$(DEPDIR)/lib527-timeval.Tpo" 
"$(DEPDIR)/lib527-timeval.Po"; else rm -f "$(DEPDIR)/lib527-timeval.Tpo"; exit 
1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$(top_srcdir)/lib/timeval.c' 
object='lib527-timeval.obj' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib527_CFLAGS) $(CFLAGS) -c -o lib527-timeval.obj 
`if test -f '$(top_srcdir)/lib/timeval.c'; then $(CYGPATH_W) 
'$(top_srcdir)/lib/timeval.c'; else $(CYGPATH_W) 
'$(srcdir)/$(top_srcdir)/lib/timeval.c'; fi`
-+
- lib529-lib525.o: lib525.c
- @am__fastdepCC_TRUE@  if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib529_CFLAGS) $(CFLAGS) -MT lib529-lib525.o -MD 
-MP -MF "$(DEPDIR)/lib529-lib525.Tpo" -c -o lib529-lib525.o `test -f 'lib525.c' 
|| echo '$(srcdir)/'`lib525.c; \
- @am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/lib529-lib525.Tpo" 
"$(DEPDIR)/lib529-lib525.Po"; else rm -f "$(DEPDIR)/lib529-lib525.Tpo"; exit 1; 
fi
-@@ -797,6 +820,20 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib529_CFLAGS) $(CFLAGS) -c -o lib529-first.obj 
`if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) 
'$(srcdir)/first.c'; fi`
- 
-+lib529-timeval.o: $(top_srcdir)/lib/timeval.c
[EMAIL PROTECTED]@      if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib529_CFLAGS) $(CFLAGS) -MT lib529-timeval.o -MD 
-MP -MF "$(DEPDIR)/lib529-timeval.Tpo" -c -o lib529-timeval.o `test -f 
'$(top_srcdir)/lib/timeval.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/timeval.c; 
\
[EMAIL PROTECTED]@      then mv -f "$(DEPDIR)/lib529-timeval.Tpo" 
"$(DEPDIR)/lib529-timeval.Po"; else rm -f "$(DEPDIR)/lib529-timeval.Tpo"; exit 
1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$(top_srcdir)/lib/timeval.c' 
object='lib529-timeval.o' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib529_CFLAGS) $(CFLAGS) -c -o lib529-timeval.o 
`test -f '$(top_srcdir)/lib/timeval.c' || echo 
'$(srcdir)/'`$(top_srcdir)/lib/timeval.c
-+
-+lib529-timeval.obj: $(top_srcdir)/lib/timeval.c
[EMAIL PROTECTED]@      if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib529_CFLAGS) $(CFLAGS) -MT lib529-timeval.obj 
-MD -MP -MF "$(DEPDIR)/lib529-timeval.Tpo" -c -o lib529-timeval.obj `if test -f 
'$(top_srcdir)/lib/timeval.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/timeval.c'; 
else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/timeval.c'; fi`; \
[EMAIL PROTECTED]@      then mv -f "$(DEPDIR)/lib529-timeval.Tpo" 
"$(DEPDIR)/lib529-timeval.Po"; else rm -f "$(DEPDIR)/lib529-timeval.Tpo"; exit 
1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$(top_srcdir)/lib/timeval.c' 
object='lib529-timeval.obj' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib529_CFLAGS) $(CFLAGS) -c -o lib529-timeval.obj 
`if test -f '$(top_srcdir)/lib/timeval.c'; then $(CYGPATH_W) 
'$(top_srcdir)/lib/timeval.c'; else $(CYGPATH_W) 
'$(srcdir)/$(top_srcdir)/lib/timeval.c'; fi`
-+
- lib530-lib530.o: lib530.c
- @am__fastdepCC_TRUE@  if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib530_CFLAGS) $(CFLAGS) -MT lib530-lib530.o -MD 
-MP -MF "$(DEPDIR)/lib530-lib530.Tpo" -c -o lib530-lib530.o `test -f 'lib530.c' 
|| echo '$(srcdir)/'`lib530.c; \
- @am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/lib530-lib530.Tpo" 
"$(DEPDIR)/lib530-lib530.Po"; else rm -f "$(DEPDIR)/lib530-lib530.Tpo"; exit 1; 
fi
-@@ -867,6 +904,20 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib532_CFLAGS) $(CFLAGS) -c -o lib532-first.obj 
`if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) 
'$(srcdir)/first.c'; fi`
- 
-+lib532-timeval.o: $(top_srcdir)/lib/timeval.c
[EMAIL PROTECTED]@      if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib532_CFLAGS) $(CFLAGS) -MT lib532-timeval.o -MD 
-MP -MF "$(DEPDIR)/lib532-timeval.Tpo" -c -o lib532-timeval.o `test -f 
'$(top_srcdir)/lib/timeval.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/timeval.c; 
\
[EMAIL PROTECTED]@      then mv -f "$(DEPDIR)/lib532-timeval.Tpo" 
"$(DEPDIR)/lib532-timeval.Po"; else rm -f "$(DEPDIR)/lib532-timeval.Tpo"; exit 
1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$(top_srcdir)/lib/timeval.c' 
object='lib532-timeval.o' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib532_CFLAGS) $(CFLAGS) -c -o lib532-timeval.o 
`test -f '$(top_srcdir)/lib/timeval.c' || echo 
'$(srcdir)/'`$(top_srcdir)/lib/timeval.c
-+
-+lib532-timeval.obj: $(top_srcdir)/lib/timeval.c
[EMAIL PROTECTED]@      if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib532_CFLAGS) $(CFLAGS) -MT lib532-timeval.obj 
-MD -MP -MF "$(DEPDIR)/lib532-timeval.Tpo" -c -o lib532-timeval.obj `if test -f 
'$(top_srcdir)/lib/timeval.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/timeval.c'; 
else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/timeval.c'; fi`; \
[EMAIL PROTECTED]@      then mv -f "$(DEPDIR)/lib532-timeval.Tpo" 
"$(DEPDIR)/lib532-timeval.Po"; else rm -f "$(DEPDIR)/lib532-timeval.Tpo"; exit 
1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='$(top_srcdir)/lib/timeval.c' 
object='lib532-timeval.obj' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@      $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(lib532_CFLAGS) $(CFLAGS) -c -o lib532-timeval.obj 
`if test -f '$(top_srcdir)/lib/timeval.c'; then $(CYGPATH_W) 
'$(top_srcdir)/lib/timeval.c'; else $(CYGPATH_W) 
'$(srcdir)/$(top_srcdir)/lib/timeval.c'; fi`
-+
- mostlyclean-libtool:
-       -rm -f *.lo
- 

Index: postfix.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/postfix.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- postfix.patch       20 Dec 2006 18:01:11 -0000      1.1.2.1
+++ postfix.patch       30 Apr 2007 02:48:27 -0000      1.1.2.2
@@ -73,7 +73,7 @@
 +                      echo 'yes.'
 +                      
 +                      if [ -f /usr/sbin/sendmail.old ] ; then
-+                              \bin/echo '/usr/sbin/sendmail.old already 
exists. Would you like to overwrite it [yN]? \c'
++                              /bin/echo '/usr/sbin/sendmail.old already 
exists. Would you like to overwrite it [yN]? \c'
 +                              
 +                              read ANS
 +                              case "$ANS" in

Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libcurl4.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
--- libcurl4.info       26 Mar 2007 15:03:29 -0000      1.2.2.4
+++ libcurl4.info       30 Apr 2007 02:48:27 -0000      1.2.2.5
@@ -1,6 +1,6 @@
 Package: libcurl4
-Version: 7.16.1
-Revision: 4
+Version: 7.16.2
+Revision: 1
 Description: Lib. for transferring files with URL syntax
 DescPackaging: <<
   Now use System's OpenSSL.
@@ -14,7 +14,7 @@
   link to -lss -lcrypt -lssh2.
   
   No longer need --mandir. Private symbols now hidden with gcc 4.
-  Move libcurl.pc to %p/share/pkgconfig and depend on pkgconfig >= 0.20-1
+  Depend on pkgconfig >= 0.20-1
   per http://wiki.finkproject.org/index.php/Fink:Packaging:pkg-config
   
   Versions of curl before 7.11.1-11 were maintained by Max Horn.
@@ -24,7 +24,7 @@
 License: OSI-Approved
 
 Source: http://curl.haxx.se/download/curl-%v.tar.bz2
-Source-MD5: acdab0b0467c55e10ed02d2afed80575
+Source-MD5: 37a1de15c4300ca9413d39d2bcea9b36
 
 Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1)
 BuildDepends: system-openssl-dev, fink (>= 0.25.0), libssh2
@@ -33,7 +33,7 @@
 BuildDependsOnly: True
 
 PatchFile: %n.patch
-PatchFile-MD5: f14a23c473d70869ff47e4f505db935e
+PatchFile-MD5: 2ce99b9ff92f43cbe72b39647bc8bae0
 
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
@@ -46,7 +46,6 @@
   /bin/cp docs/libcurl/*.html %I/share/doc/%N/libcurl
   /bin/mkdir -p %I/share/aclocal
   /bin/cp docs/libcurl/libcurl.m4 %I/share/aclocal
-  /bin/mv %I/lib/pkgconfig %I/share
 <<
 DocFiles: CHANGES COPYING README RELEASE-NOTES
 
@@ -89,12 +88,30 @@
   TestScript:<<
     #!/bin/bash -ev
     
-    #This patch disables tests 518 and 537 which don't work on Darwin
-    echo '518' >>tests/data/DISABLED
-    echo '537' >>tests/data/DISABLED
+    #These tests fail intermittently on i386 but not powerpc.
+    #Haven't been able to figure out why.
+    #It's believed to be an issue with the test system, not libcurl itself.
+    if [ "%m" == "i386" ]; then
+       echo '503' >>tests/data/DISABLED
+       echo '530' >>tests/data/DISABLED
+       echo '531' >>tests/data/DISABLED
+    fi
     
-    #Fix expired cookie in test 62
-    perl -pi -e 's/1170327387/2054030187/g' tests/data/test62
+    #These scp/sftp tests can't be run as root.
+    echo '600' >>tests/data/DISABLED
+    echo '601' >>tests/data/DISABLED
+    echo '602' >>tests/data/DISABLED
+    echo '603' >>tests/data/DISABLED
+    echo '604' >>tests/data/DISABLED
+    echo '605' >>tests/data/DISABLED
+    echo '606' >>tests/data/DISABLED
+    echo '607' >>tests/data/DISABLED
+    echo '608' >>tests/data/DISABLED
+    echo '609' >>tests/data/DISABLED
+    
+    #Someone actually registered non-existing-host.com
+    #which causes test 534 to fail.
+    perl -pi -e 's/non-existing-host.com/non-existing-host.haxx.se/;' 
tests/data/test534
     
     #Build and run the tests
     make test-full || exit 2


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

Reply via email to