Update to 1.2.38pre2

* Fix wrong color on NetBSD/evbearmv6hf-el with Yasushi Oshima's patch

Chagnelog:
1.2.38pre2:
	- various bug fixes

1.2.38pre1:
	- xinerama fixes
        - app-group transient window implementation
	- FreeBSD ACPI support - Alexander Motin (amotin)

1.2.37:
	- fix centering of transient windows over parents (Bert Wesarg)
	- check if window is allowed to be moved, before starting movement (Bert Wesarg)
	- fix key handling on buttons

1.2.36:
	- add option TaskBarFullscreenAutoShow (default = 1)

1.2.36pre2: 2008-08-17
	- regrab keyboard bindings when keyboard mapping changes

1.2.36pre1: 2008-08-07
	- fix unresponsive taskbar when PassFirstClickToClient=0
	- add support for sysfs interface (instead of proc) for battery
          status (initial code by Santiago Garcia Mantinan)
	- fix maximized window repositioning on fullscreen toggle
	- bug 1852567 - make searching for icons more consistent (iconPath first,
          search each directory first for all possible types - xpm, png)
	- Italian translation update
	- Korean translation update
	- translation cleanup: converted .po files to UTF-8

7 files changed, 74 insertions, 17 deletions

diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 7d333481c15..1301b2b673c 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.46 2013/06/06 12:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2014/01/05 12:29:33 ryoon Exp $
 
-PKGREVISION=		6
 COMMENT=		Small, fast and light-weight window manager
 
 CONFLICTS+=		icewm-gnome-[0-9]* icewm-imlib-[0-9]*
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 5a34d73e26f..0fa64f7ca28 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.66 2012/10/08 12:42:20 asau Exp $
+# $NetBSD: Makefile.common,v 1.67 2014/01/05 12:29:33 ryoon Exp $
 #
 # used by wm/icewm/Makefile
 # used by wm/icewm-imlib/Makefile
 
-DISTNAME=		icewm-1.2.35
-PKGREVISION=		1
+DISTNAME=		icewm-1.2.38pre2
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=icewm/}
 
@@ -77,5 +76,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${HTMLDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index 85d598687c0..2510401b3b4 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/06/14 18:18:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.25 2014/01/05 12:29:33 ryoon Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
@@ -328,5 +328,4 @@ share/locale/tr/LC_MESSAGES/icewm.mo
 share/locale/uk/LC_MESSAGES/icewm.mo
 share/locale/vi/LC_MESSAGES/icewm.mo
 share/locale/zh_CN/LC_MESSAGES/icewm.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 share/locale/zh_TW/LC_MESSAGES/icewm.mo
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index fd41e2ab0db..afde4458dc6 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.38 2013/08/18 21:29:37 wiz Exp $
+$NetBSD: distinfo,v 1.39 2014/01/05 12:29:33 ryoon Exp $
 
-SHA1 (icewm-1.2.35.tar.gz) = a0174901ca89aa091a58efedfec1536c5e477210
-RMD160 (icewm-1.2.35.tar.gz) = 19b044d9f88f860d3e25a3f419404e106162f40b
-Size (icewm-1.2.35.tar.gz) = 831087 bytes
-SHA1 (patch-aa) = 54ee3fe3ecf520977b208472d99a218e590537ce
-SHA1 (patch-ad) = e2f1e92b95f43bb2efdd5a5a4eab44d43f61a91b
+SHA1 (icewm-1.2.38pre2.tar.gz) = e0fa0ac454c8a7bbe850f114e9a0a82082516da3
+RMD160 (icewm-1.2.38pre2.tar.gz) = e2b3fefdae7e1d368920e84d175058e3fe7c8d93
+Size (icewm-1.2.38pre2.tar.gz) = 854190 bytes
+SHA1 (patch-aa) = f8293eb29bffc657e6ae322a944c9c7416ce6687
+SHA1 (patch-ad) = 04dbb91c1486d6aa493fffa2661f330347153fe5
 SHA1 (patch-aj) = aa357c56d3165f36a347133cf11cc299438617e9
 SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1
 SHA1 (patch-src_apppstatus.cc) = ea685b05bdcc7169b8f830409c4948c7ee9092a3
 SHA1 (patch-src_base.h) = cd869fd68b2d169fcded97662212e7eccee9c83c
 SHA1 (patch-src_yarray.h) = c1e96402396bf6120a286e01c57b7202b4a3b9fb
+SHA1 (patch-src_ypixbuf.cc) = 6ecc2f9b76a2bf0589ae9ea98733f61a49f9afd1
diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa
index 63cd66766d0..c29fe62dcf0 100644
--- a/wm/icewm/patches/patch-aa
+++ b/wm/icewm/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2013/08/18 21:29:08 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2014/01/05 12:29:33 ryoon Exp $
+
+* Support NetBSD's iconv(3)
 
 --- src/ylocale.cc.orig	2008-01-05 07:34:25.000000000 +0000
 +++ src/ylocale.cc
diff --git a/wm/icewm/patches/patch-ad b/wm/icewm/patches/patch-ad
index 0d957244736..cc2f725bdc1 100644
--- a/wm/icewm/patches/patch-ad
+++ b/wm/icewm/patches/patch-ad
@@ -1,8 +1,10 @@
-$NetBSD: patch-ad,v 1.10 2013/08/18 21:29:08 wiz Exp $
+$NetBSD: patch-ad,v 1.11 2014/01/05 12:29:33 ryoon Exp $
 
---- src/Makefile.in.orig	2008-01-05 07:34:24.000000000 +0000
+* -lfontconfig part: Fix link on NetBSD/evbearmv6-hf-el
+
+--- src/Makefile.in.orig	2009-11-08 18:59:46.000000000 +0000
 +++ src/Makefile.in
-@@ -33,7 +33,7 @@ DEFS =          @DEFS@ \
+@@ -33,14 +33,14 @@ DEFS =          @DEFS@ \
                  -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
                  -DICESMEXE='"icewm-session$(EXEEXT)"' \
                  -DICEHELPEXE='"icehelp$(EXEEXT)"' \
@@ -11,3 +13,11 @@ $NetBSD: patch-ad,v 1.10 2013/08/18 21:29:08 wiz Exp $
  
  CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) \
  	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
