- Update to 11.3.1

- Strip binary executable and shared library
- Convert to new options helper
- Use OPTIONS_SUB
- Remove outdated pre-install:
- Regenerate patch file with makepatch:

Changes:	https://github.com/buganini/bsdconv/releases
PR:		201010
Submitted by:	sunpoet (myself)
Approved by:	Kuan-Chung Chiu <buganini@gmail.com> (maintainer)

4 files changed, 217 insertions, 104 deletions

diff --git a/converters/bsdconv/Makefile b/converters/bsdconv/Makefile
index 40573eabc04d..56bad3191d48 100644
--- a/converters/bsdconv/Makefile
+++ b/converters/bsdconv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bsdconv
-PORTVERSION=	11.1
+PORTVERSION=	11.3.1
 CATEGORIES=	converters
 
 MAINTAINER=	buganini@gmail.com
@@ -14,35 +14,18 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
 
 OPTIONS_DEFINE=	CHINESE EBCDIC
+OPTIONS_SUB=	yes
 CHINESE_DESC=	Extra Chinese codecs
 EBCDIC_DESC=	EBCDIC codecs
 
+ALL_TARGET=	libbsdconv bsdconv-mktable meta bsdconv-man bsdconv-completion bsdconv filters scorers codecs_basic
+INSTALL_TARGET=	installdir install_main install_filters install_scorers install_basic
+MAKE_ARGS=	PREFIX=${PREFIX} STRIP=${STRIP}
 USE_LDCONFIG=	yes
 
-MAKE_ARGS=	PREFIX=${PREFIX}
-
-ALL_TARGET=	libbsdconv bsdconv-mktable meta bsdconv-man bsdconv-completion bsdconv codecs_basic
-INSTALL_TARGET=	installdir install_main install_basic
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCHINESE}
-ALL_TARGET+=	codecs_chinese
-INSTALL_TARGET+=install_chinese
-PLIST_SUB+=	CHINESE=""
-.else
-PLIST_SUB+=	CHINESE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MEBCDIC}
-ALL_TARGET+=	codecs_ebcdic
-INSTALL_TARGET+=install_ebcdic
-PLIST_SUB+=	EBCDIC=""
-.else
-PLIST_SUB+=	EBCDIC="@comment "
-.endif
-
-pre-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}/ ${STAGEDIR}${DATADIR}/from/ ${STAGEDIR}${DATADIR}/inter/ ${STAGEDIR}${DATADIR}/to/
+CHINESE_ALL_TARGET=	codecs_chinese
+CHINESE_INSTALL_TARGET=	install_chinese
+EBCDIC_ALL_TARGET=	codecs_ebcdic
+EBCDIC_INSTALL_TARGET=	install_ebcdic
 
 .include <bsd.port.mk>
diff --git a/converters/bsdconv/distinfo b/converters/bsdconv/distinfo
index 635209e5cddb..0bbe23621def 100644
--- a/converters/bsdconv/distinfo
+++ b/converters/bsdconv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buganini-bsdconv-11.1_GH0.tar.gz) = afd3e5f512d8e87b852000134644bc98263c1b5fdd818af9f5d19a16359a3934
-SIZE (buganini-bsdconv-11.1_GH0.tar.gz) = 5811769
+SHA256 (buganini-bsdconv-11.3.1_GH0.tar.gz) = b0656011fd40ec440e9966bba44d330a6213fdd198c487c87bc61869ef7fea9e
+SIZE (buganini-bsdconv-11.3.1_GH0.tar.gz) = 6194052
diff --git a/converters/bsdconv/files/patch-Makefile b/converters/bsdconv/files/patch-Makefile
index 150a851b6205..a7d3ff4e9988 100644
--- a/converters/bsdconv/files/patch-Makefile
+++ b/converters/bsdconv/files/patch-Makefile
@@ -1,7 +1,7 @@
---- Makefile.orig	2013-09-16 12:15:40.000000000 +0800
-+++ Makefile	2014-05-15 23:43:23.541980613 +0800
-@@ -3,17 +3,9 @@ BSDCONV_PATH?=${PREFIX}
- CFLAGS+=-Wall -DPREFIX='"${PREFIX}"' -DBSDCONV_PATH='"${BSDCONV_PATH}"'
+--- Makefile.orig	2014-05-13 13:09:10 UTC
++++ Makefile
+@@ -5,17 +5,9 @@ BSDCONV_PATH?=${PREFIX}
+ CFLAGS+=-O2 -Wall -D_BSDCONV_INTERNAL -DPREFIX='"${PREFIX}"' -DBSDCONV_PATH='"${BSDCONV_PATH}"'
  SHLIBVER=11
  
 -UNAME_S=$(shell uname -s)
