5 files changed, 47 insertions, 22 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 2f7e2a577033..7aef1724c9bd 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	libiconv
-PORTVERSION=	1.5.1
+PORTVERSION=	1.6.1
 CATEGORIES=	converters devel
-MASTER_SITES=	ftp://ftp.ilog.fr/pub/Users/haible/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		ftp://ftp.ilog.fr/pub/Users/haible/gnu/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index df0de994019f..42441e22980e 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1 +1 @@
-MD5 (libiconv-1.5.1.tar.gz) = 8b7c51cd7c44618258cec9439fa858ba
+MD5 (libiconv-1.6.1.tar.gz) = 0117656ed71bc2929949583403cc7742
diff --git a/converters/libiconv/files/patch-ad b/converters/libiconv/files/patch-ad
index 5995da70576d..0935140cdfa0 100644
--- a/converters/libiconv/files/patch-ad
+++ b/converters/libiconv/files/patch-ad
@@ -1,18 +1,25 @@
---- lib/Makefile.in.orig	Fri Dec  8 08:49:42 2000
-+++ lib/Makefile.in	Thu Feb  8 22:59:57 2001
-@@ -1,2 +1,2 @@
+
+$FreeBSD$
+
+--- lib/Makefile.in.orig	Sun Mar 11 16:37:52 2001
++++ lib/Makefile.in	Mon Apr  2 11:13:17 2001
+@@ -1,4 +1,4 @@
 -# Makefile for libiconv/lib
 +# Makefile for libgiconv/lib
  
-@@ -51,23 +51,23 @@
+ #### Start of system configuration section. ####
+ 
+@@ -49,27 +49,27 @@
+ 
+ LIBCHARSET_OBJECTS = ../libcharset/lib/localcharset.lo
  
 -all : libiconv.la @PLUGLIB@
 +all : libgiconv.la @PLUGLIB@
  
 -libiconv.la : $(OBJECTS)
--	$(LIBTOOL_LINK) $(CC) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) $(OBJECTS) $(LIBCHARSET_OBJECTS)
+-	$(LIBTOOL_LINK) $(CC) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) $(LIBCHARSET_OBJECTS)
 +libgiconv.la : $(OBJECTS)
-+	$(LIBTOOL_LINK) $(CC) -o libgiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) $(OBJECTS) $(LIBCHARSET_OBJECTS)
++	$(LIBTOOL_LINK) $(CC) -o libgiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) $(LIBCHARSET_OBJECTS)
  
 -libiconv_plug.so : libiconv_plug_@OS@.so
 -	$(RM) libiconv_plug.so
@@ -41,23 +48,39 @@
 -	  /bin/ld -shared -expect_unresolved \* -o libiconv_plug_osf.so iconv_plug.o; \
 +	  /bin/ld -shared -expect_unresolved \* -o libgiconv_plug_osf.so iconv_plug.o; \
  	fi
-@@ -81,3 +81,3 @@
+ 
+ iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h $(srcdir)/encodings.def $(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def $(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def $(srcdir)/aliases.h $(srcdir)/aliases_aix.h $(srcdir)/aliases_osf1.h $(srcdir)/aliases_dos.h $(srcdir)/flags.h
+@@ -79,13 +79,13 @@
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
+ install-lib : all force
  	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
 +	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(libdir)/libgiconv.la
  
-@@ -87,3 +87,3 @@
+ install : all force
+ 	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
+ 	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi
  	if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
 +	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(DESTDIR)$(libdir)/libgiconv.la
  	if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
-@@ -96,3 +96,3 @@
+ 
+ installdirs : force
+@@ -94,7 +94,7 @@
+ 	if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
+ 
  uninstall : force
 -	$(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libiconv.la
 +	$(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libgiconv.la
  	if test -n "@PLUGLIB@"; then $(RM) $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
-@@ -104,3 +104,3 @@
+ 
+ check : all
+@@ -102,7 +102,7 @@
+ mostlyclean : clean
+ 
  clean : force
 -	$(RM) *.o *.lo *.a *.la libiconv_plug* core
 +	$(RM) *.o *.lo *.a *.la libgiconv_plug* core
  	$(RM) -r .libs _libs
+ 
+ distclean : clean
diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae
index e69701bcb996..ac1e50e2f341 100644
--- a/converters/libiconv/files/patch-ae
+++ b/converters/libiconv/files/patch-ae
@@ -1,18 +1,18 @@
 
 $FreeBSD$
 
---- libcharset/lib/Makefile.in.orig	Tue Dec 12 21:43:30 2000
-+++ libcharset/lib/Makefile.in	Fri Feb  9 21:31:11 2001
+--- libcharset/lib/Makefile.in.orig	Sun Mar 11 16:37:53 2001
++++ libcharset/lib/Makefile.in	Mon Apr  2 11:56:59 2001
 @@ -10,6 +10,7 @@
  local_prefix = /usr/local
  exec_prefix = @exec_prefix@
- libdir = $(exec_prefix)/lib
-+sysconfdir = $(exec_prefix)/etc
+ libdir = @libdir@
++sysconfdir = $(exec_prefix)/libdata
  
  # Programs used by "make":
  CC = @CC@
-@@ -50,7 +51,7 @@
- 	$(LIBTOOL_LINK) $(CC) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) $(OBJECTS)
+@@ -51,7 +52,7 @@
+ 	$(LIBTOOL_LINK) $(CC) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
  
  localcharset.lo : $(srcdir)/localcharset.c
 -	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(INCLUDES) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c
@@ -20,7 +20,7 @@ $FreeBSD$
  
  charset.alias: $(srcdir)/config.charset
  	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-@@ -69,11 +70,12 @@
+@@ -70,11 +71,12 @@
  install-lib : all force
  	$(MKINSTALLDIRS) $(libdir)
  	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
@@ -37,7 +37,7 @@ $FreeBSD$
  
  # The following is needed in order to install a simple file in $(libdir)
  # which is shared with other installed packages. We use a list of referencing
-@@ -85,15 +87,16 @@
+@@ -86,15 +88,16 @@
  install : all force
  	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
  	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
index 99c9ca02e0c9..117fa87bb63a 100644
--- a/converters/libiconv/pkg-plist
+++ b/converters/libiconv/pkg-plist
@@ -1,5 +1,4 @@
 bin/giconv
-etc/charset.alias
 include/giconv.h
 include/libcharset.h
 lib/libcharset.a
@@ -8,3 +7,4 @@ lib/libcharset.so.1
 lib/libgiconv.a
 lib/libgiconv.so
 lib/libgiconv.so.2
+libdata/charset.alias