Mon Jun 16 10:17:56 2008 UTC ()
Update to 1.2.34 as requested by PR pkg/38890;
Patches proviced by Joel Carnat <joel@carnat.net>.


(hauke)
diff -r1.38 -r1.39 pkgsrc/wm/icewm/Makefile
diff -r1.60 -r1.61 pkgsrc/wm/icewm/Makefile.common
diff -r1.21 -r1.22 pkgsrc/wm/icewm/PLIST
diff -r1.33 -r1.34 pkgsrc/wm/icewm/distinfo
diff -r1.9 -r1.10 pkgsrc/wm/icewm/patches/patch-aa
diff -r1.6 -r0 pkgsrc/wm/icewm/patches/patch-ac
diff -r1.8 -r1.9 pkgsrc/wm/icewm/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/wm/icewm/patches/patch-aj
diff -r1.1 -r0 pkgsrc/wm/icewm/patches/patch-ak
cvs diff -r1.38 -r1.39 pkgsrc/wm/icewm/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/icewm/Makefile 2007/08/25 15:41:32 1.38
+++ pkgsrc/wm/icewm/Makefile 2008/06/16 10:17:56 1.39
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.38 2007/08/25 15:41:32 obache Exp $ 1# $NetBSD: Makefile,v 1.39 2008/06/16 10:17:56 hauke Exp $
2 2
3PKGREVISION= 1 
4COMMENT= Small, fast and light-weight window manager 3COMMENT= Small, fast and light-weight window manager
5 4
6CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]* 5CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]*
7 6
8CONFIGURE_ARGS+= --with-gnome-menus=no 7CONFIGURE_ARGS+= --with-gnome-menus=no
9CONFIGURE_ARGS+= --with-imlib=no 8CONFIGURE_ARGS+= --with-imlib=no
10CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm} 9CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm}
11 10
12.include "Makefile.common" 11.include "Makefile.common"
13.include "../../x11/libXext/buildlink3.mk" 12.include "../../x11/libXext/buildlink3.mk"
14.include "../../x11/libXinerama/buildlink3.mk" 13.include "../../x11/libXinerama/buildlink3.mk"
15.include "../../x11/libXpm/buildlink3.mk" 14.include "../../x11/libXpm/buildlink3.mk"
16.include "../../x11/xextproto/buildlink3.mk" 15.include "../../x11/xextproto/buildlink3.mk"
cvs diff -r1.60 -r1.61 pkgsrc/wm/icewm/Makefile.common (expand / switch to unified diff)

