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

Modified Files:
      Tag: pangocairo-branch
        curl-unified.info erc.info lftp.info libcurl3-unified.info 
        libcurl4.info net-snmp-unified.info postfix-10.5.info 
        postfix.info qtm.info xtraceroute.info yaz.info 
Added Files:
      Tag: pangocairo-branch
        net-snmp-unified.patch 
Log Message:
merge from trunk

Index: lftp.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/lftp.info,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- lftp.info   28 Sep 2007 16:34:30 -0000      1.3.2.2
+++ lftp.info   3 Nov 2007 20:25:29 -0000       1.3.2.3
@@ -1,6 +1,6 @@
 Package: lftp
-Version: 3.5.4
-Revision: 1011
+Version: 3.6.0
+Revision: 1
 ###
 Depends: expat1-shlibs, libgettext3-shlibs, libiconv, libncurses5-shlibs (>= 
5.4-20041023-1006), readline5-shlibs (>= 5.0-1004)
 BuildDepends: expat1, libgettext3-dev, libiconv-dev, libncurses5 (>= 
5.4-20041023-1006), readline5 (>= 5.0-1004), system-openssl-dev
@@ -12,17 +12,9 @@
 <<
 ###
 Source: mirror:custom:lftp-%v.tar.bz2
-Source-MD5: 1c7f49822793d03588fd4080c40281a7
+Source-MD5: bb19dac3cd3f1b43b3074bfd2ca9785b
 ###
 PatchScript: <<
-  ### Fix getopt linking in lftp (multi defs)
-  #perl -pi -e 's,\*\) LIBOBJS="\$LIBOBJS getopt.\$ac_objext" ;;,\*\) 
LIBOBJS="\$LIBOBJS" ;;,g' configure
-  #perl -pi -e 's,\*\) LIBOBJS="\$LIBOBJS getopt1.\$ac_objext" ;;,\*\) 
LIBOBJS="\$LIBOBJS" ;;,g' configure
-
-  ### Fix for resolv.h
-  #perl -pi -e 's,\$ac_includes_default,\$ac_includes_default\n#include 
\<netinet/in.h\>\n#include \<arpa/nameser.h\>,g' configure
-  #perl -pi -e 's,\#include \<resolv.h\>,\#include \<nameser.h\>\n\#include 
\<resolv.h\>,g' configure
-
   ### Fix libtool relink
   perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
 
@@ -32,6 +24,9 @@
   ### lftp 3.4.7 redef of srandom
   perl -pi -e 's,CDECL void srandom\(unsigned seed\);,,g' src/ResMgr.cc
 
+  ### 10.5 fix for unsetenv
+  perl -pi -e 's,if HAVE_UNSETENV,if \!HAVE_UNSETENV,g' src/misc.cc
+
   ### don't link against already-installed version
   perl -pi -e 's/-L\$\(DESTDIR\)\$\(pkgverlibdir\)//g' src/Makefile.in
 <<

Index: postfix-10.5.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/postfix-10.5.info,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- postfix-10.5.info   18 Sep 2007 00:27:37 -0000      1.1.2.4
+++ postfix-10.5.info   3 Nov 2007 20:25:29 -0000       1.1.2.5
@@ -1,7 +1,7 @@
 Info2: <<
 Package: postfix%type_pkg[-mysql]%type_pkg[-ldap]
-Version: 2.4.5
-Revision: 1101
+Version: 2.4.6
+Revision: 101
 Type: -mysql (boolean), -ldap (boolean)
 Distribution: 10.5
 
@@ -106,7 +106,7 @@
 Recommends: cyrus-sasl2
 
 Source: 
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%v.tar.gz
-Source-MD5: ceba0cde05d12baa0ba2ed69fbb96b42
+Source-MD5: 303327f66c13ff9631734651ee184a88
 
 PatchFile: %{ni}.patch
 PatchFile-MD5: 31684b35b796746b483b36191a250abf

Index: xtraceroute.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/xtraceroute.info,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- xtraceroute.info    5 Oct 2007 18:16:14 -0000       1.2.2.2
+++ xtraceroute.info    3 Nov 2007 20:25:29 -0000       1.2.2.3
@@ -8,6 +8,7 @@
 BuildDepends: glib, gtk+, gdk-pixbuf, orbit-dev, imlib, esound, gettext-dev, 
gettext-bin, gettext-tools, fink (>= 0.20.1-1)
 UpdateConfigGuess: true
 ConfigureParams: --mandir='%p/share/man' --datadir='%p/share'
