Attachment #114893 for bug #156619

View | Details | Raw Unified | Return to bug 156619
Collapse All | Expand All

Lines 6-26 Link Here

(-)b/converters/bsdconv/Makefile (-4 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= bsdconv	8	PORTNAME= bsdconv
9	PORTVERSION= 4.3	9	PORTVERSION= 4.5
10	CATEGORIES= converters	10	CATEGORIES= converters
11	MASTER_SITES= http://cloud.github.com/downloads/buganini/bsdconv/	11	MASTER_SITES= http://cloud.github.com/downloads/buganini/bsdconv/
12		12
13	MAINTAINER= buganini@gmail.com	13	MAINTAINER= buganini@gmail.com
14	COMMENT= BSD licensed charset/encoding converter library	14	COMMENT= BSD licensed charset/encoding converter library
15		15
		16	OPTIONS= EXTRA "Extra codecs (Chinese specifics)" OFF
		17
16	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
17		19
18	MAKE_ARGS= PREFIX=${PREFIX}	20	MAKE_ARGS= PREFIX=${PREFIX}
19		21
		22	ALL_TARGET= libbsdconv bsdconv_mktable meta bsdconv codecs_basic
		23	INSTALL_TARGET= install_main install_basic
		24
20	.include <bsd.port.pre.mk>	25	.include <bsd.port.pre.mk>
21		26
22	#.if ${OSVERSION} < 701101	27	.if defined(WITH_EXTRA)
23	EXTRA_PATCHES= ${FILESDIR}/extra-patch-strndup	28	ALL_TARGET+= codecs_extra
24	#.endif	29	INSTALL_TARGET+=install_extra
		30	PLIST_SUB+= EXTRA=""
		31	.else
		32	PLIST_SUB+= EXTRA="@comment "
		33	.endif
25		34
26	.include <bsd.port.post.mk>	35	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)b/converters/bsdconv/distinfo (-2 / +2 lines)
1	SHA256 (bsdconv-4.3.tar.gz) = c456db155aa5f6f342edd3e6ff0561d79a3a3f1723670ecc60626711bed7fe1d	1	SHA256 (bsdconv-4.5.tar.gz) = 8ff3f61cfbe96c156531934e2e70cd700564c64b3c03c14e9acf84ca13a2c38c
2	SIZE (bsdconv-4.3.tar.gz) = 3704402	2	SIZE (bsdconv-4.5.tar.gz) = 3706760




--- 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;
+}

Lines 4-9 include/bsdconv.h Link Here

(-)b/converters/bsdconv/pkg-plist (-12 / +30 lines)
4	lib/libbsdconv.so	4	lib/libbsdconv.so
5	lib/libbsdconv.so.4	5	lib/libbsdconv.so.4
6	%%DATADIR%%/from/3F	6	%%DATADIR%%/from/3F
		7	%%DATADIR%%/from/ANSI-CONTROL
		8	%%DATADIR%%/from/ANSI-CONTROL.so
7	%%DATADIR%%/from/ASCII	9	%%DATADIR%%/from/ASCII
8	%%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY	10	%%DATADIR%%/from/ASCII-NAMED-HTML-ENTITY
9	%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY	11	%%DATADIR%%/from/ASCII-NUMERIC-HTML-ENTITY
Lines 12-20 lib/libbsdconv.so.4 Link Here
12	%%DATADIR%%/from/BSDCONV	14	%%DATADIR%%/from/BSDCONV
13	%%DATADIR%%/from/BSDCONV.so	15	%%DATADIR%%/from/BSDCONV.so
14	%%DATADIR%%/from/BSDCONV_KEYWORD	16	%%DATADIR%%/from/BSDCONV_KEYWORD
		17	%%DATADIR%%/from/BSDCONV_LOG
		18	%%DATADIR%%/from/BSDCONV_LOG.so
