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

Modified Files:
        lftp.info 
Log Message:
backport new and unified from 10.4


Index: lftp.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/lftp.info,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- lftp.info   1 Mar 2006 03:34:01 -0000       1.26
+++ lftp.info   24 Sep 2007 02:53:05 -0000      1.27
@@ -1,10 +1,9 @@
 Package: lftp
-Version: 3.3.4
-Revision: 1
+Version: 3.5.4
+Revision: 11
 ###
-Depends: expat-shlibs, libgettext3-shlibs, libiconv, readline5-shlibs, 
libncurses5-shlibs
-BuildDepends: expat, libgettext3-dev, libiconv-dev, readline5, libncurses5
-Conflicts: lftp-ssl
+Depends: expat1-shlibs, libgettext3-shlibs, libiconv, libncurses5-shlibs (>= 
5.4-20041023-1), readline5-shlibs (>= 5.0-1)
+BuildDepends: expat1, libgettext3-dev, libiconv-dev, libncurses5 (>= 
5.4-20041023-1), readline5 (>= 5.0-1), system-openssl-dev
 Replaces: lftp-ssl
 ###
 CustomMirror: <<
@@ -13,33 +12,49 @@
 <<
 ###
 Source: mirror:custom:lftp-%v.tar.bz2
-Source-MD5: b37c36c8b2bc58cd3020324cd2df1348
+Source-MD5: 1c7f49822793d03588fd4080c40281a7
 ###
 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
+  #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
+  #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
+
+  ### Force configure to not use 10.4's native poll function
+  sed -i -e 's/poll_works=yes/poll_works=no/' configure
+
+  ### 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: 3.3
 ###
-SetCPPFLAGS: -no-cpp-precomp -Wno-long-double -DBIND_8_COMPAT
+SetCPPFLAGS: -Wno-long-double -DBIND_8_COMPAT
+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 --without-ssl --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
 ###
-Description: Sophisticated command line based FTP client
+SplitOff: <<
+  Package: lftp-ssl
+  Depends: lftp (= %v-%r), fink-obsolete-packages
+  DocFiles: COPYING
+<<
+###
+Description: Sophisticated command line based FTP client (SSL)
 DescDetail: <<
   lftp is a sophisticated command line based FTP client. It has a
   multithreaded design allowing you to issue and execute multiple


-------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to