@@ -16,86 +16,81 @@
 -LIBS+=-ldl
 -endif
  
- TODO_CODECS_BASIC=
- TODO_CODECS_BASIC+=from/00
-@@ -174,12 +166,12 @@ builddir:
- 	mkdir -p build/share/bsdconv/to
+ TODO_FILTERS=
+ TODO_FILTERS+=ANSI
+@@ -237,14 +229,14 @@ bsdconv-completion: builddir libbsdconv 
+ bsdconv-dbg: builddir libbsdconv src/libbsdconv.c src/bsdconv.h src/bsdconv-dbg.c
+ 	$(CC) ${CFLAGS} src/libbsdconv.c src/bsdconv-dbg.c -o build/bin/bsdconv-dbg ${LIBS}
  
- installdir:
--	mkdir -p ${PREFIX}/bin
--	mkdir -p ${PREFIX}/lib
--	mkdir -p ${PREFIX}/include
--	mkdir -p ${PREFIX}/share/bsdconv/from
--	mkdir -p ${PREFIX}/share/bsdconv/inter
--	mkdir -p ${PREFIX}/share/bsdconv/to
-+	mkdir -p ${DESTDIR}${PREFIX}/bin
-+	mkdir -p ${DESTDIR}${PREFIX}/lib
-+	mkdir -p ${DESTDIR}${PREFIX}/include
-+	mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/from
-+	mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/inter
-+	mkdir -p ${DESTDIR}${PREFIX}/share/bsdconv/to
+-filters: builddir
++filters: builddir meta
+ 	for item in ${TODO_FILTERS} ; do \
+ 		echo Build filter $${item}.so ; \
+ 		$(CC) ${CFLAGS} modules/filter/$${item}.c -L./build/lib/ -fPIC -shared -o ./build/share/bsdconv/filter/$${item}.so -lbsdconv ${LIBS} ; \
+ 		if [ -e modules/filter/$${item}.man ]; then cp modules/filter/$${item}.man ./build/share/bsdconv/filter/$${item}.man ; fi ; \
+ 	done
  
- libbsdconv: builddir src/libbsdconv.c src/bsdconv.h
- 	$(CC) ${CFLAGS} src/libbsdconv.c -fPIC -shared -o build/lib/${SHLIBNAME} ${LIBS}
-@@ -238,41 +230,41 @@ clean:
- install: installdir install_main install_basic install_chinese install_ebcdic
+-scorers: builddir
++scorers: builddir meta
+ 	for item in ${TODO_SCORERS} ; do \
+ 		echo Build scorer $${item}.so ; \
+ 		$(CC) ${CFLAGS} modules/scorer/$${item}.c -L./build/lib/ -fPIC -shared -o ./build/share/bsdconv/scorer/$${item}.so -lbsdconv ${LIBS} ; \
+@@ -291,12 +283,12 @@ clean:
+ install: installdir install_main install_filters install_scorers install_basic install_chinese install_ebcdic
  
  install_main:
