Subject: pkg/15478: Non-maintainer update of wm/icewm
To: None <gnats-bugs@gnats.netbsd.org>
From: None <svs@ropnet.ru>
List: netbsd-bugs
Date: 02/04/2002 07:40:06
>Number: 15478
>Category: pkg
>Synopsis: Non-maintainer update of wm/icewm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Feb 03 20:41:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Sergey Svishchev
>Release:
>Organization:
>Environment:
>Description:
IceWM 1.0.9 was released quite a time ago.
>How-To-Repeat:
>Fix:
Index: icewm/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icewm/Makefile.common,v
retrieving revision 1.6
diff -u -r1.6 Makefile.common
--- Makefile.common 2001/09/09 03:37:02 1.6
+++ Makefile.common 2002/02/02 22:45:39
@@ -1,31 +1,33 @@
# $NetBSD: Makefile.common,v 1.6 2001/09/09 03:37:02 jlam Exp $
#
-DISTNAME= icewm-1.0.4
+DISTNAME= icewm-1.0.9-2
+PKGNAME= icewm-1.0.9
CATEGORIES= x11 wm
-MASTER_SITES= http://download.sourceforge.net/icewm/ \
- ftp://ftp.fu-berlin.de/unix/X11/window-managers/icewm/
-EXTRACT_SUFX= .src.tar.gz
+MASTER_SITES= http://download.sourceforge.net/icewm/
MAINTAINER= wiz@netbsd.org
HOMEPAGE= http://icewm.sourceforge.net/
GNU_CONFIGURE= # defined
USE_X11BASE= # defined
+USE_GMAKE= # defined
FILESDIR= ${.CURDIR}/../../wm/icewm/files
PATCHDIR= ${.CURDIR}/../../wm/icewm/patches
+WRKSRC= ${.CURDIR}/../../wm/icewm/work/${PKGNAME}
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD"
.if exists(/usr/include/machine/apmvar.h)
-CPPFLAGS+= -DCONFIG_APM
+CPPFLAGS+= -DCONFIG_APM -DSTART_XPM="\"bsd-daemon.xpm\""
.endif
.endif
DOCDIR= ${PREFIX}/share/doc/icewm
HTMLDIR= ${PREFIX}/share/doc/html/icewm
+INSTALL_TARGET= install-base install-nls
post-extract:
${CP} ${FILES} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
Index: icewm/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icewm/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST 2001/10/31 20:59:16 1.1
+++ PLIST 2002/02/02 22:45:42
@@ -1,7 +1,9 @@
@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:16 zuntum Exp $
bin/icewm
bin/icewmhint
bin/icewmbg
+bin/icesh
+bin/genpref
lib/X11/icewm/icons/app_16x16.xpm
lib/X11/icewm/icons/app_32x32.xpm
lib/X11/icewm/icons/bomb_16x16.xpm
@@ -74,6 +76,7 @@
lib/X11/icewm/preferences
lib/X11/icewm/taskbar/bsd-daemon.xpm
lib/X11/icewm/taskbar/debian.xpm
+lib/X11/icewm/taskbar/icewm.xpm
lib/X11/icewm/taskbar/linux.xpm
lib/X11/icewm/taskbar/linux1.xpm
lib/X11/icewm/taskbar/linux2.xpm
@@ -81,6 +84,66 @@
lib/X11/icewm/taskbar/start.xpm
lib/X11/icewm/taskbar/windows.xpm
lib/X11/icewm/taskbar/xfreeos2.xpm
+lib/X11/icewm/themes/Infadel2/cursors/left.xpm
+lib/X11/icewm/themes/Infadel2/cursors/move.xpm
+lib/X11/icewm/themes/Infadel2/cursors/right.xpm
+lib/X11/icewm/themes/Infadel2/cursors/sizeB.xpm
+lib/X11/icewm/themes/Infadel2/cursors/sizeBL.xpm
+lib/X11/icewm/themes/Infadel2/cursors/sizeBR.xpm
+lib/X11/icewm/themes/Infadel2/cursors/sizeL.xpm
+lib/X11/icewm/themes/Infadel2/cursors/sizeR.xpm
+lib/X11/icewm/themes/Infadel2/cursors/sizeT.xpm
+lib/X11/icewm/themes/Infadel2/cursors/sizeTL.xpm
+lib/X11/icewm/themes/Infadel2/cursors/sizeTR.xpm
+lib/X11/icewm/themes/Infadel2/Ergonomic.theme
+lib/X11/icewm/themes/Infadel2/Overloaded.theme
+lib/X11/icewm/themes/Infadel2/closeA.xpm
+lib/X11/icewm/themes/Infadel2/closeI.xpm
+lib/X11/icewm/themes/Infadel2/default.theme
+lib/X11/icewm/themes/Infadel2/depthA.xpm
+lib/X11/icewm/themes/Infadel2/depthI.xpm
+lib/X11/icewm/themes/Infadel2/fonts.dir
+lib/X11/icewm/themes/Infadel2/hideA.xpm
+lib/X11/icewm/themes/Infadel2/hideI.xpm
+lib/X11/icewm/themes/Infadel2/maximizeA.xpm
+lib/X11/icewm/themes/Infadel2/maximizeI.xpm
+lib/X11/icewm/themes/Infadel2/menuButtonA.xpm
+lib/X11/icewm/themes/Infadel2/menuButtonI.xpm
+lib/X11/icewm/themes/Infadel2/minimizeA.xpm
+lib/X11/icewm/themes/Infadel2/minimizeI.xpm
+lib/X11/icewm/themes/Infadel2/restoreA.xpm
+lib/X11/icewm/themes/Infadel2/restoreI.xpm
+lib/X11/icewm/themes/Infadel2/rolldownA.xpm
+lib/X11/icewm/themes/Infadel2/rolldownI.xpm
+lib/X11/icewm/themes/Infadel2/rollupA.xpm
+lib/X11/icewm/themes/Infadel2/rollupI.xpm
+lib/X11/icewm/themes/Infadel2/snap.pcf
+lib/X11/icewm/themes/Infadel2/titleAB.xpm
+lib/X11/icewm/themes/Infadel2/titleAJ.xpm
+lib/X11/icewm/themes/Infadel2/titleAM.xpm
+lib/X11/icewm/themes/Infadel2/titleAP.xpm
+lib/X11/icewm/themes/Infadel2/titleAQ.xpm
+lib/X11/icewm/themes/Infadel2/titleAR.xpm
+lib/X11/icewm/themes/Infadel2/titleAS.xpm
+lib/X11/icewm/themes/Infadel2/titleAT.xpm
+lib/X11/icewm/themes/Infadel2/titleIB.xpm
+lib/X11/icewm/themes/Infadel2/titleIJ.xpm
+lib/X11/icewm/themes/Infadel2/titleIM.xpm
+lib/X11/icewm/themes/Infadel2/titleIP.xpm
+lib/X11/icewm/themes/Infadel2/titleIQ.xpm
+lib/X11/icewm/themes/Infadel2/titleIR.xpm
+lib/X11/icewm/themes/Infadel2/titleIS.xpm
+lib/X11/icewm/themes/Infadel2/titleIT.xpm
+lib/X11/icewm/themes/Infadel2/icons/app_16x16.xpm
+lib/X11/icewm/themes/Infadel2/icons/folder_16x16.xpm
+lib/X11/icewm/themes/Infadel2/icons/folder_32x32.xpm
+lib/X11/icewm/themes/Infadel2/mailbox/errmail.xpm
+lib/X11/icewm/themes/Infadel2/mailbox/mail.xpm
+lib/X11/icewm/themes/Infadel2/mailbox/newmail.xpm
+lib/X11/icewm/themes/Infadel2/mailbox/nomail.xpm
+lib/X11/icewm/themes/Infadel2/mailbox/unreadmail.xpm
+lib/X11/icewm/themes/Infadel2/taskbar/linux.xpm
+lib/X11/icewm/themes/Infadel2/taskbar/windows.xpm
lib/X11/icewm/themes/gtk2/closeA.xpm
lib/X11/icewm/themes/gtk2/closeI.xpm
lib/X11/icewm/themes/gtk2/default.theme
@@ -200,6 +263,7 @@
share/doc/html/icewm/icewm-13.html
share/doc/html/icewm/icewm-14.html
share/doc/html/icewm/icewm-15.html
+share/doc/html/icewm/icewm-16.html
share/doc/html/icewm/icewm-2.html
share/doc/html/icewm/icewm-3.html
share/doc/html/icewm/icewm-4.html
@@ -215,8 +279,29 @@
share/doc/icewm/FAQ
share/doc/icewm/README
share/doc/icewm/TODO
+share/locale/ca/LC_MESSAGES/icewm.mo
+share/locale/de/LC_MESSAGES/icewm.mo
+share/locale/en/LC_MESSAGES/icewm.mo
+share/locale/es/LC_MESSAGES/icewm.mo
+share/locale/fi/LC_MESSAGES/icewm.mo
+share/locale/fr/LC_MESSAGES/icewm.mo
+share/locale/hr/LC_MESSAGES/icewm.mo
+share/locale/hu/LC_MESSAGES/icewm.mo
+share/locale/it/LC_MESSAGES/icewm.mo
+share/locale/ja/LC_MESSAGES/icewm.mo
+share/locale/lt/LC_MESSAGES/icewm.mo
+share/locale/pl/LC_MESSAGES/icewm.mo
+share/locale/pt_BR/LC_MESSAGES/icewm.mo
+share/locale/ro/LC_MESSAGES/icewm.mo
+share/locale/ru/LC_MESSAGES/icewm.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
@dirrm share/doc/icewm
@dirrm share/doc/html/icewm
+@dirrm lib/X11/icewm/themes/Infadel2/taskbar
+@dirrm lib/X11/icewm/themes/Infadel2/mailbox
+@dirrm lib/X11/icewm/themes/Infadel2/icons
+@dirrm lib/X11/icewm/themes/Infadel2/cursors
+@dirrm lib/X11/icewm/themes/Infadel2
@dirrm lib/X11/icewm/themes/win95
@dirrm lib/X11/icewm/themes/warp4
@dirrm lib/X11/icewm/themes/warp3
Index: icewm/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icewm/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 2001/04/18 09:19:51 1.2
+++ distinfo 2002/02/02 22:45:43
@@ -1,10 +1,9 @@
$NetBSD: distinfo,v 1.2 2001/04/18 09:19:51 agc Exp $
-SHA1 (icewm-1.0.4.src.tar.gz) = 5a742159daed68b1eee18573aefb6e1991615548
-Size (icewm-1.0.4.src.tar.gz) = 317288 bytes
-SHA1 (patch-aa) = 6b5a64baa1cb9a6581b0820e15c13994e8f01e19
-SHA1 (patch-ab) = 00f276e3be3f3793d2e93ca6af76b2b26cd8618a
-SHA1 (patch-ac) = 342b84b159d56a8e9d61c25a8accb654ac03d0f4
-SHA1 (patch-ad) = 04e94460ed02a14c7a8aabbda14c7164d4f4310a
-SHA1 (patch-ae) = c79f893ff15d417af831e650ecda75c1f251c6e2
+SHA1 (icewm-1.0.9-2.tar.gz) = a875bda267309ec804e52d74504dbfc3379d194f
+Size (icewm-1.0.9-2.tar.gz) = 630017 bytes
+SHA1 (patch-aa) = 0cfc8010a65fdd5694b149f266a8898d2e8c00d9
+SHA1 (patch-ab) = 5feb1d7b706585e73b29e1806fbcb20618810797
+SHA1 (patch-ac) = 5275f5e9b5dae569d8d01a1209c00f40490edcbc
+SHA1 (patch-ae) = d936e36e69be17d10704c396ff27e8d987c4ec5c
SHA1 (patch-af) = dc217958d726b5ae8932320ac85c5499b410195a
Index: icewm/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icewm/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patch-aa 2000/12/12 02:03:48 1.1.1.1
+++ patch-aa 2002/02/02 22:45:43
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
-
---- sysdep.in.orig Mon Nov 8 06:45:52 1999
-+++ sysdep.in Mon Mar 6 22:20:48 2000
-@@ -1,6 +1,6 @@
- CXX = @CXX@
+--- sysdep.in.orig Fri Apr 27 05:32:21 2001
++++ sysdep.in Wed Aug 1 14:06:00 2001
+@@ -2,10 +2,10 @@
LD = @CXX_LINK@
--SYS_CFLAGS = @CXXFLAGS@ @DEFS@
-+SYS_CFLAGS = @CXXFLAGS@ @CPPFLAGS@ @DEFS@
+
+ SYS_CFLAGS = \
+- @DEBUG@ @CXXFLAGS@ @DEFS@ \
++ @DEBUG@ @CPPFLAGS@ @CXXFLAGS@ @DEFS@ \
+ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ @GNOME_CFLAGS@
SYS_INCDIRS =
-SYS_LIBDIRS =
+SYS_LIBDIRS = @LDFLAGS@
SYS_LIBS = @LIBS@
+
+ CORE_LIBS = @CORE_LIBS@
Index: icewm/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icewm/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patch-ab 2000/12/12 02:03:48 1.1.1.1
+++ patch-ab 2002/02/02 22:45:43
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
-
---- src/aapm.cc.orig Sun Feb 13 10:28:36 2000
-+++ src/aapm.cc Mon Mar 6 22:22:36 2000
-@@ -22,11 +22,18 @@
+--- src/aapm.cc.orig Fri Apr 27 05:32:22 2001
++++ src/aapm.cc Wed Aug 1 14:11:41 2001
+@@ -25,6 +25,12 @@
- #ifdef CONFIG_APM
+ #ifdef CONFIG_APPLET_APM
+#if defined(__NetBSD__)
+#include <sys/ioctl.h>
@@ -15,16 +13,10 @@
YColor *YApm::apmBg = 0;
YColor *YApm::apmFg = 0;
YFont *YApm::apmFont = 0;
-
- void ApmStr(char *s, bool Tool) {
-+#ifdef __linux__
- char buf[45];
- int len, i, fd = open("/proc/apm", O_RDONLY);
- char driver[16];
-@@ -97,6 +104,44 @@
- strcat(s," - Charging");
+@@ -100,6 +106,44 @@
+ strcat(s,_(" - Charging"));
else
- strcat(s,"M");
+ strcat(s,_("M"));
+#elif defined(__NetBSD__)
+ struct apm_power_info aip;
+ int fd = open(APMDEV, O_RDONLY);
@@ -52,14 +44,14 @@
+
+ if (aip.ac_state == APM_AC_ON)
+ if (Tool)
-+ strcat(s," - Power");
++ strcat(s,_(" - Power"));
+ else
-+ strcat(s,"P");
++ strcat(s,_("P"));
+ if (aip.battery_state == APM_BATT_CHARGING)
+ if (Tool)
-+ strcat(s," - Charging");
++ strcat(s,_(" - Charging"));
+ else
-+ strcat(s,"M");
++ strcat(s,_("M"));
+
+ close(fd);
+#endif
Index: icewm/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icewm/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ac
--- patch-ac 2000/12/12 02:03:48 1.1.1.1
+++ patch-ac 2002/02/02 22:45:43
@@ -5,7 +5,7 @@
@@ -3,6 +3,10 @@
#include "ytimer.h"
- #ifdef CONFIG_APM
+ #ifdef CONFIG_APPLET_APM
+#if defined(__NetBSD__)
+#define APMDEV "/dev/apm"
+#endif
Index: icewm/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/wm/icewm/patches/patch-ae,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ae
--- patch-ae 2000/12/12 02:03:48 1.1.1.1
+++ patch-ae 2002/02/02 22:45:43
@@ -1,16 +1,14 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
-
---- src/wmtaskbar.cc.orig Sun Mar 19 08:34:58 2000
-+++ src/wmtaskbar.cc Mon Jul 31 01:47:42 2000
-@@ -254,7 +254,11 @@
+--- src/wmtaskbar.cc.orig Fri Apr 27 05:32:22 2001
++++ src/wmtaskbar.cc Wed Aug 1 14:19:53 2001
+@@ -240,7 +240,11 @@
} else
fClock = 0;
- #ifdef CONFIG_APM
+ #ifdef CONFIG_APPLET_APM
+#ifdef __linux__
if (taskBarShowApm && access("/proc/apm", 0) == 0) {
+#elif defined(__NetBSD__)
+ if (taskBarShowApm && access(APMDEV, 0) == 0) {
+#endif
- fApm = new YApm(this);
- if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
+ fApm = new YApm(this);
+ if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
} else
>Release-Note:
>Audit-Trail:
>Unformatted: