ports/156619: [maintainer update] converters/bsdconv to 4.5
Kuan-Chung Chiu
buganini at gmail.com
Sun Apr 24 17:50:11 UTC 2011
>Number: 156619
>Category: ports
>Synopsis: [maintainer update] converters/bsdconv to 4.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 24 17:50:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Kuan-Chung Chiu
>Release: 9-CURRENT
>Organization:
N/A
>Environment:
FreeBSD Elizabeth.twbbs.org 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r220689M: Sat Apr 16 19:48:29 CST 2011 root at Elizabeth.twbbs.org:/usr/obj/usr/src/sys/ELIZABETH amd64
>Description:
Update converters/bsdconv to 4.5
this update includes bugfix and new codecs for coming chinese/bug5
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/converters/bsdconv/Makefile b/converters/bsdconv/Makefile
index 93a15e7..b03660b 100644
--- a/converters/bsdconv/Makefile
+++ b/converters/bsdconv/Makefile
@@ -6,21 +6,30 @@
#
PORTNAME= bsdconv
-PORTVERSION= 4.3
+PORTVERSION= 4.5
CATEGORIES= converters
MASTER_SITES= http://cloud.github.com/downloads/buganini/bsdconv/
MAINTAINER= buganini at gmail.com
COMMENT= BSD licensed charset/encoding converter library
+OPTIONS= EXTRA "Extra codecs (Chinese specifics)" OFF
+
USE_LDCONFIG= yes
MAKE_ARGS= PREFIX=${PREFIX}
+ALL_TARGET= libbsdconv bsdconv_mktable meta bsdconv codecs_basic
+INSTALL_TARGET= install_main install_basic
+
.include <bsd.port.pre.mk>
-#.if ${OSVERSION} < 701101
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-strndup
-#.endif
+.if defined(WITH_EXTRA)
+ALL_TARGET+= codecs_extra
+INSTALL_TARGET+=install_extra
+PLIST_SUB+= EXTRA=""
+.else
+PLIST_SUB+= EXTRA="@comment "
+.endif
.include <bsd.port.post.mk>
diff --git a/converters/bsdconv/distinfo b/converters/bsdconv/distinfo
index ad7dbd9..f33b03a 100644
--- a/converters/bsdconv/distinfo
+++ b/converters/bsdconv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bsdconv-4.3.tar.gz) = c456db155aa5f6f342edd3e6ff0561d79a3a3f1723670ecc60626711bed7fe1d
-SIZE (bsdconv-4.3.tar.gz) = 3704402
+SHA256 (bsdconv-4.5.tar.gz) = 8ff3f61cfbe96c156531934e2e70cd700564c64b3c03c14e9acf84ca13a2c38c
+SIZE (bsdconv-4.5.tar.gz) = 3706760
diff --git a/converters/bsdconv/files/extra-patch-strndup b/converters/bsdconv/files/extra-patch-strndup
deleted file mode 100644
index d0d6aa2..0000000
--- a/converters/bsdconv/files/extra-patch-strndup
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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-plist b/converters/bsdconv/pkg-plist
index bacc233..e3d752b 100644
--- a/converters/bsdconv/pkg-plist
+++ b/converters/bsdconv/pkg-plist
@@ -4,6 +4,8 @@ include/bsdconv.h
lib/libbsdconv.so
lib/libbsdconv.so.4
%%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
@@ -12,9 +14,11 @@ lib/libbsdconv.so.4
%%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/CNS11643
-%%DATADIR%%/from/CNS11643.so
+%%EXTRA%%%%DATADIR%%/from/CNS11643
+%%EXTRA%%%%DATADIR%%/from/CNS11643.so
%%DATADIR%%/from/CP1251
%%DATADIR%%/from/CP1252
%%DATADIR%%/from/CP936
@@ -29,8 +33,8 @@ lib/libbsdconv.so.4
%%DATADIR%%/from/PASS
%%DATADIR%%/from/PASS.so
%%DATADIR%%/from/SHIFT-JIS
-%%DATADIR%%/from/UNICODE
-%%DATADIR%%/from/UNICODE.so
+%%DATADIR%%/from/SKIP
+%%DATADIR%%/from/SKIP.so
%%DATADIR%%/from/UTF-16BE
%%DATADIR%%/from/UTF-16BE.so
%%DATADIR%%/from/UTF-16LE
@@ -41,19 +45,23 @@ lib/libbsdconv.so.4
%%DATADIR%%/from/UTF-32LE.so
%%DATADIR%%/from/UTF-8
%%DATADIR%%/from/UTF-8.so
-%%DATADIR%%/inter/CHEWING
-%%DATADIR%%/inter/CNS11643
+%%DATADIR%%/inter/AMBIGUOUS-PAD
+%%DATADIR%%/inter/AMBIGUOUS-PAD.so
+%%DATADIR%%/inter/BIG5-DEFRAG
+%%DATADIR%%/inter/BIG5-DEFRAG.so
+%%EXTRA%%%%DATADIR%%/inter/CHEWING
+%%EXTRA%%%%DATADIR%%/inter/CNS11643
%%DATADIR%%/inter/FROM_ALIAS
%%DATADIR%%/inter/FULL
%%DATADIR%%/inter/HALF
-%%DATADIR%%/inter/HAN_PINYIN
+%%EXTRA%%%%DATADIR%%/inter/HAN_PINYIN
%%DATADIR%%/inter/INTER_ALIAS
%%DATADIR%%/inter/JP_PINYIN
%%DATADIR%%/inter/LOWER
%%DATADIR%%/inter/MAC
%%DATADIR%%/inter/NL2BR
%%DATADIR%%/inter/TO_ALIAS
-%%DATADIR%%/inter/UNICODE
+%%EXTRA%%%%DATADIR%%/inter/UNICODE
%%DATADIR%%/inter/UNIX
%%DATADIR%%/inter/UPPER
%%DATADIR%%/inter/UPSIDEDOWN
@@ -61,10 +69,12 @@ lib/libbsdconv.so.4
%%DATADIR%%/inter/ZHCN
%%DATADIR%%/inter/ZHTW
%%DATADIR%%/inter/ZHTW_WORDS
-%%DATADIR%%/inter/ZH_COMP
-%%DATADIR%%/inter/ZH_DECOMP
+%%EXTRA%%%%DATADIR%%/inter/ZH_COMP
+%%EXTRA%%%%DATADIR%%/inter/ZH_DECOMP
%%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
@@ -72,6 +82,8 @@ lib/libbsdconv.so.4
%%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
@@ -79,11 +91,15 @@ lib/libbsdconv.so.4
%%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/CNS11643
-%%DATADIR%%/to/CNS11643.so
+%%EXTRA%%%%DATADIR%%/to/CNS11643
+%%EXTRA%%%%DATADIR%%/to/CNS11643.so
%%DATADIR%%/to/CP936
%%DATADIR%%/to/CP936_TRANS
%%DATADIR%%/to/CP950
@@ -93,6 +109,8 @@ lib/libbsdconv.so.4
%%DATADIR%%/to/ISO-8859-1
%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list