--	install -m 555 build/bin/bsdconv ${PREFIX}/bin
--	install -m 555 build/bin/bsdconv-man ${PREFIX}/bin
--	install -m 555 build/bin/bsdconv-mktable ${PREFIX}/bin
--	install -m 555 build/bin/bsdconv-completion ${PREFIX}/bin
--	install -m 444 build/include/bsdconv.h ${PREFIX}/include
--	install -m 444 build/lib/${SHLIBNAME} ${PREFIX}/lib
--	install -m 444 build/share/bsdconv/from/alias ${PREFIX}/share/bsdconv/from/alias
--	install -m 444 build/share/bsdconv/inter/alias ${PREFIX}/share/bsdconv/inter/alias
--	install -m 444 build/share/bsdconv/to/alias ${PREFIX}/share/bsdconv/to/alias
-+	install -m 555 build/bin/bsdconv ${DESTDIR}${PREFIX}/bin
-+	install -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
-+	install -m 555 build/bin/bsdconv-mktable ${DESTDIR}${PREFIX}/bin
-+	install -m 555 build/bin/bsdconv-completion ${DESTDIR}${PREFIX}/bin
-+	install -m 444 build/include/bsdconv.h ${DESTDIR}${PREFIX}/include
-+	install -m 444 build/lib/${SHLIBNAME} ${DESTDIR}${PREFIX}/lib
-+	install -m 444 build/share/bsdconv/from/alias ${DESTDIR}${PREFIX}/share/bsdconv/from/alias
-+	install -m 444 build/share/bsdconv/inter/alias ${DESTDIR}${PREFIX}/share/bsdconv/inter/alias
-+	install -m 444 build/share/bsdconv/to/alias ${DESTDIR}${PREFIX}/share/bsdconv/to/alias
- 	if [ ${SHLIBNAME} != libbsdconv.so ]; then \
--		ln -sf libbsdconv.so.${SHLIBVER} ${PREFIX}/lib/libbsdconv.so ; \
-+		ln -sf libbsdconv.so.${SHLIBVER} ${DESTDIR}${PREFIX}/lib/libbsdconv.so ; \
- 	fi
+-	install -m 555 build/bin/bsdconv ${DESTDIR}${PREFIX}/bin
+-	install -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
+-	install -m 555 build/bin/bsdconv-mktable ${DESTDIR}${PREFIX}/bin
+-	install -m 555 build/bin/bsdconv-completion ${DESTDIR}${PREFIX}/bin
++	install ${STRIP} -m 555 build/bin/bsdconv ${DESTDIR}${PREFIX}/bin
++	install ${STRIP} -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
++	install ${STRIP} -m 555 build/bin/bsdconv-mktable ${DESTDIR}${PREFIX}/bin
++	install ${STRIP} -m 555 build/bin/bsdconv-completion ${DESTDIR}${PREFIX}/bin
+ 	install -m 444 build/include/bsdconv.h ${DESTDIR}${PREFIX}/include
+-	install -m 444 build/lib/${SHLIBNAME} ${DESTDIR}${PREFIX}/lib
++	install ${STRIP} -m 444 build/lib/${SHLIBNAME} ${DESTDIR}${PREFIX}/lib
+ 	install -m 444 build/share/bsdconv/from/alias ${DESTDIR}${PREFIX}/share/bsdconv/from/alias
+ 	install -m 444 build/share/bsdconv/inter/alias ${DESTDIR}${PREFIX}/share/bsdconv/inter/alias
+ 	install -m 444 build/share/bsdconv/to/alias ${DESTDIR}${PREFIX}/share/bsdconv/to/alias
+@@ -307,13 +299,13 @@ install_main:
+ 
+ install_filters:
+ 	for item in ${TODO_FILTERS} ; do \
+-		install -m 444 build/share/bsdconv/filter/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/filter/$${item}.so ; \
++		install ${STRIP} -m 444 build/share/bsdconv/filter/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/filter/$${item}.so ; \
+ 		if [ -e build/share/bsdconv/filter/$${item}.man ]; then install -m 444 build/share/bsdconv/filter/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/filter/$${item}.man ; fi ; \
+ 	done
  
- install_doc:
--	install -m 555 build/bin/bsdconv-man ${PREFIX}/bin
-+	install -m 555 build/bin/bsdconv-man ${DESTDIR}${PREFIX}/bin
+ install_scorers:
+ 	for item in ${TODO_SCORERS} ; do \
+-		install -m 444 build/share/bsdconv/scorer/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/scorer/$${item}.so ; \
++		install ${STRIP} -m 444 build/share/bsdconv/scorer/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/scorer/$${item}.so ; \
+ 		if [ -e build/share/bsdconv/scorer/$${item}.man ]; then install -m 444 build/share/bsdconv/scorer/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/scorer/$${item}.man ; fi ; \
+ 	done
  
- install_basic:
+@@ -321,21 +313,21 @@ install_basic:
  	for item in ${TODO_CODECS_BASIC} ; do \
--		install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
--		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
--		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
-+		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
-+		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
-+		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ 		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
+ 		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+-		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
++		if [ -e build/share/bsdconv/$${item}.so ]; then install ${STRIP} -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
  	done
  
  install_chinese:
  	for item in ${TODO_CODECS_CHINESE} ; do \
--		install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
--		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
--		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
-+		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
-+		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
-+		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ 		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
+ 		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+-		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
++		if [ -e build/share/bsdconv/$${item}.so ]; then install ${STRIP} -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
  	done
  
  install_ebcdic:
  	for item in ${TODO_CODECS_EBCDIC} ; do \
