Update icewm{,-imlib,-gnome} to 1.2.9:

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)

1.2.8: 2003-06-08
- various build/minor fixes
- new option enableAddressBar(=1)

1.2.8pre3: 2003-06-03
- fix Alt+Tab window getting stuck under load
- menu mnemonics tweaks (Hanspeter Roth)
- add mnemonics to zh_TW.Big5.po (Benshark Chen)
- task bar layout tweaks
- Restrictions on command line argument parsing.
  Only -o, -o ARG or --option, --option=ARG forms
  are accepted now, not any other combinations
- improvements for NETWM system tray (you must run 'icewmtray'
  in background to support this)

1.2.8pre2: 2003-05-18
- improved focus handling (alt+tab, window close, workspace switch)
- fix taskbar issues from pre1
- GNOME 2 workspace switcher applet (Adam James Fitzpatrick)
- renamed --with-gnome-menus to --enable-menus-gnome1
- cleanups in configurable keyboard bindings handling
- renamed modMetaIsCtrlAlt to modSuperIsCtrlAlt. Win95keys now
  enabled by default.

1.2.8pre1: 2003-05-04
- fix: interaction between shaped windows and fullscreen (Owen Marshall)
- fix: posible crash on shutdown
- minor memory leak fixes
- fix handling of fullscreen windows with shaped
  window borders (Owen Marshall)
- convert zh_CN.gb2312.po to UTF-8 (zh_CN.po) - lark@lark.net.cn
- autodetect gnome/kde menu directories (Nehal Mistry)
- fixed address bar behavior in various configurations
- Hungarian translation update (Peter Somogyi)
- Xft2 doesn't require RENDER extension (Make Fabian)
- partial Korean translation (Hwang, Sang-Jin / Make Fabian)
- LDFLAGS fix (Robert Klein)
- fix problem with menufile items not having mnemonics (_)
- initial implementation of NETWM system tray

7 files changed, 24 insertions, 52 deletions

diff --git a/wm/icewm-gnome/PLIST b/wm/icewm-gnome/PLIST
index de813592393..bade202b4f4 100644
--- a/wm/icewm-gnome/PLIST
+++ b/wm/icewm-gnome/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2003/06/03 16:04:46 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/07/09 21:14:29 jmmv Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
-bin/icewm-menu-gnome1
 bin/icewmbg
 bin/icewmhint
+bin/icewmtray
 share/doc/html/icewm/icewm-1.html
 share/doc/html/icewm/icewm-10.html
 share/doc/html/icewm/icewm-11.html
@@ -27,7 +27,6 @@ share/doc/html/icewm/icewm.html
 share/doc/icewm/BUGS
 share/doc/icewm/CHANGES
 share/doc/icewm/COPYING
-share/doc/icewm/FAQ
 share/doc/icewm/README
 share/doc/icewm/README.wm-session
 share/doc/icewm/TODO
@@ -104,7 +103,6 @@ share/icewm/mailbox/nomail.xpm
 share/icewm/mailbox/unreadmail.xpm
 share/icewm/menu
 share/icewm/preferences
-share/icewm/programs
 share/icewm/taskbar/bsd-daemon.xpm
 share/icewm/taskbar/debian.xpm
 share/icewm/taskbar/icewm.xpm
@@ -329,6 +327,7 @@ ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/icewm.mo
@@ -339,7 +338,7 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/icewm.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 @dirrm share/icewm/themes/win95
 @dirrm share/icewm/themes/warp4
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index b8fc6ce813e..2c4e76300d6 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.25 2003/06/23 14:23:15 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.26 2003/07/09 21:14:26 jmmv Exp $
 
-DISTNAME=		icewm-1.2.7
+DISTNAME=		icewm-1.2.9
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=icewm/}
 
@@ -11,6 +11,7 @@ GNU_CONFIGURE=		# defined
 USE_BUILDLINK2=		yes
 USE_X11=		# defined
 USE_GMAKE=		# defined
+USE_GNU_ICONV=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	# defined
 BUILD_USES_MSGFMT=	# defined
@@ -39,12 +40,10 @@ INSTALL_TARGET=		install-base install-nls
 
 post-extract:
 	${CP} ${FILES} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
-	${MV} ${WRKSRC}/po/zh_CN.gb2312.po ${WRKSRC}/po/zh_CN.GB2312.po
-	${MV} ${WRKSRC}/po/zh_CN.gb2312.pox ${WRKSRC}/po/zh_CN.GB2312.pox
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
-	for file in BUGS CHANGES COPYING FAQ README README.wm-session TODO; do\
+	for file in BUGS CHANGES COPYING README README.wm-session TODO; do\
 		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${HTMLDIR}
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index 72761307fdf..c691941f1ce 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2003/06/03 16:04:45 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/07/09 21:14:26 jmmv Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
 bin/icewmbg
 bin/icewmhint
+bin/icewmtray
 share/doc/html/icewm/icewm-1.html
 share/doc/html/icewm/icewm-10.html
 share/doc/html/icewm/icewm-11.html
@@ -26,7 +27,6 @@ share/doc/html/icewm/icewm.html
 share/doc/icewm/BUGS
 share/doc/icewm/CHANGES
 share/doc/icewm/COPYING
-share/doc/icewm/FAQ
 share/doc/icewm/README
 share/doc/icewm/README.wm-session
 share/doc/icewm/TODO
@@ -103,7 +103,6 @@ share/icewm/mailbox/nomail.xpm
 share/icewm/mailbox/unreadmail.xpm
 share/icewm/menu
 share/icewm/preferences
-share/icewm/programs
 share/icewm/taskbar/bsd-daemon.xpm
 share/icewm/taskbar/debian.xpm
 share/icewm/taskbar/icewm.xpm
@@ -328,6 +327,7 @@ ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/icewm.mo
@@ -338,7 +338,7 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/icewm.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 @dirrm share/icewm/themes/win95
 @dirrm share/icewm/themes/warp4
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index d1577306959..d64050431a1 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2003/06/03 16:04:45 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2003/07/09 21:14:26 jmmv Exp $
 
-SHA1 (icewm-1.2.7.tar.gz) = 365698115291e32806c83293adee88cbb0730901
-Size (icewm-1.2.7.tar.gz) = 782335 bytes
+SHA1 (icewm-1.2.9.tar.gz) = 23e5d40a88bf42cdc00fdf2f1ef7cbd8a3788c86
+Size (icewm-1.2.9.tar.gz) = 807024 bytes
 SHA1 (patch-ab) = 791868a4320a62ac81de487667f90cbdaeacd2a7
 SHA1 (patch-ac) = 756d7fa3fcae780c23f203fb1bfd6ca1f7e26fad
-SHA1 (patch-ad) = ca4f99934ab9733b990eeca07aa03ec307573f18
-SHA1 (patch-ae) = 85445be7228d65016265e862470abdda5f193898
-SHA1 (patch-af) = f6f0cc084f7016ff1df29a206208a776246cba82
+SHA1 (patch-ad) = 547959962949513af96fcd7fb8bcd9600ae0e34e
+SHA1 (patch-af) = 158475e299d0423f513da4c96b219447e28f8b2f
diff --git a/wm/icewm/patches/patch-ad b/wm/icewm/patches/patch-ad
index 4774431ec04..00d66c01046 100644
--- a/wm/icewm/patches/patch-ad
+++ b/wm/icewm/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2003/06/03 16:04:46 jmmv Exp $
+$NetBSD: patch-ad,v 1.5 2003/07/09 21:14:27 jmmv Exp $
 
---- src/Makefile.in.orig	2003-03-08 20:37:53.000000000 +0100
+--- src/Makefile.in.orig	2003-06-22 18:38:20.000000000 +0200
 +++ src/Makefile.in
-@@ -28,11 +28,11 @@ DEFS =          @DEFS@ \
+@@ -28,7 +28,7 @@ DEFS =          @DEFS@ \
                  -DEXEEXT='"$(EXEEXT)"' \
                  -DICEWMEXE='"icewm$(EXEEXT)"' \
                  -DICEHELPEXE='"icehelp$(EXEEXT)"' \
@@ -11,8 +11,3 @@ $NetBSD: patch-ad,v 1.4 2003/06/03 16:04:46 jmmv Exp $
  
  CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) \
  	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
--LFLAGS =
-+LFLAGS =	@LDFLAGS@
- LIBS =          @LIBS@
- 
- CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae
deleted file mode 100644
index 6d04ffdcdb8..00000000000
--- a/wm/icewm/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2003/06/03 16:04:46 jmmv Exp $
-
---- src/wmframe.h.orig	2003-03-08 20:37:52.000000000 +0100
-+++ src/wmframe.h
-@@ -260,6 +260,7 @@ public:
- 
-     YMenu *windowMenu();
- 
-+    long getState() const { return fWinState; }
-     bool isFullscreen() const { return (getState() & WinStateFullscreen) ? true : false; }
-     /// FIX: precalculate these on state changes!!!
-     int borderX() const {
-@@ -344,7 +345,6 @@ public:
-     void setTrayOption(long option);
- #endif
-     void setDoNotCover(bool flag);
--    long getState() const { return fWinState; }
-     void setState(long mask, long state);
- 
-     bool isMaximized() const { return (getState() &
diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af
index 853430ec851..92be624db7c 100644
--- a/wm/icewm/patches/patch-af
+++ b/wm/icewm/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.5 2003/06/03 16:04:46 jmmv Exp $
+$NetBSD: patch-af,v 1.6 2003/07/09 21:14:28 jmmv Exp $
 
---- po/Makefile.in.orig	2003-06-03 16:31:49.000000000 +0200
+--- po/Makefile.in.orig	2003-06-22 18:38:20.000000000 +0200
 +++ po/Makefile.in
 @@ -29,7 +29,7 @@ all: $(MOFILES)
  install: all
  	@echo "Installing message catalogues in $(DESTDIR)$(LOCDIR)"
  	@for catalog in $(MOFILES); do \
--	     lang=`echo $${catalog} | sed -e 's/.mo//'` ; \
-+	     lang=`echo $${catalog} | sed -e 's/.mo//' -e 's/.po//'` ; \
+-	     lang=`echo $${catalog} | sed -e 's/\.mo//'` ; \
++	     lang=`echo $${catalog} | sed -e 's/\.mo//' -e 's/\.po//'` ; \
  	     msgdir="$(DESTDIR)$(LOCDIR)/$${lang}/LC_MESSAGES"; \
  	     echo "Installing language: $${lang}" ; \
  	     $(INSTALLDIR) "$${msgdir}"; \