From ad8846e59c45ed2f853b726114f78566a4256a50 Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 5 Oct 2014 19:59:18 +0000
Subject: Convert to USES=charsetfix and USES=libtool

---
 ftp/lftp/Makefile                        |  2 +-
 ftp/lftp/files/patch-build-aux-ltmain.sh | 15 -----------
 ftp/lftp/files/patch-lib-Makefile.in     | 43 --------------------------------
 3 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 ftp/lftp/files/patch-build-aux-ltmain.sh
 delete mode 100644 ftp/lftp/files/patch-lib-Makefile.in

(limited to 'ftp/lftp')

diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 96ccf82dee0f..fb20fee57878 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -20,7 +20,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
-USES=		iconv readline shebangfix
+USES=		charsetfix iconv libtool readline shebangfix
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/ftp/lftp/files/patch-build-aux-ltmain.sh b/ftp/lftp/files/patch-build-aux-ltmain.sh
deleted file mode 100644
index 6cff253074b8..000000000000
--- a/ftp/lftp/files/patch-build-aux-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- build-aux/ltmain.sh.orig
-+++ build-aux/ltmain.sh
-@@ -4230,12 +4230,6 @@
- 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
- 	fi
- 
--	# Install the pseudo-library for information purposes.
--	func_basename "$file"
--	name=$func_basename_result
--	instname=$dir/${name}i
--	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
--
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
- 	;;
diff --git a/ftp/lftp/files/patch-lib-Makefile.in b/ftp/lftp/files/patch-lib-Makefile.in
deleted file mode 100644
index 19879129afb7..000000000000
--- a/ftp/lftp/files/patch-lib-Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- lib/Makefile.in.orig	2011-09-20 10:20:00.632757147 +0200
-+++ lib/Makefile.in	2011-09-20 10:22:27.434783661 +0200
-@@ -1376,8 +1376,6 @@
- libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(INET_PTON_LIB) \
- 	$(LIBSOCKET) $(LIB_CLOCK_GETTIME) $(LTLIBICONV) $(LTLIBINTL)
- GPERF = gperf
--charset_alias = $(DESTDIR)$(libdir)/charset.alias
--charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
- 
- # Because this Makefile snippet defines a variable used by other
- # gnulib Makefile snippets, it must be present in all Makefile.am that
-@@ -2303,31 +2301,10 @@
- 	fi ; \
- 	if $$need_charset_alias; then \
- 	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
--	fi ; \
--	if test -f $(charset_alias); then \
--	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
--	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
--	  rm -f $(charset_tmp) ; \
--	else \
--	  if $$need_charset_alias; then \
--	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
--	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
--	    rm -f $(charset_tmp) ; \
--	  fi ; \
- 	fi
- 
- uninstall-local: uninstall-localcharset
- uninstall-localcharset: all-local
--	if test -f $(charset_alias); then \
--	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
--	  if grep '^# Packages using this file: $$' $(charset_tmp) \
--	      > /dev/null; then \
--	    rm -f $(charset_alias); \
--	  else \
--	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
--	  fi; \
--	  rm -f $(charset_tmp); \
--	fi
- 
- charset.alias: config.charset
- 	$(AM_V_GEN)rm -f t-$@ $@ && \
-- 
cgit v1.2.3