From 4a27f2d0bcba821506933a94a4e6b0df125de7e2 Mon Sep 17 00:00:00 2001 From: yyamano Date: Tue, 11 Dec 2007 06:04:02 +0000 Subject: Make this build on Darwin. --- comms/libopensync/distinfo | 4 ++-- comms/libopensync/patches/patch-aa | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'comms') diff --git a/comms/libopensync/distinfo b/comms/libopensync/distinfo index 27465a643b1..8ab92a55d85 100644 --- a/comms/libopensync/distinfo +++ b/comms/libopensync/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/05/23 12:44:40 markd Exp $ +$NetBSD: distinfo,v 1.2 2007/12/11 06:04:02 yyamano Exp $ SHA1 (libopensync-0.22.tar.bz2) = 47860a8c6621aa89fbff2af2517787747af7cc30 RMD160 (libopensync-0.22.tar.bz2) = a1e9715d037a7c474b80d609e6c96a24cbb6692f Size (libopensync-0.22.tar.bz2) = 489978 bytes -SHA1 (patch-aa) = 9940ffc5dd7fabfb0291a12254451286a9ed3e00 +SHA1 (patch-aa) = 353b17668c17e531343d280575beca707f4f643d diff --git a/comms/libopensync/patches/patch-aa b/comms/libopensync/patches/patch-aa index 948c3a87218..72ffcc6137a 100644 --- a/comms/libopensync/patches/patch-aa +++ b/comms/libopensync/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/05/23 12:44:40 markd Exp $ +$NetBSD: patch-aa,v 1.2 2007/12/11 06:04:02 yyamano Exp $ ---- formats/vformats-xml/vformat.c.orig 2007-03-27 23:49:27.000000000 +1200 +--- formats/vformats-xml/vformat.c.orig 2007-03-27 20:49:27.000000000 +0900 +++ formats/vformats-xml/vformat.c @@ -236,7 +236,7 @@ static void _read_attribute_value_add (V if (charset) { cd = iconv_open("UTF-8", charset->str); -#ifdef SOLARIS -+#if defined(SOLARIS) || defined(__NetBSD__) ++#if defined(SOLARIS) || defined(__NetBSD__) || defined(__APPLE__) if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { #else if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/05/23 12:44:40 markd Exp $ /* because inbuf is not UTF-8, we think it is ISO-8859-1 */ cd = iconv_open("UTF-8", "ISO-8859-1"); -#ifdef SOLARIS -+#if defined(SOLARIS) || defined(__NetBSD__) ++#if defined(SOLARIS) || defined(__NetBSD__) || defined(__APPLE__) if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { #else if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) { -- cgit v1.2.3