5 files changed, 0 insertions, 49 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 4ed0ac2be8a4..d811edb66504 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -10,7 +10,6 @@ MASTER_SITES=	GNU
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A character set conversion library
 
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 LIBTOOLFILES=	configure libcharset/configure preload/configure
 CONFIGURE_ARGS=	--enable-static \
diff --git a/converters/libiconv/files/patch-lib_Makefile.in b/converters/libiconv/files/patch-lib_Makefile.in
index dfabe72bbb7d..0b8c2ab636b0 100644
--- a/converters/libiconv/files/patch-lib_Makefile.in
+++ b/converters/libiconv/files/patch-lib_Makefile.in
@@ -1,16 +1,5 @@
 --- lib/Makefile.in.orig	2011-08-07 19:48:03.000000000 +0200
 +++ lib/Makefile.in	2011-10-23 22:03:44.000000000 +0200
-@@ -26,8 +26,8 @@
- -Dset_relocation_prefix=libiconv_set_relocation_prefix \
- -Drelocate=libiconv_relocate @DEFS@
- LIBTOOL = @LIBTOOL@
--LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
--LIBTOOL_LINK = $(LIBTOOL) --mode=link
-+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
- # Windows resource compiler (windres). Used via libtool.
 @@ -50,7 +50,7 @@
  
  # Before making a release, change this according to the libtool documentation,
diff --git a/converters/libiconv/files/patch-libcharset::lib::Makefile.in b/converters/libiconv/files/patch-libcharset::lib::Makefile.in
deleted file mode 100644
index 6ff9ccfd5d61..000000000000
--- a/converters/libiconv/files/patch-libcharset::lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- libcharset/lib/Makefile.in.orig	Thu Jan 30 03:43:59 2003
-+++ libcharset/lib/Makefile.in		Tue Oct 14 16:55:29 2003
-@@ -25,8 +25,8 @@
- -Dset_relocation_prefix=libcharset_set_relocation_prefix \
- -Drelocate=libcharset_relocate @DEFS@
- LIBTOOL = @LIBTOOL@
--LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
--LIBTOOL_LINK = $(LIBTOOL) --mode=link
-+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
- RM = rm -f
diff --git a/converters/libiconv/files/patch-src::Makefile.in b/converters/libiconv/files/patch-src::Makefile.in
index 919c44d2b116..ba1da2b0eedf 100644
--- a/converters/libiconv/files/patch-src::Makefile.in
+++ b/converters/libiconv/files/patch-src::Makefile.in
@@ -1,16 +1,5 @@
 --- src/Makefile.in.orig	2009-06-21 07:17:33.000000000 -0400
 +++ src/Makefile.in	2009-07-04 19:46:15.000000000 -0400
-@@ -23,8 +23,8 @@
- LDFLAGS = @LDFLAGS@
- INCLUDES = -I. -I$(srcdir) -I.. -I../include -I$(srcdir)/../include -I../srclib -I$(srcdir)/../srclib
- LIBTOOL = @LIBTOOL@
--LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
--LIBTOOL_LINK = $(LIBTOOL) --mode=link
-+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
- WINDRES = @WINDRES@
 @@ -113,6 +113,7 @@ install : all force
  	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
  	case "@host_os@" in \
diff --git a/converters/libiconv/files/patch-test::Makefile.in b/converters/libiconv/files/patch-test::Makefile.in
deleted file mode 100644
index 7d3898255c8c..000000000000
--- a/converters/libiconv/files/patch-test::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- tests/Makefile.in.orig	2009-08-11 23:52:40.000000000 +0000
-+++ tests/Makefile.in	2009-08-11 23:56:06.000000000 +0000
-@@ -12,8 +12,8 @@
- LDFLAGS = @LDFLAGS@
- INCLUDES = -I. -I$(srcdir) -I../include -I$(srcdir)/../include -I../srclib -I$(srcdir)/../srclib -I../lib
- LIBTOOL = @LIBTOOL@
--LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
--LIBTOOL_LINK = $(LIBTOOL) --mode=link
-+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
-+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
- LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
- LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
- RM = rm -f