Don't play games with libtool, just use the .la files. Fixes build with

libtool-2.2. Bump revision.

4 files changed, 36 insertions, 19 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 1c6cd694fc7..131532bb2a2 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2009/09/18 16:22:18 hasso Exp $
+# $NetBSD: Makefile,v 1.90 2009/12/01 07:46:48 joerg Exp $
 
 DISTNAME=		lftp-4.0.1
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://ftp.yars.free.net/pub/source/lftp/ \
 			ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/ \
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index 69dfb4be2c2..20d969b129f 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.15 2009/09/16 07:13:20 hasso Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/12/01 07:46:48 joerg Exp $
 bin/lftp
 bin/lftpget
-lib/lftp/${PKGVERSION}/cmd-mirror.so
-lib/lftp/${PKGVERSION}/cmd-sleep.so
-lib/lftp/${PKGVERSION}/cmd-torrent.so
-lib/lftp/${PKGVERSION}/liblftp-network.so
-lib/lftp/${PKGVERSION}/liblftp-pty.so
-lib/lftp/${PKGVERSION}/proto-file.so
-lib/lftp/${PKGVERSION}/proto-fish.so
-lib/lftp/${PKGVERSION}/proto-ftp.so
-lib/lftp/${PKGVERSION}/proto-http.so
-lib/lftp/${PKGVERSION}/proto-sftp.so
+lib/lftp/${PKGVERSION}/cmd-mirror.la
+lib/lftp/${PKGVERSION}/cmd-sleep.la
+lib/lftp/${PKGVERSION}/cmd-torrent.la
+lib/lftp/${PKGVERSION}/liblftp-network.la
+lib/lftp/${PKGVERSION}/liblftp-pty.la
+lib/lftp/${PKGVERSION}/proto-file.la
+lib/lftp/${PKGVERSION}/proto-fish.la
+lib/lftp/${PKGVERSION}/proto-ftp.la
+lib/lftp/${PKGVERSION}/proto-http.la
+lib/lftp/${PKGVERSION}/proto-sftp.la
 lib/liblftp-jobs.la
 lib/liblftp-tasks.la
 man/man1/lftp.1
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index 0d172a72b3e..e1bb340c660 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.49 2009/09/18 16:22:18 hasso Exp $
+$NetBSD: distinfo,v 1.50 2009/12/01 07:46:48 joerg Exp $
 
 SHA1 (lftp-4.0.1.tar.bz2) = 01bcf6c053efab68c2e5ccf3ceb6c944db16aac3
 RMD160 (lftp-4.0.1.tar.bz2) = 7ca64c5544fc2dbcc0e7b9804f3eccb64316bb86
 Size (lftp-4.0.1.tar.bz2) = 1580251 bytes
-SHA1 (patch-aa) = 62af66bc66593164eb13fb25e63ff1b0e68f870b
+SHA1 (patch-aa) = f7b8eeef10b0a73ea21be671858ae39b981da78e
 SHA1 (patch-ab) = 65c92b264873b45c69a0dfde2d2715dca0b6dc36
 SHA1 (patch-ac) = 32e1fba23d4d6bd0b06bacbe503cb9b39d2bf825
 SHA1 (patch-ae) = 3ee418b94cc1afb7b2db5bc550fd966d346368a4
diff --git a/net/lftp/patches/patch-aa b/net/lftp/patches/patch-aa
index ee57b153f88..43314e005b3 100644
--- a/net/lftp/patches/patch-aa
+++ b/net/lftp/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.13 2009/06/08 10:16:22 hasso Exp $
+$NetBSD: patch-aa,v 1.14 2009/12/01 07:46:49 joerg Exp $
 
 Do not install by default Perl scripts; they are installed via
 ${INSTALL_SCRIPT} if the user set the "perl" option.
 
---- src/Makefile.in.orig	2009-05-15 09:25:52 +0300
-+++ src/Makefile.in	2009-06-08 12:21:53 +0300
-@@ -893,7 +893,7 @@ top_builddir = @top_builddir@
+Do not remove the *.la files.
+
+--- src/Makefile.in.orig	2009-09-16 11:31:08.000000000 +0200
++++ src/Makefile.in
+@@ -980,7 +980,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  pkgverlibdir = $(pkglibdir)/$(VERSION)
  bin_SCRIPTS = lftpget
@@ -14,7 +16,7 @@ ${INSTALL_SCRIPT} if the user set the "perl" option.
  noinst_SCRIPTS = ftpget
  EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SCRIPTS) $(noinst_SCRIPTS)
  lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h
-@@ -1416,7 +1416,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
+@@ -1513,7 +1513,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRA
  install-binPROGRAMS: install-libLTLIBRARIES
  
  installdirs:
@@ -23,3 +25,17 @@ ${INSTALL_SCRIPT} if the user set the "perl" option.
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
+@@ -1629,13 +1629,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 	uninstall-pkgverlibLTLIBRARIES
+ 
+ 
+-# libtool does not strip modules, do it here.
+-install-data-hook:
+-@WITH_MODULES_TRUE@	rm -f $(DESTDIR)$(pkgverlibdir)/*.la; \
+-@WITH_MODULES_TRUE@	case " $(LDFLAGS) " in *" -s "*) \
+-@WITH_MODULES_TRUE@		$(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so;; \
+-@WITH_MODULES_TRUE@	esac
+-@WITH_MODULES_FALSE@	-rmdir $(DESTDIR)$(pkgverlibdir) 2>/dev/null || :
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: