Updated icewm to 1.2.12

Changes:

1.2.12: 2003-08-24
MAJOR CHANGE: reverted preferences/theme order to same
          as before 1.2.10. Added "prefoverride" file for overriding
          theme preferences.
        - icewmbg is only re/started when already running
        - fix build with --disable-taskbar
        - fix build with --disable-shape
        - fix ShowMoveSizeStatus with OpaqueMove/Resize

1.2.11: 2003-08-19
        - added forcedClose window option (Hanspeter Roth)
        - added recent average in network monitor
        - fix icewmbg not setting theme background
        - fix spelling of _NET_WORKAREA hint (Jeff Pohlmeyer (tgeek))
        - fix spelling of --client-id option name (YAMAMOTO, Taku <taku@cent.saitama-u.ac.jp>)
        - fix random restart failures
        - fix codeset handling on FreeBSD
        - Czech translation update (Jan Horak)
        - Bulgarian translation (Pavel Pyuter)
        - fix painting of exposed icons

1.2.10: 2003-08-11
        - added "Default" to Themes submenu
        - documentation updates

1.2.10pre11: 2003-08-10
        - theme selector now writes the selected theme in ~/.icewm/theme
        - theme selector now restarts icewmbg automatically
        - minor cleanups in apm applet
        - build fixes
        - Infadel2 theme cleanups (Hanspeter Roth)

1.2.10pre10: 2003-08-01
        - fixed icewmbg semtransparency support. icewmbg will no longer
          exit when semitransparency is enabled
        - major focus cleanups

1.2.10pre9: 2003-07-30
        - double buffering performance optimizations

1.2.10pre8: 2003-07-27
        - FIXED: taskbar tray location off by one pixel
1.2.10pre7: 2003-07-26
        - FIXED: shaped windows when --enable-shaped-decorations
        - FIXED: icewmbg prefs now added to default preferences file

1.2.10pre6: 2003-07-25
        - FIXED: theme local font path with Xft/fontconfig
        - disabled movement of maximized windows offscreen (use shift to
          override)
        - corefonts now enabled when Xft major version = 1

1.2.10pre5: 2003-07-24
        - FIXED: compile with --enable-corefonts
        - FIXED: compile with Xft v1
        - Dutch translation update by Reinout van Schouwen
        - added internal border to taskbar

1.2.10pre4: 2003-07-19
        - FIXED: problem with --enable-shaped-decorations and
          full-screen windows (mplayer)
        - Italian translation update by Yuri Bongiorno

1.2.10pre3: 2003-07-13
        - implement support for depth 1 window icons
        - FIXED build with some compilers
        - painting is now double buffered (TODO: optional) and faster
        - Russian translation update (Anton B. Farygin)

1.2.10pre2: 2003-07-05
        - MAJOR CHANGE: the theme needs to be specified in the ~/.icewm/theme
          file, like this:
              Theme=icedesert/default.theme
        - Theme settings are now loaded before ~/.icewm/preferences
        - FIXED network monitor crash with "pl" locale (Pawel Warowny)
        - simplified tray icon option in window menu
        - Finnish translation update (Taisto Kuikka (taistok))

1.2.10pre1: 2003-06-29
        - MAJOR CHANGE: icewm background handling moved to icewmbg program
        - fixes to gnome2 menu support (Nehal Mistry)
        - FIXED: task bar auto hide with taskbar menus
        - FIXED: some focusing problems with gtk2 (Owen Taylor, Bernhard Walle)
        - code cleanups in font handling
1.2.9: 2003-06-22
        - added gnome2 menu support (Nehal Mistry)
        - added missing netwm active window notification
        - new option FocusRequestFlashTime
        - fix problem with accented characters in the title bar
        - fix aspect ratio on maximization
        - fix gcc 3.3 build
        - fix crash with a single workspace (oops!)
        - Polish translation update (Arkadiusz Lipiec)
        - documentation of using WINDOW_ROLE property in
          winoptions (Jo Valentine-Cooper)

Changes on pkgsrc:

	* Use shared PLIST on icewm-{gnome,imlib}

Ok'ed by wiz@ and jmmv@

6 files changed, 16 insertions, 29 deletions

diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index fe01437ce85..32a18659d21 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2003/07/16 07:41:33 tron Exp $
+# $NetBSD: Makefile,v 1.21 2003/08/31 21:15:05 xtraeme Exp $
 
 PKGNAME=		${DISTNAME}
-PKGREVISION=		2
 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 33051156ef8..a22bbf23bce 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.28 2003/07/17 22:55:12 grant Exp $
+# $NetBSD: Makefile.common,v 1.29 2003/08/31 21:15:05 xtraeme Exp $
 
-DISTNAME=		icewm-1.2.9
+DISTNAME=		icewm-1.2.12
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=icewm/}
 
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index c691941f1ce..7982bc11950 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/07/09 21:14:26 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/08/31 21:15:05 xtraeme Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
@@ -15,6 +15,7 @@ share/doc/html/icewm/icewm-15.html
 share/doc/html/icewm/icewm-16.html
 share/doc/html/icewm/icewm-17.html
 share/doc/html/icewm/icewm-18.html
+share/doc/html/icewm/icewm-19.html
 share/doc/html/icewm/icewm-2.html
 share/doc/html/icewm/icewm-3.html
 share/doc/html/icewm/icewm-4.html
@@ -316,6 +317,7 @@ share/icewm/themes/win95/restore.xpm
 share/icewm/toolbar
 share/icewm/winoptions
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/icewm.mo
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index b6ad20357b8..2e1354414a1 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2003/07/10 10:49:40 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2003/08/31 21:15:06 xtraeme Exp $
 
-SHA1 (icewm-1.2.9.tar.gz) = 23e5d40a88bf42cdc00fdf2f1ef7cbd8a3788c86
-Size (icewm-1.2.9.tar.gz) = 807024 bytes
+SHA1 (icewm-1.2.12.tar.gz) = 95b62b127d81ecf71f647e10e9a70a63ca788efa
+Size (icewm-1.2.12.tar.gz) = 837068 bytes
 SHA1 (patch-ab) = 791868a4320a62ac81de487667f90cbdaeacd2a7
-SHA1 (patch-ac) = 756d7fa3fcae780c23f203fb1bfd6ca1f7e26fad
-SHA1 (patch-ad) = 547959962949513af96fcd7fb8bcd9600ae0e34e
+SHA1 (patch-ad) = dea29afa98513b686d8d3d4d5a64c3cd86ddfbc5
diff --git a/wm/icewm/patches/patch-ac b/wm/icewm/patches/patch-ac
deleted file mode 100644
index cd106ab6e7a..00000000000
--- a/wm/icewm/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/06/03 16:04:45 jmmv Exp $
-
---- src/aapm.h.orig	2003-03-08 20:37:52.000000000 +0100
-+++ src/aapm.h
-@@ -6,7 +6,7 @@
- #include "ywindow.h"
- #include "ytimer.h"
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #define APMDEV "/dev/apm"
- #else
- #define APMDEV "/proc/apm"
diff --git a/wm/icewm/patches/patch-ad b/wm/icewm/patches/patch-ad
index 00d66c01046..f493c409459 100644
--- a/wm/icewm/patches/patch-ad
+++ b/wm/icewm/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2003/07/09 21:14:27 jmmv Exp $
+$NetBSD: patch-ad,v 1.6 2003/08/31 21:15:07 xtraeme Exp $
 
---- src/Makefile.in.orig	2003-06-22 18:38:20.000000000 +0200
-+++ src/Makefile.in
-@@ -28,7 +28,7 @@ DEFS =          @DEFS@ \
-                 -DEXEEXT='"$(EXEEXT)"' \
+--- src/Makefile.in.orig	2003-08-31 23:09:07.000000000 +0200
++++ src/Makefile.in	2003-08-31 23:09:55.000000000 +0200
+@@ -29,7 +29,7 @@
                  -DICEWMEXE='"icewm$(EXEEXT)"' \
+                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
                  -DICEHELPEXE='"icehelp$(EXEEXT)"' \
 -                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(prefix)/share/doc/html/icewm/icewm.html"'
++		-DICEHELPIDX='"$(prefix)/share/doc/html/icewm/icewm.html"'
  
  CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) \
  	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`