diff options
author | martti <martti@pkgsrc.org> | 2002-02-26 09:41:39 +0000 |
---|---|---|
committer | martti <martti@pkgsrc.org> | 2002-02-26 09:41:39 +0000 |
commit | 9aaf372a1d26bccfbacf2ae2556f8a2c4ccc00f4 (patch) | |
tree | aa7eb69a9f1ca2bd8bcc5b9490fa61c771a3b43e /wm | |
parent | ca21196d32938b1f957d6d6ec64426dfd6f4d29d (diff) | |
download | pkgsrc-9aaf372a1d26bccfbacf2ae2556f8a2c4ccc00f4.tar.gz |
Updated icewm to 1.0.9.2 (provided by Sergey Svishchev in pkg/15478)
* a lot of bug fixes
* new translations
* NLS support
Diffstat (limited to 'wm')
-rw-r--r-- | wm/icewm/Makefile | 4 | ||||
-rw-r--r-- | wm/icewm/Makefile.common | 15 | ||||
-rw-r--r-- | wm/icewm/PLIST | 105 | ||||
-rw-r--r-- | wm/icewm/distinfo | 16 | ||||
-rw-r--r-- | wm/icewm/patches/patch-aa | 18 | ||||
-rw-r--r-- | wm/icewm/patches/patch-ab | 30 | ||||
-rw-r--r-- | wm/icewm/patches/patch-ac | 4 | ||||
-rw-r--r-- | wm/icewm/patches/patch-ad | 12 | ||||
-rw-r--r-- | wm/icewm/patches/patch-ae | 14 | ||||
-rw-r--r-- | wm/icewm/patches/patch-af | 13 |
10 files changed, 151 insertions, 80 deletions
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index 8b74bd2ec9e..7494aadd330 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/26 09:41:39 martti Exp $ # -COMMENT= small, fast and light-weight window manager +COMMENT= Small, fast and light-weight window manager CONFLICTS+= icewm-gnome-[0-9]* diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 8b8f7cf36a2..28d0a569539 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,31 +1,34 @@ -# $NetBSD: Makefile.common,v 1.7 2002/02/08 12:31:03 wiz Exp $ +# $NetBSD: Makefile.common,v 1.8 2002/02/26 09:41:39 martti Exp $ # -DISTNAME= icewm-1.0.4 +DISTNAME= icewm-1.0.9-2 +PKGNAME= icewm-1.0.9.2 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/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@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= ${WRKDIR}/icewm-1.0.9 .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 diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST index 0dc06336e99..aaf17617f10 100644 --- a/wm/icewm/PLIST +++ b/wm/icewm/PLIST @@ -1,7 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:16 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/26 09:41:39 martti Exp $ +bin/genpref +bin/icehelp +bin/icesh bin/icewm -bin/icewmhint bin/icewmbg +bin/icewmhint lib/X11/icewm/icons/app_16x16.xpm lib/X11/icewm/icons/app_32x32.xpm lib/X11/icewm/icons/bomb_16x16.xpm @@ -26,8 +29,10 @@ lib/X11/icewm/icons/gimp_16x16.xpm lib/X11/icewm/icons/gimp_32x32.xpm lib/X11/icewm/icons/gimp_hi_16x16.xpm lib/X11/icewm/icons/gimp_hi_32x32.xpm +lib/X11/icewm/icons/gnome_16x16.xpm lib/X11/icewm/icons/java_16x16.xpm lib/X11/icewm/icons/java_32x32.xpm +lib/X11/icewm/icons/kde_16x16.xpm lib/X11/icewm/icons/koules_16x16.xpm lib/X11/icewm/icons/koules_32x32.xpm lib/X11/icewm/icons/navigator_16x16.xpm @@ -74,6 +79,7 @@ lib/X11/icewm/menu 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 +87,66 @@ lib/X11/icewm/taskbar/linux20.xpm lib/X11/icewm/taskbar/start.xpm lib/X11/icewm/taskbar/windows.xpm lib/X11/icewm/taskbar/xfreeos2.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/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/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/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/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/taskbar/linux.xpm +lib/X11/icewm/themes/Infadel2/taskbar/windows.xpm +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/gtk2/closeA.xpm lib/X11/icewm/themes/gtk2/closeI.xpm lib/X11/icewm/themes/gtk2/default.theme @@ -200,6 +266,7 @@ share/doc/html/icewm/icewm-12.html 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 +282,32 @@ share/doc/icewm/COPYING share/doc/icewm/FAQ share/doc/icewm/README share/doc/icewm/TODO -@dirrm share/doc/icewm -@dirrm share/doc/html/icewm +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 etc/X11/icewm +@dirrm lib/X11/icewm/icons +@dirrm lib/X11/icewm/ledclock +@dirrm lib/X11/icewm/mailbox +@dirrm lib/X11/icewm/taskbar +@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 @@ -225,8 +316,6 @@ share/doc/icewm/TODO @dirrm lib/X11/icewm/themes/metal2 @dirrm lib/X11/icewm/themes/gtk2 @dirrm lib/X11/icewm/themes -@dirrm lib/X11/icewm/taskbar -@dirrm lib/X11/icewm/mailbox -@dirrm lib/X11/icewm/ledclock -@dirrm lib/X11/icewm/icons @dirrm lib/X11/icewm +@dirrm share/doc/html/icewm +@dirrm share/doc/icewm diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index 81a9b69482d..dc694b2225a 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 09:19:51 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/02/26 09:41:39 martti 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 (patch-af) = dc217958d726b5ae8932320ac85c5499b410195a +SHA1 (icewm-1.0.9-2.tar.bz2) = f42d64996cde40f790247eb5428fb56dc2bfdb2f +Size (icewm-1.0.9-2.tar.bz2) = 484612 bytes +SHA1 (patch-aa) = 8dc74038552f8c9783622229981a9a83b3464512 +SHA1 (patch-ab) = 725521ed1192a70764ee409e98e4512f25dcc883 +SHA1 (patch-ac) = 5275f5e9b5dae569d8d01a1209c00f40490edcbc +SHA1 (patch-ae) = edc66c096499df9a8b76d43376b3e40c408c99d3 diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa index ab7317d7259..ba585243fd1 100644 --- a/wm/icewm/patches/patch-aa +++ b/wm/icewm/patches/patch-aa @@ -1,13 +1,17 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2002/02/26 09:41:40 martti 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@ diff --git a/wm/icewm/patches/patch-ab b/wm/icewm/patches/patch-ab index de1b544a2a6..9d84d95c208 100644 --- a/wm/icewm/patches/patch-ab +++ b/wm/icewm/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2002/02/26 09:41:40 martti 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 Tue Oct 9 16:54:03 2001 ++++ src/aapm.cc Tue Feb 26 09:02:17 2002 +@@ -25,6 +25,12 @@ - #ifdef CONFIG_APM + #ifdef CONFIG_APPLET_APM +#if defined(__NetBSD__) +#include <sys/ioctl.h> @@ -15,17 +15,19 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ YColor *YApm::apmBg = 0; YColor *YApm::apmFg = 0; YFont *YApm::apmFont = 0; +@@ -32,6 +38,7 @@ + extern YPixmap *taskbackPixmap; void ApmStr(char *s, bool Tool) { -+#ifdef __linux__ ++#if !defined(__NetBSD__) char buf[45]; int len, i, fd = open("/proc/apm", O_RDONLY); char driver[16]; -@@ -97,6 +104,44 @@ - strcat(s," - Charging"); +@@ -102,6 +109,44 @@ + strcat(s,_(" - Charging")); else - strcat(s,"M"); -+#elif defined(__NetBSD__) + strcat(s,_("M")); ++#else + struct apm_power_info aip; + int fd = open(APMDEV, O_RDONLY); + @@ -52,14 +54,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + + 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 diff --git a/wm/icewm/patches/patch-ac b/wm/icewm/patches/patch-ac index 19ed9c00786..148f98526f7 100644 --- a/wm/icewm/patches/patch-ac +++ b/wm/icewm/patches/patch-ac @@ -1,11 +1,11 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2002/02/26 09:41:40 martti Exp $ --- src/aapm.h.orig Sun Dec 5 11:47:02 1999 +++ src/aapm.h Mon Mar 6 22:20:48 2000 @@ -3,6 +3,10 @@ #include "ytimer.h" - #ifdef CONFIG_APM + #ifdef CONFIG_APPLET_APM +#if defined(__NetBSD__) +#define APMDEV "/dev/apm" +#endif diff --git a/wm/icewm/patches/patch-ad b/wm/icewm/patches/patch-ad deleted file mode 100644 index 19b6632c33e..00000000000 --- a/wm/icewm/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ - ---- src/config.h.orig Mon Nov 8 06:45:52 1999 -+++ src/config.h Mon Mar 6 22:20:48 2000 -@@ -31,6 +31,6 @@ - #define CONFIG_NET_STATUS - - /* apm status */ --#define CONFIG_APM -+/* #define CONFIG_APM */ - - #endif diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae index 9dbeefc1887..506b2f05f47 100644 --- a/wm/icewm/patches/patch-ae +++ b/wm/icewm/patches/patch-ae @@ -1,16 +1,16 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +$NetBSD: patch-ae,v 1.2 2002/02/26 09:41:40 martti 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 Tue Oct 9 16:54:04 2001 ++++ src/wmtaskbar.cc Tue Feb 26 08:48:08 2002 +@@ -287,7 +287,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 diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af deleted file mode 100644 index 12043c3da93..00000000000 --- a/wm/icewm/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 2001/02/23 17:40:25 wiz Exp $ - ---- src/config.h.orig Sun Jan 14 23:29:15 2001 -+++ src/config.h Sun Jan 14 23:29:25 2001 -@@ -4,6 +4,8 @@ - - #ifndef LITE - -+#define START_PIXMAP "bsd-daemon.xpm" -+ - /* tooltips */ - #define CONFIG_TOOLTIP - |