Attachment 207972 Details for Bug 240954 – libiconv114.patch

[patch] libiconv114.patch

libiconv114.patch (text/plain), 12.28 KB, created by Yuichiro NAITO on 2019-10-01 02:08:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuichiro NAITO

Created: 2019-10-01 02:08:35 UTC

Size: 12.28 KB

patch

obsolete

>Index: japanese/libiconv114/Makefile
>===================================================================
>--- japanese/libiconv114/Makefile	(nonexistent)
>+++ japanese/libiconv114/Makefile	(working copy)
>@@ -0,0 +1,47 @@
>+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
>+# $FreeBSD$
>+
>+PORTNAME=	libiconv114
>+PORTVERSION=	1.14
>+CATEGORIES=	japanese converters devel
>+MASTER_SITES=	GNU
>+DISTNAME=	libiconv-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
>+
>+MAINTAINER=	gnome@FreeBSD.org
>+COMMENT=	Character set conversion library
>+
>+LICENSE=	GPLv3
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+USES=		libtool
>+USE_CSTD=	gnu89
>+USE_LDCONFIG=	yes
>+
>+CONFLICTS=	converters/libiconv
>+
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--enable-static \
>+		--disable-nls \
>+		--docdir=${DOCSDIR} \
>+		am_cv_func_iconv=no
>+INSTALL_TARGET=	install-strip
>+MAKE_JOBS_UNSAFE=	yes
>+
>+OPTIONS_DEFINE=	DOCS ENCODINGS PATCHES
>+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>
>
>Property changes on: japanese/libiconv114/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: japanese/libiconv114/distinfo
>===================================================================
>--- japanese/libiconv114/distinfo	(nonexistent)
>+++ japanese/libiconv114/distinfo	(working copy)
>@@ -0,0 +1,5 @@
>+TIMESTAMP = 1568939308
>+SHA256 (libiconv-1.14.tar.gz) = 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
>+SIZE (libiconv-1.14.tar.gz) = 4984397
>+SHA256 (libiconv-1.14-ja-1.patch.gz) = c9474ee420b971029073dabf5e599b049945fbb040f353dce4db32191401bfee
>+SIZE (libiconv-1.14-ja-1.patch.gz) = 291963
>
>Property changes on: japanese/libiconv114/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: japanese/libiconv114/files/patch-include-iconv.h.in
>===================================================================
>--- japanese/libiconv114/files/patch-include-iconv.h.in	(nonexistent)
>+++ japanese/libiconv114/files/patch-include-iconv.h.in	(working copy)
>@@ -0,0 +1,76 @@
>+--- include/iconv.h.in.orig	2011-08-07 17:48:03 UTC
>++++ include/iconv.h.in
>+@@ -21,8 +21,10 @@
>+ #ifndef _LIBICONV_H
>+ #define _LIBICONV_H
>+ 
>++#ifndef LIBICONV_PLUG
>+ #define _LIBICONV_VERSION 0x010E    /* 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
>+@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd);
>+ #endif
>+ 
>+ 
>+-#ifndef LIBICONV_PLUG
>+ 
>+ /* Nonstandard extensions. */
>+ 
>+@@ -127,12 +128,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). */
>++#ifndef LIBICONV_PLUG
>+ #define iconv_open_into libiconv_open_into
>++#endif
>+ extern int iconv_open_into (const char* tocode, const char* fromcode,
>+                             iconv_allocation_t* resultp);
>+ 
>+ /* Control of attributes. */
>++#ifndef LIBICONV_PLUG
>+ #define iconvctl libiconvctl
>++#endif
>+ extern int iconvctl (iconv_t cd, int request, void* argument);
>+ 
>+ /* Hook performed after every successful conversion of a Unicode character. */
>+@@ -210,9 +215,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 */
>++#ifdef LIBICONV_PLUG
>++#define ICONV_GET_ILSEQ_INVALID 128
>++#define ICONV_SET_ILSEQ_INVALID 129
>++#endif
>+ 
>+ /* Listing of locale independent encodings. */
>++#ifndef LIBICONV_PLUG
>+ #define iconvlist libiconvlist
>++#endif
>+ extern void iconvlist (int (*do_one) (unsigned int namescount,
>+                                       const char * const * names,
>+                                       void* data),
>+@@ -224,6 +235,7 @@ extern const char * iconv_canonicalize (const char * n
>+ 
>+ /* Support for relocatable packages.  */
>+ 
>++#ifndef LIBICONV_PLUG
>+ /* 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
>+@@ -231,12 +243,12 @@ extern const char * iconv_canonicalize (const char * n
>+    instead of "/").  */
>+ extern void libiconv_set_relocation_prefix (const char *orig_prefix,
>+                                             const char *curr_prefix);
>++#endif
>+ 
>+ #ifdef __cplusplus
>+ }
>+ #endif
>+ 
>+-#endif
>+ 
>+ 
>+ #endif /* _LIBICONV_H */
>
>Property changes on: japanese/libiconv114/files/patch-include-iconv.h.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: japanese/libiconv114/files/patch-libcharset__lib__config.charset
>===================================================================
>--- japanese/libiconv114/files/patch-libcharset__lib__config.charset	(nonexistent)
>+++ japanese/libiconv114/files/patch-libcharset__lib__config.charset	(working copy)
>@@ -0,0 +1,43 @@
>+--- libcharset/lib/config.charset.orig	2010-04-05 00:25:38 UTC
>++++ libcharset/lib/config.charset
>+@@ -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"
>
>Property changes on: japanese/libiconv114/files/patch-libcharset__lib__config.charset
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: japanese/libiconv114/files/patch-src__Makefile.in
>===================================================================
>--- japanese/libiconv114/files/patch-src__Makefile.in	(nonexistent)
>+++ japanese/libiconv114/files/patch-src__Makefile.in	(working copy)
>@@ -0,0 +1,19 @@
>+--- src/Makefile.in.orig	2011-06-04 17:05:58 UTC
>++++ src/Makefile.in
>+@@ -71,7 +71,6 @@ OBJECTS_RES_no =
>+ # without internationalization and not linked with libintl.
>+ 
>+ all : iconv_no_i18n$(EXEEXT) iconv.@OBJEXT@ $(OBJECTS_RES_@WOE32@)
>+-	test `ls -ld . | sed -e 's/^d$.........$.*/\1/'` = rwxrwxrwx || chmod 777 .
>+ 
>+ # This is the temporary iconv executable, without internationalization.
>+ iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@)
>+@@ -113,7 +112,7 @@ install : all force
>+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
>+ 	case "@host_os@" in \
>+ 	  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);; \
>+-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
>++	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
>+ 	esac
>+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
>+ 
>
>Property changes on: japanese/libiconv114/files/patch-src__Makefile.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: japanese/libiconv114/pkg-descr
>===================================================================
>--- japanese/libiconv114/pkg-descr	(nonexistent)
>+++ japanese/libiconv114/pkg-descr	(working copy)
>@@ -0,0 +1,14 @@
>+This library provides an iconv() implementation, for use on systems which
>+don't have one, or whose implementation cannot convert from/to Unicode.
>+
>+It can convert from any of these encodings to any other, through Unicode
>+conversion. It has also some limited support for transliteration, i.e.
>+when a character cannot be represented in the target character set, it can
>+be approximated through one or several similarly looking characters.
>+
>+libiconv is for you if your application needs to support multiple character
>+encodings, but that support lacks from your system.
>+
>+See either README or website for the list of supported encodings.
>+
>+WWW: http://www.gnu.org/software/libiconv/
>
>Property changes on: japanese/libiconv114/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: japanese/libiconv114/pkg-plist
>===================================================================
>--- japanese/libiconv114/pkg-plist	(nonexistent)
>+++ japanese/libiconv114/pkg-plist	(working copy)
>@@ -0,0 +1,25 @@
>+bin/iconv
>+include/iconv.h
>+include/libcharset.h
>+include/localcharset.h
>+lib/charset.alias
>+lib/libcharset.a
>+lib/libcharset.so
>+lib/libcharset.so.1
>+lib/libcharset.so.1.0.0
>+lib/libiconv.a
>+lib/libiconv.so
>+lib/libiconv.so.2
>+lib/libiconv.so.2.5.1
>+man/man1/iconv.1.gz
>+man/man3/iconv.3.gz
>+man/man3/iconv_open.3.gz
>+man/man3/iconv_open_into.3.gz
>+man/man3/iconv_close.3.gz
>+man/man3/iconvctl.3.gz
>+%%PORTDOCS%%%%DOCSDIR%%/iconv.1.html
>+%%PORTDOCS%%%%DOCSDIR%%/iconv.3.html
>+%%PORTDOCS%%%%DOCSDIR%%/iconv_close.3.html
>+%%PORTDOCS%%%%DOCSDIR%%/iconv_open.3.html
>+%%PORTDOCS%%%%DOCSDIR%%/iconv_open_into.3.html
>+%%PORTDOCS%%%%DOCSDIR%%/iconvctl.3.html
>
>Property changes on: japanese/libiconv114/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 240954: 207971 | 207972 | 214301