+SetLDFLAGS: 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 UpdatePOD: true
 CompileScript: <<
 #!/bin/sh -ev

Index: yaz.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/yaz.info,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- yaz.info    18 Sep 2007 00:27:38 -0000      1.3.2.2
+++ yaz.info    3 Nov 2007 20:25:30 -0000       1.3.2.3
@@ -1,8 +1,8 @@
 Package: yaz
 Version: 3.0.10
-Revision: 1004
+Revision: 1005
 Source: http://ftp.indexdata.dk/pub/%n/%n-%v.tar.gz
-Depends: %N-shlibs (= %v-%r), libiconv, libxml2-shlibs, libxslt-shlibs, 
libgettext3-shlibs, libncurses5-shlibs
+Depends: %N-shlibs (= %v-%r), libiconv, libxml2-shlibs, libxslt-shlibs, 
libgettext3-shlibs, libncurses5-shlibs, pkgconfig (>= 0.21-1)
 BuildDepends: libiconv-dev, libiconv-dev, libxml2, libxslt, gettext-tools, 
libgettext3-dev, libxml2-bin, libncurses5
 Maintainer: Jack Fink <[EMAIL PROTECTED]>
 Homepage: http://www.indexdata.dk/yaz

Index: postfix.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/postfix.info,v
retrieving revision 1.12.2.11
retrieving revision 1.12.2.12
diff -u -d -r1.12.2.11 -r1.12.2.12
--- postfix.info        13 Aug 2007 15:56:22 -0000      1.12.2.11
+++ postfix.info        3 Nov 2007 20:25:29 -0000       1.12.2.12
@@ -1,7 +1,7 @@
 Info2: <<
 Package: postfix%type_pkg[-mysql]%type_pkg[-ldap]
-Version: 2.4.5
-Revision: 1001
+Version: 2.4.6
+Revision: 1
 Type: -mysql (boolean), -ldap (boolean)
 Distribution: 10.3, 10.4
 
@@ -106,7 +106,7 @@
 Recommends: cyrus-sasl2
 
 Source: 
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%v.tar.gz
-Source-MD5: ceba0cde05d12baa0ba2ed69fbb96b42
+Source-MD5: 303327f66c13ff9631734651ee184a88
 
 PatchFile: %{ni}.patch
 PatchFile-MD5: 31684b35b796746b483b36191a250abf

Index: net-snmp-unified.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/net-snmp-unified.info,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- net-snmp-unified.info       28 Sep 2007 16:34:30 -0000      1.1.2.4
+++ net-snmp-unified.info       3 Nov 2007 20:25:29 -0000       1.1.2.5
@@ -1,6 +1,6 @@
 Package: net-snmp-unified
-Version: 5.4
-Revision: 1023
+Version: 5.4.1
+Revision: 1
 Description: SNMP tools and libraries
 License: BSD
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -27,8 +27,11 @@
 <<
 
 Source: mirror:sourceforge:net-snmp/net-snmp-%v.tar.gz
-Source-MD5: 46d893281056ff476e597659cb91574d
-PatchScript:   perl -pi -e 's/#include <kvm.h>/$&\nkvm_t *kd;/' 
agent/mibgroup/host/hr_swrun.c
+Source-MD5: 6c974df7a5a5b1579f72115e6b045bda
+PatchScript: <<
+       perl -pi -e 's/#include <kvm.h>/$&\nkvm_t *kd;/' 
agent/mibgroup/host/hr_swrun.c
+       patch -p1 --fuzz=4 < %a/%n.patch
+<<
 
 SetCPPFLAGS: -I%p/lib/system-openssl/include
 SetLDFLAGS: -L%p/lib/system-openssl/lib
@@ -76,11 +79,11 @@
        DocFiles: COPYING
        Files: lib/libnetsnmp*.15*.dylib
        Shlibs: <<