+ LFLAGS =	@LDFLAGS@
+ LIBS =          @LIBS@
+ 
+-CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
++CORE_LIBS =     @CORE_LIBS@ -lfontconfig # `fc-config --libs`
+ IMAGE_LIBS =    @IMAGE_LIBS@
+ AUDIO_LIBS =    @AUDIO_LIBS@
+ GNOME1_LIBS =    @GNOME1_LIBS@
diff --git a/wm/icewm/patches/patch-src_ypixbuf.cc b/wm/icewm/patches/patch-src_ypixbuf.cc
new file mode 100644
index 00000000000..09798712f77
--- /dev/null
+++ b/wm/icewm/patches/patch-src_ypixbuf.cc
@@ -0,0 +1,46 @@
+$NetBSD: patch-src_ypixbuf.cc,v 1.1 2014/01/05 12:29:33 ryoon Exp $
+
+From http://www.yagoto-urayama.jp/~oshimaya/netbsd/files/icewm-1.2.35.diff
+Fix color
+
+--- src/ypixbuf.cc.orig	2009-11-08 18:59:46.000000000 +0000
++++ src/ypixbuf.cc
+@@ -570,6 +570,23 @@ static void copyPixbufToRGB32(unsigned c
+ }
+ 
+ template <int Channels>
++static void copyPixbufToBGR32(unsigned char const * src, unsigned const sStep,
++                              char * dst, unsigned const dStep,
++                              unsigned const width, unsigned const height) {
++    MSG(("copyPixbufToRGB32"));
++
++    for (unsigned y(height); y > 0; --y, src+= sStep, dst+= dStep) {
++        unsigned char const * s(src); char * d(dst);
++        for (unsigned x(width); x-- > 0; s+= Channels, d+= 4)
++        {
++                d[0] = s[0];
++                d[1] = s[1];
++                d[2] = s[2];
++        }
++    }
++}
++
++template <int Channels>
+ static void copyPixbufToRGB565(unsigned char const * src, unsigned const sStep,
+                                char * dst, unsigned const dStep,
+                                unsigned const width, unsigned const height) {
+@@ -651,10 +668,12 @@ static void copyPixbufToImage(YPixbuf::P
+     unsigned const width(image.width), height(image.height);
+ 
+     if (image.depth > 16) {
+-        if (CHANNEL_MASK(image, 0xff0000, 0x00ff00, 0x0000ff) ||
+-            CHANNEL_MASK(image, 0x0000ff, 0x00ff00, 0xff0000))
++        if (CHANNEL_MASK(image, 0xff0000, 0x00ff00, 0x0000ff))
+             copyPixbufToRGB32<Channels> (pixels, rowstride,
+                      image.data, image.bytes_per_line, width, height);
++        else if (CHANNEL_MASK(image, 0x0000ff, 0x00ff00, 0xff0000))
++            copyPixbufToBGR32<Channels> (pixels, rowstride,
++                     image.data, image.bytes_per_line, width, height);
+         else
+             copyPixbufToRGBAny<yuint32, Channels> (pixels, rowstride,
+                 image.data, image.bytes_per_line, width, height,