--		install -m 444 build/share/bsdconv/$${item} ${PREFIX}/share/bsdconv/$${item} ; \
--		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
--		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
-+		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
-+		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
-+		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
+ 		install -m 444 build/share/bsdconv/$${item} ${DESTDIR}${PREFIX}/share/bsdconv/$${item} ; \
+ 		if [ -e build/share/bsdconv/$${item}.man ]; then install -m 444 build/share/bsdconv/$${item}.man ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.man ; fi ; \
+-		if [ -e build/share/bsdconv/$${item}.so ]; then install -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
++		if [ -e build/share/bsdconv/$${item}.so ]; then install ${STRIP} -m 444 build/share/bsdconv/$${item}.so ${DESTDIR}${PREFIX}/share/bsdconv/$${item}.so ; fi ; \
  	done
  
- plist:
+ build_doc: build_doc_tex build_doc_sphinx
diff --git a/converters/bsdconv/pkg-plist b/converters/bsdconv/pkg-plist
index 58c81768d02a..60e8b8db34dd 100644
--- a/converters/bsdconv/pkg-plist
+++ b/converters/bsdconv/pkg-plist
@@ -5,6 +5,23 @@ bin/bsdconv-mktable
 include/bsdconv.h
 lib/libbsdconv.so
 lib/libbsdconv.so.11
+%%DATADIR%%/filter/ANSI.so
+%%DATADIR%%/filter/BYTE.so
+%%DATADIR%%/filter/CJK.man
+%%DATADIR%%/filter/CJK.so
+%%DATADIR%%/filter/CNS11643.so
+%%DATADIR%%/filter/CYRILLIC.so
+%%DATADIR%%/filter/HANGUL.so
+%%DATADIR%%/filter/HIRAGANA.so
+%%DATADIR%%/filter/KATAKANA.so
+%%DATADIR%%/filter/KHMER.so
+%%DATADIR%%/filter/LATIN1.so
+%%DATADIR%%/filter/MAHJONG.so
+%%DATADIR%%/filter/PRINT.so
+%%DATADIR%%/filter/ROMAN.so
+%%DATADIR%%/filter/THAI.so
+%%DATADIR%%/filter/UNICODE.so
+%%DATADIR%%/filter/alias
 %%DATADIR%%/from/00
 %%DATADIR%%/from/00.man
 %%DATADIR%%/from/ANSI-CONTROL
@@ -15,9 +32,13 @@ lib/libbsdconv.so.11
 %%DATADIR%%/from/ANY.so
 %%DATADIR%%/from/ASCII
 %%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY
+%%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY.man
 %%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY
+%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.man
 %%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.so
+%%DATADIR%%/from/ASCII.man
 %%DATADIR%%/from/BIG5-5C
+%%DATADIR%%/from/BIG5-5C.man
 %%DATADIR%%/from/BSDCONV
 %%DATADIR%%/from/BSDCONV-KEYWORD
 %%DATADIR%%/from/BSDCONV-KEYWORD.man
@@ -27,6 +48,7 @@ lib/libbsdconv.so.11
 %%DATADIR%%/from/BSDCONV.man
 %%DATADIR%%/from/BSDCONV.so
 %%DATADIR%%/from/BYTE
+%%DATADIR%%/from/BYTE.man
 %%DATADIR%%/from/ESCAPE
 %%DATADIR%%/from/ESCAPE.man
 %%DATADIR%%/from/ESCAPE.so
@@ -34,33 +56,51 @@ lib/libbsdconv.so.11
 %%DATADIR%%/from/PASS.man
 %%DATADIR%%/from/PASS.so
 %%DATADIR%%/from/UTF-16BE
+%%DATADIR%%/from/UTF-16BE.man
 %%DATADIR%%/from/UTF-16BE.so
 %%DATADIR%%/from/UTF-16LE
+%%DATADIR%%/from/UTF-16LE.man
 %%DATADIR%%/from/UTF-16LE.so
 %%DATADIR%%/from/UTF-32BE
+%%DATADIR%%/from/UTF-32BE.man
 %%DATADIR%%/from/UTF-32BE.so
 %%DATADIR%%/from/UTF-32LE
+%%DATADIR%%/from/UTF-32LE.man
 %%DATADIR%%/from/UTF-32LE.so
 %%DATADIR%%/from/_CP1251
+%%DATADIR%%/from/_CP1251.man
 %%DATADIR%%/from/_CP1252
+%%DATADIR%%/from/_CP1252.man
 %%DATADIR%%/from/_CP1253
