Attachment #207971 for bug #240954




# $FreeBSD$

PORTNAME=	libiconv
PORTVERSION=	1.16
PORTREVISION=	11
CATEGORIES=	converters devel
MASTER_SITES=	GNU


LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		libtool
USE_CSTD=	gnu89
USE_LDCONFIG=	yes

CONFLICTS=	japanese/libiconv114

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-static \
		--disable-nls \

		am_cv_func_iconv=no
INSTALL_TARGET=	install-strip
MAKE_JOBS_UNSAFE=	yes
USES=		libtool
USE_CSTD=	gnu89
USE_LDCONFIG=	yes

OPTIONS_DEFINE=	DOCS ENCODINGS
OPTIONS_DEFAULT=ENCODINGS
ENCODINGS_DESC=	Include extra character sets
PATCHES_DESC=	Apply patches to fix CP932, add EUCJP-MS

ENCODINGS_CONFIGURE_ENABLE=	extra-encodings

PATCHES_PATCH_SITES=	http://apolloron.org/software/libiconv-1.14-ja/ \
			LOCAL/kwm
PATCHES_PATCHFILES=	${DISTNAME}-ja-1.patch.gz:-p1

post-patch:
	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
	@${REINPLACE_CMD} -e 's:gawk:awk:g' ${WRKSRC}/configure \
		${WRKSRC}/libcharset/configure
		${WRKSRC}/preload/configure

.include <bsd.port.mk>

Lines 1-4 Link Here

(-)converters/libiconv/distinfo (-4 / +3 lines)
1	SHA256 (libiconv-1.14.tar.gz) = 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613	1	TIMESTAMP = 1569891121
2	SIZE (libiconv-1.14.tar.gz) = 4984397	2	SHA256 (libiconv-1.16.tar.gz) = e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
3	SHA256 (libiconv-1.14-ja-1.patch.gz) = c9474ee420b971029073dabf5e599b049945fbb040f353dce4db32191401bfee	3	SIZE (libiconv-1.16.tar.gz) = 5166734
4	SIZE (libiconv-1.14-ja-1.patch.gz) = 291963




--- include/iconv.h.in.orig	2019-04-26 18:48:39 UTC
+++ include/iconv.h.in
@@ -20,8 +20,10 @@
 #ifndef _LIBICONV_H
 #define _LIBICONV_H
 
+#ifndef LIBICONV_PLUG
 #define _LIBICONV_VERSION 0x0110    /* version number: (major<<8) + minor */
 extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
+#endif
 
 /* We would like to #include any system header file which could define
    iconv_t, 1. in order to eliminate the risk that the user gets compilation
@@ -93,7 +95,6 @@ extern int iconv_close (iconv_t cd);
 #endif
 
 

 
 /* Nonstandard extensions. */
 
@@ -126,12 +127,16 @@ typedef struct {
 /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
    encoding ‘tocode’ into preallocated memory. Returns an error indicator
    (0 or -1 with errno set). */

 extern int iconvctl (iconv_t cd, int request, void* argument);
 
 /* Hook performed after every successful conversion of a Unicode character. */
@@ -209,9 +214,15 @@ struct iconv_fallbacks {
 #define ICONV_SET_DISCARD_ILSEQ   4  /* const int *argument */
 #define ICONV_SET_HOOKS           5  /* const struct iconv_hooks *argument */
 #define ICONV_SET_FALLBACKS       6  /* const struct iconv_fallbacks *argument */

 extern void iconvlist (int (*do_one) (unsigned int namescount,
                                       const char * const * names,
                                       void* data),
@@ -223,6 +234,7 @@ extern const char * iconv_canonicalize (
 
 /* Support for relocatable packages.  */
 

 /* Sets the original and the current installation prefix of the package.
    Relocation simply replaces a pathname starting with the original prefix
    by the corresponding pathname with the current prefix instead.  Both
@@ -230,12 +242,12 @@ extern const char * iconv_canonicalize (
    instead of "/").  */
 extern void libiconv_set_relocation_prefix (const char *orig_prefix,
                                             const char *curr_prefix);




--- libcharset/lib/config.charset.orig	2010-04-05 02:25:38.000000000 +0200
+++ libcharset/lib/config.charset	2011-10-23 22:05:50.000000000 +0200
@@ -348,7 +348,7 @@ case "$os" in
     #echo "sun_eu_greek ?" # what is this?
     echo "UTF-8 UTF-8"
     ;;
-  freebsd* | os2*)
+  freebsd4.[0-5]* | os2*)
     # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
     # localcharset.c falls back to using the full locale name
     # from the environment variables.
@@ -385,6 +385,31 @@ case "$os" in
     echo "ja_JP.Shift_JIS SHIFT_JIS"
     echo "ko_KR.EUC EUC-KR"
     ;;
+  freebsd*)
+	echo "US-ASCII ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO_8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO_8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO_8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO_8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO_8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO_8859-9 ISO-8859-9"
+	echo "ISO8859-13 ISO-8859-13"
+	echo "ISO_8859-13 ISO-8859-13"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "ISO_8859-15 ISO-8859-15"
+	echo "eucCN GB2312"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "Big5 BIG5"
+	echo "Big5HKSCS BIG5-HKSCS"
+	echo "SJIS SHIFT_JIS"
+        ;;
   netbsd*)
     echo "646 ASCII"
     echo "ISO8859-1 ISO-8859-1"

