Date: 15 Jun 2002 14:52:29 -0400 From: Joe Marcus Clarke <marcus@FreeBSD.org> To: gnome@FreeBSD.org Subject: RFC: Please review libiconv 1.8 update Message-ID: <1024167149.34017.10.camel@shumai.marcuscom.com>
next in thread | raw e-mail | index | archive | help
--=-dUkMI4gSWFFWedsOoz6p Content-Type: text/plain Content-Transfer-Encoding: 7bit I have prepared a libiconv update to 1.8 based on the fact that 1.7.0.1 is no longer available and 1.8 has been out for almost a month. I have incremented the shared lib version number to 4 since the library has received quite a few changes. Please test these patches. Thanks. Joe --=-dUkMI4gSWFFWedsOoz6p Content-Disposition: attachment; filename=libiconv.diff Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; name=libiconv.diff; charset=ISO-8859-1 diff -ruN libiconv.orig/Makefile libiconv/Makefile --- converters/libiconv.orig/Makefile Sat Jun 15 14:47:45 2002 +++ converters/libiconv/Makefile Sat Jun 15 14:26:55 2002 @@ -6,10 +6,9 @@ # =20 PORTNAME=3D libiconv -PORTVERSION=3D 1.7.0.1 +PORTVERSION=3D 1.8 CATEGORIES=3D converters devel -MASTER_SITES=3D ftp://ftp.ilog.fr/pub/Users/haible/gnu/ \ - ${MASTER_SITE_GNU} +MASTER_SITES=3D ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR=3D ${PORTNAME} =20 MAINTAINER=3D gnome@FreeBSD.org @@ -33,6 +32,6 @@ .endif =20 pre-build: - @cd ${WRKSRC} ; ${GPERF} -t -L ANSI-C -H aliases_hash -N aliases_lookup -= 7 -C -k '1,3-11,$$' -i 1 lib/aliases.gperf > lib/aliases.h + @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 =20 .include <bsd.port.post.mk> diff -ruN libiconv.orig/distinfo libiconv/distinfo --- converters/libiconv.orig/distinfo Sat Jun 15 14:47:45 2002 +++ converters/libiconv/distinfo Sat Jun 15 13:56:02 2002 @@ -1 +1 @@ -MD5 (libiconv-1.7.0.1.tar.gz) =3D b4bcf45da1208360647c8a0928acf03d +MD5 (libiconv-1.8.tar.gz) =3D fd2a95a4b79fbdc8ea55ad093a8bb6cf diff -ruN libiconv.orig/files/patch-ad libiconv/files/patch-ad --- converters/libiconv.orig/files/patch-ad Sat Jun 15 14:47:45 2002 +++ converters/libiconv/files/patch-ad Sat Jun 15 14:42:44 2002 @@ -1,14 +1,11 @@ - -$FreeBSD: ports/converters/libiconv/files/patch-ad,v 1.5 2002/03/18 09:43:= 24 sobomax Exp $ - ---- lib/Makefile.in.orig Thu Jun 28 01:37:49 2001 -+++ lib/Makefile.in Sun Mar 17 11:34:57 2002 +--- 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 @@ =20 # Before making a release, change this according to the libtool documenta= tion, # section "Library interface versions". --LIBICONV_VERSION_INFO =3D 2:4:0 -+LIBICONV_VERSION_INFO =3D 3 +-LIBICONV_VERSION_INFO =3D 3:0:1 ++LIBICONV_VERSION_INFO =3D 4 =20 # Needed by $(LIBTOOL). top_builddir =3D .. diff -ruN libiconv.orig/files/patch-include::iconv.h.in libiconv/files/patc= h-include::iconv.h.in --- converters/libiconv.orig/files/patch-include::iconv.h.in Sat Jun 15 14:= 47:45 2002 +++ converters/libiconv/files/patch-include::iconv.h.in Sat Jun 15 14:04:41= 2002 @@ -1,9 +1,9 @@ =20 -$FreeBSD: ports/converters/libiconv/files/patch-include::iconv.h.in,v 1.1 = 2002/03/18 09:43:24 sobomax Exp $ +$FreeBSD$ =20 ---- include/iconv.h.in.orig Mon Jun 25 15:06:22 2001 -+++ include/iconv.h.in Sun Mar 17 15:41:14 2002 -@@ -21,6 +21,10 @@ +--- 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 =20 @@ -11,10 +11,11 @@ +#define LIBICONV_PLUG +#endif + - #define _LIBICONV_VERSION 0x0107 /* version number: (major<<8) + minor= */ ++ + #define _LIBICONV_VERSION 0x0108 /* version number: (major<<8) + minor= */ extern int _libiconv_version; /* Likewise */ =20 -@@ -68,6 +72,8 @@ +@@ -68,6 +73,8 @@ encoding `tocode'. */ #ifndef LIBICONV_PLUG #define iconv_open libiconv_open @@ -23,7 +24,7 @@ #endif extern iconv_t iconv_open (const char* tocode, const char* fromcode); =20 -@@ -78,17 +84,21 @@ +@@ -78,17 +85,21 @@ Decrements `*outbytesleft' and increments `*outbuf' by the same amount= . */ #ifndef LIBICONV_PLUG #define iconv libiconv diff -ruN libiconv.orig/files/patch-lib_loop-unicode.h libiconv/files/patch= -lib_loop-unicode.h --- converters/libiconv.orig/files/patch-lib_loop-unicode.h Sat Jun 15 14:4= 7:45 2002 +++ converters/libiconv/files/patch-lib_loop-unicode.h Sat Jun 15 14:07:35 = 2002 @@ -1,5 +1,5 @@ ---- lib/loop_unicode.h.orig Fri Jun 8 22:04:33 2001 -+++ lib/loop_unicode.h Mon Apr 29 05:12:08 2002 +--- 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 =3D backup_state; outptr =3D backup_outptr; @@ -16,7 +16,7 @@ outleft =3D backup_outleft; - if (sub_outcount < 0) - return RET_TOOSMALL; -+ return sub_outcount; ++ return sub_outcount; } if (last) break; @@ -24,7 +24,7 @@ cd->ostate =3D backup_state; outptr =3D backup_outptr; outleft =3D backup_outleft; -- if (sub_outcount < 0) +- if (sub_outcount !=3D RET_ILUNI) - return RET_TOOSMALL; + return sub_outcount; } diff -ruN libiconv.orig/files/patch-src_Makefile.in libiconv/files/patch-sr= c_Makefile.in --- converters/libiconv.orig/files/patch-src_Makefile.in Wed Dec 31 19:00:0= 0 1969 +++ converters/libiconv/files/patch-src_Makefile.in Sat Jun 15 14:26:21 200= 2 @@ -0,0 +1,11 @@ +--- 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_prefi= x) ; 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 @L= IBINTL@ -o iconv;; \ + *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.= la @LTLIBINTL@ -o iconv;; \ + esac + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv diff -ruN libiconv.orig/pkg-plist libiconv/pkg-plist --- converters/libiconv.orig/pkg-plist Sat Jun 15 14:47:45 2002 +++ converters/libiconv/pkg-plist Sat Jun 15 14:43:12 2002 @@ -6,7 +6,7 @@ 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 --=-dUkMI4gSWFFWedsOoz6p-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1024167149.34017.10.camel>