+%%DATADIR%%/from/_CP1253.man
 %%DATADIR%%/from/_CP874
+%%DATADIR%%/from/_CP874.man
 %%DATADIR%%/from/_CP949
+%%DATADIR%%/from/_CP949.man
 %%DATADIR%%/from/_GB18030
+%%DATADIR%%/from/_GB18030.man
 %%DATADIR%%/from/_GB18030.so
 %%DATADIR%%/from/_GBK
+%%DATADIR%%/from/_GBK.man
+%%DATADIR%%/from/_HKSCS2004
 %%DATADIR%%/from/_ISO-8859-1
+%%DATADIR%%/from/_ISO-8859-1.man
 %%DATADIR%%/from/_JIS0212
 %%DATADIR%%/from/_SHIFT-JIS
+%%DATADIR%%/from/_SHIFT-JIS.man
 %%DATADIR%%/from/_UAO250
+%%DATADIR%%/from/_UAO250.man
 %%DATADIR%%/from/_UTF-8
 %%DATADIR%%/from/_UTF-8.man
 %%DATADIR%%/from/_UTF-8.so
 %%DATADIR%%/from/alias
+%%DATADIR%%/inter/ALIAS-FILTER
 %%DATADIR%%/inter/ALIAS-FROM
+%%DATADIR%%/inter/ALIAS-FROM.man
 %%DATADIR%%/inter/ALIAS-FROM.so
 %%DATADIR%%/inter/ALIAS-INTER
 %%DATADIR%%/inter/ALIAS-TO
+%%DATADIR%%/inter/ALIAS-TO.man
 %%DATADIR%%/inter/ALIAS-TO.so
 %%DATADIR%%/inter/AMBIGUOUS-PAD
 %%DATADIR%%/inter/AMBIGUOUS-PAD.man
@@ -69,48 +109,70 @@ lib/libbsdconv.so.11
 %%DATADIR%%/inter/AMBIGUOUS-UNPAD.man
 %%DATADIR%%/inter/AMBIGUOUS-UNPAD.so
 %%DATADIR%%/inter/BIG5-DEFRAG
+%%DATADIR%%/inter/BIG5-DEFRAG.man
 %%DATADIR%%/inter/BIG5-DEFRAG.so
+%%DATADIR%%/inter/CASEFOLD
 %%DATADIR%%/inter/COUNT
 %%DATADIR%%/inter/COUNT.man
 %%DATADIR%%/inter/COUNT.so
 %%DATADIR%%/inter/FULL
+%%DATADIR%%/inter/FULL.man
 %%DATADIR%%/inter/HALF
+%%DATADIR%%/inter/HALF.man
 %%DATADIR%%/inter/INSERT
 %%DATADIR%%/inter/INSERT.man
 %%DATADIR%%/inter/INSERT.so
 %%DATADIR%%/inter/KANA-PHONETIC
+%%DATADIR%%/inter/KANA-PHONETIC.man
 %%DATADIR%%/inter/LOWER
+%%DATADIR%%/inter/LOWER.man
 %%DATADIR%%/inter/MAC
+%%DATADIR%%/inter/MAC.man
 %%DATADIR%%/inter/NL2BR
-%%DATADIR%%/inter/NOBOM
+%%DATADIR%%/inter/NL2BR.man
 %%DATADIR%%/inter/PASS
 %%DATADIR%%/inter/PASS.man
 %%DATADIR%%/inter/PASS.so
+%%DATADIR%%/inter/REPLACE
+%%DATADIR%%/inter/REPLACE.man
+%%DATADIR%%/inter/REPLACE.so
 %%DATADIR%%/inter/SCORE
 %%DATADIR%%/inter/SCORE-TRAIN
+%%DATADIR%%/inter/SCORE-TRAIN.man
 %%DATADIR%%/inter/SCORE-TRAIN.so
+%%DATADIR%%/inter/SCORE.man
 %%DATADIR%%/inter/SCORE.so
+%%DATADIR%%/inter/STRINGS
+%%DATADIR%%/inter/STRINGS.man
+%%DATADIR%%/inter/STRINGS.so
 %%DATADIR%%/inter/TRIM-WIDTH
+%%DATADIR%%/inter/TRIM-WIDTH.man
 %%DATADIR%%/inter/TRIM-WIDTH.so
 %%DATADIR%%/inter/UNIX
+%%DATADIR%%/inter/UNIX.man
 %%DATADIR%%/inter/UPPER
