FreeBSD Bugzilla – Attachment 31845 Details for
Bug 52893
Update port: converters/libiconv to 1.9.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 27.16 KB, created by
tkato
on 2003-06-03 14:20:10 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato
Created:
2003-06-03 14:20:10 UTC
Size:
27.16 KB
patch
obsolete
>diff -urN /usr/ports/converters/libiconv/Makefile converters/libiconv/Makefile >--- /usr/ports/converters/libiconv/Makefile Sat Apr 12 22:38:00 2003 >+++ converters/libiconv/Makefile Fri May 30 11:27:58 2003 >@@ -6,8 +6,7 @@ > # > > PORTNAME= libiconv >-PORTVERSION= 1.8 >-PORTREVISION= 2 >+PORTVERSION= 1.9.1 > CATEGORIES= converters devel > MASTER_SITES= ${MASTER_SITE_GNU} > MASTER_SITE_SUBDIR= ${PORTNAME} >@@ -15,8 +14,10 @@ > MAINTAINER= gnome@FreeBSD.org > COMMENT= A character set conversion library > >+USE_REINPLACE= yes > USE_LIBTOOL= yes > LIBTOOLFILES= configure libcharset/configure >+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} > CONFIGURE_ARGS= --enable-static \ > --without-libintl-prefix > INSTALLS_SHLIB= yes >@@ -24,17 +25,7 @@ > MAN1= iconv.1 > MAN3= iconv.3 iconv_open.3 iconv_close.3 > >-.include <bsd.port.pre.mk> >+post-patch: >+ @${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h > >-# gperf 2.7.2 required >-.if ${OSVERSION} < 430000 >-BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf >-GPERF= ${LOCALBASE}/bin/gperf >-.else >-GPERF= /usr/bin/gperf >-.endif >- >-pre-build: >- @cd ${WRKSRC} ; ${GPERF} -t -L ANSI-C -H aliases_hash -N aliases_lookup -G -W aliases -7 -C -k '1,3-11,$$' -i 1 lib/aliases.gperf > lib/aliases.h >- >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >diff -urN /usr/ports/converters/libiconv/distinfo converters/libiconv/distinfo >--- /usr/ports/converters/libiconv/distinfo Tue Sep 10 20:07:04 2002 >+++ converters/libiconv/distinfo Fri May 30 10:12:09 2003 >@@ -1 +1 @@ >-MD5 (libiconv-1.8.tar.gz) = fd2a95a4b79fbdc8ea55ad093a8bb6cf >+MD5 (libiconv-1.9.1.tar.gz) = 0c99a05e0c3c153bac1c960f78711155 >diff -urN /usr/ports/converters/libiconv/files/patch-Makefile.in converters/libiconv/files/patch-Makefile.in >--- /usr/ports/converters/libiconv/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 >+++ converters/libiconv/files/patch-Makefile.in Fri May 30 11:28:49 2003 >@@ -0,0 +1,18 @@ >+ >+$FreeBSD$ >+ >+--- Makefile.in.orig Wed Apr 23 20:29:22 2003 >++++ Makefile.in Fri May 30 02:17:30 2003 >+@@ -34,10 +34,10 @@ >+ cd src && $(MAKE) all >+ cd po && $(MAKE) all >+ cd man && $(MAKE) all >+- if test -d tests; then cd tests && $(MAKE) all; fi >++# if test -d tests; then cd tests && $(MAKE) all; fi >+ >+ lib/localcharset.h : >+- builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" >++ builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib" >+ >+ # Installs the library and include files only. Typically called with only >+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. >diff -urN /usr/ports/converters/libiconv/files/patch-aa converters/libiconv/files/patch-aa >--- /usr/ports/converters/libiconv/files/patch-aa Fri Nov 1 21:48:58 2002 >+++ converters/libiconv/files/patch-aa Thu Jan 1 09:00:00 1970 >@@ -1,17 +0,0 @@ >---- Makefile.in.orig Tue Apr 30 10:23:47 2002 >-+++ Makefile.in Sun Oct 27 22:11:16 2002 >-@@ -27,12 +27,12 @@ >- SHELL = /bin/sh >- >- all : force >-- builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" >-+ builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib" >- cd lib && $(MAKE) all >- cd src && $(MAKE) all >- cd po && $(MAKE) all >- cd man && $(MAKE) all >-- if test -d tests; then cd tests && $(MAKE) all; fi >-+ #if test -d tests; then cd tests && $(MAKE) all; fi >- >- # Installs the library and include files only. Typically called with only >- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. >diff -urN /usr/ports/converters/libiconv/files/patch-ac converters/libiconv/files/patch-ac >--- /usr/ports/converters/libiconv/files/patch-ac Fri Nov 1 21:48:58 2002 >+++ converters/libiconv/files/patch-ac Thu Jan 1 09:00:00 1970 >@@ -1,27 +0,0 @@ >---- man/Makefile.in.orig Mon May 21 08:34:42 2001 >-+++ man/Makefile.in Sun Oct 27 22:09:17 2002 >-@@ -10,7 +10,7 @@ >- local_prefix = /usr/local >- exec_prefix = @exec_prefix@ >- mandir = @mandir@ >--docdir = $(prefix)/doc/libiconv >-+docdir = $(prefix)/share/doc/libiconv >- htmldir = $(docdir) >- >- # Programs used by "make": >-@@ -35,7 +35,6 @@ >- cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done >- if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi >- cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done >-- if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi >- if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi >- if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi >- cd $(srcdir) && for f in *.html ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; done >-@@ -45,7 +44,6 @@ >- if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi >- if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi >- if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi >-- if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi >- if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi >- if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi >- >diff -urN /usr/ports/converters/libiconv/files/patch-ad converters/libiconv/files/patch-ad >--- /usr/ports/converters/libiconv/files/patch-ad Tue Sep 10 20:07:04 2002 >+++ converters/libiconv/files/patch-ad Thu Jan 1 09:00:00 1970 >@@ -1,11 +0,0 @@ >---- lib/Makefile.in.orig Sat Jun 15 14:42:20 2002 >-+++ lib/Makefile.in Sat Jun 15 14:42:27 2002 >-@@ -39,7 +39,7 @@ >- >- # Before making a release, change this according to the libtool documentation, >- # section "Library interface versions". >--LIBICONV_VERSION_INFO = 3:0:1 >-+LIBICONV_VERSION_INFO = 3 >- >- # Needed by $(LIBTOOL). >- top_builddir = .. >diff -urN /usr/ports/converters/libiconv/files/patch-ae converters/libiconv/files/patch-ae >--- /usr/ports/converters/libiconv/files/patch-ae Tue Apr 30 03:41:51 2002 >+++ converters/libiconv/files/patch-ae Thu Jan 1 09:00:00 1970 >@@ -1,69 +0,0 @@ >---- libcharset/lib/Makefile.in.orig Wed Jun 27 18:56:56 2001 >-+++ libcharset/lib/Makefile.in Sat Apr 27 15:57:01 2002 >-@@ -10,6 +10,7 @@ >- local_prefix = /usr/local >- exec_prefix = @exec_prefix@ >- libdir = @libdir@ >-+sysconfdir = $(exec_prefix)/libdata >- >- # Programs used by "make": >- CC = @CC@ >-@@ -38,7 +39,7 @@ >- >- # Before making a release, change this according to the libtool documentation, >- # section "Library interface versions". >--LIBCHARSET_VERSION_INFO = 1:0:0 >-+LIBCHARSET_VERSION_INFO = 1 >- >- # Needed by $(LIBTOOL). >- top_builddir = .. >-@@ -53,7 +54,7 @@ >- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS) >- >- localcharset.lo : $(srcdir)/localcharset.c >-- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c >-+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c >- >- charset.alias: $(srcdir)/config.charset >- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ >-@@ -72,11 +73,12 @@ >- install-lib : all force >- $(MKINSTALLDIRS) $(libdir) >- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la >-- test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \ >-+ $(MKINSTALLDIRS) $(sysconfdir) >-+ test -f $(sysconfdir)/charset.alias && orig=$(sysconfdir)/charset.alias \ >- || orig=charset.alias; \ >-- sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \ >-- $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \ >-- rm -f $(libdir)/t-charset.alias >-+ sed -f ref-add.sed $$orig > $(sysconfdir)/t-charset.alias; \ >-+ $(INSTALL_DATA) $(sysconfdir)/t-charset.alias $(sysconfdir)/charset.alias; \ >-+ rm -f $(sysconfdir)/t-charset.alias >- >- # The following is needed in order to install a simple file in $(libdir) >- # which is shared with other installed packages. We use a list of referencing >-@@ -88,15 +90,16 @@ >- install : all force >- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) >- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la >-- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ >-- sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \ >-- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \ >-- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ >-+ $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) >-+ if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \ >-+ sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \ >-+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \ >-+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \ >- else \ >- if test @GLIBC21@ = no; then \ >-- sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \ >-- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \ >-- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ >-+ sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \ >-+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \ >-+ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \ >- fi ; \ >- fi >- >diff -urN /usr/ports/converters/libiconv/files/patch-configure converters/libiconv/files/patch-configure >--- /usr/ports/converters/libiconv/files/patch-configure Tue Apr 30 17:07:33 2002 >+++ converters/libiconv/files/patch-configure Fri May 30 11:31:31 2003 >@@ -1,9 +1,17 @@ > > $FreeBSD: ports/converters/libiconv/files/patch-configure,v 1.1 2002/04/30 08:07:33 sobomax Exp $ > >---- configure 2002/04/30 07:59:47 1.1 >-+++ configure 2002/04/30 08:00:22 >-@@ -5256,6 +5256,7 @@ >+--- configure.orig Fri May 23 05:19:20 2003 >++++ configure Fri May 30 11:22:14 2003 >+@@ -1905,7 +1905,6 @@ >+ >+ >+ >+-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man' >+ >+ >+ ac_ext=c >+@@ -19236,6 +19235,7 @@ > > # This can be used to rebuild libtool when needed > LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" >diff -urN /usr/ports/converters/libiconv/files/patch-include::iconv.h.in converters/libiconv/files/patch-include::iconv.h.in >--- /usr/ports/converters/libiconv/files/patch-include::iconv.h.in Tue Sep 10 20:07:04 2002 >+++ converters/libiconv/files/patch-include::iconv.h.in Thu Jan 1 09:00:00 1970 >@@ -1,49 +0,0 @@ >- >-$FreeBSD: ports/converters/libiconv/files/patch-include::iconv.h.in,v 1.2 2002/06/16 19:11:11 marcus Exp $ >- >---- include/iconv.h.in.orig Thu May 23 07:48:42 2002 >-+++ include/iconv.h.in Sat Jun 15 14:04:11 2002 >-@@ -21,6 +21,11 @@ >- #ifndef _LIBICONV_H >- #define _LIBICONV_H >- >-+#ifdef __FreeBSD__ >-+#define LIBICONV_PLUG >-+#endif >-+ >-+ >- #define _LIBICONV_VERSION 0x0108 /* version number: (major<<8) + minor */ >- extern int _libiconv_version; /* Likewise */ >- >-@@ -68,6 +73,8 @@ >- encoding `tocode'. */ >- #ifndef LIBICONV_PLUG >- #define iconv_open libiconv_open >-+#else >-+#define libiconv_open iconv_open >- #endif >- extern iconv_t iconv_open (const char* tocode, const char* fromcode); >- >-@@ -78,17 +85,21 @@ >- Decrements `*outbytesleft' and increments `*outbuf' by the same amount. */ >- #ifndef LIBICONV_PLUG >- #define iconv libiconv >-+#else >-+#define libiconv iconv >- #endif >- extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft); >- >- /* Frees resources allocated for conversion descriptor `cd'. */ >- #ifndef LIBICONV_PLUG >- #define iconv_close libiconv_close >-+#else >-+#define libiconv_close iconv_close >- #endif >- extern int iconv_close (iconv_t cd); >- >- >--#ifndef LIBICONV_PLUG >-+#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__) >- >- /* Nonstandard extensions. */ >- >diff -urN /usr/ports/converters/libiconv/files/patch-lib::Makefile.in converters/libiconv/files/patch-lib::Makefile.in >--- /usr/ports/converters/libiconv/files/patch-lib::Makefile.in Thu Jan 1 09:00:00 1970 >+++ converters/libiconv/files/patch-lib::Makefile.in Fri May 30 11:29:21 2003 >@@ -0,0 +1,14 @@ >+ >+$FreeBSD$ >+ >+--- lib/Makefile.in.orig Sun May 18 23:19:16 2003 >++++ lib/Makefile.in Fri May 30 02:20:37 2003 >+@@ -44,7 +44,7 @@ >+ >+ # Before making a release, change this according to the libtool documentation, >+ # section "Library interface versions". >+-LIBICONV_VERSION_INFO = 4:0:2 >++LIBICONV_VERSION_INFO = 4 >+ >+ # Needed by $(LIBTOOL). >+ top_builddir = .. >diff -urN /usr/ports/converters/libiconv/files/patch-lib::iconv.c converters/libiconv/files/patch-lib::iconv.c >--- /usr/ports/converters/libiconv/files/patch-lib::iconv.c Mon Mar 18 18:43:24 2002 >+++ converters/libiconv/files/patch-lib::iconv.c Thu Jan 1 09:00:00 1970 >@@ -1,58 +0,0 @@ >- >-$FreeBSD: ports/converters/libiconv/files/patch-lib::iconv.c,v 1.1 2002/03/18 09:43:24 sobomax Exp $ >- >---- lib/iconv.c.orig Sat May 26 03:25:09 2001 >-+++ lib/iconv.c Sun Mar 17 15:47:32 2002 >-@@ -176,6 +176,13 @@ >- } >- #endif >- >-+#undef libiconv_open >-+ >-+iconv_t libiconv_open (const char* tocode, const char* fromcode) >-+{ >-+ return (iconv_open(tocode, fromcode)); >-+} >-+ >- iconv_t iconv_open (const char* tocode, const char* fromcode) >- { >- struct conv_struct * cd; >-@@ -358,6 +365,15 @@ >- return (iconv_t)(-1); >- } >- >-+#undef libiconv >-+ >-+size_t libiconv (iconv_t icd, >-+ ICONV_CONST char* * inbuf, size_t *inbytesleft, >-+ char* * outbuf, size_t *outbytesleft) >-+{ >-+ return (iconv(icd, inbuf, inbytesleft, outbuf, outbytesleft)); >-+} >-+ >- size_t iconv (iconv_t icd, >- ICONV_CONST char* * inbuf, size_t *inbytesleft, >- char* * outbuf, size_t *outbytesleft) >-@@ -371,6 +387,13 @@ >- outbuf,outbytesleft); >- } >- >-+#undef libiconv_close >-+ >-+int libiconv_close (iconv_t icd) >-+{ >-+ return (iconv_close(icd)); >-+} >-+ >- int iconv_close (iconv_t icd) >- { >- conv_t cd = (conv_t) icd; >-@@ -378,7 +401,7 @@ >- return 0; >- } >- >--#ifndef LIBICONV_PLUG >-+#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__) >- >- int iconvctl (iconv_t icd, int request, void* argument) >- { >diff -urN /usr/ports/converters/libiconv/files/patch-lib::loop-unicode.h converters/libiconv/files/patch-lib::loop-unicode.h >--- /usr/ports/converters/libiconv/files/patch-lib::loop-unicode.h Thu Jan 1 09:00:00 1970 >+++ converters/libiconv/files/patch-lib::loop-unicode.h Fri May 30 11:29:33 2003 >@@ -0,0 +1,32 @@ >+ >+$FreeBSD$ >+ >+--- lib/loop_unicode.h.orig Wed Apr 16 19:08:22 2003 >++++ lib/loop_unicode.h Fri May 30 02:43:29 2003 >+@@ -53,7 +53,7 @@ >+ outptr = backup_outptr; >+ outleft = backup_outleft; >+ if (sub_outcount != RET_ILUNI) >+- return RET_TOOSMALL; >++ return sub_outcount; >+ } >+ } >+ { >+@@ -97,7 +97,7 @@ >+ outptr = backup_outptr; >+ outleft = backup_outleft; >+ if (sub_outcount != RET_ILUNI) >+- return RET_TOOSMALL; >++ return sub_outcount; >+ } >+ if (last) >+ break; >+@@ -148,7 +148,7 @@ >+ outptr = backup_outptr; >+ outleft = backup_outleft; >+ if (sub_outcount != RET_ILUNI) >+- return RET_TOOSMALL; >++ return sub_outcount; >+ } >+ } >+ return RET_ILUNI; >diff -urN /usr/ports/converters/libiconv/files/patch-lib_aliases.gperf converters/libiconv/files/patch-lib_aliases.gperf >--- /usr/ports/converters/libiconv/files/patch-lib_aliases.gperf Fri Nov 1 21:48:58 2002 >+++ converters/libiconv/files/patch-lib_aliases.gperf Thu Jan 1 09:00:00 1970 >@@ -1,134 +0,0 @@ >---- lib/aliases.gperf.orig Wed May 29 10:16:47 2002 >-+++ lib/aliases.gperf Mon Oct 14 12:31:58 2002 >-@@ -12,6 +12,7 @@ >- US, ei_ascii >- CSASCII, ei_ascii >- UTF-8, ei_utf8 >-+UTF8, ei_utf8 >- UCS-2, ei_ucs2 >- ISO-10646-UCS-2, ei_ucs2 >- CSUNICODE, ei_ucs2 >-@@ -43,6 +44,7 @@ >- JAVA, ei_java >- ISO-8859-1, ei_iso8859_1 >- ISO_8859-1, ei_iso8859_1 >-+ISO8859-1, ei_iso8859_1 >- ISO_8859-1:1987, ei_iso8859_1 >- ISO-IR-100, ei_iso8859_1 >- CP819, ei_iso8859_1 >-@@ -52,6 +54,7 @@ >- CSISOLATIN1, ei_iso8859_1 >- ISO-8859-2, ei_iso8859_2 >- ISO_8859-2, ei_iso8859_2 >-+ISO8859-2, ei_iso8859_2 >- ISO_8859-2:1987, ei_iso8859_2 >- ISO-IR-101, ei_iso8859_2 >- LATIN2, ei_iso8859_2 >-@@ -59,6 +62,7 @@ >- CSISOLATIN2, ei_iso8859_2 >- ISO-8859-3, ei_iso8859_3 >- ISO_8859-3, ei_iso8859_3 >-+ISO8859-3, ei_iso8859_3 >- ISO_8859-3:1988, ei_iso8859_3 >- ISO-IR-109, ei_iso8859_3 >- LATIN3, ei_iso8859_3 >-@@ -66,6 +70,7 @@ >- CSISOLATIN3, ei_iso8859_3 >- ISO-8859-4, ei_iso8859_4 >- ISO_8859-4, ei_iso8859_4 >-+ISO8859-4, ei_iso8859_4 >- ISO_8859-4:1988, ei_iso8859_4 >- ISO-IR-110, ei_iso8859_4 >- LATIN4, ei_iso8859_4 >-@@ -73,12 +78,14 @@ >- CSISOLATIN4, ei_iso8859_4 >- ISO-8859-5, ei_iso8859_5 >- ISO_8859-5, ei_iso8859_5 >-+ISO8859-5, ei_iso8859_5 >- ISO_8859-5:1988, ei_iso8859_5 >- ISO-IR-144, ei_iso8859_5 >- CYRILLIC, ei_iso8859_5 >- CSISOLATINCYRILLIC, ei_iso8859_5 >- ISO-8859-6, ei_iso8859_6 >- ISO_8859-6, ei_iso8859_6 >-+ISO8859-6, ei_iso8859_6 >- ISO_8859-6:1987, ei_iso8859_6 >- ISO-IR-127, ei_iso8859_6 >- ECMA-114, ei_iso8859_6 >-@@ -87,6 +94,7 @@ >- CSISOLATINARABIC, ei_iso8859_6 >- ISO-8859-7, ei_iso8859_7 >- ISO_8859-7, ei_iso8859_7 >-+ISO8859-7, ei_iso8859_7 >- ISO_8859-7:1987, ei_iso8859_7 >- ISO-IR-126, ei_iso8859_7 >- ECMA-118, ei_iso8859_7 >-@@ -96,12 +104,14 @@ >- CSISOLATINGREEK, ei_iso8859_7 >- ISO-8859-8, ei_iso8859_8 >- ISO_8859-8, ei_iso8859_8 >-+ISO8859-8, ei_iso8859_8 >- ISO_8859-8:1988, ei_iso8859_8 >- ISO-IR-138, ei_iso8859_8 >- HEBREW, ei_iso8859_8 >- CSISOLATINHEBREW, ei_iso8859_8 >- ISO-8859-9, ei_iso8859_9 >- ISO_8859-9, ei_iso8859_9 >-+ISO8859-9, ei_iso8859_9 >- ISO_8859-9:1989, ei_iso8859_9 >- ISO-IR-148, ei_iso8859_9 >- LATIN5, ei_iso8859_9 >-@@ -109,6 +119,7 @@ >- CSISOLATIN5, ei_iso8859_9 >- ISO-8859-10, ei_iso8859_10 >- ISO_8859-10, ei_iso8859_10 >-+ISO8859-10, ei_iso8859_10 >- ISO_8859-10:1992, ei_iso8859_10 >- ISO-IR-157, ei_iso8859_10 >- LATIN6, ei_iso8859_10 >-@@ -116,11 +127,13 @@ >- CSISOLATIN6, ei_iso8859_10 >- ISO-8859-13, ei_iso8859_13 >- ISO_8859-13, ei_iso8859_13 >-+ISO8859-13, ei_iso8859_13 >- ISO-IR-179, ei_iso8859_13 >- LATIN7, ei_iso8859_13 >- L7, ei_iso8859_13 >- ISO-8859-14, ei_iso8859_14 >- ISO_8859-14, ei_iso8859_14 >-+ISO8859-14, ei_iso8859_14 >- ISO_8859-14:1998, ei_iso8859_14 >- ISO-IR-199, ei_iso8859_14 >- LATIN8, ei_iso8859_14 >-@@ -128,10 +141,12 @@ >- ISO-CELTIC, ei_iso8859_14 >- ISO-8859-15, ei_iso8859_15 >- ISO_8859-15, ei_iso8859_15 >-+ISO8859-15, ei_iso8859_15 >- ISO_8859-15:1998, ei_iso8859_15 >- ISO-IR-203, ei_iso8859_15 >- ISO-8859-16, ei_iso8859_16 >- ISO_8859-16, ei_iso8859_16 >-+ISO8859-16, ei_iso8859_16 >- ISO_8859-16:2000, ei_iso8859_16 >- ISO-IR-226, ei_iso8859_16 >- KOI8-R, ei_koi8_r >-@@ -253,12 +268,12 @@ >- CHINESE, ei_gb2312 >- ISO-IR-165, ei_isoir165 >- CN-GB-ISOIR165, ei_isoir165 >--KSC_5601, ei_ksc5601 >--KS_C_5601-1987, ei_ksc5601 >--KS_C_5601-1989, ei_ksc5601 >--ISO-IR-149, ei_ksc5601 >--CSKSC56011987, ei_ksc5601 >--KOREAN, ei_ksc5601 >-+KSC_5601, ei_euc_kr >-+KS_C_5601-1987, ei_euc_kr >-+KS_C_5601-1989, ei_euc_kr >-+ISO-IR-149, ei_euc_kr >-+CSKSC56011987, ei_euc_kr >-+KOREAN, ei_euc_kr >- EUC-JP, ei_euc_jp >- EUCJP, ei_euc_jp >- EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp >diff -urN /usr/ports/converters/libiconv/files/patch-lib_loop-unicode.h converters/libiconv/files/patch-lib_loop-unicode.h >--- /usr/ports/converters/libiconv/files/patch-lib_loop-unicode.h Tue Sep 10 20:07:04 2002 >+++ converters/libiconv/files/patch-lib_loop-unicode.h Thu Jan 1 09:00:00 1970 >@@ -1,32 +0,0 @@ >---- lib/loop_unicode.h.orig Mon May 6 06:17:43 2002 >-+++ lib/loop_unicode.h Sat Jun 15 14:07:14 2002 >-@@ -52,8 +52,7 @@ >- cd->ostate = backup_state; >- outptr = backup_outptr; >- outleft = backup_outleft; >-- if (sub_outcount < 0) >-- return RET_TOOSMALL; >-+ return sub_outcount; >- } >- } >- { >-@@ -96,8 +95,7 @@ >- cd->ostate = backup_state; >- outptr = backup_outptr; >- outleft = backup_outleft; >-- if (sub_outcount < 0) >-- return RET_TOOSMALL; >-+ return sub_outcount; >- } >- if (last) >- break; >-@@ -144,8 +142,7 @@ >- cd->ostate = backup_state; >- outptr = backup_outptr; >- outleft = backup_outleft; >-- if (sub_outcount != RET_ILUNI) >-- return RET_TOOSMALL; >-+ return sub_outcount; >- } >- } >- return RET_ILUNI; >diff -urN /usr/ports/converters/libiconv/files/patch-libcharset::Makefile.in converters/libiconv/files/patch-libcharset::Makefile.in >--- /usr/ports/converters/libiconv/files/patch-libcharset::Makefile.in Thu Jan 1 09:00:00 1970 >+++ converters/libiconv/files/patch-libcharset::Makefile.in Fri May 30 11:29:48 2003 >@@ -0,0 +1,14 @@ >+ >+$FreeBSD$ >+ >+--- libcharset/Makefile.in.orig Wed Apr 23 20:29:22 2003 >++++ libcharset/Makefile.in Fri May 30 02:45:08 2003 >+@@ -43,7 +43,7 @@ >+ # Installs the library and include files only. Typically called with only >+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. >+ install-lib : all force >+- cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' >++ cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' sysconfdir='$(sysconfdir)' >+ $(mkinstalldirs) $(includedir) >+ $(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h >+ $(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h >diff -urN /usr/ports/converters/libiconv/files/patch-libcharset::lib::Makefile.in converters/libiconv/files/patch-libcharset::lib::Makefile.in >--- /usr/ports/converters/libiconv/files/patch-libcharset::lib::Makefile.in Thu Jan 1 09:00:00 1970 >+++ converters/libiconv/files/patch-libcharset::lib::Makefile.in Fri May 30 11:30:07 2003 >@@ -0,0 +1,72 @@ >+ >+$FreeBSD$ >+ >+--- libcharset/lib/Makefile.in.orig Mon Apr 14 22:51:06 2003 >++++ libcharset/lib/Makefile.in Fri May 30 02:28:19 2003 >+@@ -10,6 +10,7 @@ >+ local_prefix = /usr/local >+ exec_prefix = @exec_prefix@ >+ libdir = @libdir@ >++sysconfdir = $(exec_prefix)/libdata >+ >+ # Programs used by "make": >+ CC = @CC@ >+@@ -17,7 +18,7 @@ >+ CPPFLAGS = @CPPFLAGS@ >+ LDFLAGS = @LDFLAGS@ >+ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. -I../include >+-DEFS = -DLIBDIR=\"$(libdir)\" \ >++DEFS = -DLIBDIR=\"$(sysconfdir)\" \ >+ -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ >+ -Dset_relocation_prefix=libcharset_set_relocation_prefix \ >+ -Drelocate=libcharset_relocate @DEFS@ >+@@ -42,7 +43,7 @@ >+ >+ # Before making a release, change this according to the libtool documentation, >+ # section "Library interface versions". >+-LIBCHARSET_VERSION_INFO = 1:0:0 >++LIBCHARSET_VERSION_INFO = 1 >+ >+ # Needed by $(LIBTOOL). >+ top_builddir = .. >+@@ -79,11 +80,12 @@ >+ install-lib : all force >+ $(mkinstalldirs) $(libdir) >+ $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la >+- test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \ >++ $(mkinstalldirs) $(sysconfdir) >++ test -f $(sysconfdir)/charset.alias && orig=$(sysconfdir)/charset.alias \ >+ || orig=charset.alias; \ >+- sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \ >+- $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \ >+- rm -f $(libdir)/t-charset.alias >++ sed -f ref-add.sed $$orig > $(sysconfdir)/t-charset.alias; \ >++ $(INSTALL_DATA) $(sysconfdir)/t-charset.alias $(sysconfdir)/charset.alias; \ >++ rm -f $(sysconfdir)/t-charset.alias >+ >+ # The following is needed in order to install a simple file in $(libdir) >+ # which is shared with other installed packages. We use a list of referencing >+@@ -95,15 +97,16 @@ >+ install : all force >+ $(mkinstalldirs) $(DESTDIR)$(libdir) >+ $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la >+- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ >+- sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \ >+- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \ >+- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ >++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) >++ if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \ >++ sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \ >++ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \ >++ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \ >+ else \ >+ if test @GLIBC21@ = no; then \ >+- sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \ >+- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \ >+- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ >++ sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \ >++ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \ >++ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \ >+ fi ; \ >+ fi >+ >diff -urN /usr/ports/converters/libiconv/files/patch-libcharset_Makefile.in converters/libiconv/files/patch-libcharset_Makefile.in >--- /usr/ports/converters/libiconv/files/patch-libcharset_Makefile.in Wed May 15 04:28:45 2002 >+++ converters/libiconv/files/patch-libcharset_Makefile.in Thu Jan 1 09:00:00 1970 >@@ -1,11 +0,0 @@ >---- libcharset/Makefile.in.orig Mon May 21 23:48:37 2001 >-+++ libcharset/Makefile.in Sat Apr 6 21:25:39 2002 >-@@ -38,7 +38,7 @@ >- # Installs the library and include files only. Typically called with only >- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. >- install-lib : all force >-- cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' >-+ cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' sysconfdir='$(sysconfdir)' >- $(MKINSTALLDIRS) $(includedir) >- $(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h >- >diff -urN /usr/ports/converters/libiconv/files/patch-src_Makefile.in converters/libiconv/files/patch-src_Makefile.in >--- /usr/ports/converters/libiconv/files/patch-src_Makefile.in Mon Jun 17 04:11:11 2002 >+++ converters/libiconv/files/patch-src_Makefile.in Thu Jan 1 09:00:00 1970 >@@ -1,11 +0,0 @@ >---- src/Makefile.in.orig Sat Jun 15 14:25:55 2002 >-+++ src/Makefile.in Sat Jun 15 14:26:05 2002 >-@@ -77,7 +77,7 @@ >- if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi >- if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi >- case "@host_os@" in \ >-- hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ >-+ hpux*|freebsd*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ >- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ >- esac >- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv >diff -urN /usr/ports/converters/libiconv/pkg-plist converters/libiconv/pkg-plist >--- /usr/ports/converters/libiconv/pkg-plist Thu Apr 25 00:49:47 2002 >+++ converters/libiconv/pkg-plist Fri May 30 11:13:59 2003 >@@ -1,12 +1,13 @@ > bin/iconv > include/iconv.h > include/libcharset.h >+include/localcharset.h > lib/libcharset.a > lib/libcharset.so > lib/libcharset.so.1 > lib/libiconv.a > lib/libiconv.so >-lib/libiconv.so.3 >+lib/libiconv.so.4 > libdata/charset.alias > share/doc/libiconv/iconv.1.html > share/doc/libiconv/iconv.3.html
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=31845">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 52893
: 31845