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

Modified Files:
      Tag: pangocairo-branch
        lftp.info net-snmp-unified.info sylpheed-gpgme.info 
        sylpheed-ssl.info sylpheed.info xchat.info 
Log Message:
mege from head

Index: lftp.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/lftp.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- lftp.info   16 Jan 2007 16:03:01 -0000      1.3.2.1
+++ lftp.info   28 Sep 2007 16:34:30 -0000      1.3.2.2
@@ -1,11 +1,10 @@
 Package: lftp
 Version: 3.5.4
-Revision: 10
+Revision: 1011
 ###
-Depends: expat-shlibs, libgettext3-shlibs, libiconv, libncurses5-shlibs (>= 
5.4-20041023-1006), readline5-shlibs (>= 5.0-1004)
-BuildDepends: expat, libgettext3-dev, libiconv-dev, libncurses5 (>= 
5.4-20041023-1006), readline5 (>= 5.0-1004), system-openssl-dev
-Conflicts: lftp
-Replaces: lftp
+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
+Replaces: lftp-ssl
 ###
 CustomMirror: <<
   Primary: ftp://ftp.yars.free.net/lftp/
@@ -32,25 +31,26 @@
 
   ### lftp 3.4.7 redef of srandom
   perl -pi -e 's,CDECL void srandom\(unsigned seed\);,,g' src/ResMgr.cc
+
+  ### don't link against already-installed version
+  perl -pi -e 's/-L\$\(DESTDIR\)\$\(pkgverlibdir\)//g' src/Makefile.in
 <<
 ###
 GCC: 4.0
 ###
 SetCPPFLAGS: -Wno-long-double -DBIND_8_COMPAT
-NoSetLDFLAGS: true
-NoSetLIBS: true
-SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib
+SetLDFLAGS: -L%p/lib/system-openssl/lib
 ###
 DocFiles: ABOUT-NLS BUGS COPYING ChangeLog FAQ FEATURES INSTALL MIRRORS NEWS 
README* THANKS TODO lftp.lsm
 ConfFiles: %p/etc/lftp.conf
 ###
-ConfigureParams: --with-pic --enable-share --enable-static --with-modules 
--without-socksdante --with-openssl=/usr --without-gnutls 
--with-locale-dir=%p/share/locale --with-included-readline=no 
--with-included-gettext=no --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib
+ConfigureParams: --with-pic --with-modules --without-socksdante 
--with-openssl=%p/lib/system-openssl --without-gnutls 
--with-locale-dir=%p/share/locale --with-included-readline=no 
--with-included-gettext=no --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib --disable-dependency-tracking
 ###
 InstallScript: make install DESTDIR=%d
 ###
 SplitOff: <<
   Package: lftp-ssl
-  Depends: lftp (= %v-%r)
+  Depends: lftp (= %v-%r), fink-obsolete-packages
   DocFiles: COPYING
 <<
 ###

Index: sylpheed.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/sylpheed.info,v
retrieving revision 1.5.2.20
retrieving revision 1.5.2.21
diff -u -d -r1.5.2.20 -r1.5.2.21
--- sylpheed.info       28 Sep 2007 16:15:26 -0000      1.5.2.20
+++ sylpheed.info       28 Sep 2007 16:34:30 -0000      1.5.2.21
@@ -1,6 +1,6 @@
 Package: sylpheed
-Version: 2.4.4
-Revision: 1002
+Version: 2.4.6
+Revision: 1001
 Depends: <<
   jpilot (>= 0.99.9-12), pilot-link10-shlibs,
   openldap23-shlibs, db44-aes-shlibs | db44-shlibs, cyrus-sasl2-shlibs,
@@ -26,7 +26,7 @@
 Replaces: sylpheed-ssl, sylpheed-gpgme
 
 Source: http://sylpheed.sraoss.jp/sylpheed/v2.4/sylpheed-%v.tar.bz2