15	%%DATADIR%%/from/BYTE	19	%%DATADIR%%/from/BYTE
16	%%DATADIR%%/from/CNS11643	20	%%EXTRA%%%%DATADIR%%/from/CNS11643
17	%%DATADIR%%/from/CNS11643.so	21	%%EXTRA%%%%DATADIR%%/from/CNS11643.so
18	%%DATADIR%%/from/CP1251	22	%%DATADIR%%/from/CP1251
19	%%DATADIR%%/from/CP1252	23	%%DATADIR%%/from/CP1252
20	%%DATADIR%%/from/CP936	24	%%DATADIR%%/from/CP936
Lines 29-36 lib/libbsdconv.so.4 Link Here
29	%%DATADIR%%/from/PASS	33	%%DATADIR%%/from/PASS
30	%%DATADIR%%/from/PASS.so	34	%%DATADIR%%/from/PASS.so
31	%%DATADIR%%/from/SHIFT-JIS	35	%%DATADIR%%/from/SHIFT-JIS
32	%%DATADIR%%/from/UNICODE	36	%%DATADIR%%/from/SKIP
33	%%DATADIR%%/from/UNICODE.so	37	%%DATADIR%%/from/SKIP.so
34	%%DATADIR%%/from/UTF-16BE	38	%%DATADIR%%/from/UTF-16BE
35	%%DATADIR%%/from/UTF-16BE.so	39	%%DATADIR%%/from/UTF-16BE.so
36	%%DATADIR%%/from/UTF-16LE	40	%%DATADIR%%/from/UTF-16LE
Lines 41-59 lib/libbsdconv.so.4 Link Here
41	%%DATADIR%%/from/UTF-32LE.so	45	%%DATADIR%%/from/UTF-32LE.so
42	%%DATADIR%%/from/UTF-8	46	%%DATADIR%%/from/UTF-8
43	%%DATADIR%%/from/UTF-8.so	47	%%DATADIR%%/from/UTF-8.so
44	%%DATADIR%%/inter/CHEWING	48	%%DATADIR%%/inter/AMBIGUOUS-PAD
45	%%DATADIR%%/inter/CNS11643	49	%%DATADIR%%/inter/AMBIGUOUS-PAD.so
		50	%%DATADIR%%/inter/BIG5-DEFRAG
		51	%%DATADIR%%/inter/BIG5-DEFRAG.so
		52	%%EXTRA%%%%DATADIR%%/inter/CHEWING
		53	%%EXTRA%%%%DATADIR%%/inter/CNS11643
46	%%DATADIR%%/inter/FROM_ALIAS	54	%%DATADIR%%/inter/FROM_ALIAS
47	%%DATADIR%%/inter/FULL	55	%%DATADIR%%/inter/FULL
48	%%DATADIR%%/inter/HALF	56	%%DATADIR%%/inter/HALF
49	%%DATADIR%%/inter/HAN_PINYIN	57	%%EXTRA%%%%DATADIR%%/inter/HAN_PINYIN
50	%%DATADIR%%/inter/INTER_ALIAS	58	%%DATADIR%%/inter/INTER_ALIAS
51	%%DATADIR%%/inter/JP_PINYIN	59	%%DATADIR%%/inter/JP_PINYIN
52	%%DATADIR%%/inter/LOWER	60	%%DATADIR%%/inter/LOWER
53	%%DATADIR%%/inter/MAC	61	%%DATADIR%%/inter/MAC
54	%%DATADIR%%/inter/NL2BR	62	%%DATADIR%%/inter/NL2BR
55	%%DATADIR%%/inter/TO_ALIAS	63	%%DATADIR%%/inter/TO_ALIAS
56	%%DATADIR%%/inter/UNICODE	64	%%EXTRA%%%%DATADIR%%/inter/UNICODE
57	%%DATADIR%%/inter/UNIX	65	%%DATADIR%%/inter/UNIX
58	%%DATADIR%%/inter/UPPER	66	%%DATADIR%%/inter/UPPER
59	%%DATADIR%%/inter/UPSIDEDOWN	67	%%DATADIR%%/inter/UPSIDEDOWN
Lines 61-70 lib/libbsdconv.so.4 Link Here
61	%%DATADIR%%/inter/ZHCN	69	%%DATADIR%%/inter/ZHCN
62	%%DATADIR%%/inter/ZHTW	70	%%DATADIR%%/inter/ZHTW
63	%%DATADIR%%/inter/ZHTW_WORDS	71	%%DATADIR%%/inter/ZHTW_WORDS
64	%%DATADIR%%/inter/ZH_COMP	72	%%EXTRA%%%%DATADIR%%/inter/ZH_COMP
65	%%DATADIR%%/inter/ZH_DECOMP	73	%%EXTRA%%%%DATADIR%%/inter/ZH_DECOMP
66	%%DATADIR%%/to/3F	74	%%DATADIR%%/to/3F
67	%%DATADIR%%/to/3F.so	75	%%DATADIR%%/to/3F.so
		76	%%DATADIR%%/to/ANSI-CONTROL
		77	%%DATADIR%%/to/ANSI-CONTROL.so
