update to 1.2.16

1.2.16: 2004-08-16
	- fullscreen fix for _NET_WM_STATE_FULLSCREEN (affects mplayer)
	- use our own replacement for basename
	- ACPI battery status fix (gicco)
	- fix bug 984427 (addressbar ignores backspace when numlock pressed)
	- Polish translation update
1.2.15: 2004-08-09
	- enable locale for icesh
1.2.15pre4: 2004-08-05
	- fix crash/lockup at startup in ACPI status applet when ac module
          not loaded
	- tray icon sizing cleanups
	- fix bug 883518: keyboard gets locked until icewm menu is activated
	- double buffering fixes
	- French translation update
	- Finnish translation update (Taisto Kuikka)
	- menuprogreload menu keyword added (Konstantin Korikov)
	  syntax: menuprogreload title icon timeout command ...
	- battery status display for FreeBSD (Hanspeter Roth)
	- smart snap window positioning triggered by C+S+A+numpad (Bert Wesarg)
	- key to show desktop (Super+D)
1.2.15pre3: 2004-08-01
	- icesound gcc 2.95.3 compile fix (Thomas Zajic)
	- net status support for OpenBSD (Hanspeter Roth)
	- FreeBSD build fix (Hanspeter Roth)
	- basename cleanups for FreeBSD
	- systray cleanups for wine, ...
	- battery status uses design capacity (Hanspeter Roth)
1.2.15pre2: 2004-07-18
	- Slovak translation (Radovan Stas)
	- fix activation from gnome-2.6 panel to properly raise window
	- fix transparency support (caused crashes in xchat...)
        - NetBSD support for NetStatus (Iain Hibbert)
	- net modifier setup code to cope with weird xorg modifier setup
1.2.15pre1: 2004-06-27
	- fix ppp applet isdn online status
	- fix focusing new+maximized windows
	- fix some alt+tab pref combinations (hidden + all/group workspaces)
	- some more gcc 3.4 fixes (morfic)

8 files changed, 9 insertions, 186 deletions

diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 827e47ae712..7def9920f69 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2004/07/02 19:00:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/09/01 11:08:46 recht Exp $
 
 PKGNAME=		${DISTNAME}
-PKGREVISION=		1
 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 0909826c162..fc4f18bf2f1 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.37 2004/08/02 16:50:40 recht Exp $
+# $NetBSD: Makefile.common,v 1.38 2004/09/01 11:08:46 recht Exp $
 
-DISTNAME=		icewm-1.2.14
+DISTNAME=		icewm-1.2.16
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=icewm/}
 
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index 5604bbf9a94..e54d9910860 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/07/02 19:25:16 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.15 2004/09/01 11:08:46 recht Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
@@ -24,6 +24,7 @@ share/doc/icewm/html/icewm-17.html
 share/doc/icewm/html/icewm-18.html
 share/doc/icewm/html/icewm-19.html
 share/doc/icewm/html/icewm-2.html
+share/doc/icewm/html/icewm-20.html
 share/doc/icewm/html/icewm-3.html
 share/doc/icewm/html/icewm-4.html
 share/doc/icewm/html/icewm-5.html
@@ -351,6 +352,7 @@ ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/icewm.mo
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index 1450d91adf6..f06d111d78e 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.18 2004/06/26 23:56:21 xtraeme Exp $
+$NetBSD: distinfo,v 1.19 2004/09/01 11:08:46 recht Exp $
 
-SHA1 (icewm-1.2.14.tar.gz) = 72cf06de5817d7383bd151961c2e24d3490e1826
-Size (icewm-1.2.14.tar.gz) = 932635 bytes
-SHA1 (patch-aa) = 374e3f7aae46c8ac3f0759dd6e72f2defd909fa5
-SHA1 (patch-ab) = 791868a4320a62ac81de487667f90cbdaeacd2a7
+SHA1 (icewm-1.2.16.tar.gz) = 79f8e011fa601943714c034c06ae1654bb834c9e
+Size (icewm-1.2.16.tar.gz) = 947114 bytes
 SHA1 (patch-ac) = 2f04935c54e8ea8f6dccfe2c9b37c9c16df88bc6
 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
-SHA1 (patch-ae) = b1db6d35fb2454c132c734b67483d8a9d22ed9df
-SHA1 (patch-af) = c7498dc4f962911bfde25e0f1b37508d5e9ba0c4
diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa
deleted file mode 100644
index 9f83739c502..00000000000
--- a/wm/icewm/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/06/26 23:58:02 xtraeme Exp $
-
-allow CONFIG_APPLET_APM to stay defined for NetBSD
-
---- src/aapm.h.orig	Sat Apr 17 20:56:20 2004
-+++ src/aapm.h	Sat Apr 17 20:55:27 2004
-@@ -1,5 +1,5 @@
- 
--#ifndef linux
-+#if !defined(linux) && !defined(__NetBSD__)
- #undef CONFIG_APPLET_APM
- #elif CONFIG_APPLET_APM
- 
diff --git a/wm/icewm/patches/patch-ab b/wm/icewm/patches/patch-ab
deleted file mode 100644
index 8bb9614a62a..00000000000
--- a/wm/icewm/patches/patch-ab
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/06/03 16:04:45 jmmv Exp $
-
---- src/aapm.cc.orig	2003-03-08 20:37:52.000000000 +0100
-+++ src/aapm.cc
-@@ -15,6 +15,12 @@
- 
- #ifdef CONFIG_APPLET_APM
- 
-+#if defined(__NetBSD__)
-+#include <sys/ioctl.h>
-+#include <machine/apmvar.h>
-+#include <fcntl.h>
-+#endif
-+
- #include "ylib.h"
- #include "sysdep.h"
- 
-@@ -47,6 +53,7 @@ extern YColor *taskBarBg;
- 
- 
- void ApmStr(char *s, bool Tool) {
-+#if !defined(__NetBSD__)
-     char buf[80];
-     int len, i, fd = open("/proc/apm", O_RDONLY);
-     char driver[16];
-@@ -121,6 +128,46 @@ void ApmStr(char *s, bool Tool) {
-             strcat(s, _(" - Charging"));
-         else
-             strcat(s, _("C"));
-+#else
-+    struct apm_power_info aip;
-+    int fd = open(APMDEV, O_RDONLY);
-+
-+    if (fd == -1) {
-+        return;
-+    }
-+
-+    memset(&aip, 0, sizeof(aip));
-+    if (ioctl(fd, APM_IOC_GETPOWER, &aip) == -1) {
-+        fprintf(stderr, "ioctl failed on APMDEV");
-+        close(fd);
-+        return;
-+    }
-+
-+    if (!Tool) {
-+        if (taskBarShowApmTime) {
-+            if (aip.minutes_left == 0) {
-+                sprintf(s, "%02d", aip.battery_life);
-+            } else
-+                sprintf(s, "%d:%02d", aip.minutes_left/60, aip.minutes_left%60);
-+        } else
-+            sprintf(s, "%02d", aip.battery_life);
-+    } else {
-+        sprintf(s, "%d%%", aip.battery_life);
-+    }
-+
-+    if (aip.ac_state == APM_AC_ON)
-+        if (Tool)
-+            strcat(s,_(" - Power"));
-+        else
-+            strcat(s,_("P"));
-+    if (aip.battery_state == APM_BATT_CHARGING)
-+        if (Tool)
-+            strcat(s,_(" - Charging"));
-+        else
-+            strcat(s,_("M"));
-+
-+    close(fd);
-+#endif
- }
- 
- int ignore_directory_entry(struct dirent *de) {
diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae
deleted file mode 100644
index ac64c42da8d..00000000000
--- a/wm/icewm/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2004/06/22 20:45:45 xtraeme Exp $
-
-Turn on HAVE_NET_STATUS for NetBSD
- 
---- src/apppstatus.h.orig	Sat Sep 27 08:54:45 2003
-+++ src/apppstatus.h	Sun Jun 20 18:19:04 2004
-@@ -9,7 +9,7 @@
- #define NETSTATUS_H
- 
- #ifdef CONFIG_APPLET_NET_STATUS
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
- 
- #define HAVE_NET_STATUS 1
- 
-@@ -61,7 +61,7 @@
- };
- 
- 
--#else // linux || __FreeBSD__
-+#else // linux || __FreeBSD__ || __NetBSD__
- #undef CONFIG_APPLET_NET_STATUS
- #endif
- #endif // CONFIG_APPLET_NET_STATUS
diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af
deleted file mode 100644
index c89bd68aea4..00000000000
--- a/wm/icewm/patches/patch-af
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-af,v 1.9 2004/06/26 23:56:21 xtraeme Exp $
-
-Add some code for NetBSD to
-   a) check if an interface is up, and
-   b) get the in/out character count for that interface
-
---- src/apppstatus.cc.orig	Sat Sep 27 08:54:45 2003
-+++ src/apppstatus.cc	Sun Jun 20 20:45:26 2004
-@@ -358,6 +358,26 @@
-         return isUpIsdn();
- #endif
- 
-+#ifdef __NetBSD__
-+    struct ifreq ifr;
-+
-+    if (fNetDev == 0)
-+        return false;
-+
-+    int s = socket(AF_INET, SOCK_DGRAM, 0);
-+
-+    if( s != -1 ) {
-+	strncpy(ifr.ifr_name, fNetDev, sizeof(ifr.ifr_name));
-+	if( ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) != -1 ) {
-+	    if( ifr.ifr_flags & IFF_UP ) {
-+		close(s);
-+		return true;
-+	    }
-+	}
-+	close(s);
-+    }
-+    return false;
-+#else
-     char buffer[32 * sizeof(struct ifreq)];
-     struct ifconf ifc;
-     struct ifreq *ifr;
-@@ -390,6 +410,7 @@
- 
-     close(s);
-     return false;
-+#endif
- }
- 
- void NetStatus::updateStatus() {
-@@ -510,6 +531,21 @@
-         }
-     }
- #endif //FreeBSD
-+#ifdef __NetBSD__
-+    struct ifdatareq ifdr;
-+    struct if_data * const ifi = &ifdr.ifdr_data;
-+    int s;
-+    
-+    s = socket(AF_INET, SOCK_DGRAM, 0);
-+    if( s != -1 ) {
-+	strncpy(ifdr.ifdr_name, fNetDev, sizeof(ifdr.ifdr_name));
-+	if (ioctl(s, SIOCGIFDATA, &ifdr) != -1) {
-+	    cur_ibytes = ifi->ifi_ibytes;
-+	    cur_obytes = ifi->ifi_obytes;
-+	}
-+	close(s);
-+    }
-+#endif //__NetBSD__
- 
-     // correct the values and look for overflows
-     //msg("w/o corrections: ibytes: %lld, prev_ibytes; %lld, offset: %lld", cur_ibytes, prev_ibytes, offset_ibytes);