-Source-MD5: 79225738189e78e9a9f2a47a3ee4f3d6
+Source-MD5: 361908337111957c911026a07d1e0e44
 
 SetCPPFLAGS: -I%p/lib/pilot-link10/include -I%p/lib/system-openssl/include
 SetLDFLAGS: -L%p/lib/pilot-link10/lib -lresolv -L%p/lib/system-openssl/lib

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.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- net-snmp-unified.info       13 Aug 2007 15:56:22 -0000      1.1.2.3
+++ net-snmp-unified.info       28 Sep 2007 16:34:30 -0000      1.1.2.4
@@ -1,21 +1,35 @@
 Package: net-snmp-unified
 Version: 5.4
-Revision: 2
+Revision: 1023
+Description: SNMP tools and libraries
+License: BSD
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
 Depends: <<
-       daemonic, 
+       daemonic,
        %N15-shlibs (>= %v-%r)
 <<
 BuildDepends: <<
-       fink (>= 0.24.12-1),
+       fink (>= 0.26.0-1),
        gawk,
        expat1,
        system-perl
 <<
-Conflicts: net-snmp (<< 5.4-1), net-snmp-ssl (<< 5.4-1), ucd-snmp (<< 5.4-1)
-Replaces: net-snmp (<< 5.4-1), net-snmp-ssl (<< 5.4-1), ucd-snmp (<< 5.4-1)
+Conflicts: <<
+       net-snmp (<< 5.4-1),
+       net-snmp-ssl (<< 5.4-1),
+       ucd-snmp (<< 5.4-1)
+<<
+Replaces: <<
+       net-snmp (<< 5.4-1),
+       net-snmp-ssl (<< 5.4-1),
+       ucd-snmp (<< 5.4-1)
+<<
+
 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
+
 SetCPPFLAGS: -I%p/lib/system-openssl/include
 SetLDFLAGS: -L%p/lib/system-openssl/lib
 ConfigureParams: <<
@@ -32,25 +46,34 @@
        --with-sys-contact='[EMAIL PROTECTED]' \
        --with-sys-location=Unknown \
        --without-kmem-usage \
-       --without-python-modules \
-       --with-perl-modules='PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5 
INSTALLARCHLIB=%p/lib/perl5/darwin INSTALLSITELIB=%p/lib/perl5 
INSTALLSITEARCH=%p/lib/perl5/darwin INSTALLMAN1DIR=%p/share/man/man1 
INSTALLMAN3DIR=%p/share/man/man3 INSTALLSITEMAN1DIR=%p/share/man/man1 
INSTALLSITEMAN3DIR=%p/share/man/man3 INSTALLBIN=%p/bin INSTALLSITEBIN=%p/bin 
INSTALLSCRIPT=%p/bin'
+       --without-python-modules
 <<
 CompileScript: <<
-#!/bin/sh -ex
-       PERLPROG=/usr/bin/perl ./configure %c
+#!/bin/sh -ev
+
+       eval "`/usr/bin/perl -V:archname -V:version`"
+       export PERLMAKEARGS="PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/$version 
INSTALLARCHLIB=%p/lib/perl5/$version/$archname 
INSTALLSITELIB=%p/lib/perl5/$version 
INSTALLSITEARCH=%p/lib/perl5/$version/$archname 
INSTALLMAN1DIR=%p/lib/perl5/$version INSTALLMAN3DIR=%p/lib/perl5/$version 
INSTALLSITEMAN1DIR=%p/lib/perl5/$version 
INSTALLSITEMAN3DIR=%p/lib/perl5/$version INSTALLBIN=%p/bin 
INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin"
+
+       PERLPROG=/usr/bin/perl ./configure %c 
--with-perl-modules="$PERLMAKEARGS"
        make
-       cat > README.obsolete <<EOF
-The packages net-snmp, net-snmp-ssl, net-snmp-dev, and net-snmp-ssl-dev 
-are obsolete packages. Install net-snmp-unified instead.
-EOF
 <<
+
 InstallScript: <<
-       make install DESTDIR=%d
+#!/bin/sh -ev
+
+       make -j1 install DESTDIR=%d
        install -d -m 755 %i/var/log