--- pkgsrc/wm/icewm/Makefile.common 2007/08/25 15:41:32 1.60
+++ pkgsrc/wm/icewm/Makefile.common 2008/06/16 10:17:56 1.61
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.common,v 1.60 2007/08/25 15:41:32 obache Exp $ 1# $NetBSD: Makefile.common,v 1.61 2008/06/16 10:17:56 hauke Exp $
2 2
3DISTNAME= icewm-1.2.27 3DISTNAME= icewm-1.2.34
4CATEGORIES= x11 wm 4CATEGORIES= x11 wm
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.icewm.org/ 8HOMEPAGE= http://www.icewm.org/
9 9
10GNU_CONFIGURE= yes 10GNU_CONFIGURE= yes
11USE_TOOLS+= gmake msgfmt 11USE_TOOLS+= gmake msgfmt
12USE_PKGLOCALEDIR= yes 12USE_PKGLOCALEDIR= yes
13 13
14DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo
15FILESDIR= ${.CURDIR}/../../wm/icewm/files 15FILESDIR= ${.CURDIR}/../../wm/icewm/files
16PATCHDIR= ${.CURDIR}/../../wm/icewm/patches 16PATCHDIR= ${.CURDIR}/../../wm/icewm/patches
cvs diff -r1.21 -r1.22 pkgsrc/wm/icewm/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/icewm/PLIST 2007/08/25 15:41:32 1.21
+++ pkgsrc/wm/icewm/PLIST 2008/06/16 10:17:56 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.21 2007/08/25 15:41:32 obache Exp $ 1@comment $NetBSD: PLIST,v 1.22 2008/06/16 10:17:56 hauke Exp $
2bin/icehelp 2bin/icehelp
3bin/icesh 3bin/icesh
4bin/icewm 4bin/icewm
5bin/icewm-session 5bin/icewm-session
6bin/icewmbg 6bin/icewmbg
7bin/icewmhint 7bin/icewmhint
8bin/icewmtray 8bin/icewmtray
9share/doc/icewm/BUGS 9share/doc/icewm/BUGS
10share/doc/icewm/CHANGES 10share/doc/icewm/CHANGES
11share/doc/icewm/COPYING 11share/doc/icewm/COPYING
12share/doc/icewm/README 12share/doc/icewm/README
13share/doc/icewm/README.wm-session 13share/doc/icewm/README.wm-session
14share/doc/icewm/TODO 14share/doc/icewm/TODO
@@ -25,71 +25,41 @@ share/doc/icewm/html/icewm-18.html @@ -25,71 +25,41 @@ share/doc/icewm/html/icewm-18.html
25share/doc/icewm/html/icewm-19.html 25share/doc/icewm/html/icewm-19.html
26share/doc/icewm/html/icewm-2.html 26share/doc/icewm/html/icewm-2.html
27share/doc/icewm/html/icewm-20.html 27share/doc/icewm/html/icewm-20.html
28share/doc/icewm/html/icewm-3.html 28share/doc/icewm/html/icewm-3.html
29share/doc/icewm/html/icewm-4.html 29share/doc/icewm/html/icewm-4.html
30share/doc/icewm/html/icewm-5.html 30share/doc/icewm/html/icewm-5.html
31share/doc/icewm/html/icewm-6.html 31share/doc/icewm/html/icewm-6.html
32share/doc/icewm/html/icewm-7.html 32share/doc/icewm/html/icewm-7.html
33share/doc/icewm/html/icewm-8.html 33share/doc/icewm/html/icewm-8.html
34share/doc/icewm/html/icewm-9.html 34share/doc/icewm/html/icewm-9.html
35share/doc/icewm/html/icewm.html 35share/doc/icewm/html/icewm.html
36share/icewm/icons/app_16x16.xpm 36share/icewm/icons/app_16x16.xpm
37share/icewm/icons/app_32x32.xpm 37share/icewm/icons/app_32x32.xpm
38share/icewm/icons/bomb_16x16.xpm 
39share/icewm/icons/bomb_32x32.xpm 
40share/icewm/icons/communicator-abook_16x16.xpm 
41share/icewm/icons/communicator-abook_32x32.xpm 
42share/icewm/icons/communicator-browser_16x16.xpm 
43share/icewm/icons/communicator-browser_32x32.xpm 
44share/icewm/icons/communicator-composer_16x16.xpm 
45share/icewm/icons/communicator-composer_32x32.xpm 
46share/icewm/icons/communicator-discussion_16x16.xpm 
47share/icewm/icons/communicator-discussion_32x32.xpm 
48share/icewm/icons/communicator-mail_16x16.xpm 
49share/icewm/icons/communicator-mail_32x32.xpm 
50share/icewm/icons/emacs_16x16.xpm 38share/icewm/icons/emacs_16x16.xpm
51share/icewm/icons/emacs_32x32.xpm 39share/icewm/icons/emacs_32x32.xpm
52share/icewm/icons/file_16x16.xpm 40share/icewm/icons/file_16x16.xpm
53share/icewm/icons/file_32x32.xpm 41share/icewm/icons/file_32x32.xpm
54share/icewm/icons/folder_16x16.xpm 42share/icewm/icons/folder_16x16.xpm
55share/icewm/icons/folder_32x32.xpm 43share/icewm/icons/folder_32x32.xpm
56share/icewm/icons/fte_16x16.xpm 44share/icewm/icons/fte_16x16.xpm
57share/icewm/icons/fte_32x32.xpm 45share/icewm/icons/fte_32x32.xpm
58share/icewm/icons/gimp_16x16.xpm 
59share/icewm/icons/gimp_32x32.xpm 
60share/icewm/icons/gnome_16x16.xpm 
61share/icewm/icons/java_16x16.xpm 46share/icewm/icons/java_16x16.xpm
62share/icewm/icons/java_32x32.xpm 47share/icewm/icons/java_32x32.xpm
63share/icewm/icons/kde_16x16.xpm 
64share/icewm/icons/koules_16x16.xpm 
65share/icewm/icons/koules_32x32.xpm 
66share/icewm/icons/navigator_16x16.xpm 
67share/icewm/icons/navigator_32x32.xpm 
68share/icewm/icons/netscape_16x16.xpm 
69share/icewm/icons/netscape_32x32.xpm 
70share/icewm/icons/pdf_16x16.xpm 
71share/icewm/icons/pdf_32x32.xpm 
72share/icewm/icons/vim_16x16.xpm 48share/icewm/icons/vim_16x16.xpm
73share/icewm/icons/vim_32x32.xpm 49share/icewm/icons/vim_32x32.xpm
74share/icewm/icons/vim_48x48.xpm 50share/icewm/icons/vim_48x48.xpm
75share/icewm/icons/xisp_16x16.xpm 
76share/icewm/icons/xisp_32x32.xpm 
77share/icewm/icons/xload_16x16.xpm 
78share/icewm/icons/xload_32x32.xpm 
79share/icewm/icons/xterm_16x16.xpm 51share/icewm/icons/xterm_16x16.xpm
80share/icewm/icons/xterm_32x32.xpm 52share/icewm/icons/xterm_32x32.xpm
81share/icewm/icons/xv_16x16.xpm 
82share/icewm/icons/xv_32x32.xpm 
83share/icewm/keys 53share/icewm/keys
84share/icewm/ledclock/a.xpm 54share/icewm/ledclock/a.xpm
85share/icewm/ledclock/colon.xpm 55share/icewm/ledclock/colon.xpm
86share/icewm/ledclock/dot.xpm 56share/icewm/ledclock/dot.xpm
87share/icewm/ledclock/m.xpm 57share/icewm/ledclock/m.xpm
88share/icewm/ledclock/n0.xpm 58share/icewm/ledclock/n0.xpm
89share/icewm/ledclock/n1.xpm 59share/icewm/ledclock/n1.xpm
90share/icewm/ledclock/n2.xpm 60share/icewm/ledclock/n2.xpm
91share/icewm/ledclock/n3.xpm 61share/icewm/ledclock/n3.xpm
92share/icewm/ledclock/n4.xpm 62share/icewm/ledclock/n4.xpm
93share/icewm/ledclock/n5.xpm 63share/icewm/ledclock/n5.xpm
94share/icewm/ledclock/n6.xpm 64share/icewm/ledclock/n6.xpm
95share/icewm/ledclock/n7.xpm 65share/icewm/ledclock/n7.xpm
@@ -98,37 +68,30 @@ share/icewm/ledclock/n9.xpm @@ -98,37 +68,30 @@ share/icewm/ledclock/n9.xpm
98share/icewm/ledclock/p.xpm 68share/icewm/ledclock/p.xpm
99share/icewm/ledclock/percent.xpm 69share/icewm/ledclock/percent.xpm
100share/icewm/ledclock/slash.xpm 70share/icewm/ledclock/slash.xpm
101share/icewm/ledclock/space.xpm 71share/icewm/ledclock/space.xpm
102share/icewm/mailbox/errmail.xpm 72share/icewm/mailbox/errmail.xpm
103share/icewm/mailbox/mail.xpm 73share/icewm/mailbox/mail.xpm
104share/icewm/mailbox/newmail.xpm 74share/icewm/mailbox/newmail.xpm
105share/icewm/mailbox/nomail.xpm 75share/icewm/mailbox/nomail.xpm
106share/icewm/mailbox/unreadmail.xpm 76share/icewm/mailbox/unreadmail.xpm
107share/icewm/menu 77share/icewm/menu
108share/icewm/preferences 78share/icewm/preferences
109share/icewm/taskbar/bsd-daemon.xpm 79share/icewm/taskbar/bsd-daemon.xpm
110share/icewm/taskbar/collapse.xpm 80share/icewm/taskbar/collapse.xpm
111share/icewm/taskbar/debian.xpm 
112share/icewm/taskbar/desktop.xpm 81share/icewm/taskbar/desktop.xpm
113share/icewm/taskbar/expand.xpm 82share/icewm/taskbar/expand.xpm
114share/icewm/taskbar/icewm.xpm 
115share/icewm/taskbar/linux.xpm 
116share/icewm/taskbar/linux1.xpm 
117share/icewm/taskbar/linux2.xpm 
118share/icewm/taskbar/linux20.xpm 
119share/icewm/taskbar/start.xpm 83share/icewm/taskbar/start.xpm
120share/icewm/taskbar/windows.xpm 84share/icewm/taskbar/windows.xpm
121share/icewm/taskbar/xfreeos2.xpm 
122share/icewm/themes/Infadel2/Ergonomic.theme 85share/icewm/themes/Infadel2/Ergonomic.theme
123share/icewm/themes/Infadel2/Overloaded.theme 86share/icewm/themes/Infadel2/Overloaded.theme
124share/icewm/themes/Infadel2/closeA.xpm 87share/icewm/themes/Infadel2/closeA.xpm
125share/icewm/themes/Infadel2/closeI.xpm 88share/icewm/themes/Infadel2/closeI.xpm
126share/icewm/themes/Infadel2/cursors/left.xpm 89share/icewm/themes/Infadel2/cursors/left.xpm
127share/icewm/themes/Infadel2/cursors/move.xpm 90share/icewm/themes/Infadel2/cursors/move.xpm
128share/icewm/themes/Infadel2/cursors/right.xpm 91share/icewm/themes/Infadel2/cursors/right.xpm
129share/icewm/themes/Infadel2/cursors/sizeB.xpm 92share/icewm/themes/Infadel2/cursors/sizeB.xpm
130share/icewm/themes/Infadel2/cursors/sizeBL.xpm 93share/icewm/themes/Infadel2/cursors/sizeBL.xpm
131share/icewm/themes/Infadel2/cursors/sizeBR.xpm 94share/icewm/themes/Infadel2/cursors/sizeBR.xpm
132share/icewm/themes/Infadel2/cursors/sizeL.xpm 95share/icewm/themes/Infadel2/cursors/sizeL.xpm
133share/icewm/themes/Infadel2/cursors/sizeR.xpm 96share/icewm/themes/Infadel2/cursors/sizeR.xpm
134share/icewm/themes/Infadel2/cursors/sizeT.xpm 97share/icewm/themes/Infadel2/cursors/sizeT.xpm
@@ -151,27 +114,27 @@ share/icewm/themes/Infadel2/mailbox/unre @@ -151,27 +114,27 @@ share/icewm/themes/Infadel2/mailbox/unre
151share/icewm/themes/Infadel2/maximizeA.xpm 114share/icewm/themes/Infadel2/maximizeA.xpm
152share/icewm/themes/Infadel2/maximizeI.xpm 115share/icewm/themes/Infadel2/maximizeI.xpm
153share/icewm/themes/Infadel2/menuButtonA.xpm 116share/icewm/themes/Infadel2/menuButtonA.xpm
154share/icewm/themes/Infadel2/menuButtonI.xpm 117share/icewm/themes/Infadel2/menuButtonI.xpm
155share/icewm/themes/Infadel2/minimizeA.xpm 118share/icewm/themes/Infadel2/minimizeA.xpm
156share/icewm/themes/Infadel2/minimizeI.xpm 119share/icewm/themes/Infadel2/minimizeI.xpm
157share/icewm/themes/Infadel2/restoreA.xpm 120share/icewm/themes/Infadel2/restoreA.xpm
158share/icewm/themes/Infadel2/restoreI.xpm 121share/icewm/themes/Infadel2/restoreI.xpm
159share/icewm/themes/Infadel2/rolldownA.xpm 122share/icewm/themes/Infadel2/rolldownA.xpm
160share/icewm/themes/Infadel2/rolldownI.xpm 123share/icewm/themes/Infadel2/rolldownI.xpm
161share/icewm/themes/Infadel2/rollupA.xpm 124share/icewm/themes/Infadel2/rollupA.xpm
162share/icewm/themes/Infadel2/rollupI.xpm 125share/icewm/themes/Infadel2/rollupI.xpm
163share/icewm/themes/Infadel2/snap.pcf 126share/icewm/themes/Infadel2/snap.pcf
164share/icewm/themes/Infadel2/taskbar/linux.xpm 127share/icewm/themes/Infadel2/taskbar/start.xpm
165share/icewm/themes/Infadel2/taskbar/windows.xpm 128share/icewm/themes/Infadel2/taskbar/windows.xpm
166share/icewm/themes/Infadel2/titleAB.xpm 129share/icewm/themes/Infadel2/titleAB.xpm
167share/icewm/themes/Infadel2/titleAJ.xpm 130share/icewm/themes/Infadel2/titleAJ.xpm
168share/icewm/themes/Infadel2/titleAM.xpm 131share/icewm/themes/Infadel2/titleAM.xpm
169share/icewm/themes/Infadel2/titleAP.xpm 132share/icewm/themes/Infadel2/titleAP.xpm
170share/icewm/themes/Infadel2/titleAQ.xpm 133share/icewm/themes/Infadel2/titleAQ.xpm
171share/icewm/themes/Infadel2/titleAR.xpm 134share/icewm/themes/Infadel2/titleAR.xpm
172share/icewm/themes/Infadel2/titleAS.xpm 135share/icewm/themes/Infadel2/titleAS.xpm
173share/icewm/themes/Infadel2/titleAT.xpm 136share/icewm/themes/Infadel2/titleAT.xpm
174share/icewm/themes/Infadel2/titleIB.xpm 137share/icewm/themes/Infadel2/titleIB.xpm
175share/icewm/themes/Infadel2/titleIJ.xpm 138share/icewm/themes/Infadel2/titleIJ.xpm
176share/icewm/themes/Infadel2/titleIM.xpm 139share/icewm/themes/Infadel2/titleIM.xpm
177share/icewm/themes/Infadel2/titleIP.xpm 140share/icewm/themes/Infadel2/titleIP.xpm
@@ -380,13 +343,15 @@ share/locale/zh_TW/LC_MESSAGES/icewm.mo @@ -380,13 +343,15 @@ share/locale/zh_TW/LC_MESSAGES/icewm.mo
380@dirrm share/icewm/themes/Infadel2/taskbar 343@dirrm share/icewm/themes/Infadel2/taskbar
381@dirrm share/icewm/themes/Infadel2/mailbox 344@dirrm share/icewm/themes/Infadel2/mailbox
382@dirrm share/icewm/themes/Infadel2/icons 345@dirrm share/icewm/themes/Infadel2/icons
383@dirrm share/icewm/themes/Infadel2/cursors 346@dirrm share/icewm/themes/Infadel2/cursors
384@dirrm share/icewm/themes/Infadel2 347@dirrm share/icewm/themes/Infadel2
385@dirrm share/icewm/themes 348@dirrm share/icewm/themes
386@dirrm share/icewm/taskbar 349@dirrm share/icewm/taskbar
387@dirrm share/icewm/mailbox 350@dirrm share/icewm/mailbox
388@dirrm share/icewm/ledclock 351@dirrm share/icewm/ledclock
389@dirrm share/icewm/icons 352@dirrm share/icewm/icons
390@dirrm share/icewm 353@dirrm share/icewm
391@dirrm share/doc/icewm/html 354@dirrm share/doc/icewm/html
392@dirrm share/doc/icewm 355@dirrm share/doc/icewm
 356@exec ${MKDIR} %D/etc/icewm
 357@dirrm etc/icewm
