Update to 1.2.34 as requested by PR pkg/38890;

Patches proviced by Joel Carnat <joel@carnat.net>.

5 files changed, 12 insertions, 49 deletions

diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa
index 5949d78b392..a9bfd5718d4 100644
--- a/wm/icewm/patches/patch-aa
+++ b/wm/icewm/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2006/11/28 15:26:18 rillig Exp $
+$NetBSD: patch-aa,v 1.10 2008/06/16 10:17:56 hauke Exp $
 
---- src/ylocale.cc.orig	2006-08-06 20:38:14.000000000 +0200
-+++ 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);
+--- src/ylocale.cc.orig	2007-12-27 19:16:17.000000000 +0100
++++ src/ylocale.cc	2008-06-08 15:43:51.000000000 +0200
+@@ -153,5 +153,9 @@
      size_t inlen(lLen), outlen(4 * lLen);
  
 +#if defined(__NetBSD__) || defined(__sun)
@@ -13,4 +12,3 @@ $NetBSD: patch-aa,v 1.9 2006/11/28 15:26:18 rillig Exp $
 +#endif
          warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
  
-     *((YUChar *) outbuf) = 0;
diff --git a/wm/icewm/patches/patch-ac b/wm/icewm/patches/patch-ac
deleted file mode 100644
index fb52a0fdf26..00000000000
--- a/wm/icewm/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2006/02/09 21:36:41 ghen Exp $
-
-Get icewm to look in the right place for START_PIXMAP
-
---- src/wmtaskbar.cc.orig	2006-02-09 17:15:58.000000000 +0100
-+++ src/wmtaskbar.cc
-@@ -90,7 +90,8 @@ static void initPixmaps() {
-     YResourcePaths subdirs(paths, base);
- 
-     if ((icewmImage = themedirs.loadImage(base, ICEWM_PIXMAP)) == null &&
--        (icewmImage = themedirs.loadImage(base, START_PIXMAP)) == null)
-+        (icewmImage = themedirs.loadImage(base, START_PIXMAP)) == null &&
-+        (icewmImage = subdirs.loadImage(base, START_PIXMAP)) == null)
-         icewmImage = subdirs.loadImage(base, ICEWM_PIXMAP);
- 
-     windowsImage = subdirs.loadImage(base, "windows.xpm");
diff --git a/wm/icewm/patches/patch-ad b/wm/icewm/patches/patch-ad
index 745648f719a..9682c48a968 100644
--- a/wm/icewm/patches/patch-ad
+++ b/wm/icewm/patches/patch-ad
@@ -1,15 +1,11 @@
-$NetBSD: patch-ad,v 1.8 2004/06/26 23:56:21 xtraeme Exp $
+$NetBSD: patch-ad,v 1.9 2008/06/16 10:17:56 hauke Exp $
 
-Make IceWM look in the right place for help files
-
---- src/Makefile.in.orig	Sun May 23 07:18:19 2004
-+++ src/Makefile.in	Tue Jun 22 22:29:11 2004
-@@ -31,7 +31,7 @@
-                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
+--- src/Makefile.in.orig	2007-12-27 19:16:17.000000000 +0100
++++ src/Makefile.in	2008-06-08 15:48:05.000000000 +0200
+@@ -34,5 +34,5 @@
                  -DICESMEXE='"icewm-session$(EXEEXT)"' \
                  -DICEHELPEXE='"icehelp$(EXEEXT)"' \
 -                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
 +                -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"'
  
  CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) \
- 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
diff --git a/wm/icewm/patches/patch-aj b/wm/icewm/patches/patch-aj
index 29f30c74044..585c878a1f4 100644
--- a/wm/icewm/patches/patch-aj
+++ b/wm/icewm/patches/patch-aj
@@ -1,9 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2006/10/04 19:38:06 rillig Exp $
+$NetBSD: patch-aj,v 1.3 2008/06/16 10:17:56 hauke Exp $
 
---- src/aapm.cc.orig	2006-08-06 20:38:16.000000000 +0200
-+++ src/aapm.cc	2006-10-04 21:23:18.000000000 +0200
-@@ -38,8 +38,12 @@
- #include <sys/file.h>
+--- src/aapm.cc.orig	2007-12-27 19:16:17.000000000 +0100
++++ src/aapm.cc	2008-06-08 15:50:01.000000000 +0200
+@@ -39,6 +39,10 @@
  #include <sys/ioctl.h>
  #include <sys/types.h>
 +#ifdef __sparcv9
@@ -14,4 +13,3 @@ $NetBSD: patch-aj,v 1.2 2006/10/04 19:38:06 rillig Exp $
 +#endif
  
  YColor *YApm::apmBg = 0;
- YColor *YApm::apmFg = 0;
diff --git a/wm/icewm/patches/patch-ak b/wm/icewm/patches/patch-ak
deleted file mode 100644
index 91cbca75cbe..00000000000
--- a/wm/icewm/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/10/04 19:38:06 rillig Exp $
-
---- configure.orig	2006-10-04 21:23:23.000000000 +0200
-+++ configure	2006-10-04 21:24:12.000000000 +0200
-@@ -10354,7 +10354,7 @@ else
- echo "${ECHO_T}no" >&6
- fi
- 
--    if test "${XFT_CONFIG}" == ""; then
-+    if test "${XFT_CONFIG}" = ""; then
-       # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5