View | Details | Raw Unified | Return to bug 240954 | Differences between
and this patch

Collapse All | Expand All

(-)japanese/libiconv114/Makefile (+47 lines)
Line 0 Link Here
1
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
2
# $FreeBSD$
3
4
PORTNAME=	libiconv114
5
PORTVERSION=	1.14
6
CATEGORIES=	japanese converters devel
7
MASTER_SITES=	GNU
8
DISTNAME=	libiconv-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
9
10
MAINTAINER=	gnome@FreeBSD.org
11
COMMENT=	Character set conversion library
12
13
LICENSE=	GPLv3
14
LICENSE_FILE=	${WRKSRC}/COPYING
15
16
USES=		libtool
17
USE_CSTD=	gnu89
18
USE_LDCONFIG=	yes
19
20
CONFLICTS=	converters/libiconv
21
22
GNU_CONFIGURE=	yes
23
CONFIGURE_ARGS=	--enable-static \
24
		--disable-nls \
25
		--docdir=${DOCSDIR} \
26
		am_cv_func_iconv=no
27
INSTALL_TARGET=	install-strip
28
MAKE_JOBS_UNSAFE=	yes
29
30
OPTIONS_DEFINE=	DOCS ENCODINGS PATCHES
31
OPTIONS_DEFAULT=ENCODINGS
32
ENCODINGS_DESC=	Include extra character sets
33
PATCHES_DESC=	Apply patches to fix CP932, add EUCJP-MS
34
35
ENCODINGS_CONFIGURE_ENABLE=	extra-encodings
36
37
PATCHES_PATCH_SITES=	http://apolloron.org/software/libiconv-1.14-ja/ \
38
			LOCAL/kwm
39
PATCHES_PATCHFILES=	${DISTNAME}-ja-1.patch.gz:-p1
40
41
post-patch:
42
	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
43
	@${REINPLACE_CMD} -e 's:gawk:awk:g' ${WRKSRC}/configure \
44
		${WRKSRC}/libcharset/configure \
45
		${WRKSRC}/preload/configure
46
47
.include <bsd.port.mk>
(-)japanese/libiconv114/distinfo (+5 lines)
Line 0 Link Here
1
TIMESTAMP = 1568939308
2
SHA256 (libiconv-1.14.tar.gz) = 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
3
SIZE (libiconv-1.14.tar.gz) = 4984397
4
SHA256 (libiconv-1.14-ja-1.patch.gz) = c9474ee420b971029073dabf5e599b049945fbb040f353dce4db32191401bfee
5
SIZE (libiconv-1.14-ja-1.patch.gz) = 291963
(-)japanese/libiconv114/files/patch-include-iconv.h.in (+76 lines)
Line 0 Link Here
1
--- include/iconv.h.in.orig	2011-08-07 17:48:03 UTC
2
+++ include/iconv.h.in
3
@@ -21,8 +21,10 @@
4
 #ifndef _LIBICONV_H
5
 #define _LIBICONV_H
6
 
7
+#ifndef LIBICONV_PLUG
8
 #define _LIBICONV_VERSION 0x010E    /* version number: (major<<8) + minor */
9
 extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
10
+#endif
11
 
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
14
@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd);
15
 #endif
16
 
17
 
18
-#ifndef LIBICONV_PLUG
19
 
20
 /* Nonstandard extensions. */
21
 