Lines 1-6 Link Here

(-)converters/libiconv/files/patch-src__Makefile.in (-4 / +4 lines)
1	--- src/Makefile.in.orig 2011-06-04 19:05:58.000000000 +0200	1	--- src/Makefile.in.orig 2019-01-27 22:07:13 UTC
2	+++ src/Makefile.in 2013-07-06 18:49:54.000000000 +0200	2	+++ src/Makefile.in
3	@@ -71,7 +71,6 @@	3	@@ -71,7 +71,6 @@ OBJECTS_RES_no =
4	# without internationalization and not linked with libintl.	4	# without internationalization and not linked with libintl.
5		5
6	all : iconv_no_i18n$(EXEEXT) iconv.@OBJEXT@ $(OBJECTS_RES_@WOE32@)	6	all : iconv_no_i18n$(EXEEXT) iconv.@OBJEXT@ $(OBJECTS_RES_@WOE32@)
Lines 8-14 Link Here
8		8
9	# This is the temporary iconv executable, without internationalization.	9	# This is the temporary iconv executable, without internationalization.
10	iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@)	10	iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@)
11	@@ -113,7 +112,7 @@	11	@@ -113,7 +112,7 @@ install : all force
12	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi	12	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
13	case "@host_os@" in \	13	case "@host_os@" in \
14	hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \	14	hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \

Lines 2-8 Link Here

(-)converters/libiconv/pkg-plist (-2 / +1 lines)
2	include/iconv.h	2	include/iconv.h
3	include/libcharset.h	3	include/libcharset.h
4	include/localcharset.h	4	include/localcharset.h
5	lib/charset.alias
6	lib/libcharset.a	5	lib/libcharset.a
7	lib/libcharset.so	6	lib/libcharset.so
8	lib/libcharset.so.1	7	lib/libcharset.so.1
Lines 10-16 Link Here
10	lib/libiconv.a	9	lib/libiconv.a
11	lib/libiconv.so	10	lib/libiconv.so
12	lib/libiconv.so.2	11	lib/libiconv.so.2
13	lib/libiconv.so.2.5.1	12	lib/libiconv.so.2.6.1
14	man/man1/iconv.1.gz	13	man/man1/iconv.1.gz
15	man/man3/iconv.3.gz	14	man/man3/iconv.3.gz
16	man/man3/iconv_open.3.gz	15	man/man3/iconv_open.3.gz

Return to bug 240954

Lines 2-9 Link Here

