3 files changed, 78 insertions, 72 deletions

diff --git a/converters/bsdconv/Makefile b/converters/bsdconv/Makefile
index 3df6d2968299..f3a1cd4ba833 100644
--- a/converters/bsdconv/Makefile
+++ b/converters/bsdconv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bsdconv
-PORTVERSION=	6.2
+PORTVERSION=	7.0
 CATEGORIES=	converters
 MASTER_SITES=	https://github.com/buganini/${PORTNAME}/tarball/${PORTVERSION}/
 DISTNAME=	buganini-${PORTNAME}-${PORTVERSION}-0-g${GITVERSION}
@@ -16,7 +16,7 @@ COMMENT=	BSD licensed charset/encoding converter library
 
 LICENSE=	BSD
 
-GITVERSION=	50e0819
+GITVERSION=	2d21a55
 FETCH_ARGS=	-pRr
 WRKSRC=		${WRKDIR}/buganini-${PORTNAME}-${GITVERSION}
 
diff --git a/converters/bsdconv/distinfo b/converters/bsdconv/distinfo
index 4e030f1ecbd0..1369a5cef160 100644
--- a/converters/bsdconv/distinfo
+++ b/converters/bsdconv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buganini-bsdconv-6.2-0-g50e0819.tar.gz) = 66d786528e2892694c4794dafdc603c2e358890d7cf52a04948f8d2fd6e80489
-SIZE (buganini-bsdconv-6.2-0-g50e0819.tar.gz) = 4235292
+SHA256 (buganini-bsdconv-7.0-0-g2d21a55.tar.gz) = df1fc214fbbbf0ceb11c5abfd664180bb4c16edc2ae509078a4d0953cf4929a4
+SIZE (buganini-bsdconv-7.0-0-g2d21a55.tar.gz) = 4233325
diff --git a/converters/bsdconv/pkg-plist b/converters/bsdconv/pkg-plist
index 477c84784145..86e58d93f9fc 100644
--- a/converters/bsdconv/pkg-plist
+++ b/converters/bsdconv/pkg-plist
@@ -2,36 +2,53 @@ bin/bsdconv
 bin/bsdconv_mktable
 include/bsdconv.h
 lib/libbsdconv.so
-lib/libbsdconv.so.6
+lib/libbsdconv.so.7
 %%DATADIR%%/from/3F
 %%DATADIR%%/from/ANSI-CONTROL
+%%DATADIR%%/from/ANSI-CONTROL.so
+%%DATADIR%%/from/ASCII
 %%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY
 %%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY
-%%DATADIR%%/from/ASCII
+%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.so
 %%DATADIR%%/from/BIG5-5C
 %%DATADIR%%/from/BSDCONV
+%%DATADIR%%/from/BSDCONV.so
 %%DATADIR%%/from/BSDCONV_KEYWORD
 %%DATADIR%%/from/BSDCONV_LOG
+%%DATADIR%%/from/BSDCONV_LOG.so
 %%DATADIR%%/from/BYTE
-%%DATADIR%%/from/CP1251
-%%DATADIR%%/from/CP1252
-%%DATADIR%%/from/CP949
 %%DATADIR%%/from/ESCAPE
-%%DATADIR%%/from/GBK
-%%DATADIR%%/from/ISO-8859-1
+%%DATADIR%%/from/ESCAPE.so
 %%DATADIR%%/from/NUL
 %%DATADIR%%/from/PASS
-%%DATADIR%%/from/SHIFT-JIS
+%%DATADIR%%/from/PASS.so
 %%DATADIR%%/from/SKIP
-%%DATADIR%%/from/UAO250
+%%DATADIR%%/from/SKIP.so
 %%DATADIR%%/from/UTF-16BE
+%%DATADIR%%/from/UTF-16BE.so
 %%DATADIR%%/from/UTF-16LE
+%%DATADIR%%/from/UTF-16LE.so
 %%DATADIR%%/from/UTF-32BE
+%%DATADIR%%/from/UTF-32BE.so
 %%DATADIR%%/from/UTF-32LE
-%%DATADIR%%/from/UTF-8
+%%DATADIR%%/from/UTF-32LE.so
+%%DATADIR%%/from/_CP1251
+%%DATADIR%%/from/_CP1252
+%%DATADIR%%/from/_CP874
+%%DATADIR%%/from/_CP949
+%%DATADIR%%/from/_GBK
+%%DATADIR%%/from/_ISO-8859-1
+%%DATADIR%%/from/_SHIFT-JIS
+%%DATADIR%%/from/_UAO250
+%%DATADIR%%/from/_UTF-8
+%%DATADIR%%/from/_UTF-8.so
+%%DATADIR%%/from/alias
 %%DATADIR%%/inter/AMBIGUOUS-PAD
+%%DATADIR%%/inter/AMBIGUOUS-PAD.so
 %%DATADIR%%/inter/AMBIGUOUS-UNPAD