-               %p/lib/libnetsnmp.15.dylib        16.0.0 
net-snmp-unified15-shlibs (>= 5.4-1)
-               %p/lib/libnetsnmpagent.15.dylib   16.0.0 
net-snmp-unified15-shlibs (>= 5.4-1)
-               %p/lib/libnetsnmphelpers.15.dylib 16.0.0 
net-snmp-unified15-shlibs (>= 5.4-1)
-               %p/lib/libnetsnmpmibs.15.dylib    16.0.0 
net-snmp-unified15-shlibs (>= 5.4-1)
-               %p/lib/libnetsnmptrapd.15.dylib   16.0.0 
net-snmp-unified15-shlibs (>= 5.4-1)
+               %p/lib/libnetsnmp.15.dylib        17.0.0 
net-snmp-unified15-shlibs (>= 5.4.1-1)
+               %p/lib/libnetsnmpagent.15.dylib   17.0.0 
net-snmp-unified15-shlibs (>= 5.4.1-1)
+               %p/lib/libnetsnmphelpers.15.dylib 17.0.0 
net-snmp-unified15-shlibs (>= 5.4.1-1)
+               %p/lib/libnetsnmpmibs.15.dylib    17.0.0 
net-snmp-unified15-shlibs (>= 5.4.1-1)
+               %p/lib/libnetsnmptrapd.15.dylib   17.0.0 
net-snmp-unified15-shlibs (>= 5.4.1-1)
        <<
 <<
 SplitOff2: <<

Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libcurl4.info,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -d -r1.2.2.8 -r1.2.2.9
--- libcurl4.info       18 Sep 2007 00:27:37 -0000      1.2.2.8
+++ libcurl4.info       3 Nov 2007 20:25:29 -0000       1.2.2.9
@@ -1,5 +1,5 @@
 Package: libcurl4
-Version: 7.17.0
+Version: 7.17.1
 Revision: 1
 Description: Lib. for transferring files with URL syntax
 DescPackaging: <<
@@ -26,7 +26,7 @@
 License: OSI-Approved
 
 Source: http://curl.haxx.se/download/curl-%v.tar.bz2
-Source-MD5: b529a8d2778c8ad09c33d9bbddee7e44
+Source-MD5: 1fa635d1dfde8337c98c82749d75c1de
 
 Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1)
 BuildDepends: system-openssl-dev, fink (>= 0.25.0), libssh2.1 (>= 0.17-1)
@@ -39,6 +39,7 @@
 
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
+SetCFLAGS: -g -Os
 ConfigureParams: <<
        --with-ssl=%p/lib/system-openssl \
        --without-gnutls \
@@ -65,7 +66,7 @@
   
   Depends: libssh2.1-shlibs (>= 0.17-1)
     
-  Files: lib/libcurl.4.0.0.dylib lib/libcurl.4.dylib
+  Files: lib/libcurl.4.0.1.dylib lib/libcurl.4.dylib
   Shlibs: %p/lib/libcurl.4.dylib 5.0.0 %n (>= 7.16.0-1)
   DocFiles: CHANGES COPYING README RELEASE-NOTES
 <<
@@ -90,7 +91,7 @@
 SplitOff4: <<
   Package: curl-unified
   Description: OBSOLETE use curl instead
-  Depends: curl (= %v-%r), fink-obsolete-packages
+  Depends: curl (= %v-%r)
   DocFiles: CHANGES COPYING README RELEASE-NOTES
 <<
 
@@ -125,7 +126,8 @@
     echo '613' >>tests/data/DISABLED
     echo '614' >>tests/data/DISABLED
     echo '615' >>tests/data/DISABLED
-
+       echo '2004' >>tests/data/DISABLED
+       
     #Build and run the tests
     make test-full || exit 2
   <<

Index: qtm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/qtm.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
--- qtm.info    17 Oct 2007 17:36:30 -0000      1.1.2.5
+++ qtm.info    3 Nov 2007 20:25:29 -0000       1.1.2.6
@@ -1,5 +1,5 @@
 Package: qtm
-Version: 0.5.5
+Version: 0.5.6.1
 Revision: 1002
 Source: mirror:sourceforge:catkin/%n-%v.tar.gz
 Depends: libgettext3-shlibs, libiconv, libpng3-shlibs, qt4-x11-core-shlibs, 
qt4-x11-gui-shlibs, x11, x11-shlibs
@@ -9,7 +9,7 @@
 Homepage: http://qtm.blogistan.co.uk
 License: GPL
 Description: Blogging helper, based on Qt4
-Source-MD5: 2d5f433b5cfcb080dc026849b3085ab6
+Source-MD5: 1a5d21b504656b8115723967ef95edc1
 CompileScript: <<
        #!/bin/bash -ev
        export QTDIR=%p/lib/qt4-x11

--- NEW FILE: net-snmp-unified.patch ---

--- net-snmp-5.4.1/configure    2007-07-27 13:04:19.000000000 -0400
+++ net-snmp-5.4.1-new/configure        2007-11-02 12:47:06.000000000 -0400
@@ -31784,7 +31784,7 @@
 if test "x$embed_perl" != "xno" ; then
     echo "$as_me:$LINENO: checking for Perl CFLAGS" >&5
 echo $ECHO_N "checking for Perl CFLAGS... $ECHO_C" >&6
