4 files changed, 3 insertions, 65 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index bdc415cb8f7a..3e03574f7e66 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libiconv
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	converters devel
 MASTER_SITES=	GNU
 
diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae
deleted file mode 100644
index d9b1009744a2..000000000000
--- a/converters/libiconv/files/patch-ae
+++ /dev/null
@@ -1,63 +0,0 @@
---- libcharset/lib/Makefile.in.orig	2009-03-26 08:01:00.000000000 -0400
-+++ libcharset/lib/Makefile.in	2009-06-06 15:28:00.000000000 -0400
-@@ -10,6 +10,7 @@ prefix = @prefix@
- local_prefix = /usr/local
- exec_prefix = @exec_prefix@
- libdir = @libdir@
-+sysconfdir = ${exec_prefix}/libdata
- 
- # Programs used by "make":
- CC = @CC@
-@@ -44,7 +45,7 @@ SHELL = /bin/sh
- 
- # Before making a release, change this according to the libtool documentation,
- # section "Library interface versions".
--LIBCHARSET_VERSION_INFO = 1:0:0
-+LIBCHARSET_VERSION_INFO = 1
- 
- # Needed by $(LIBTOOL).
- top_builddir = ..
-@@ -59,7 +60,7 @@ libcharset.la : $(OBJECTS)
- 	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
- 
- localcharset.lo : $(srcdir)/localcharset.c
--	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/localcharset.c
-+	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
- 
- relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
- 	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c
-@@ -80,7 +81,7 @@ ref-del.sed : $(srcdir)/ref-del.sin
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- 	$(mkinstalldirs) $(libdir)
--	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-+	$(LIBTOOL_INSTALL) cp libcharset.la $(libdir)/libcharset.la
- 	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
- 	                                || orig=charset.alias; \
- 	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
-@@ -108,16 +109,17 @@ install : all force
- 	  need_charset_alias=false ; \
- 	fi ; \
- 	$(mkinstalldirs) $(DESTDIR)$(libdir) ; \
--	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
--	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
--	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
--	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
--	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
-+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \
-+	$(LIBTOOL_INSTALL) cp libcharset.la $(DESTDIR)$(libdir)/libcharset.la
-+	if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
-+	  sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
-+	  $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
-+	  rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
- 	else \
- 	  if $$need_charset_alias; then \
--	    sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
--	    $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
--	    rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
-+	    sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
-+	    $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
-+	    rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \
- 	  fi ; \
- 	fi
- 
diff --git a/converters/libiconv/files/patch-libcharset::lib::config.charset b/converters/libiconv/files/patch-libcharset::lib::config.charset
index f8bcbb5cf587..ba30603dc83a 100644
--- a/converters/libiconv/files/patch-libcharset::lib::config.charset
+++ b/converters/libiconv/files/patch-libcharset::lib::config.charset
@@ -35,8 +35,8 @@
 +	echo "eucJP EUC-JP"
 +	echo "eucKR EUC-KR"
 +	echo "Big5 BIG5"
++	echo "Big5HKSCS BIG5-HKSCS"
 +	echo "SJIS SHIFT_JIS"
-+	echo "Shift_JIS SHIFT_JIS"
 +        ;;
    netbsd*)
      echo "646 ASCII"
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
index 884a181b62a8..fc450fbc5b6d 100644
--- a/converters/libiconv/pkg-plist
+++ b/converters/libiconv/pkg-plist
@@ -2,6 +2,7 @@ bin/iconv
 include/iconv.h
 include/libcharset.h
 include/localcharset.h
+lib/charset.alias
 lib/libcharset.a
 lib/libcharset.la
 lib/libcharset.so
@@ -10,7 +11,6 @@ lib/libiconv.a
 lib/libiconv.la
 lib/libiconv.so
 lib/libiconv.so.3
-libdata/charset.alias
 %%DOCSDIR%%/iconv.1.html
 %%DOCSDIR%%/iconv.3.html
 %%DOCSDIR%%/iconv_close.3.html