22
@@ -127,12 +128,16 @@ typedef struct {
23
 /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
24
    encoding ‘tocode’ into preallocated memory. Returns an error indicator
25
    (0 or -1 with errno set). */
26
+#ifndef LIBICONV_PLUG
27
 #define iconv_open_into libiconv_open_into
28
+#endif
29
 extern int iconv_open_into (const char* tocode, const char* fromcode,
30
                             iconv_allocation_t* resultp);
31
 
32
 /* Control of attributes. */
33
+#ifndef LIBICONV_PLUG
34
 #define iconvctl libiconvctl
35
+#endif
36
 extern int iconvctl (iconv_t cd, int request, void* argument);
37
 
38
 /* Hook performed after every successful conversion of a Unicode character. */
39
@@ -210,9 +215,15 @@ struct iconv_fallbacks {
40
 #define ICONV_SET_DISCARD_ILSEQ   4  /* const int *argument */
41
 #define ICONV_SET_HOOKS           5  /* const struct iconv_hooks *argument */
42
 #define ICONV_SET_FALLBACKS       6  /* const struct iconv_fallbacks *argument */
43
+#ifdef LIBICONV_PLUG
44
+#define ICONV_GET_ILSEQ_INVALID 128
45
+#define ICONV_SET_ILSEQ_INVALID 129
46
+#endif
47
 
48
 /* Listing of locale independent encodings. */
49
+#ifndef LIBICONV_PLUG
50
 #define iconvlist libiconvlist
51
+#endif
52
 extern void iconvlist (int (*do_one) (unsigned int namescount,
53
                                       const char * const * names,
54
                                       void* data),
55
@@ -224,6 +235,7 @@ extern const char * iconv_canonicalize (const char * n
56
 
57
 /* Support for relocatable packages.  */
58
 
59
+#ifndef LIBICONV_PLUG
60
 /* Sets the original and the current installation prefix of the package.
61
    Relocation simply replaces a pathname starting with the original prefix
62
    by the corresponding pathname with the current prefix instead.  Both
63
@@ -231,12 +243,12 @@ extern const char * iconv_canonicalize (const char * n
64
    instead of "/").  */
65
 extern void libiconv_set_relocation_prefix (const char *orig_prefix,
66
                                             const char *curr_prefix);
67
+#endif
68
 
69
 #ifdef __cplusplus
70
 }
71
 #endif
72
 
73
-#endif
74
 
75
 
76
 #endif /* _LIBICONV_H */
(-)japanese/libiconv114/files/patch-libcharset__lib__config.charset (+43 lines)
Line 0 Link Here
1
--- libcharset/lib/config.charset.orig	2010-04-05 00:25:38 UTC
2
+++ libcharset/lib/config.charset
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"
(-)japanese/libiconv114/files/patch-src__Makefile.in (+19 lines)
Line 0 Link Here
1
--- src/Makefile.in.orig	2011-06-04 17:05:58 UTC
2
+++ src/Makefile.in
3
@@ -71,7 +71,6 @@ OBJECTS_RES_no =
4
 # without internationalization and not linked with libintl.
5
 
6
 all : iconv_no_i18n$(EXEEXT) iconv.@OBJEXT@ $(OBJECTS_RES_@WOE32@)
7
-	test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 .
8
 
9
 # This is the temporary iconv executable, without internationalization.
10
 iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@)
11
@@ -113,7 +112,7 @@ install : all force
12
 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
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);; \
15
-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
16
+	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
17
 	esac
18
 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
19
 
(-)japanese/libiconv114/pkg-descr (+14 lines)
Line 0 Link Here
1
This library provides an iconv() implementation, for use on systems which
2
don't have one, or whose implementation cannot convert from/to Unicode.
3
4
It can convert from any of these encodings to any other, through Unicode
5
conversion. It has also some limited support for transliteration, i.e.
6
when a character cannot be represented in the target character set, it can
7
be approximated through one or several similarly looking characters.
8
9
libiconv is for you if your application needs to support multiple character
10
encodings, but that support lacks from your system.
11
12
See either README or website for the list of supported encodings.
13
14
WWW: http://www.gnu.org/software/libiconv/
(-)japanese/libiconv114/pkg-plist (+25 lines)
Line 0 Link Here
1
bin/iconv
2
include/iconv.h
3
include/libcharset.h
4
include/localcharset.h
5
lib/charset.alias
6
lib/libcharset.a
7
lib/libcharset.so
8
lib/libcharset.so.1
9
lib/libcharset.so.1.0.0
10
lib/libiconv.a
11
lib/libiconv.so
12
lib/libiconv.so.2
13
lib/libiconv.so.2.5.1
14
man/man1/iconv.1.gz
15
man/man3/iconv.3.gz
16
man/man3/iconv_open.3.gz
17
man/man3/iconv_open_into.3.gz
18
man/man3/iconv_close.3.gz
19
man/man3/iconvctl.3.gz
20
%%PORTDOCS%%%%DOCSDIR%%/iconv.1.html
21
%%PORTDOCS%%%%DOCSDIR%%/iconv.3.html
22
%%PORTDOCS%%%%DOCSDIR%%/iconv_close.3.html
23
%%PORTDOCS%%%%DOCSDIR%%/iconv_open.3.html
24
%%PORTDOCS%%%%DOCSDIR%%/iconv_open_into.3.html
25
%%PORTDOCS%%%%DOCSDIR%%/iconvctl.3.html

Return to bug 240954