+       install -d -m 755 %i/share/doc/installed-packages
+       find %i -name perllocal.pod -exec rm -rf {} \; || :
+
+       for type in "" "-ssl"; do
+               touch %i/share/doc/installed-packages/net-snmp$type
+       done
 <<
 DocFiles: AGENT.txt CHANGES COPYING ChangeLog CodingStyle EXAMPLE.conf.def FAQ 
NEWS PORTING README* TODO
-Splitoff: <<
+SplitOff: <<
        Package: %N15-shlibs
+       DocFiles: COPYING
        Files: lib/libnetsnmp*.15*.dylib
        Shlibs: <<
                %p/lib/libnetsnmp.15.dylib        16.0.0 
net-snmp-unified15-shlibs (>= 5.4-1)
@@ -59,15 +82,24 @@
                %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)
        <<
-       DocFiles: COPYING
 <<
 SplitOff2: <<
-       Package: %N-dev
-       Depends: %N (>= %v-%r)
-       Replaces: net-snmp-dev (<< 5.4-1), net-snmp (<< 5.4-1), 
net-snmp-ssl-dev (<< 5.4-1), net-snmp-ssl (<< 5.4-1)
-       Conflicts: net-snmp-dev (<< 5.4-1), net-snmp-ssl-dev (<< 5.4-1)
-       Files: include lib/*.a lib/*.dylib bin/net-snmp-config
+       Package: %N15-dev
+       Depends: %N15-shlibs (= %v-%r)
+       Conflicts: <<
+               net-snmp-dev (<< 5.4-1),
+               net-snmp-ssl-dev (<< 5.4-1),
+               net-snmp-unified-dev
+       <<
+       Replaces: <<
+               net-snmp-dev (<< 5.4-1),
+               net-snmp (<< 5.4-1),
+               net-snmp-ssl-dev (<< 5.4-1),
+               net-snmp-ssl (<< 5.4-1),
+               net-snmp-unified-dev
+       <<
        DocFiles: COPYING
+       Files: include lib/*.a lib/*.dylib bin/net-snmp-config
 <<
 SplitOff3: <<
        Package: net-snmp
@@ -77,7 +109,7 @@
                fink (>= 0.26.0-1),
                fink-obsolete-packages
        <<
-       DocFiles: README.obsolete
+       Files: share/doc/installed-packages/%n
 <<
 SplitOff4: <<
        Package: net-snmp-ssl
@@ -87,28 +119,9 @@
                fink (>= 0.26.0-1),
                fink-obsolete-packages
        <<
-       DocFiles: README.obsolete
-<<
-SplitOff7: <<
-       Package: net-snmp-dev
-       Description: upgrade package for net-snmp-unified-dev
-       Depends: <<
-               %N-dev (>= %v-%r),
-               fink (>= 0.26.0-1),
-               fink-obsolete-packages
-       <<
-       DocFiles: README.obsolete
-<<
-SplitOff8: <<
-       Package: net-snmp-ssl-dev
-       Description: upgrade package for net-snmp-unified-dev
-       Depends: <<
-               %N-dev (>= %v-%r),
-               fink (>= 0.26.0-1),
-               fink-obsolete-packages
-       <<
-       DocFiles: README.obsolete
+       Files: share/doc/installed-packages/%n
 <<
+
 PreRmScript: <<
 if [ $1 != "upgrade" ]; then
        daemonic disable %N
@@ -132,12 +145,18 @@
 
 </service>
 <<
-Description: SNMP tools and libraries
+
+Homepage: http://net-snmp.sourceforge.net/
 DescDetail: <<
        The net-snmp package, previously known as ucd-snmp, provides tools 
        and libraries relating to SNMP. It provides SNMP libraries, tools 
        to request and set information, an SNMP daemon, among other features.
 <<
+DescUsage: <<
+In order to run net-snmp correctly, the community name needs to be set. The
+easiest way to set this is to run the 'snmpconf' program, allowing you to
+setup the various net-snmp configuration files.
+<<
 DescPackaging: <<
 Customised install script to put files in correct directories.
 Logfile set to PREFIX/var/log/snmpd.log
@@ -146,13 +165,14 @@
 the command tools, or alternatively using the 'defVersion' option in the
 snmp.conf file.
 <<
-DescUsage: <<
-In order to run net-snmp correctly, the community name needs to be set. The
-easiest way to set this is to run the 'snmpconf' program, allowing you to
-setup the various net-snmp configuration files.
-<<
 DescPort: <<
 Based on the net-snmp package developed by Justin Hallett and Jeremy Higgs.
+
+dmacks: OS X 10.3 has kvm.h but that header does not declare an
+(apparently global var) "kd". Later OS X disable kvm altogether (via
+the platform-specific defs in net-snmp/system/*.h, which override
+configure detection) so it's not a problem there, but backporting that
+solution to 10.3 fails to build for deeper reasons. So we'll just
+declare kd and hope for the best.
 <<
-License: BSD
-Homepage: http://net-snmp.sourceforge.net/
+

Index: sylpheed-gpgme.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/sylpheed-gpgme.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
--- sylpheed-gpgme.info 18 Sep 2007 00:27:37 -0000      1.1.2.2
+++ sylpheed-gpgme.info 28 Sep 2007 16:34:30 -0000      1.1.2.3
@@ -1,6 +1,6 @@
 Package: sylpheed-gpgme
-Version: 2.4.4
-Revision: 1001
+Version: 2.4.6
+Revision: 1000
 Depends: <<
   jpilot, pilot-link10-shlibs,
   openldap23-shlibs, db44-aes-shlibs | db44-shlibs, cyrus-sasl2-shlibs, 
gpgme11-shlibs, libgpg-error-shlibs, openssl097-shlibs,
@@ -24,7 +24,7 @@
 Replaces: sylpheed-ssl (<< 2.3.0-1), sylpheed
 
 Source: http://sylpheed.sraoss.jp/sylpheed/v2.4/sylpheed-%v.tar.bz2
-Source-MD5: 79225738189e78e9a9f2a47a3ee4f3d6
+Source-MD5: 361908337111957c911026a07d1e0e44
 
 SetCPPFLAGS: -I%p/lib/pilot-link10/include
 SetLDFLAGS: -L%p/lib/pilot-link10/lib -lresolv

Index: xchat.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/xchat.info,v
retrieving revision 1.9.2.17
retrieving revision 1.9.2.18
diff -u -d -r1.9.2.17 -r1.9.2.18
--- xchat.info  28 Sep 2007 16:15:26 -0000      1.9.2.17
+++ xchat.info  28 Sep 2007 16:34:30 -0000      1.9.2.18
@@ -15,8 +15,8 @@
 # maintainership of) the affected package.
 
 Package: xchat
-Version: 2.6.8
-Revision: 1023
+Version: 2.8.2
+Revision: 1022
 Maintainer: Max Horn <[EMAIL PROTECTED]>
 BuildDepends: <<
   system-openssl-dev,
@@ -55,8 +55,8 @@
 <<
 Conflicts: xchat-ssl (<< 2.6.8-1022)
 Replaces: xchat-ssl (<< 2.6.8-1022)
-Source: http://xchat.org/files/source/2.6/xchat-%v.tar.bz2
-Source-MD5: 940fd8560a4e4e5d905e53207c6cbb87
+Source: http://xchat.org/files/source/2.8/xchat-%v.tar.bz2
+Source-MD5: d87a93bcd39d96ff3a3d0f8199efcf12
 Patch: %n.patch
 ConfigureParams: <<
   --enable-openssl \

Index: sylpheed-ssl.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/sylpheed-ssl.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
--- sylpheed-ssl.info   18 Sep 2007 00:27:37 -0000      1.1.2.2
+++ sylpheed-ssl.info   28 Sep 2007 16:34:30 -0000      1.1.2.3
@@ -1,6 +1,6 @@
 Package: sylpheed-ssl
 Type: bundle
-Version: 2.4.4
+Version: 2.4.6
 Revision: 1
 Depends: sylpheed-gpgme, fink-obsolete-packages
 Description: Placeholder package to update to unified sylpheed. (OBSOLETE)


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to