From 2801d797d0c9491cc60bdf77cdf2bacd5ccd7179 Mon Sep 17 00:00:00 2001 From: naddy Date: Fri, 24 Apr 2009 18:56:49 +0000 Subject: [PATCH] update to 1.13; from Brad --- converters/libiconv/Makefile | 21 ++++++++++--------- converters/libiconv/distinfo | 10 ++++----- converters/libiconv/patches/patch-lib_iconv_c | 12 ----------- .../libiconv/patches/patch-lib_loop_wchar_h | 15 ------------- .../patch-libcharset_lib_config_charset | 8 +++---- .../patch-libcharset_lib_localcharset_c | 8 +++---- .../libiconv/patches/patch-src_Makefile_in | 10 ++++----- converters/libiconv/pkg/PLIST | 7 ++++--- 8 files changed, 33 insertions(+), 58 deletions(-) delete mode 100644 converters/libiconv/patches/patch-lib_iconv_c delete mode 100644 converters/libiconv/patches/patch-lib_loop_wchar_h diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 42a3f2cd28b..06864321454 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,39 +1,40 @@ -# $OpenBSD: Makefile,v 1.31 2008/06/18 19:50:31 naddy Exp $ +# $OpenBSD: Makefile,v 1.32 2009/04/24 18:56:49 naddy Exp $ COMMENT= character set conversion library -DISTNAME= libiconv-1.12 +DISTNAME= libiconv-1.13 CATEGORIES= converters devel MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/} -SHARED_LIBS += charset 1.0 # .1.0 -SHARED_LIBS += iconv 5.0 # .6.0 + +SHARED_LIBS= charset 1.0 \ + iconv 6.0 HOMEPAGE= http://www.gnu.org/software/libiconv/ MAINTAINER= Brad Smith -# LGPL, GPLv3 +# LGPLv2, GPLv3 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes - WANTLIB= c + BUILD_DEPENDS= ::devel/gperf USE_LIBTOOL= Yes SEPARATE_BUILD= simple -CONFIGURE_STYLE=gnu +CONFIGURE_STYLE= gnu MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux ${WRKSRC}/libcharset/build-aux CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static \ + --disable-nls \ --enable-extra-encodings \ - --disable-nls + --enable-static CONFIGURE_ENV= am_cv_proto_iconv='extern size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);' MAKE_FLAGS= INSTALL_DATA=cp pre-configure: @cd ${WRKSRC}; \ - ${SETENV} ${CONFIGURE_ENV} make -f Makefile.devel lib/aliases.h + ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.devel lib/aliases.h .include diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index c6b397759a3..de5aa7926e1 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,5 +1,5 @@ -MD5 (libiconv-1.12.tar.gz) = wr4oJZV1FTWmGK4O3rj2SA== -RMD160 (libiconv-1.12.tar.gz) = dKY8GiljrBcpwax63+yP05emhb0= -SHA1 (libiconv-1.12.tar.gz) = pXONffu9AcSejOAm6k/6DwGvAXk= -SHA256 (libiconv-1.12.tar.gz) = qZ4kT9eLq7leo8mlyIuWSZTtqh0V/Y3eW0BngB4j8M0= -SIZE (libiconv-1.12.tar.gz) = 4513309 +MD5 (libiconv-1.13.tar.gz) = BIAyowMuvRghUL3uMKXVMw== +RMD160 (libiconv-1.13.tar.gz) = aVuQwIMO5FchOptGrn2nDy6WLEM= +SHA1 (libiconv-1.13.tar.gz) = EOX30mpZQwqaiKPQtVdjTm9yyFk= +SHA256 (libiconv-1.13.tar.gz) = ik/JS87Ph/1/ORBNNW08TDB8rTkHIeZZc5iEMKJRnPY= +SIZE (libiconv-1.13.tar.gz) = 4731530 diff --git a/converters/libiconv/patches/patch-lib_iconv_c b/converters/libiconv/patches/patch-lib_iconv_c deleted file mode 100644 index e1d8c8a6046..00000000000 --- a/converters/libiconv/patches/patch-lib_iconv_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_iconv_c,v 1.3 2008/05/28 20:03:13 naddy Exp $ ---- lib/iconv.c.orig Mon Apr 23 23:24:57 2007 -+++ lib/iconv.c Wed May 21 17:48:40 2008 -@@ -431,7 +431,7 @@ iconv_t iconv_open (const char* tocode, const char* fr - /* Initialize additional fields. */ - if (from_wchar != to_wchar) { - struct wchar_conv_struct * wcd = (struct wchar_conv_struct *) cd; -- memset(&wcd->state,'\0',sizeof(mbstate_t)); -+ memset(&wcd->state,'\0',sizeof wcd->state); - } - /* Done. */ - return (iconv_t)cd; diff --git a/converters/libiconv/patches/patch-lib_loop_wchar_h b/converters/libiconv/patches/patch-lib_loop_wchar_h deleted file mode 100644 index 645941bfcc2..00000000000 --- a/converters/libiconv/patches/patch-lib_loop_wchar_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-lib_loop_wchar_h,v 1.2 2008/05/28 20:03:13 naddy Exp $ ---- lib/loop_wchar.h.orig Mon Apr 11 12:03:36 2005 -+++ lib/loop_wchar.h Mon Apr 11 13:52:35 2005 -@@ -39,8 +39,10 @@ - # endif - # endif - #else --# ifndef mbstate_t -+# if !HAVE_MBSTATE_T -+# ifndef mbstate_t - typedef int mbstate_t; -+# endif - # endif - #endif - diff --git a/converters/libiconv/patches/patch-libcharset_lib_config_charset b/converters/libiconv/patches/patch-libcharset_lib_config_charset index 87fa91883cd..d3216db39d1 100644 --- a/converters/libiconv/patches/patch-libcharset_lib_config_charset +++ b/converters/libiconv/patches/patch-libcharset_lib_config_charset @@ -1,7 +1,7 @@ -$OpenBSD: patch-libcharset_lib_config_charset,v 1.6 2005/12/01 11:23:42 bernd Exp $ ---- libcharset/lib/config.charset.orig Wed Jan 21 19:53:20 2004 -+++ libcharset/lib/config.charset Wed Nov 30 17:52:14 2005 -@@ -345,13 +345,14 @@ case "$os" in +$OpenBSD: patch-libcharset_lib_config_charset,v 1.7 2009/04/24 18:56:49 naddy Exp $ +--- libcharset/lib/config.charset.orig Sat Jan 24 18:39:06 2009 ++++ libcharset/lib/config.charset Sun Apr 19 23:47:28 2009 +@@ -348,13 +348,14 @@ case "$os" in #echo "sun_eu_greek ?" # what is this? echo "UTF-8 UTF-8" ;; diff --git a/converters/libiconv/patches/patch-libcharset_lib_localcharset_c b/converters/libiconv/patches/patch-libcharset_lib_localcharset_c index b89bd8af267..49f9ffd1be0 100644 --- a/converters/libiconv/patches/patch-libcharset_lib_localcharset_c +++ b/converters/libiconv/patches/patch-libcharset_lib_localcharset_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-libcharset_lib_localcharset_c,v 1.2 2008/05/28 20:03:13 naddy Exp $ ---- libcharset/lib/localcharset.c.orig Wed Oct 18 13:55:49 2006 -+++ libcharset/lib/localcharset.c Wed May 21 17:55:51 2008 -@@ -194,8 +194,9 @@ get_charset_aliases (void) +$OpenBSD: patch-libcharset_lib_localcharset_c,v 1.3 2009/04/24 18:56:49 naddy Exp $ +--- libcharset/lib/localcharset.c.orig Sun Jan 25 14:04:42 2009 ++++ libcharset/lib/localcharset.c Sun Apr 19 23:47:28 2009 +@@ -200,8 +200,9 @@ get_charset_aliases (void) free (old_res_ptr); break; } diff --git a/converters/libiconv/patches/patch-src_Makefile_in b/converters/libiconv/patches/patch-src_Makefile_in index 5c18d9fbd2a..4b4766c5cdc 100644 --- a/converters/libiconv/patches/patch-src_Makefile_in +++ b/converters/libiconv/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.4 2008/05/28 20:03:13 naddy Exp $ ---- src/Makefile.in.orig Mon May 28 00:15:52 2007 -+++ src/Makefile.in Wed May 21 19:40:43 2008 -@@ -63,7 +63,6 @@ OBJECTS_RES_no = +$OpenBSD: patch-src_Makefile_in,v 1.5 2009/04/24 18:56:49 naddy Exp $ +--- src/Makefile.in.orig Sat Jan 17 04:00:59 2009 ++++ src/Makefile.in Sun Apr 19 23:47:28 2009 +@@ -71,7 +71,6 @@ OBJECTS_RES_no = # without internationalization and not linked with libintl. all : iconv_no_i18n iconv.@OBJEXT@ $(OBJECTS_RES_@WOE32@) @@ -9,7 +9,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.4 2008/05/28 20:03:13 naddy Exp $ # This is the temporary iconv executable, without internationalization. iconv_no_i18n : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@) -@@ -104,7 +103,7 @@ install : all force +@@ -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;; \ diff --git a/converters/libiconv/pkg/PLIST b/converters/libiconv/pkg/PLIST index 9463c6a0654..a98a376a417 100644 --- a/converters/libiconv/pkg/PLIST +++ b/converters/libiconv/pkg/PLIST @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.8 2008/05/28 20:03:14 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.9 2009/04/24 18:56:49 naddy Exp $ %%SHARED%% -bin/iconv +@bin bin/iconv include/iconv.h include/libcharset.h include/localcharset.h @@ -9,15 +9,16 @@ lib/libcharset.a lib/libcharset.la lib/libiconv.a lib/libiconv.la -@endfake @man man/man1/iconv.1 @man man/man3/iconv.3 @man man/man3/iconv_close.3 @man man/man3/iconv_open.3 +@man man/man3/iconv_open_into.3 @man man/man3/iconvctl.3 share/doc/libiconv/ share/doc/libiconv/iconv.1.html share/doc/libiconv/iconv.3.html share/doc/libiconv/iconv_close.3.html share/doc/libiconv/iconv_open.3.html +share/doc/libiconv/iconv_open_into.3.html share/doc/libiconv/iconvctl.3.html