(-)converters/libiconv/Makefile (-13 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libiconv	4	PORTNAME= libiconv
5	PORTVERSION= 1.14	5	PORTVERSION= 1.16
6	PORTREVISION= 11
7	CATEGORIES= converters devel	6	CATEGORIES= converters devel
8	MASTER_SITES= GNU	7	MASTER_SITES= GNU
9		8
Lines 13-18 Link Here
13	LICENSE= GPLv3	12	LICENSE= GPLv3
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
		15	USES= libtool
		16	USE_CSTD= gnu89
		17	USE_LDCONFIG= yes
		18
		19	CONFLICTS= japanese/libiconv114
		20
16	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS= --enable-static \	22	CONFIGURE_ARGS= --enable-static \
18	--disable-nls \	23	--disable-nls \
Lines 20-44 Link Here
20	am_cv_func_iconv=no	25	am_cv_func_iconv=no
21	INSTALL_TARGET= install-strip	26	INSTALL_TARGET= install-strip
22	MAKE_JOBS_UNSAFE= yes	27	MAKE_JOBS_UNSAFE= yes
23	USES= libtool
24	USE_CSTD= gnu89
25	USE_LDCONFIG= yes
26		28
27	OPTIONS_DEFINE= DOCS ENCODINGS PATCHES	29	OPTIONS_DEFINE= DOCS ENCODINGS
28	OPTIONS_DEFAULT=ENCODINGS	30	OPTIONS_DEFAULT=ENCODINGS
29	ENCODINGS_DESC= Include extra character sets	31	ENCODINGS_DESC= Include extra character sets
30	PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS
31		32
32	ENCODINGS_CONFIGURE_ENABLE= extra-encodings	33	ENCODINGS_CONFIGURE_ENABLE= extra-encodings
33		34
34	PATCHES_PATCH_SITES= http://apolloron.org/software/libiconv-1.14-ja/ \
35	LOCAL/kwm
36	PATCHES_PATCHFILES= ${DISTNAME}-ja-1.patch.gz:-p1
37
38	post-patch:	35	post-patch:
39	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h	36	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
40	@${REINPLACE_CMD} -e 's:gawk:awk:g' ${WRKSRC}/configure \	37	@${REINPLACE_CMD} -e 's:gawk:awk:g' ${WRKSRC}/configure \
41	${WRKSRC}/libcharset/configure \	38	${WRKSRC}/libcharset/configure
42	${WRKSRC}/preload/configure
43		39
44	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-17 Link Here

(-)converters/libiconv/files/patch-include-iconv.h.in (-8 / +8 lines)
1	--- include/iconv.h.in.orig 2011-08-07 17:48:03 UTC	1	--- include/iconv.h.in.orig 2019-04-26 18:48:39 UTC
2	+++ include/iconv.h.in	2	+++ include/iconv.h.in
3	@@ -21,8 +21,10 @@	3	@@ -20,8 +20,10 @@
4	#ifndef _LIBICONV_H	4	#ifndef _LIBICONV_H
5	#define _LIBICONV_H	5	#define _LIBICONV_H
6		6
7	+#ifndef LIBICONV_PLUG	7	+#ifndef LIBICONV_PLUG
8	#define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */	8	#define _LIBICONV_VERSION 0x0110 /* version number: (major<<8) + minor */
9	extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */	9	extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
10	+#endif	10	+#endif
11		11
12	/* We would like to #include any system header file which could define	12	/* We would like to #include any system header file which could define
13	iconv_t, 1. in order to eliminate the risk that the user gets compilation	13	iconv_t, 1. in order to eliminate the risk that the user gets compilation
14	@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd);	14	@@ -93,7 +95,6 @@ extern int iconv_close (iconv_t cd);
15	#endif	15	#endif
16		16
17		17
Lines 19-25 Link Here
19		19
20	/* Nonstandard extensions. */	20	/* Nonstandard extensions. */
21		21
22	@@ -127,12 +128,16 @@ typedef struct {	22	@@ -126,12 +127,16 @@ typedef struct {
23	/* Allocates descriptor for code conversion from encoding ‘fromcode’ to	23	/* Allocates descriptor for code conversion from encoding ‘fromcode’ to
24	encoding ‘tocode’ into preallocated memory. Returns an error indicator	24	encoding ‘tocode’ into preallocated memory. Returns an error indicator
25	(0 or -1 with errno set). */	25	(0 or -1 with errno set). */
Lines 36-42 Link Here
36	extern int iconvctl (iconv_t cd, int request, void* argument);	36	extern int iconvctl (iconv_t cd, int request, void* argument);
37		37
38	/* Hook performed after every successful conversion of a Unicode character. */	38	/* Hook performed after every successful conversion of a Unicode character. */
39	@@ -210,9 +215,15 @@ struct iconv_fallbacks {	39	@@ -209,9 +214,15 @@ struct iconv_fallbacks {
40	#define ICONV_SET_DISCARD_ILSEQ 4 /* const int argument /	40	#define ICONV_SET_DISCARD_ILSEQ 4 /* const int argument /
41	#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks argument /	41	#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks argument /
42	#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks argument /	42	#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks argument /
Lines 52-58 Link Here
52	extern void iconvlist (int (*do_one) (unsigned int namescount,	52	extern void iconvlist (int (*do_one) (unsigned int namescount,
53	const char * const * names,	53	const char * const * names,
54	void* data),	54	void* data),
55	@@ -224,6 +235,7 @@ extern const char * iconv_canonicalize (const char * n	55	@@ -223,6 +234,7 @@ extern const char * iconv_canonicalize (
56		56
57	/* Support for relocatable packages. */	57	/* Support for relocatable packages. */
58		58
Lines 60-66 Link Here
60	/* Sets the original and the current installation prefix of the package.	60	/* Sets the original and the current installation prefix of the package.
61	Relocation simply replaces a pathname starting with the original prefix	61	Relocation simply replaces a pathname starting with the original prefix
62	by the corresponding pathname with the current prefix instead. Both	62	by the corresponding pathname with the current prefix instead. Both
63	@@ -231,12 +243,12 @@ extern const char * iconv_canonicalize (const char * n	63	@@ -230,12 +242,12 @@ extern const char * iconv_canonicalize (
64	instead of "/"). */	64	instead of "/"). */
65	extern void libiconv_set_relocation_prefix (const char *orig_prefix,	65	extern void libiconv_set_relocation_prefix (const char *orig_prefix,
66	const char *curr_prefix);	66	const char *curr_prefix);

Lines 1-43 Link Here

(-)converters/libiconv/files/patch-libcharset__lib__config.charset (-43 lines)
1	--- libcharset/lib/config.charset.orig 2010-04-05 02:25:38.000000000 +0200
2	+++ libcharset/lib/config.charset 2011-10-23 22:05:50.000000000 +0200
3	@@ -348,7 +348,7 @@ case "$os" in
4	#echo "sun_eu_greek ?" # what is this?
5	echo "UTF-8 UTF-8"
6	;;
7	- freebsd* \| os2*)
8	+ freebsd4.[0-5]* \| os2*)
9	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
10	# localcharset.c falls back to using the full locale name
11	# from the environment variables.
12	@@ -385,6 +385,31 @@ case "$os" in
13	echo "ja_JP.Shift_JIS SHIFT_JIS"
14	echo "ko_KR.EUC EUC-KR"
15	;;
16	+ freebsd*)
17	+ echo "US-ASCII ASCII"
18	+ echo "ISO8859-1 ISO-8859-1"
19	+ echo "ISO_8859-1 ISO-8859-1"
20	+ echo "ISO8859-2 ISO-8859-2"
21	+ echo "ISO_8859-2 ISO-8859-2"
22	+ echo "ISO8859-4 ISO-8859-4"
23	+ echo "ISO_8859-4 ISO-8859-4"
24	+ echo "ISO8859-5 ISO-8859-5"
25	+ echo "ISO_8859-5 ISO-8859-5"
26	+ echo "ISO8859-7 ISO-8859-7"
27	+ echo "ISO_8859-7 ISO-8859-7"
28	+ echo "ISO8859-9 ISO-8859-9"
29	+ echo "ISO_8859-9 ISO-8859-9"
30	+ echo "ISO8859-13 ISO-8859-13"
31	+ echo "ISO_8859-13 ISO-8859-13"
32	+ echo "ISO8859-15 ISO-8859-15"
33	+ echo "ISO_8859-15 ISO-8859-15"
34	+ echo "eucCN GB2312"
35	+ echo "eucJP EUC-JP"
36	+ echo "eucKR EUC-KR"
37	+ echo "Big5 BIG5"
38	+ echo "Big5HKSCS BIG5-HKSCS"
39	+ echo "SJIS SHIFT_JIS"
40	+ ;;
41	netbsd*)
42	echo "646 ASCII"
43	echo "ISO8859-1 ISO-8859-1"