7 files changed, 76 insertions, 40 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 4206705059f1..4897ef07e2d9 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libiconv
-PORTVERSION=	1.6.1
+PORTVERSION=	1.7
 CATEGORIES=	converters devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.ilog.fr/pub/Users/haible/gnu/
@@ -21,5 +21,13 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		giconv.1
 MAN3=		giconv.3 giconv_open.3 giconv_close.3
+MAKE_FLAGS+=	LIBTOOL="${LIBTOOL}" -ELIBTOOL
+
+post-patch:
+	# Patching the test scripts to exit -1 if a comparision fails:
+	@${PERL} -pi -e 's,(cmp [^\s]+\s[^\s]+)(\s*2>\s*/dev/null)?\s*\n,\1\
+		|| exit -1\n,,' ${WRKSRC}/tests/check-translit \
+			${WRKSRC}/tests/check-stateless \
+			${WRKSRC}/tests/check-stateful
 
 .include <bsd.port.mk>
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 42441e22980e..153543a10405 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1 +1 @@
-MD5 (libiconv-1.6.1.tar.gz) = 0117656ed71bc2929949583403cc7742
+MD5 (libiconv-1.7.tar.gz) = bc7029c0bc913dc297cf49afa4c0e133
diff --git a/converters/libiconv/files/patch-ab b/converters/libiconv/files/patch-ab
index a9fc3338dc55..42b47d294478 100644
--- a/converters/libiconv/files/patch-ab
+++ b/converters/libiconv/files/patch-ab
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Fri Dec  8 08:49:16 2000
-+++ src/Makefile.in	Thu Feb  8 22:58:33 2001
-@@ -40,8 +40,8 @@
+--- src/Makefile.in	Mon Jun 25 17:58:00 2001
++++ src/Makefile.in	Thu Aug 23 10:16:07 2001
+@@ -41,8 +41,8 @@
  
 -iconv : $(srcdir)/iconv.c ../lib/libiconv.la
--	$(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -I../lib $(srcdir)/iconv.c ../lib/libiconv.la -o $@
+-	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) -I../lib $(CFLAGS) $(CPPFLAGS) $(srcdir)/iconv.c ../lib/libiconv.la -o $@
 +iconv : $(srcdir)/iconv.c ../lib/libgiconv.la
-+	$(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -I../lib $(srcdir)/iconv.c ../lib/libgiconv.la -o $@
++	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) -I../lib $(CFLAGS) $(CPPFLAGS) $(srcdir)/iconv.c ../lib/libgiconv.la -o $@
  
  # The following rule is necessary to avoid a toplevel "make -n check" failure.
 -../lib/libiconv.la :
diff --git a/converters/libiconv/files/patch-ad b/converters/libiconv/files/patch-ad
index 0935140cdfa0..2fb99909fee2 100644
--- a/converters/libiconv/files/patch-ad
+++ b/converters/libiconv/files/patch-ad
@@ -1,25 +1,22 @@
-
-$FreeBSD$
-
---- lib/Makefile.in.orig	Sun Mar 11 16:37:52 2001
-+++ lib/Makefile.in	Mon Apr  2 11:13:17 2001
+--- lib/Makefile.in	Wed Jun 27 18:37:49 2001
++++ lib/Makefile.in	Thu Aug 23 10:24:29 2001
 @@ -1,4 +1,4 @@
 -# Makefile for libiconv/lib
 +# Makefile for libgiconv/lib
  
  #### Start of system configuration section. ####
  
-@@ -49,27 +49,27 @@
+@@ -50,31 +50,31 @@
  
  LIBCHARSET_OBJECTS = ../libcharset/lib/localcharset.lo
  
--all : libiconv.la @PLUGLIB@
-+all : libgiconv.la @PLUGLIB@
+-all : @PLUGLIB@ libiconv.la
++all : @PLUGLIB@ libgiconv.la
  
 -libiconv.la : $(OBJECTS)
--	$(LIBTOOL_LINK) $(CC) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) $(LIBCHARSET_OBJECTS)
+-	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -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) -no-undefined $(OBJECTS) $(LIBCHARSET_OBJECTS)
++	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -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
@@ -29,28 +26,33 @@ $FreeBSD$
 +	$(LN_S) libgiconv_plug_@OS@.so libgiconv_plug.so
  
 -libiconv_plug_linux.so : $(SOURCES)