+%%DATADIR%%/inter/UPPER.man
 %%DATADIR%%/inter/UPSIDEDOWN
+%%DATADIR%%/inter/UPSIDEDOWN.man
 %%DATADIR%%/inter/WHITESPACE-DERAIL
+%%DATADIR%%/inter/WHITESPACE-DERAIL.man
 %%DATADIR%%/inter/WHITESPACE-DERAIL.so
 %%DATADIR%%/inter/WHITESPACE-RERAIL
+%%DATADIR%%/inter/WHITESPACE-RERAIL.man
 %%DATADIR%%/inter/WHITESPACE-RERAIL.so
 %%DATADIR%%/inter/WIDTH
 %%DATADIR%%/inter/WIDTH.man
 %%DATADIR%%/inter/WIDTH.so
 %%DATADIR%%/inter/WIN
+%%DATADIR%%/inter/WIN.man
 %%DATADIR%%/inter/ZH-FUZZY-CN
 %%DATADIR%%/inter/ZH-FUZZY-TW
-%%DATADIR%%/inter/ZH-STRINGS
-%%DATADIR%%/inter/ZH-STRINGS.man
-%%DATADIR%%/inter/ZH-STRINGS.so
 %%DATADIR%%/inter/ZHCN
+%%DATADIR%%/inter/ZHCN.man
 %%DATADIR%%/inter/ZHTW
 %%DATADIR%%/inter/ZHTW-WORDS
+%%DATADIR%%/inter/ZHTW-WORDS.man
+%%DATADIR%%/inter/ZHTW.man
 %%DATADIR%%/inter/_NF-HANGUL-COMPOSITION
 %%DATADIR%%/inter/_NF-HANGUL-COMPOSITION.so
 %%DATADIR%%/inter/_NF-HANGUL-DECOMPOSITION
@@ -123,34 +185,49 @@ lib/libbsdconv.so.11
 %%DATADIR%%/inter/_NFD
 %%DATADIR%%/inter/_NFKD
 %%DATADIR%%/inter/alias
+%%DATADIR%%/scorer/CJK.so
+%%DATADIR%%/scorer/LATIN1.so
 %%DATADIR%%/to/00
 %%DATADIR%%/to/ANY
 %%DATADIR%%/to/ANY.man
 %%DATADIR%%/to/ANY.so
 %%DATADIR%%/to/ASCII
 %%DATADIR%%/to/ASCII-HTML-CNS11643-IMG
+%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.man
 %%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
 %%DATADIR%%/to/ASCII-HTML-INFO
+%%DATADIR%%/to/ASCII-HTML-INFO.man
 %%DATADIR%%/to/ASCII-HTML-INFO.so
 %%DATADIR%%/to/ASCII-HTML-UNICODE-IMG
+%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.man
 %%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
 %%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY
+%%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY.man
+%%DATADIR%%/to/ASCII.man
 %%DATADIR%%/to/BIG5-5C
+%%DATADIR%%/to/BIG5-5C.man
 %%DATADIR%%/to/BSDCONV
 %%DATADIR%%/to/BSDCONV-KEYWORD
 %%DATADIR%%/to/BSDCONV-KEYWORD.man
 %%DATADIR%%/to/BSDCONV-LOG
+%%DATADIR%%/to/BSDCONV-LOG.man
 %%DATADIR%%/to/BSDCONV-LOG.so
-%%DATADIR%%/to/BSDCONV-STDOUT
-%%DATADIR%%/to/BSDCONV-STDOUT.so
+%%DATADIR%%/to/BSDCONV-OUTPUT
+%%DATADIR%%/to/BSDCONV-OUTPUT.man
+%%DATADIR%%/to/BSDCONV-OUTPUT.so
+%%DATADIR%%/to/BSDCONV.man
 %%DATADIR%%/to/BSDCONV.so
 %%DATADIR%%/to/BYTE
+%%DATADIR%%/to/BYTE.man
 %%DATADIR%%/to/CP936-TRANS
+%%DATADIR%%/to/CP936-TRANS.man
 %%DATADIR%%/to/CP950-TRANS
+%%DATADIR%%/to/CP950-TRANS.man
 %%DATADIR%%/to/ESCAPE
 %%DATADIR%%/to/ESCAPE.man
 %%DATADIR%%/to/ESCAPE.so
 %%DATADIR%%/to/NULL
+%%DATADIR%%/to/NULL.man
 %%DATADIR%%/to/NULL.so
 %%DATADIR%%/to/PASS
 %%DATADIR%%/to/PASS.man