+%%DATADIR%%/inter/AMBIGUOUS-UNPAD.so
 %%DATADIR%%/inter/BIG5-DEFRAG
+%%DATADIR%%/inter/BIG5-DEFRAG.so
 %%DATADIR%%/inter/FROM_ALIAS
 %%DATADIR%%/inter/FULL
 %%DATADIR%%/inter/HALF
@@ -41,111 +58,100 @@ lib/libbsdconv.so.6
 %%DATADIR%%/inter/MAC
 %%DATADIR%%/inter/NL2BR
 %%DATADIR%%/inter/SCORE
+%%DATADIR%%/inter/SCORE.so
 %%DATADIR%%/inter/SCORE_TRAIN
+%%DATADIR%%/inter/SCORE_TRAIN.so
+%%DATADIR%%/inter/SPLIT
+%%DATADIR%%/inter/SPLIT.so
 %%DATADIR%%/inter/TO_ALIAS
 %%DATADIR%%/inter/UNIX
 %%DATADIR%%/inter/UPPER
 %%DATADIR%%/inter/UPSIDEDOWN
 %%DATADIR%%/inter/WHITESPACE-DERAIL
+%%DATADIR%%/inter/WHITESPACE-DERAIL.so
 %%DATADIR%%/inter/WHITESPACE-RERAIL
+%%DATADIR%%/inter/WHITESPACE-RERAIL.so
 %%DATADIR%%/inter/WIDTH
+%%DATADIR%%/inter/WIDTH.so
 %%DATADIR%%/inter/WIN
 %%DATADIR%%/inter/ZHCN
 %%DATADIR%%/inter/ZHTW
 %%DATADIR%%/inter/ZHTW_WORDS
+%%DATADIR%%/inter/alias
 %%DATADIR%%/to/3F
+%%DATADIR%%/to/3F.so
 %%DATADIR%%/to/ANSI-CONTROL
+%%DATADIR%%/to/ANSI-CONTROL.so
+%%DATADIR%%/to/ASCII
 %%DATADIR%%/to/ASCII-ESCAPED-UNICODE
+%%DATADIR%%/to/ASCII-ESCAPED-UNICODE.so
 %%DATADIR%%/to/ASCII-HEX-NUMERIC-HTML-ENTITY
+%%DATADIR%%/to/ASCII-HEX-NUMERIC-HTML-ENTITY.so
 %%DATADIR%%/to/ASCII-HTML-CNS11643-IMG
+%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
 %%DATADIR%%/to/ASCII-HTML-INFO
+%%DATADIR%%/to/ASCII-HTML-INFO.so
 %%DATADIR%%/to/ASCII-HTML-UNICODE-IMG
+%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
 %%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY
-%%DATADIR%%/to/ASCII
 %%DATADIR%%/to/BIG5-5C
 %%DATADIR%%/to/BSDCONV
+%%DATADIR%%/to/BSDCONV.so
 %%DATADIR%%/to/BSDCONV_KEYWORD
 %%DATADIR%%/to/BSDCONV_LOG
+%%DATADIR%%/to/BSDCONV_LOG.so
 %%DATADIR%%/to/BSDCONV_RAW
+%%DATADIR%%/to/BSDCONV_RAW.so
 %%DATADIR%%/to/BSDCONV_STDOUT
+%%DATADIR%%/to/BSDCONV_STDOUT.so
 %%DATADIR%%/to/BYTE
-%%DATADIR%%/to/CP936
 %%DATADIR%%/to/CP936_TRANS
-%%DATADIR%%/to/CP950
 %%DATADIR%%/to/CP950_TRANS
-%%DATADIR%%/to/GBK
-%%DATADIR%%/to/ISO-8859-1
 %%DATADIR%%/to/NUL
 %%DATADIR%%/to/NULL
