From 9d11d2aa63f93cfd29b46a223d46adce74d8ff59 Mon Sep 17 00:00:00 2001 From: jca Date: Mon, 6 Apr 2015 09:20:57 +0000 Subject: [PATCH] Update to libunistring-0.9.5. ok ajacoutot@ pascal@ (MAINTAINER) --- converters/libunistring/Makefile | 10 +++------- converters/libunistring/distinfo | 4 ++-- converters/libunistring/patches/patch-Makefile_in | 8 ++++---- converters/libunistring/pkg/PLIST | 3 ++- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/converters/libunistring/Makefile b/converters/libunistring/Makefile index a8206f67bd1..147611573c2 100644 --- a/converters/libunistring/Makefile +++ b/converters/libunistring/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2014/04/02 09:23:13 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.5 2015/04/06 09:20:57 jca Exp $ COMMENT = manipulate Unicode strings -DISTNAME = libunistring-0.9.3 -REVISION = 1 +DISTNAME = libunistring-0.9.5 -SHARED_LIBS += unistring 0.0 # 1.2 +SHARED_LIBS += unistring 0.1 # 2.0 CATEGORIES = converters @@ -23,7 +22,4 @@ MODULES = converters/libiconv CONFIGURE_STYLE = gnu CONFIGURE_ARGS = ${CONFIGURE_SHARED} -# XXX: One regression test fails: -# test-wcwidth fails on: ASSERT (wcwidth (0x05B0) == 0); - .include diff --git a/converters/libunistring/distinfo b/converters/libunistring/distinfo index e35809ea278..473b2677a9b 100644 --- a/converters/libunistring/distinfo +++ b/converters/libunistring/distinfo @@ -1,2 +1,2 @@ -SHA256 (libunistring-0.9.3.tar.gz) = YQ0+xyT72qZUr+PP8gufTVBL4/0pb97S4Pf3ZAQQBqM= -SIZE (libunistring-0.9.3.tar.gz) = 2555215 +SHA256 (libunistring-0.9.5.tar.gz) = GowHckZ4UL73GXMYqV9Eq7tnjqg8vxGaNQDMeEgnahc= +SIZE (libunistring-0.9.5.tar.gz) = 3487957 diff --git a/converters/libunistring/patches/patch-Makefile_in b/converters/libunistring/patches/patch-Makefile_in index fb4aaa4281c..38aa5d5e697 100644 --- a/converters/libunistring/patches/patch-Makefile_in +++ b/converters/libunistring/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/06/14 17:30:48 pascal Exp $ ---- Makefile.in.orig Thu Mar 1 15:31:29 2012 -+++ Makefile.in Thu Mar 1 15:31:38 2012 -@@ -773,7 +773,7 @@ top_builddir = @top_builddir@ +$OpenBSD: patch-Makefile_in,v 1.2 2015/04/06 09:20:57 jca Exp $ +--- Makefile.in.orig Mon Feb 16 11:28:01 2015 ++++ Makefile.in Sat Apr 4 15:23:28 2015 +@@ -1358,7 +1358,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4 diff --git a/converters/libunistring/pkg/PLIST b/converters/libunistring/pkg/PLIST index df942dd0d90..b0ea11c4220 100644 --- a/converters/libunistring/pkg/PLIST +++ b/converters/libunistring/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.2 2014/04/02 09:23:13 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.3 2015/04/06 09:20:57 jca Exp $ include/unicase.h include/uniconv.h include/unictype.h +include/unigbrk.h include/unilbrk.h include/uniname.h include/uninorm.h