From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 29 Dec 2009 22:45:42 +0000 (+0000)
Subject: [package] update lftp to 4.0.5 (#6383)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=45d8b3e6dc73f1338353009d583c57bddac9ae35

[package] update lftp to 4.0.5 (#6383)

SVN-Revision: 18970
---

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 3fd93c6615..598015ade2 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008-2009 OpenWrt.org
 #
 
@@ -9,12 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lftp
-PKG_VERSION:=4.0.3
+PKG_VERSION:=4.0.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://lftp.cybermirror.org/old/
-PKG_MD5SUM:=24f4b25718fef09cbc4d26ea73bd1578
+PKG_SOURCE_URL:=http://lftp.cybermirror.org \
+  http://lftp.cybermirror.org/old
+PKG_MD5SUM:=5400cad5f91e131ac2ded7c24aea594c
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,6 +30,12 @@ define Package/lftp
   URL:=http://lftp.yar.ru/
 endef
 
+define Package/lftp/description
+  lftp is sophisticated file transfer program with command line interface. It
+  supports FTP, HTTP, FISH, SFTP and FILE (local FS) protocols. GNU Readline
+  library is used for input.
+endef
+
 # uses GNU configure
 
 CONFIGURE_ARGS += \
@@ -35,7 +44,7 @@ CONFIGURE_ARGS += \
 	--without-gnutls \
 	--without-libresolv \
 	--with-openssl="$(STAGING_DIR)/usr" \
-	--disable-static 
+	--disable-static
 
 CONFIGURE_VARS += \
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \
@@ -43,17 +52,14 @@ CONFIGURE_VARS += \
         LDFLAGS="$$$$LDFLAGS" \
         LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses -lgcc $(LIBGCC_S) -ldl" \
 
-define Build/Compile
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                LD="\$$$$(CC)" \
-                all
-endef
+MAKE_VARS += \
+	LD="\$$$$(CC)" \
 
-define Package/lftp/install 
+define Package/lftp/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lftp $(1)/usr/bin
-endef 
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lftp $(1)/usr/bin
+endef
 
 define Package/lftp/postinst
 # check for real system
diff --git a/net/lftp/patches/001-libintl.patch b/net/lftp/patches/001-libintl.patch
index 9891ca8501..df77ac5614 100644
--- a/net/lftp/patches/001-libintl.patch
+++ b/net/lftp/patches/001-libintl.patch
@@ -1,6 +1,5 @@
-diff -burN lftp-3.7.7/lib/gettext.h lftp-3.7.7.patched/lib/gettext.h
---- lftp-3.7.7/lib/gettext.h	2008-05-16 18:28:43.000000000 +0200
-+++ lftp-3.7.7.patched/lib/gettext.h	2009-01-03 18:59:05.374184151 +0100
+--- a/lib/gettext.h
++++ b/lib/gettext.h
 @@ -22,7 +22,6 @@
  #if ENABLE_NLS
  
diff --git a/net/lftp/patches/002-gettimeofday.patch b/net/lftp/patches/002-gettimeofday.patch
index ea6d490b2a..e69de29bb2 100644
--- a/net/lftp/patches/002-gettimeofday.patch
+++ b/net/lftp/patches/002-gettimeofday.patch
@@ -1,23 +0,0 @@
-diff -burN lftp-3.7.7/lib/sys_time.in.h lftp-3.7.7.patched/lib/sys_time.in.h
---- lftp-3.7.7/lib/sys_time.in.h	2008-10-24 16:00:33.000000000 +0200
-+++ lftp-3.7.7.patched/lib/sys_time.in.h	2009-01-03 21:20:34.129104049 +0100
-@@ -39,6 +39,10 @@
- #  include <time.h>
- # endif
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif 
-+
- # if ! @HAVE_STRUCT_TIMEVAL@
- struct timeval
- {
-@@ -53,4 +57,8 @@
- int gettimeofday (struct timeval *restrict, void *restrict);
- # endif
- 
-+#ifdef __cplusplus
-+}
-+#endif 
-+
- #endif /* _GL_SYS_TIME_H */