cvs diff -r1.33 -r1.34 pkgsrc/wm/icewm/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/icewm/distinfo 2006/11/28 15:26:18 1.33
+++ pkgsrc/wm/icewm/distinfo 2008/06/16 10:17:56 1.34
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.33 2006/11/28 15:26:18 rillig Exp $ 1$NetBSD: distinfo,v 1.34 2008/06/16 10:17:56 hauke Exp $
2 2
3SHA1 (icewm-1.2.27.tar.gz) = bb5821dbe46833804197012aee176b2c191de392 3SHA1 (icewm-1.2.34.tar.gz) = 9cc7c47e47767eccf957561f1a166ffe631c3d42
4RMD160 (icewm-1.2.27.tar.gz) = a04feda8c04f6aa15be5160e58179802d5308a64 4RMD160 (icewm-1.2.34.tar.gz) = f85a9332312134d22db19e806d9e7122ece76f07
5Size (icewm-1.2.27.tar.gz) = 1065165 bytes 5Size (icewm-1.2.34.tar.gz) = 830558 bytes
6SHA1 (patch-aa) = ed3cd062a2d2cb741539e9ec6e26fa009fb611a9 6SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e
7SHA1 (patch-ac) = 2da6c567f809db9292e123f7233e4bd767ddb26c 7SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088
8SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424 8SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2
9SHA1 (patch-aj) = 63e57e67a4a450c3ff6a6aa1e467c35ccc66d42b 
10SHA1 (patch-ak) = 6f6dfa9a8310e3f6b05720c5190a02ffbd3b8377 
cvs diff -r1.9 -r1.10 pkgsrc/wm/icewm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-aa 2006/11/28 15:26:18 1.9
+++ pkgsrc/wm/icewm/patches/patch-aa 2008/06/16 10:17:56 1.10
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1$NetBSD: patch-aa,v 1.9 2006/11/28 15:26:18 rillig Exp $ 1$NetBSD: patch-aa,v 1.10 2008/06/16 10:17:56 hauke Exp $
2 2
3--- src/ylocale.cc.orig 2006-08-06 20:38:14.000000000 +0200 3--- src/ylocale.cc.orig 2007-12-27 19:16:17.000000000 +0100
4+++ src/ylocale.cc 2006-11-28 14:19:44.455436536 +0100 4+++ src/ylocale.cc 2008-06-08 15:43:51.000000000 +0200
5@@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC 5@@ -153,5 +153,9 @@
6 char * inbuf((char *) lStr), * outbuf((char *) uStr); 
7 size_t inlen(lLen), outlen(4 * lLen); 6 size_t inlen(lLen), outlen(4 * lLen);
8  7
9+#if defined(__NetBSD__) || defined(__sun) 8+#if defined(__NetBSD__) || defined(__sun)
10+ if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen)) 9+ if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
11+#else 10+#else
12 if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) 11 if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
13+#endif 12+#endif
14 warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); 13 warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));
15  14
16 *((YUChar *) outbuf) = 0; 
File Deleted: pkgsrc/wm/icewm/patches/Attic/patch-ac
cvs diff -r1.8 -r1.9 pkgsrc/wm/icewm/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-ad 2004/06/26 23:56:21 1.8
+++ pkgsrc/wm/icewm/patches/patch-ad 2008/06/16 10:17:56 1.9
@@ -1,15 +1,11 @@ @@ -1,15 +1,11 @@
1$NetBSD: patch-ad,v 1.8 2004/06/26 23:56:21 xtraeme Exp $ 1$NetBSD: patch-ad,v 1.9 2008/06/16 10:17:56 hauke Exp $
2 2
3Make IceWM look in the right place for help files 3--- src/Makefile.in.orig 2007-12-27 19:16:17.000000000 +0100
4 4+++ src/Makefile.in 2008-06-08 15:48:05.000000000 +0200
5--- src/Makefile.in.orig Sun May 23 07:18:19 2004 5@@ -34,5 +34,5 @@
6+++ src/Makefile.in Tue Jun 22 22:29:11 2004 
7@@ -31,7 +31,7 @@ 
8 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ 
9 -DICESMEXE='"icewm-session$(EXEEXT)"' \ 6 -DICESMEXE='"icewm-session$(EXEEXT)"' \
10 -DICEHELPEXE='"icehelp$(EXEEXT)"' \ 7 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
11- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' 8- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
12+ -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"' 9+ -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"'
13  10
14 CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \ 11 CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
15 @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` 
cvs diff -r1.2 -r1.3 pkgsrc/wm/icewm/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-aj 2006/10/04 19:38:06 1.2
+++ pkgsrc/wm/icewm/patches/patch-aj 2008/06/16 10:17:56 1.3
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1$NetBSD: patch-aj,v 1.2 2006/10/04 19:38:06 rillig Exp $ 1$NetBSD: patch-aj,v 1.3 2008/06/16 10:17:56 hauke Exp $
2 2
3--- src/aapm.cc.orig 2006-08-06 20:38:16.000000000 +0200 3--- src/aapm.cc.orig 2007-12-27 19:16:17.000000000 +0100
4+++ src/aapm.cc 2006-10-04 21:23:18.000000000 +0200 4+++ src/aapm.cc 2008-06-08 15:50:01.000000000 +0200
5@@ -38,8 +38,12 @@ 5@@ -39,6 +39,10 @@
6 #include <sys/file.h> 
7 #include <sys/ioctl.h> 6 #include <sys/ioctl.h>
8 #include <sys/types.h> 7 #include <sys/types.h>
9+#ifdef __sparcv9 8+#ifdef __sparcv9
10+#include <sparc/apmvar.h> 9+#include <sparc/apmvar.h>
11+#else 10+#else
12 #include <machine/apmvar.h> 11 #include <machine/apmvar.h>
13 #endif 12 #endif
14+#endif 13+#endif
15  14
16 YColor *YApm::apmBg = 0; 15 YColor *YApm::apmBg = 0;
17 YColor *YApm::apmFg = 0; 
File Deleted: pkgsrc/wm/icewm/patches/patch-ak