diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-28 15:26:18 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-28 15:26:18 +0000 |
| commit | 7d4b351790f02333a3b6f459ca979c1643e8f901 (patch) | |
| tree | e4a01b6ddbfc50912a6263d2106906449a8024ac /wm | |
| parent | f365cce1280d65f8e610c98bd16d8eeff61ad78b (diff) | |
| download | pkgsrc-7d4b351790f02333a3b6f459ca979c1643e8f901.tar.gz | |
Fixed the package for Solaris 10.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/icewm/Makefile.common | 4 | ||||
| -rw-r--r-- | wm/icewm/distinfo | 4 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-aa | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 7d64ba7d405..38312e04386 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -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 @@ CONFIGURE_ARGS+= --with-cfgdir=${PKG_SYSCONFDIR:Q} .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 @@ CONFIGURE_ARGS+= --with-unicode-set=utf-32 .else . include "../../converters/libiconv/buildlink3.mk" .endif +LIBS.SunOS+= -lintl DOCDIR= ${PREFIX}/share/doc/icewm HTMLDIR= ${PREFIX}/share/doc/icewm/html diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index e53f5065303..413eb70d72f 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -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 --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa index 82d84a37ae6..5949d78b392 100644 --- a/wm/icewm/patches/patch-aa +++ b/wm/icewm/patches/patch-aa @@ -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)) |