-%%DATADIR%%/to/PASS
-%%DATADIR%%/to/RAW
-%%DATADIR%%/to/UAO250
-%%DATADIR%%/to/UCS-2BE
-%%DATADIR%%/to/UCS-2LE
-%%DATADIR%%/to/UNICODE
-%%DATADIR%%/to/UTF-16BE
-%%DATADIR%%/to/UTF-16LE
-%%DATADIR%%/to/UTF-32BE
-%%DATADIR%%/to/UTF-32LE
-%%DATADIR%%/to/UTF-8
-%%DATADIR%%/from/ANSI-CONTROL.so
-%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.so
-%%DATADIR%%/from/BSDCONV.so
-%%DATADIR%%/from/BSDCONV_LOG.so
-%%DATADIR%%/from/ESCAPE.so
-%%DATADIR%%/from/PASS.so
-%%DATADIR%%/from/SKIP.so
-%%DATADIR%%/from/UTF-16BE.so
-%%DATADIR%%/from/UTF-16LE.so
-%%DATADIR%%/from/UTF-32BE.so
-%%DATADIR%%/from/UTF-32LE.so
-%%DATADIR%%/from/UTF-8.so
-%%DATADIR%%/inter/AMBIGUOUS-PAD.so
-%%DATADIR%%/inter/AMBIGUOUS-UNPAD.so
-%%DATADIR%%/inter/BIG5-DEFRAG.so
-%%DATADIR%%/inter/SCORE.so
-%%DATADIR%%/inter/SCORE_TRAIN.so
-%%DATADIR%%/inter/WHITESPACE-DERAIL.so
-%%DATADIR%%/inter/WHITESPACE-RERAIL.so
-%%DATADIR%%/inter/WIDTH.so
-%%DATADIR%%/to/3F.so
-%%DATADIR%%/to/ANSI-CONTROL.so
-%%DATADIR%%/to/ASCII-ESCAPED-UNICODE.so
-%%DATADIR%%/to/ASCII-HEX-NUMERIC-HTML-ENTITY.so
-%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
-%%DATADIR%%/to/ASCII-HTML-INFO.so
-%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
-%%DATADIR%%/to/BSDCONV.so
-%%DATADIR%%/to/BSDCONV_LOG.so
-%%DATADIR%%/to/BSDCONV_RAW.so
-%%DATADIR%%/to/BSDCONV_STDOUT.so
 %%DATADIR%%/to/NULL.so
+%%DATADIR%%/to/PASS
 %%DATADIR%%/to/PASS.so
+%%DATADIR%%/to/RAW
 %%DATADIR%%/to/RAW.so
+%%DATADIR%%/to/UCS-2BE
 %%DATADIR%%/to/UCS-2BE.so
+%%DATADIR%%/to/UCS-2LE
 %%DATADIR%%/to/UCS-2LE.so
+%%DATADIR%%/to/UNICODE
 %%DATADIR%%/to/UNICODE.so
+%%DATADIR%%/to/UTF-16BE
 %%DATADIR%%/to/UTF-16BE.so
+%%DATADIR%%/to/UTF-16LE
 %%DATADIR%%/to/UTF-16LE.so
+%%DATADIR%%/to/UTF-32BE
 %%DATADIR%%/to/UTF-32BE.so
+%%DATADIR%%/to/UTF-32LE
 %%DATADIR%%/to/UTF-32LE.so
-%%DATADIR%%/to/UTF-8.so
-%%EXTRA%%%%DATADIR%%/from/CNS11643
-%%EXTRA%%%%DATADIR%%/from/CP936
-%%EXTRA%%%%DATADIR%%/from/CP950
-%%EXTRA%%%%DATADIR%%/from/GB2312
-%%EXTRA%%%%DATADIR%%/from/UAO241
+%%DATADIR%%/to/_CP936
+%%DATADIR%%/to/_CP950
+%%DATADIR%%/to/_GBK
+%%DATADIR%%/to/_ISO-8859-1
+%%DATADIR%%/to/_UAO250
+%%DATADIR%%/to/_UTF-8
+%%DATADIR%%/to/_UTF-8.so
+%%DATADIR%%/to/alias
+%%EXTRA%%%%DATADIR%%/from/_CNS11643
+%%EXTRA%%%%DATADIR%%/from/_CNS11643.so
+%%EXTRA%%%%DATADIR%%/from/_CP936
+%%EXTRA%%%%DATADIR%%/from/_CP950
+%%EXTRA%%%%DATADIR%%/from/_GB2312
+%%EXTRA%%%%DATADIR%%/from/_UAO241
 %%EXTRA%%%%DATADIR%%/inter/CHEWING
 %%EXTRA%%%%DATADIR%%/inter/CNS11643
 %%EXTRA%%%%DATADIR%%/inter/HAN_PINYIN
 %%EXTRA%%%%DATADIR%%/inter/UNICODE
 %%EXTRA%%%%DATADIR%%/inter/ZH_COMP
 %%EXTRA%%%%DATADIR%%/inter/ZH_DECOMP
-%%EXTRA%%%%DATADIR%%/to/CNS11643
-%%EXTRA%%%%DATADIR%%/to/GB2312
-%%EXTRA%%%%DATADIR%%/to/UAO241
-%%EXTRA%%%%DATADIR%%/from/CNS11643.so
-%%EXTRA%%%%DATADIR%%/to/CNS11643.so
+%%EXTRA%%%%DATADIR%%/to/_CNS11643
+%%EXTRA%%%%DATADIR%%/to/_CNS11643.so
+%%EXTRA%%%%DATADIR%%/to/_GB2312
+%%EXTRA%%%%DATADIR%%/to/_UAO241
 @dirrmtry %%DATADIR%%/to
 @dirrmtry %%DATADIR%%/inter
 @dirrmtry %%DATADIR%%/from