--	$(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libiconv_plug_linux.so
+-	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libiconv_plug_linux.so
 +libgiconv_plug_linux.so : $(SOURCES)
-+	$(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libgiconv_plug_linux.so
++	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libgiconv_plug_linux.so
  
 -libiconv_plug_solaris.so : $(SOURCES)
--	$(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libiconv_plug_solaris.so
 +libgiconv_plug_solaris.so : $(SOURCES)
-+	$(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libgiconv_plug_solaris.so
+ 	if test -n "@GCC@"; then \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libiconv_plug_solaris.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libgiconv_plug_solaris.so; \
+ 	else \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libiconv_plug_solaris.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libgiconv_plug_solaris.so; \
+ 	fi
  
 -libiconv_plug_osf.so : $(SOURCES)
 +libgiconv_plug_osf.so : $(SOURCES)
  	if test -n "@GCC@"; then \
--	  $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libiconv_plug_osf.so; \
-+	  $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libgiconv_plug_osf.so; \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libiconv_plug_osf.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libgiconv_plug_osf.so; \
  	else \
- 	  $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -c -o iconv_plug.o; \
+ 	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -c -o iconv_plug.o; \
 -	  /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
  
  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 @@
+@@ -84,13 +84,13 @@
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
  	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
@@ -66,7 +68,7 @@ $FreeBSD$
  	if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
  
  installdirs : force
-@@ -94,7 +94,7 @@
+@@ -99,7 +99,7 @@
  	if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
  
  uninstall : force
@@ -75,12 +77,12 @@ $FreeBSD$
  	if test -n "@PLUGLIB@"; then $(RM) $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
  
  check : all
-@@ -102,7 +102,7 @@
+@@ -107,7 +107,7 @@
  mostlyclean : clean
  
  clean : force
--	$(RM) *.o *.lo *.a *.la libiconv_plug* core
-+	$(RM) *.o *.lo *.a *.la libgiconv_plug* core
+-	$(RM) *.o *.lo *.a *.la libiconv_plug* core so_locations
++	$(RM) *.o *.lo *.a *.la libgiconv_plug* core so_locations
  	$(RM) -r .libs _libs
  
  distclean : clean
diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae
index ac1e50e2f341..3822a21281bc 100644
--- a/converters/libiconv/files/patch-ae
+++ b/converters/libiconv/files/patch-ae
@@ -1,8 +1,7 @@
-
 $FreeBSD$
 
---- libcharset/lib/Makefile.in.orig	Sun Mar 11 16:37:53 2001
-+++ libcharset/lib/Makefile.in	Mon Apr  2 11:56:59 2001
+--- libcharset/lib/Makefile.in	Wed Jun 27 18:56:56 2001
++++ libcharset/lib/Makefile.in	Thu Aug 23 10:28:27 2001
 @@ -10,6 +10,7 @@
  local_prefix = /usr/local
  exec_prefix = @exec_prefix@
@@ -11,16 +10,16 @@ $FreeBSD$
  
  # Programs used by "make":
  CC = @CC@
-@@ -51,7 +52,7 @@
- 	$(LIBTOOL_LINK) $(CC) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
+@@ -53,7 +54,7 @@
+ 	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -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
-+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(INCLUDES) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
+-	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c
++	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
  
  charset.alias: $(srcdir)/config.charset
  	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-@@ -70,11 +71,12 @@
+@@ -72,11 +73,12 @@
  install-lib : all force
  	$(MKINSTALLDIRS) $(libdir)
  	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
@@ -37,7 +36,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
-@@ -86,15 +88,16 @@
+@@ -88,15 +90,16 @@
  install : all force
  	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
  	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
diff --git a/converters/libiconv/files/patch-tests b/converters/libiconv/files/patch-tests
new file mode 100644
index 000000000000..341c04752a84
--- /dev/null
+++ b/converters/libiconv/files/patch-tests
@@ -0,0 +1,27 @@
+--- tests/Makefile.in	Mon Jun 25 18:03:32 2001
++++ tests/Makefile.in	Thu Aug 23 10:41:17 2001
+@@ -28,5 +28,3 @@
+ 
+-all :
+-
+-check : all table-from table-to ../src/iconv
++check all: table-from table-to
+ 	$(srcdir)/check-stateless $(srcdir) ASCII
+@@ -138,11 +136,11 @@
+ 
+-table-from : $(srcdir)/table-from.c ../lib/libiconv.la
+-	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/table-from.c ../lib/libiconv.la -o $@
++table-from : $(srcdir)/table-from.c ../lib/libgiconv.la
++	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/table-from.c ../lib/libgiconv.la -o $@
+ 
+-table-to : $(srcdir)/table-to.c ../lib/libiconv.la
+-	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/table-to.c ../lib/libiconv.la -o $@
++table-to : $(srcdir)/table-to.c ../lib/libgiconv.la
++	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(srcdir)/table-to.c ../lib/libgiconv.la -o $@
+ 
+ # The following rule is necessary to avoid a toplevel "make -n check" failure.
+-../lib/libiconv.la :
+-	cd ../lib && $(MAKE) libiconv.la
++../lib/libgiconv.la :
++	cd ../lib && $(MAKE) libgiconv.la
+ 
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
index 117fa87bb63a..3a0c3dfc2c2e 100644
--- a/converters/libiconv/pkg-plist
+++ b/converters/libiconv/pkg-plist
@@ -3,8 +3,8 @@ include/giconv.h
 include/libcharset.h
 lib/libcharset.a
 lib/libcharset.so
-lib/libcharset.so.1
+lib/libcharset.so.1.0
 lib/libgiconv.a
 lib/libgiconv.so
-lib/libgiconv.so.2
+lib/libgiconv.so.2.4
 libdata/charset.alias