@@ -159,72 +236,130 @@ lib/libbsdconv.so.11
 %%DATADIR%%/to/RAW.man
 %%DATADIR%%/to/RAW.so
 %%DATADIR%%/to/UCS-2BE
+%%DATADIR%%/to/UCS-2BE.man
 %%DATADIR%%/to/UCS-2BE.so
 %%DATADIR%%/to/UCS-2LE
+%%DATADIR%%/to/UCS-2LE.man
 %%DATADIR%%/to/UCS-2LE.so
 %%DATADIR%%/to/UTF-16BE
+%%DATADIR%%/to/UTF-16BE.man
 %%DATADIR%%/to/UTF-16BE.so
 %%DATADIR%%/to/UTF-16LE
+%%DATADIR%%/to/UTF-16LE.man
 %%DATADIR%%/to/UTF-16LE.so
 %%DATADIR%%/to/UTF-32BE
+%%DATADIR%%/to/UTF-32BE.man
 %%DATADIR%%/to/UTF-32BE.so
 %%DATADIR%%/to/UTF-32LE
+%%DATADIR%%/to/UTF-32LE.man
 %%DATADIR%%/to/UTF-32LE.so
 %%DATADIR%%/to/_CP1251
+%%DATADIR%%/to/_CP1251.man
 %%DATADIR%%/to/_CP1252
+%%DATADIR%%/to/_CP1252.man
 %%DATADIR%%/to/_CP1253
+%%DATADIR%%/to/_CP1253.man
 %%DATADIR%%/to/_CP874
+%%DATADIR%%/to/_CP874.man
 %%DATADIR%%/to/_CP936
+%%DATADIR%%/to/_CP936.man
 %%DATADIR%%/to/_CP949
+%%DATADIR%%/to/_CP949.man
 %%DATADIR%%/to/_CP950
+%%DATADIR%%/to/_CP950.man
 %%DATADIR%%/to/_GB18030
+%%DATADIR%%/to/_GB18030.man
 %%DATADIR%%/to/_GB18030.so
 %%DATADIR%%/to/_GBK
+%%DATADIR%%/to/_GBK.man
 %%DATADIR%%/to/_ISO-8859-1
+%%DATADIR%%/to/_ISO-8859-1.man
 %%DATADIR%%/to/_JIS0212
 %%DATADIR%%/to/_SHIFT-JIS
+%%DATADIR%%/to/_SHIFT-JIS.man
 %%DATADIR%%/to/_UAO250
+%%DATADIR%%/to/_UAO250.man
 %%DATADIR%%/to/_UTF-8
+%%DATADIR%%/to/_UTF-8.man
 %%DATADIR%%/to/_UTF-8.so
 %%DATADIR%%/to/alias
 %%CHINESE%%%%DATADIR%%/from/CCCII
+%%CHINESE%%%%DATADIR%%/from/CCCII.man
+%%CHINESE%%%%DATADIR%%/from/_BIG5-2003
+%%CHINESE%%%%DATADIR%%/from/_BIG5-2003.man
+%%CHINESE%%%%DATADIR%%/from/_BIG5-ETEN
+%%CHINESE%%%%DATADIR%%/from/_BIG5-ETEN.man
+%%CHINESE%%%%DATADIR%%/from/_BIG5E
+%%CHINESE%%%%DATADIR%%/from/_BIG5E.man
 %%CHINESE%%%%DATADIR%%/from/_CNS11643
+%%CHINESE%%%%DATADIR%%/from/_CNS11643.man
 %%CHINESE%%%%DATADIR%%/from/_CNS11643.so
 %%CHINESE%%%%DATADIR%%/from/_CP936
+%%CHINESE%%%%DATADIR%%/from/_CP936.man
 %%CHINESE%%%%DATADIR%%/from/_CP950
+%%CHINESE%%%%DATADIR%%/from/_CP950.man
 %%CHINESE%%%%DATADIR%%/from/_GB2312
+%%CHINESE%%%%DATADIR%%/from/_GB2312.man
+%%CHINESE%%%%DATADIR%%/from/_HKSCS1999
+%%CHINESE%%%%DATADIR%%/from/_HKSCS2001
 %%CHINESE%%%%DATADIR%%/from/_UAO241
+%%CHINESE%%%%DATADIR%%/from/_UAO241.man
 %%CHINESE%%%%DATADIR%%/inter/CHEWING
 %%CHINESE%%%%DATADIR%%/inter/CHEWING.man
 %%CHINESE%%%%DATADIR%%/inter/CNS11643
