3 files changed, 8 insertions, 21 deletions
diff --git a/converters/libiconv/files/patch-configure b/converters/libiconv/files/patch-configure
deleted file mode 100644
index 121192880a29..000000000000
--- a/converters/libiconv/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Fri May 23 05:19:20 2003
-+++ configure	Fri May 30 11:22:14 2003
-@@ -1905,7 +1905,6 @@
- 
- 
- 
--test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
- 
- 
- ac_ext=c
diff --git a/converters/libiconv/files/patch-lib_Makefile.in b/converters/libiconv/files/patch-lib_Makefile.in
index 4a59d96cf9e3..1731460465a7 100644
--- a/converters/libiconv/files/patch-lib_Makefile.in
+++ b/converters/libiconv/files/patch-lib_Makefile.in
@@ -1,10 +1,10 @@
---- lib/Makefile.in.orig	Wed Jun 11 13:05:08 2003
-+++ lib/Makefile.in	Wed Jun 11 13:05:15 2003
-@@ -44,7 +44,7 @@
+--- lib/Makefile.in.orig	Fri Jul 14 09:18:42 2006
++++ lib/Makefile.in	Fri Jun 29 18:30:13 2007
+@@ -48,7 +48,7 @@ SHELL = /bin/sh
  
  # Before making a release, change this according to the libtool documentation,
  # section "Library interface versions".
--LIBICONV_VERSION_INFO = 4:0:2
+-LIBICONV_VERSION_INFO = 6:0:4
 +LIBICONV_VERSION_INFO = 3
  
  # Needed by $(LIBTOOL).
diff --git a/converters/libiconv/files/patch-src::Makefile.in b/converters/libiconv/files/patch-src::Makefile.in
index 2f2b51c4b08c..52b5865d3fdc 100644
--- a/converters/libiconv/files/patch-src::Makefile.in
+++ b/converters/libiconv/files/patch-src::Makefile.in
@@ -1,9 +1,9 @@
---- src/Makefile.in.orig	Sat Jul 10 03:03:28 2004
-+++ src/Makefile.in	Sat Jul 10 03:04:15 2004
-@@ -92,6 +92,7 @@
+--- src/Makefile.in.orig	Fri Jul 14 09:19:07 2006
++++ src/Makefile.in	Fri Jun 29 18:31:59 2007
+@@ -96,6 +96,7 @@ install : all force
  	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
  	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
+ 	  hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
 +	  freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \
  	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
  	esac