- Update to 3.5

PR:		139513 139525 139525
Submitted by:	Kuan-Chung Chiu <buganini@gmail.com> (maintainer)

5 files changed, 78 insertions, 19 deletions

diff --git a/converters/bsdconv/Makefile b/converters/bsdconv/Makefile
index 16f84137780c..73d87a9a548a 100644
--- a/converters/bsdconv/Makefile
+++ b/converters/bsdconv/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bsdconv
-PORTVERSION=	3.3
+PORTVERSION=	3.5
 CATEGORIES=	converters
 MASTER_SITES=	http://security-hole.info/distfile/
-DISTNAME=	buganini-bsdconv-a500cb452f12d583fd545dc901dfca89c84b987e
+DISTNAME=	buganini-bsdconv-c14ef1b
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	BSD licensed charset/encoding converter library
@@ -18,4 +18,10 @@ USE_LDCONFIG=	yes
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+#.if ${OSVERSION} < 701101
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-strndup
+#.endif
+
+.include <bsd.port.post.mk>
diff --git a/converters/bsdconv/distinfo b/converters/bsdconv/distinfo
index 7102d896caf6..fdf674089c38 100644
--- a/converters/bsdconv/distinfo
+++ b/converters/bsdconv/distinfo
@@ -1,3 +1,3 @@
-MD5 (buganini-bsdconv-a500cb452f12d583fd545dc901dfca89c84b987e.tar.gz) = 541131dae83d8b5304912b5a62307ecc
-SHA256 (buganini-bsdconv-a500cb452f12d583fd545dc901dfca89c84b987e.tar.gz) = 4e1a1c80aaf6da7051474ffa79e969dd13f4970ef225bf82d573dd18da62824d
-SIZE (buganini-bsdconv-a500cb452f12d583fd545dc901dfca89c84b987e.tar.gz) = 995454
+MD5 (buganini-bsdconv-c14ef1b.tar.gz) = 2a17209dee54f03a0df5c6f465555a8d
+SHA256 (buganini-bsdconv-c14ef1b.tar.gz) = 06119b773c1c9e6b1f48cd12ab568d0f3eab255544581c18a83aa98d39d2157c
+SIZE (buganini-bsdconv-c14ef1b.tar.gz) = 1824149
diff --git a/converters/bsdconv/files/extra-patch-strndup b/converters/bsdconv/files/extra-patch-strndup
new file mode 100644
index 000000000000..d0d6aa261950
--- /dev/null
+++ b/converters/bsdconv/files/extra-patch-strndup
@@ -0,0 +1,25 @@
+--- src/bsdconv_func.c.orig	2009-10-11 19:26:58.000000000 +0800
++++ src/bsdconv_func.c	2009-10-14 21:30:50.000000000 +0800
+@@ -25,6 +25,7 @@
+ #endif
+ #include <string.h>
+ #include "bsdconv.h"
++#include <stdlib.h>
+ 
+ int loadcodec(struct bsdconv_codec_t *cd, char *path, int maponly){
+ #ifdef WIN32
+@@ -138,3 +139,14 @@
+ 	return r;
+ }
+ #endif
++
++char * strndup(const char *str, size_t len){
++	size_t l=strlen(str);
++	char *r;
++	if(len<l){
++		l=len;
++	}
++	r=malloc(l);
++	memcpy(r, str, l);
++	return r;
++}
diff --git a/converters/bsdconv/pkg-descr b/converters/bsdconv/pkg-descr
index de5ee9e1c44a..29fecf19f8d6 100644
--- a/converters/bsdconv/pkg-descr
+++ b/converters/bsdconv/pkg-descr
@@ -1,5 +1,4 @@
-BSD licensed charset/encoding converter library with
-more function than libiconv. (Currently only support
-few codecs)
+BSD licensed charset/encoding converter library with more function than
+libiconv. (Currently, only a few codecs are supported)
 
 WWW: http://github.com/buganini/bsdconv/
diff --git a/converters/bsdconv/pkg-plist b/converters/bsdconv/pkg-plist
index 6750b542ffb4..c688762747c2 100644
--- a/converters/bsdconv/pkg-plist
+++ b/converters/bsdconv/pkg-plist
@@ -8,26 +8,41 @@ lib/libbsdconv.so.3
 %%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY
 %%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY
 %%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY.so
-%%DATADIR%%/from/BIG5
 %%DATADIR%%/from/BIG5-5C
 %%DATADIR%%/from/BSDCONV
 %%DATADIR%%/from/BSDCONV.so
 %%DATADIR%%/from/BSDCONV_KEYWORD
+%%DATADIR%%/from/CNS11643
+%%DATADIR%%/from/CNS11643.so
 %%DATADIR%%/from/CP936
 %%DATADIR%%/from/CP950
-%%DATADIR%%/from/HTMLENTITY
 %%DATADIR%%/from/ISO-8859-1
 %%DATADIR%%/from/MOZ18
-%%DATADIR%%/from/NAMED-HTMLENTITY
+%%DATADIR%%/from/RAW
+%%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-32LE.so
 %%DATADIR%%/from/UTF-8
 %%DATADIR%%/from/UTF-8.so
 %%DATADIR%%/inter/CHEWING
 %%DATADIR%%/inter/CHS
 %%DATADIR%%/inter/CHT
+%%DATADIR%%/inter/CNS11643
+%%DATADIR%%/inter/FROM_ALIAS
 %%DATADIR%%/inter/HAN_PINYIN
+%%DATADIR%%/inter/INTER_ALIAS
+%%DATADIR%%/inter/LOWER
 %%DATADIR%%/inter/MAC
 %%DATADIR%%/inter/NL2BR
+%%DATADIR%%/inter/TO_ALIAS
+%%DATADIR%%/inter/UNICODE
 %%DATADIR%%/inter/UNIX
+%%DATADIR%%/inter/UPPER
 %%DATADIR%%/inter/WIN
 %%DATADIR%%/inter/ZHTW_NORMALIZE
 %%DATADIR%%/inter/ZH_COMPOUND
@@ -38,21 +53,35 @@ lib/libbsdconv.so.3
 %%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-IMG
-%%DATADIR%%/to/ASCII-HTML-IMG.so
+%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG
+%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
+%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG
+%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
 %%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY
 %%DATADIR%%/to/BIG5-5C
 %%DATADIR%%/to/BSDCONV
 %%DATADIR%%/to/BSDCONV.so
 %%DATADIR%%/to/BSDCONV_KEYWORD
+%%DATADIR%%/to/BSDCONV_STDOUT
+%%DATADIR%%/to/BSDCONV_STDOUT.so
+%%DATADIR%%/to/CNS11643
+%%DATADIR%%/to/CNS11643.so
 %%DATADIR%%/to/CP936
 %%DATADIR%%/to/CP950
-%%DATADIR%%/to/HTML-IMG
-%%DATADIR%%/to/HTMLENTITY
 %%DATADIR%%/to/ISO-8859-1
-%%DATADIR%%/to/JAVA
-%%DATADIR%%/to/NAMED-HTMLENTITY
-%%DATADIR%%/to/SOURCE
+%%DATADIR%%/to/RAW
+%%DATADIR%%/to/UCS-2BE
+%%DATADIR%%/to/UCS-2BE.so
+%%DATADIR%%/to/UCS-2LE
+%%DATADIR%%/to/UCS-2LE.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
 %%DATADIR%%/to/UTF-8.so
 @dirrmtry %%DATADIR%%/inter