+%%CHINESE%%%%DATADIR%%/inter/CNS11643.man
 %%CHINESE%%%%DATADIR%%/inter/HAN-PINYIN
+%%CHINESE%%%%DATADIR%%/inter/HAN-PINYIN.man
 %%CHINESE%%%%DATADIR%%/inter/UNICODE
+%%CHINESE%%%%DATADIR%%/inter/UNICODE.man
+%%CHINESE%%%%DATADIR%%/inter/ZH-BONUS
+%%CHINESE%%%%DATADIR%%/inter/ZH-BONUS-PHRASE
+%%CHINESE%%%%DATADIR%%/inter/ZH-BONUS-PHRASE.so
+%%CHINESE%%%%DATADIR%%/inter/ZH-BONUS.so
 %%CHINESE%%%%DATADIR%%/inter/ZH-COMP
+%%CHINESE%%%%DATADIR%%/inter/ZH-COMP.man
 %%CHINESE%%%%DATADIR%%/inter/ZH-DECOMP
+%%CHINESE%%%%DATADIR%%/inter/ZH-DECOMP.man
 %%CHINESE%%%%DATADIR%%/to/CCCII
+%%CHINESE%%%%DATADIR%%/to/CCCII.man
 %%CHINESE%%%%DATADIR%%/to/_CNS11643
+%%CHINESE%%%%DATADIR%%/to/_CNS11643.man
 %%CHINESE%%%%DATADIR%%/to/_CNS11643.so
 %%CHINESE%%%%DATADIR%%/to/_GB2312
+%%CHINESE%%%%DATADIR%%/to/_GB2312.man
 %%CHINESE%%%%DATADIR%%/to/_UAO241
+%%CHINESE%%%%DATADIR%%/to/_UAO241.man
 %%EBCDIC%%%%DATADIR%%/from/IBM-37
+%%EBCDIC%%%%DATADIR%%/from/IBM-37.man
 %%EBCDIC%%%%DATADIR%%/from/IBM-930
+%%EBCDIC%%%%DATADIR%%/from/IBM-930.man
 %%EBCDIC%%%%DATADIR%%/from/IBM-930.so
 %%EBCDIC%%%%DATADIR%%/from/IBM-933
+%%EBCDIC%%%%DATADIR%%/from/IBM-933.man
 %%EBCDIC%%%%DATADIR%%/from/IBM-933.so
 %%EBCDIC%%%%DATADIR%%/from/IBM-935
+%%EBCDIC%%%%DATADIR%%/from/IBM-935.man
 %%EBCDIC%%%%DATADIR%%/from/IBM-935.so
 %%EBCDIC%%%%DATADIR%%/from/IBM-937
+%%EBCDIC%%%%DATADIR%%/from/IBM-937.man
 %%EBCDIC%%%%DATADIR%%/from/IBM-937.so
 %%EBCDIC%%%%DATADIR%%/from/IBM-939
+%%EBCDIC%%%%DATADIR%%/from/IBM-939.man
 %%EBCDIC%%%%DATADIR%%/from/IBM-939.so
 %%EBCDIC%%%%DATADIR%%/to/IBM-37
+%%EBCDIC%%%%DATADIR%%/to/IBM-37.man
 %%EBCDIC%%%%DATADIR%%/to/IBM-930
+%%EBCDIC%%%%DATADIR%%/to/IBM-930.man
 %%EBCDIC%%%%DATADIR%%/to/IBM-930.so
 %%EBCDIC%%%%DATADIR%%/to/IBM-933
+%%EBCDIC%%%%DATADIR%%/to/IBM-933.man
 %%EBCDIC%%%%DATADIR%%/to/IBM-933.so
 %%EBCDIC%%%%DATADIR%%/to/IBM-935
+%%EBCDIC%%%%DATADIR%%/to/IBM-935.man
 %%EBCDIC%%%%DATADIR%%/to/IBM-935.so
 %%EBCDIC%%%%DATADIR%%/to/IBM-937
+%%EBCDIC%%%%DATADIR%%/to/IBM-937.man
 %%EBCDIC%%%%DATADIR%%/to/IBM-937.so
 %%EBCDIC%%%%DATADIR%%/to/IBM-939
+%%EBCDIC%%%%DATADIR%%/to/IBM-939.man
 %%EBCDIC%%%%DATADIR%%/to/IBM-939.so