68	%%DATADIR%%/to/ASCII	78	%%DATADIR%%/to/ASCII
69	%%DATADIR%%/to/ASCII-ESCAPED-UNICODE	79	%%DATADIR%%/to/ASCII-ESCAPED-UNICODE
70	%%DATADIR%%/to/ASCII-ESCAPED-UNICODE.so	80	%%DATADIR%%/to/ASCII-ESCAPED-UNICODE.so
Lines 72-77 lib/libbsdconv.so.4 Link Here
72	%%DATADIR%%/to/ASCII-HEX-NUMERIC-HTML-ENTITY.so	82	%%DATADIR%%/to/ASCII-HEX-NUMERIC-HTML-ENTITY.so
73	%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG	83	%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG
74	%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so	84	%%DATADIR%%/to/ASCII-HTML-CNS11643-IMG.so
		85	%%DATADIR%%/to/ASCII-HTML-INFO
		86	%%DATADIR%%/to/ASCII-HTML-INFO.so
75	%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG	87	%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG
76	%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so	88	%%DATADIR%%/to/ASCII-HTML-UNICODE-IMG.so
77	%%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY	89	%%DATADIR%%/to/ASCII-NAMED-HTML-ENTITY
Lines 79-89 lib/libbsdconv.so.4 Link Here
79	%%DATADIR%%/to/BSDCONV	91	%%DATADIR%%/to/BSDCONV
80	%%DATADIR%%/to/BSDCONV.so	92	%%DATADIR%%/to/BSDCONV.so
81	%%DATADIR%%/to/BSDCONV_KEYWORD	93	%%DATADIR%%/to/BSDCONV_KEYWORD
		94	%%DATADIR%%/to/BSDCONV_LOG
		95	%%DATADIR%%/to/BSDCONV_LOG.so
		96	%%DATADIR%%/to/BSDCONV_RAW
		97	%%DATADIR%%/to/BSDCONV_RAW.so
82	%%DATADIR%%/to/BSDCONV_STDOUT	98	%%DATADIR%%/to/BSDCONV_STDOUT
83	%%DATADIR%%/to/BSDCONV_STDOUT.so	99	%%DATADIR%%/to/BSDCONV_STDOUT.so
84	%%DATADIR%%/to/BYTE	100	%%DATADIR%%/to/BYTE
85	%%DATADIR%%/to/CNS11643	101	%%EXTRA%%%%DATADIR%%/to/CNS11643
86	%%DATADIR%%/to/CNS11643.so	102	%%EXTRA%%%%DATADIR%%/to/CNS11643.so
87	%%DATADIR%%/to/CP936	103	%%DATADIR%%/to/CP936
88	%%DATADIR%%/to/CP936_TRANS	104	%%DATADIR%%/to/CP936_TRANS
89	%%DATADIR%%/to/CP950	105	%%DATADIR%%/to/CP950
Lines 93-98 lib/libbsdconv.so.4 Link Here
93	%%DATADIR%%/to/ISO-8859-1	109	%%DATADIR%%/to/ISO-8859-1
94	%%DATADIR%%/to/PASS	110	%%DATADIR%%/to/PASS
95	%%DATADIR%%/to/PASS.so	111	%%DATADIR%%/to/PASS.so
		112	%%DATADIR%%/to/RAW
		113	%%DATADIR%%/to/RAW.so
96	%%DATADIR%%/to/UCS-2BE	114	%%DATADIR%%/to/UCS-2BE
97	%%DATADIR%%/to/UCS-2BE.so	115	%%DATADIR%%/to/UCS-2BE.so
98	%%DATADIR%%/to/UCS-2LE	116	%%DATADIR%%/to/UCS-2LE

Return to bug 156619

Removed Link Here

(-)a/converters/bsdconv/files/extra-patch-strndup (-25 lines)
1	--- src/bsdconv_func.c.orig 2009-10-11 19:26:58.000000000 +0800
2	+++ src/bsdconv_func.c 2009-10-14 21:30:50.000000000 +0800
3	@@ -25,6 +25,7 @@
4	#endif
5	#include <string.h>
6	#include "bsdconv.h"
7	+#include <stdlib.h>
8
9	int loadcodec(struct bsdconv_codec_t cd, char path, int maponly){
10	#ifdef WIN32
11	@@ -138,3 +139,14 @@
12	return r;
13	}
14	#endif
15	+
16	+char * strndup(const char *str, size_t len){
17	+ size_t l=strlen(str);
18	+ char *r;
19	+ if(len<l){
20	+ l=len;
21	+ }
22	+ r=malloc(l);
23	+ memcpy(r, str, l);
24	+ return r;
25	+}