[pkgsrc/trunk]: pkgsrc/wm/icewm Fixed the package for Solaris 10.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a62382e4b0c8
branches:  trunk
changeset: 521936:a62382e4b0c8
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 28 15:26:18 2006 +0000

description:
Fixed the package for Solaris 10.

diffstat:

 wm/icewm/Makefile.common  |  4 +++-
 wm/icewm/distinfo         |  4 ++--
 wm/icewm/patches/patch-aa |  6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r a279ce1e9602 -r a62382e4b0c8 wm/icewm/Makefile.common
--- a/wm/icewm/Makefile.common  Tue Nov 28 15:15:50 2006 +0000
+++ b/wm/icewm/Makefile.common  Tue Nov 28 15:26:18 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2006/10/04 19:38:06 rillig Exp $
+# $NetBSD: Makefile.common,v 1.56 2006/11/28 15:26:18 rillig Exp $
 
 DISTNAME=              icewm-1.2.27
 CATEGORIES=            x11 wm
@@ -27,6 +27,7 @@
 .if !exists(${X11BASE}/include/X11/extensions/Xinerama.h)
 CONFIGURE_ARGS+=       --disable-xinerama
 .endif
+MAKE_FLAGS+=           LOCDIR=${PREFIX}/${PKGLOCALEDIR}/locale
 
 PKG_SYSCONFSUBDIR=     icewm
 
@@ -44,6 +45,7 @@
 .else
 .  include "../../converters/libiconv/buildlink3.mk"
 .endif
+LIBS.SunOS+=           -lintl
 
 DOCDIR=                        ${PREFIX}/share/doc/icewm
 HTMLDIR=               ${PREFIX}/share/doc/icewm/html
diff -r a279ce1e9602 -r a62382e4b0c8 wm/icewm/distinfo
--- a/wm/icewm/distinfo Tue Nov 28 15:15:50 2006 +0000
+++ b/wm/icewm/distinfo Tue Nov 28 15:26:18 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2006/10/04 19:38:06 rillig Exp $
+$NetBSD: distinfo,v 1.33 2006/11/28 15:26:18 rillig Exp $
 
 SHA1 (icewm-1.2.27.tar.gz) = bb5821dbe46833804197012aee176b2c191de392
 RMD160 (icewm-1.2.27.tar.gz) = a04feda8c04f6aa15be5160e58179802d5308a64
 Size (icewm-1.2.27.tar.gz) = 1065165 bytes
-SHA1 (patch-aa) = 1f2655454d567c0c794d36ae0834503f9259ea65
+SHA1 (patch-aa) = ed3cd062a2d2cb741539e9ec6e26fa009fb611a9
 SHA1 (patch-ac) = 2da6c567f809db9292e123f7233e4bd767ddb26c
 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
 SHA1 (patch-aj) = 63e57e67a4a450c3ff6a6aa1e467c35ccc66d42b
diff -r a279ce1e9602 -r a62382e4b0c8 wm/icewm/patches/patch-aa
--- a/wm/icewm/patches/patch-aa Tue Nov 28 15:15:50 2006 +0000
+++ b/wm/icewm/patches/patch-aa Tue Nov 28 15:26:18 2006 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.8 2006/10/02 11:13:22 ghen Exp $
+$NetBSD: patch-aa,v 1.9 2006/11/28 15:26:18 rillig Exp $
 
 --- src/ylocale.cc.orig        2006-08-06 20:38:14.000000000 +0200
-+++ src/ylocale.cc
++++ src/ylocale.cc     2006-11-28 14:19:44.455436536 +0100
 @@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC
      char * inbuf((char *) lStr), * outbuf((char *) uStr);
      size_t inlen(lLen), outlen(4 * lLen);
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__sun)
 +    if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
 +#else
      if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))