From 0fd58d4048d67da22537f8d2d5c5881d6c5693ed Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Thu, 13 Jan 2005 01:31:53 +0000
Subject: Fix the icewm* packages on NetBSD >= 2.0 (with native iconv(3)), the
 problem was that the prototype used by this was not matching the NetBSD one,
 which uses ``const char **'' as its second argument, when libiconv and POSIX
 uses ``char **''.

This closes PR pkg/28693.

Bumped PKGREVISION to all icewm* pkgs for the bulk builds.
---
 wm/icewm-gnome/Makefile   |  4 ++--
 wm/icewm-imlib/Makefile   |  4 ++--
 wm/icewm/Makefile         |  3 ++-
 wm/icewm/distinfo         |  3 ++-
 wm/icewm/patches/patch-af | 24 ++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 wm/icewm/patches/patch-af

(limited to 'wm')

diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 34f472a1211..b382e4b67de 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/12/28 23:18:17 reed Exp $
+# $NetBSD: Makefile,v 1.30 2005/01/13 01:31:53 xtraeme Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Small, fast and light-weight window manager (GNOME version)
 
 CONFLICTS+=	icewm-[0-9]* icewm-imlib-[0-9]*
diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile
index 53a67337fa9..6e06062091e 100644
--- a/wm/icewm-imlib/Makefile
+++ b/wm/icewm-imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/12/28 23:18:17 reed Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/13 01:31:53 xtraeme Exp $
 
 PKGNAME=	${DISTNAME:S/-/-imlib-/}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Small, fast and light-weight window manager (imlib version)
 
 CONFLICTS+=	icewm-[0-9]* icewm-gnome-[0-9]*
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 7def9920f69..d4921f85c94 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/09/01 11:08:46 recht Exp $
+# $NetBSD: Makefile,v 1.27 2005/01/13 01:31:53 xtraeme Exp $
 
 PKGNAME=		${DISTNAME}
+PKGREVISION=		1
 COMMENT=		Small, fast and light-weight window manager
 
 CONFLICTS+=		icewm-gnome-[0-9]* icewm-imlib-[0-9]*
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index 7fb357b4ff7..a704471cb92 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.20 2004/11/09 07:58:14 xtraeme Exp $
+$NetBSD: distinfo,v 1.21 2005/01/13 01:31:53 xtraeme Exp $
 
 SHA1 (icewm-1.2.16.tar.gz) = 79f8e011fa601943714c034c06ae1654bb834c9e
 Size (icewm-1.2.16.tar.gz) = 947114 bytes
 SHA1 (patch-ac) = 2f04935c54e8ea8f6dccfe2c9b37c9c16df88bc6
 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
 SHA1 (patch-ae) = 2b0fd5802595021440ac97c29de13f66e08e1190
+SHA1 (patch-af) = f73e8b5b0ab49de018a7a90ec0e394ee10b44965
diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af
new file mode 100644
index 00000000000..5720d0a3851
--- /dev/null
+++ b/wm/icewm/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.11 2005/01/13 01:31:53 xtraeme Exp $
+
+--- src/ylocale.cc.orig	2004-08-16 06:58:31.000000000 +0200
++++ src/ylocale.cc	2005-01-13 02:25:55.000000000 +0100
+@@ -15,6 +15,7 @@
+ 
+ #include "intl.h"
+ #include <string.h>
++#include <sys/param.h> /* __NetBSD_Version__ */
+ 
+ #ifdef CONFIG_I18N
+ #include <errno.h>
+@@ -152,7 +153,11 @@
+     char * inbuf((char *) lStr), * outbuf((char *) uStr);
+     size_t inlen(lLen), outlen(4 * lLen);
+ 
++#if __NetBSD_Version__ >= 200000000
++    if (0 > (int) iconv(instance->toUnicode, (const char **)&inbuf, &inlen, &outbuf, &outlen))
++#else
+     if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
++#endif
+ 	warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
+ 
+     *((YUChar *) outbuf) = 0;
-- 
cgit v1.2.3