-    perlcflags=`$myperl -MExtUtils::Embed -e ccopts`
+    perlcflags=`$myperl -MExtUtils::Embed -e ccopts | sed -e 's,-arch [^ 
]*,,g'`
     if test "x$perlcflags" != "x" ; then
       echo "$as_me:$LINENO: result: $perlcflags" >&5
 echo "${ECHO_T}$perlcflags" >&6
@@ -31804,7 +31804,7 @@
 if test "x$embed_perl" != "xno" ; then
     echo "$as_me:$LINENO: checking for Perl LDFLAGS" >&5
 echo $ECHO_N "checking for Perl LDFLAGS... $ECHO_C" >&6
-    netsnmp_perlldopts=`$myperl -MExtUtils::Embed -e ldopts`
+    netsnmp_perlldopts=`$myperl -MExtUtils::Embed -e ldopts | sed -e 's,-arch 
[^ ]*,,g'`
     if test "x$netsnmp_perlldopts" != "x" ; then
       echo "$as_me:$LINENO: result: $netsnmp_perlldopts" >&5
 echo "${ECHO_T}$netsnmp_perlldopts" >&6
@@ -31824,7 +31824,7 @@
       echo "$as_me:$LINENO: checking for Perl CCDLFLAGS" >&5
 echo $ECHO_N "checking for Perl CCDLFLAGS... $ECHO_C" >&6
 
-      netsnmp_perlccdlflags=`$myperl -V:ccdlflags | $myperl -n -e 'print $1 
'"if (/^\s*ccdlflags='([^']+)';/);"`
+      netsnmp_perlccdlflags=`$myperl -V:ccdlflags | sed -e 's,-arch [^ ]*,,g' 
| $myperl -n -e 'print $1 '"if (/^\s*ccdlflags='([^']+)';/);"`
 
       echo "$as_me:$LINENO: result: $netsnmp_perlccdlflags" >&5
 echo "${ECHO_T}$netsnmp_perlccdlflags" >&6

Index: erc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/erc.info,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- erc.info    17 Oct 2007 17:36:29 -0000      1.4.2.2
+++ erc.info    3 Nov 2007 20:25:29 -0000       1.4.2.3
@@ -1,9 +1,9 @@
 Package: erc
-Depends: emacsen-common
+Depends: emacsen
 Description: Use IRC within emacs
 Homepage: http://www.emacswiki.org/cgi-bin/wiki/EmacsIRCClient
 Version: 5.1.4
-Revision: 3
+Revision: 4
 Maintainer: Jesse Alama <[EMAIL PROTECTED]>
 Source: mirror:gnu:%n/%n-%v.tar.gz
 Source-MD5: 93d10ee426a4b259a2a07436f8fd71a2

Index: curl-unified.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/curl-unified.info,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- curl-unified.info   28 Dec 2006 17:50:20 -0000      1.5.2.1
+++ curl-unified.info   3 Nov 2007 20:25:29 -0000       1.5.2.2
@@ -1,9 +1,9 @@
 Package: curl-unified
 Version: 7.11.2
-Revision: 10
+Revision: 11
 Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
 
-Depends: %N-shlibs (= %v-%r), fink-obsolete-packages
+Depends: %N-shlibs (= %v-%r)
 BuildDepends: system-openssl-dev, pkgconfig
 Replaces: curl (<< %v-%r), curl-ssl (<< %v-%r)
 

Index: libcurl3-unified.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libcurl3-unified.info,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- libcurl3-unified.info       28 Dec 2006 17:50:21 -0000      1.9.2.1
+++ libcurl3-unified.info       3 Nov 2007 20:25:29 -0000       1.9.2.2
@@ -1,6 +1,6 @@
 Package: libcurl3-unified
 Version: 7.15.5
-Revision: 4
+Revision: 5
 Description: Lib. for transferring files with URL syntax
 DescUsage: <<
 This version is obsolete and has security flaws.
@@ -68,7 +68,7 @@
   Description: OBSOLETE use curl instead
   DescUsage: For additional documentation see the %N package.
   
-  Depends: %N-shlibs (= %v-%r), fink-obsolete-packages
+  Depends: %N-shlibs (= %v-%r)
   Replaces: curl (<< %v-%r), curl-ssl(<< %v-%r)
   
   Files: bin/curl share/man/man1/curl.1 share/curl/curl-ca-bundle.crt


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

Reply via email to