Update icewm{,-gnome} to 1.2.7. Changes since 1.2.0:

1.2.7: 2003-03-08
	- minor bug fixes

1.2.7pre3: 2003-03-02
	- new option QuickSwitchGroupWorkspaces (if
          QuickSwitchToAllWorkspaces=1)
        - Italian translation update
	- more menu tweaks
	- implement NetWM window type SPLASH
	- ACPI status patch from Klaus Schneider
	- Made Alt+<left,right mouse button> behave in more standard manner
	- DoNotFocus window option added.

1.2.7pre2: 2003-02-26
	- Major improvement in percieved speed of menus
	- Dutch translation by Ton Kersten
	- add new options: ShowRun, ShowAbout, ShowWindowList,
          ShowLogoutSubMenu, AllowFullscreen (Ton Kersten)
	- support WM_WINDOW_ROLE, too
	- fix detection of netwm hints for some apps
	- fix AutoReloadMenus bug

1.2.7pre1: 2003-02-23
	- fix .order file handling for gnome menus (Thomas Zajic)
	- changed default theme to icedesert (Nehal Mistry)
	- fix crash in alt+tab when window closes
	- rewrite icewm.spec.in Christian W. Zuckschwerdt (zany@triq.net)
	- Belarussian translation by Hleb Valoska (el_globus@tut.by)
	- tweaked character set (CODESET) detection
	- 'Programs' menu is now invoked from menu file, not from the code
	- fixed fonts in Infadel2 theme when Xft is used

1.2.6: 2003-01-19
	- Slovenian translation by Jernej Kovacic
	- improve focus handling on non-xinerama multihead displays
	- another submenu/icon handling fix for gnome menus (Thomas Zajic)
	- added nonICCCMconfigureRequest window option workaround for
          non ICCCM compliant applications
	- WINDOW_ROLE handling for winoptions (Stanislav Svirid)
	- fix crash in mail status checker in pop/imap configuration
	- implement startMinimized window option, similiar to startMaximized

1.2.5: 2003-01-05
	- fix lockup when doing operations through window list
	- fix compile problem --with-xpm
	- fix icesh.cc focus handling (by Todd R. Eigenschink)
	- update workaround for some TK issues
	- slow startup fix (caused by broken lazy menu loading)

1.2.4: 2003-01-03
	- fixed submenu/icon handling for gnome menus (Thomas Zajic)
	- acpi optimization (Michal Ceresna)
	- fix crash in "Tile ..."
	- fix submenu deactivation problem (reported by Bernhard Walle)
	- fix focus loss on xmms exit (reported by Bernhard Walle)
	- fix problem with restarting the wm (when icewm-menu-gnome1 not
          present)

1.2.3: 2002-12-26
	- IMPORTANT: system configuration directory changed to
          /etc/icewm (from /etc/X11/icewm or /usr/local/etc/X11/icewm).
          icewm now installs it's data files in /usr/local/share/icewm.
        - added --disable-winmenu and --disable-taskbar configure options
	- bug fixes in menu code
	- fixed lockup when running under session manager (GNOME2)

1.2.3pre2: 2002-12-15
	- support for Xinerama
	- rewritten RPM packaging
	- new "menuprog" statement in menu files for reading a submenu
          from a pipe
	- Italian translation update
	- moved gnome menu support into an external utility (icewm-menu-gnome1)
          (used trough "menuprog", requires gnome 1.x)
	- added keybinding for showing the window list menu (KeySysWinListMenu)

1.2.3pre1: 2002-10-20 + soon
        - some small fixes for the swedish translation (tucker)
	- new APM/ACPI monitor code by Michal Ceresna (cemi)
        - Norwegian translation by Petter Johan Olsen
        - the Address Bar in the taskbar now works even without
          TaskBarDoubleHeight (Ctrl+Alt+Space)
        - new APM/ACPI battery monitoring code
        - rewritten the work area implementation (doNotCover should
          now work much better)
        - new "preferences" setting: focusOnAppRaise - focus the window when
          application requests to raise it
        - cleaned up the icewmbg implementation (TODO: config file for it)
        - fixed the Reboot vs Shutdown issue
        - Alt+Left Button drag now used for window move and
          resize (no more Ctrl+Alt)
        - fixed configure option: --enable-depend now used for make depend

1.2.2: 2002-09-06
	- fixed icewm.spec file for building RPMs
	- fixed CHANGES file

1.2.1: 2002-08-31
	- TaskBar and root menu is no longer disabled under Gnome (adjust
          your ~/.icewm/preferences manually: ShowTaskBar=0; UseRootButtons=0)
        - feature: partial support of the Enhanced Window Manager
                   Specification (NETWM) needed for GNOME2 and KDE3
                   compliance
flux    - feature: scriptable menus (as found in WindowMaker)
        - feature: execute "startup" or "restart" script found in resource
	    	   path ($ICEWM_HOME, $ETCDIR, $LIBDIR) after initialization
        - bugfix: added --help switch to icewm, allow GNU stylish
                  long options
        - feature: the directory for user preferences can be selected by
                   the ICEWM_PRIVCFG variable now (default still is and will
                   forever be ~/.icewm, but think about the beauty of
                   setting ICEWM_PRIVCFG to "$HOME/.etc/icewm"...)
        - bugfix/feature: menu parser is case-insensitive now
        - bugfix/feature: normal users won't need GNU make anymore
	- cleanup of lib/.../*.xpm by Andrey Smagin
	- FocusChangesWorkspace option by Daniel Pittman -- determines
          if a new window open on another workspace switches to that
          workspace
        - PointerRaiseDelay focusing fix by Thomas Linder
	- bugfix: enable menu items in window list popup only when appropriate
          (closes bug 217168)
	- change the ppp status applet to decrease the scale when the
          troughput goes down.
	- feature: improved icesh's worth by adding support for window classes
        - ui-change: added fullscreen window menu action; changed default key
          binding for hide, rollup and undoArrange action
	- added startMaximized{,Vert,Horz} winoptions
	- initial UrgencyHint implementation
	- added "menufile" statement for menu files
	- configure script defaults changed: imlib, i18n, nls are now default

17 files changed, 758 insertions, 786 deletions

diff --git a/wm/icewm-gnome/DESCR b/wm/icewm-gnome/DESCR
index 4b43b630f4b..23fb6e3ac17 100644
--- a/wm/icewm-gnome/DESCR
+++ b/wm/icewm-gnome/DESCR
@@ -1,20 +1,16 @@
-The goal of IceWM is to provide a small, fast and familiar window
-manager for the X11 window system. Compatibility with the mwm window
-manager is desired and will be implemented where appropriate.
+IceWM provides a small, fast and familiar window manager for the X11 window
+system.  Compatibility with the mwm window manager is desired and will be
+implemented where appropriate.
 
-The IceWM is designed to emulate the look of Motif, OS/2 Warp 4, OS/2
-Warp 3 and Windows 95. Others might added in the future.
+IceWM is designed to emulate the look of Motif, OS/2 Warp 4, OS/2 Warp 3 and
+Windows 95.  It also tries to combine the feel of these systems whenever it
+is compatible.  Others might added in the future in the core distribution,
+though many themes are available through the network.
 
-It also tries to combine the feel of the above systems whenever it is
-compatible.
+Generally, it tries to make all functions available both by keyboard and by
+mouse (this is not currently possible when using mouse focus).
 
-Generally, it tries to make all functions available both by keyboard
-and by mouse (this is not currently possible when using mouse focus).
-
-Extreme configurability similiar to fvwm and many other window
-managers is NOT the goal.
-
-This version of IceWM is built with GNOME support.
-
-Author: Marko Macek <Marko.Macek@gmx.net>
-Released under the GPL.
+This package provides IceWM linked against the Imlib library for graphics
+support, which means that it supports all image formats supported by this
+library (like PNG, JPEG, GIF and TIFF) and also includes several features
+that make it more GNOME-friendly.
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 399ae8b48eb..a1aec99254b 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.16 2003/05/03 16:38:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2003/06/03 16:04:46 jmmv Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	3
 COMMENT=	Small, fast and light-weight window manager (GNOME version)
 
-CONFLICTS+=	icewm-[0-9]*
+CONFLICTS+=	icewm-[0-9]* icewm-imlib-[0-9]*
 
 USE_BUILDLINK2=		# defined
 
 .include "../icewm/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-imlib
-
-pre-configure:
-	cd ${WRKSRC};	\
-	${MV} src/default.h src/default.h.orig;	\
-	${SED} 's/XIV(bool, autoDetectGnome,			false)/XIV(bool, autoDetectGnome,			true)/' \
-		< src/default.h.orig > src/default.h
+CONFIGURE_ARGS+=	--with-gnome-menus=yes
+CONFIGURE_ARGS+=	--with-imlib=yes
+CONFIGURE_ARGS+=	--with-xpm=no
 
+.include "../../graphics/imlib/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm-gnome/PLIST b/wm/icewm-gnome/PLIST
index 665053bd4d7..de813592393 100644
--- a/wm/icewm-gnome/PLIST
+++ b/wm/icewm-gnome/PLIST
@@ -1,264 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2003/05/03 16:38:15 jmmv Exp $
-bin/genpref
+@comment $NetBSD: PLIST,v 1.7 2003/06/03 16:04:46 jmmv Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
+bin/icewm-menu-gnome1
 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
-lib/X11/icewm/icons/bomb_32x32.xpm
-lib/X11/icewm/icons/communicator-abook_16x16.xpm
-lib/X11/icewm/icons/communicator-abook_32x32.xpm
-lib/X11/icewm/icons/communicator-browser_16x16.xpm
-lib/X11/icewm/icons/communicator-browser_32x32.xpm
-lib/X11/icewm/icons/communicator-composer_16x16.xpm
-lib/X11/icewm/icons/communicator-composer_32x32.xpm
-lib/X11/icewm/icons/communicator-discussion_16x16.xpm
-lib/X11/icewm/icons/communicator-discussion_32x32.xpm
-lib/X11/icewm/icons/communicator-mail_16x16.xpm
-lib/X11/icewm/icons/communicator-mail_32x32.xpm
-lib/X11/icewm/icons/file_16x16.xpm
-lib/X11/icewm/icons/file_32x32.xpm
-lib/X11/icewm/icons/folder_16x16.xpm
-lib/X11/icewm/icons/folder_32x32.xpm
-lib/X11/icewm/icons/fte_16x16.xpm
-lib/X11/icewm/icons/fte_32x32.xpm
-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
-lib/X11/icewm/icons/navigator_32x32.xpm
-lib/X11/icewm/icons/netscape_16x16.xpm
-lib/X11/icewm/icons/netscape_32x32.xpm
-lib/X11/icewm/icons/pdf_16x16.xpm
-lib/X11/icewm/icons/pdf_32x32.xpm
-lib/X11/icewm/icons/vim_16x16.xpm
-lib/X11/icewm/icons/vim_32x32.xpm
-lib/X11/icewm/icons/vim_48x48.xpm
-lib/X11/icewm/icons/xisp_16x16.xpm
-lib/X11/icewm/icons/xisp_32x32.xpm
-lib/X11/icewm/icons/xload_16x16.xpm
-lib/X11/icewm/icons/xload_32x32.xpm
-lib/X11/icewm/icons/xterm_16x16.xpm
-lib/X11/icewm/icons/xterm_32x32.xpm
-lib/X11/icewm/icons/xv_16x16.xpm
-lib/X11/icewm/icons/xv_32x32.xpm
-lib/X11/icewm/keys
-lib/X11/icewm/ledclock/a.xpm
-lib/X11/icewm/ledclock/colon.xpm
-lib/X11/icewm/ledclock/dot.xpm
-lib/X11/icewm/ledclock/m.xpm
-lib/X11/icewm/ledclock/n0.xpm
-lib/X11/icewm/ledclock/n1.xpm
-lib/X11/icewm/ledclock/n2.xpm
-lib/X11/icewm/ledclock/n3.xpm
-lib/X11/icewm/ledclock/n4.xpm
-lib/X11/icewm/ledclock/n5.xpm
-lib/X11/icewm/ledclock/n6.xpm
-lib/X11/icewm/ledclock/n7.xpm
-lib/X11/icewm/ledclock/n8.xpm
-lib/X11/icewm/ledclock/n9.xpm
-lib/X11/icewm/ledclock/p.xpm
-lib/X11/icewm/ledclock/slash.xpm
-lib/X11/icewm/ledclock/space.xpm
-lib/X11/icewm/mailbox/errmail.xpm
-lib/X11/icewm/mailbox/mail.xpm
-lib/X11/icewm/mailbox/newmail.xpm
-lib/X11/icewm/mailbox/nomail.xpm
-lib/X11/icewm/mailbox/unreadmail.xpm
-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
-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
-lib/X11/icewm/themes/gtk2/maximizeA.xpm
-lib/X11/icewm/themes/gtk2/maximizeI.xpm
-lib/X11/icewm/themes/gtk2/menuButtonA.xpm
-lib/X11/icewm/themes/gtk2/menuButtonI.xpm
-lib/X11/icewm/themes/gtk2/minimizeA.xpm
-lib/X11/icewm/themes/gtk2/minimizeI.xpm
-lib/X11/icewm/themes/gtk2/restoreA.xpm
-lib/X11/icewm/themes/gtk2/restoreI.xpm
-lib/X11/icewm/themes/metal2/closeA.xpm
-lib/X11/icewm/themes/metal2/closeI.xpm
-lib/X11/icewm/themes/metal2/default.theme
-lib/X11/icewm/themes/metal2/depthA.xpm
-lib/X11/icewm/themes/metal2/depthI.xpm
-lib/X11/icewm/themes/metal2/dframeAB.xpm
-lib/X11/icewm/themes/metal2/dframeABL.xpm
-lib/X11/icewm/themes/metal2/dframeABR.xpm
-lib/X11/icewm/themes/metal2/dframeAL.xpm
-lib/X11/icewm/themes/metal2/dframeAR.xpm
-lib/X11/icewm/themes/metal2/dframeAT.xpm
-lib/X11/icewm/themes/metal2/dframeATL.xpm
-lib/X11/icewm/themes/metal2/dframeATR.xpm
-lib/X11/icewm/themes/metal2/dframeIB.xpm
-lib/X11/icewm/themes/metal2/dframeIBL.xpm
-lib/X11/icewm/themes/metal2/dframeIBR.xpm
-lib/X11/icewm/themes/metal2/dframeIL.xpm
-lib/X11/icewm/themes/metal2/dframeIR.xpm
-lib/X11/icewm/themes/metal2/dframeIT.xpm
-lib/X11/icewm/themes/metal2/dframeITL.xpm
-lib/X11/icewm/themes/metal2/dframeITR.xpm
-lib/X11/icewm/themes/metal2/frameAB.xpm
-lib/X11/icewm/themes/metal2/frameABL.xpm
-lib/X11/icewm/themes/metal2/frameABR.xpm
-lib/X11/icewm/themes/metal2/frameAL.xpm
-lib/X11/icewm/themes/metal2/frameAR.xpm
-lib/X11/icewm/themes/metal2/frameAT.xpm
-lib/X11/icewm/themes/metal2/frameATL.xpm
-lib/X11/icewm/themes/metal2/frameATR.xpm
-lib/X11/icewm/themes/metal2/frameIB.xpm
-lib/X11/icewm/themes/metal2/frameIBL.xpm
-lib/X11/icewm/themes/metal2/frameIBR.xpm
-lib/X11/icewm/themes/metal2/frameIL.xpm
-lib/X11/icewm/themes/metal2/frameIR.xpm
-lib/X11/icewm/themes/metal2/frameIT.xpm
-lib/X11/icewm/themes/metal2/frameITL.xpm
-lib/X11/icewm/themes/metal2/frameITR.xpm
-lib/X11/icewm/themes/metal2/hideA.xpm
-lib/X11/icewm/themes/metal2/hideI.xpm
-lib/X11/icewm/themes/metal2/maximizeA.xpm
-lib/X11/icewm/themes/metal2/maximizeI.xpm
-lib/X11/icewm/themes/metal2/menuButtonA.xpm
-lib/X11/icewm/themes/metal2/menuButtonI.xpm
-lib/X11/icewm/themes/metal2/minimizeA.xpm
-lib/X11/icewm/themes/metal2/minimizeI.xpm
-lib/X11/icewm/themes/metal2/restoreA.xpm
-lib/X11/icewm/themes/metal2/restoreI.xpm
-lib/X11/icewm/themes/metal2/rolldownA.xpm
-lib/X11/icewm/themes/metal2/rolldownI.xpm
-lib/X11/icewm/themes/metal2/rollupA.xpm
-lib/X11/icewm/themes/metal2/rollupI.xpm
-lib/X11/icewm/themes/metal2/titleAB.xpm
-lib/X11/icewm/themes/metal2/titleAL.xpm
-lib/X11/icewm/themes/metal2/titleAM.xpm
-lib/X11/icewm/themes/metal2/titleAP.xpm
-lib/X11/icewm/themes/metal2/titleAR.xpm
-lib/X11/icewm/themes/metal2/titleAS.xpm
-lib/X11/icewm/themes/metal2/titleAT.xpm
-lib/X11/icewm/themes/metal2/titleIB.xpm
-lib/X11/icewm/themes/metal2/titleIL.xpm
-lib/X11/icewm/themes/metal2/titleIM.xpm
-lib/X11/icewm/themes/metal2/titleIP.xpm
-lib/X11/icewm/themes/metal2/titleIR.xpm
-lib/X11/icewm/themes/metal2/titleIS.xpm
-lib/X11/icewm/themes/metal2/titleIT.xpm
-lib/X11/icewm/themes/motif/close.xpm
-lib/X11/icewm/themes/motif/default.theme
-lib/X11/icewm/themes/motif/maximize.xpm
-lib/X11/icewm/themes/motif/menu.xpm
-lib/X11/icewm/themes/motif/minimize.xpm
-lib/X11/icewm/themes/motif/restore.xpm
-lib/X11/icewm/themes/nice/blue.theme
-lib/X11/icewm/themes/nice/close.xpm
-lib/X11/icewm/themes/nice/default.theme
-lib/X11/icewm/themes/nice/hide.xpm
-lib/X11/icewm/themes/nice/maximize.xpm
-lib/X11/icewm/themes/nice/minimize.xpm
-lib/X11/icewm/themes/nice/restore.xpm
-lib/X11/icewm/themes/nice/rolldown.xpm
-lib/X11/icewm/themes/nice/rollup.xpm
-lib/X11/icewm/themes/warp3/close.xpm
-lib/X11/icewm/themes/warp3/default.theme
-lib/X11/icewm/themes/warp3/hide.xpm
-lib/X11/icewm/themes/warp3/maximize.xpm
-lib/X11/icewm/themes/warp3/minimize.xpm
-lib/X11/icewm/themes/warp3/restore.xpm
-lib/X11/icewm/themes/warp3/rolldown.xpm
-lib/X11/icewm/themes/warp3/rollup.xpm
-lib/X11/icewm/themes/warp4/close.xpm
-lib/X11/icewm/themes/warp4/default.theme
-lib/X11/icewm/themes/warp4/hide.xpm
-lib/X11/icewm/themes/warp4/maximize.xpm
-lib/X11/icewm/themes/warp4/minimize.xpm
-lib/X11/icewm/themes/warp4/restore.xpm
-lib/X11/icewm/themes/win95/close.xpm
-lib/X11/icewm/themes/win95/default.theme
-lib/X11/icewm/themes/win95/maximize.xpm
-lib/X11/icewm/themes/win95/minimize.xpm
-lib/X11/icewm/themes/win95/restore.xpm
-lib/X11/icewm/toolbar
-lib/X11/icewm/winoptions
 share/doc/html/icewm/icewm-1.html
 share/doc/html/icewm/icewm-10.html
 share/doc/html/icewm/icewm-11.html
@@ -267,6 +13,8 @@ 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-17.html
+share/doc/html/icewm/icewm-18.html
 share/doc/html/icewm/icewm-2.html
 share/doc/html/icewm/icewm-3.html
 share/doc/html/icewm/icewm-4.html
@@ -281,7 +29,295 @@ 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
+share/icewm/icons/app_16x16.xpm
+share/icewm/icons/app_32x32.xpm
+share/icewm/icons/bomb_16x16.xpm
+share/icewm/icons/bomb_32x32.xpm
+share/icewm/icons/communicator-abook_16x16.xpm
+share/icewm/icons/communicator-abook_32x32.xpm
+share/icewm/icons/communicator-browser_16x16.xpm
+share/icewm/icons/communicator-browser_32x32.xpm
+share/icewm/icons/communicator-composer_16x16.xpm
+share/icewm/icons/communicator-composer_32x32.xpm
+share/icewm/icons/communicator-discussion_16x16.xpm
+share/icewm/icons/communicator-discussion_32x32.xpm
+share/icewm/icons/communicator-mail_16x16.xpm
+share/icewm/icons/communicator-mail_32x32.xpm
+share/icewm/icons/emacs_16x16.xpm
+share/icewm/icons/emacs_32x32.xpm
+share/icewm/icons/file_16x16.xpm
+share/icewm/icons/file_32x32.xpm
+share/icewm/icons/folder_16x16.xpm
+share/icewm/icons/folder_32x32.xpm
+share/icewm/icons/fte_16x16.xpm
+share/icewm/icons/fte_32x32.xpm
+share/icewm/icons/gimp_16x16.xpm
+share/icewm/icons/gimp_32x32.xpm
+share/icewm/icons/gnome_16x16.xpm
+share/icewm/icons/java_16x16.xpm
+share/icewm/icons/java_32x32.xpm
+share/icewm/icons/kde_16x16.xpm
+share/icewm/icons/koules_16x16.xpm
+share/icewm/icons/koules_32x32.xpm
+share/icewm/icons/navigator_16x16.xpm
+share/icewm/icons/navigator_32x32.xpm
+share/icewm/icons/netscape_16x16.xpm
+share/icewm/icons/netscape_32x32.xpm
+share/icewm/icons/pdf_16x16.xpm
+share/icewm/icons/pdf_32x32.xpm
+share/icewm/icons/vim_16x16.xpm
+share/icewm/icons/vim_32x32.xpm
+share/icewm/icons/vim_48x48.xpm
+share/icewm/icons/xisp_16x16.xpm
+share/icewm/icons/xisp_32x32.xpm
+share/icewm/icons/xload_16x16.xpm
+share/icewm/icons/xload_32x32.xpm
+share/icewm/icons/xterm_16x16.xpm
+share/icewm/icons/xterm_32x32.xpm
+share/icewm/icons/xv_16x16.xpm
+share/icewm/icons/xv_32x32.xpm
+share/icewm/keys
+share/icewm/ledclock/a.xpm
+share/icewm/ledclock/colon.xpm
+share/icewm/ledclock/dot.xpm
+share/icewm/ledclock/m.xpm
+share/icewm/ledclock/n0.xpm
+share/icewm/ledclock/n1.xpm
+share/icewm/ledclock/n2.xpm
+share/icewm/ledclock/n3.xpm
+share/icewm/ledclock/n4.xpm
+share/icewm/ledclock/n5.xpm
+share/icewm/ledclock/n6.xpm
+share/icewm/ledclock/n7.xpm
+share/icewm/ledclock/n8.xpm
+share/icewm/ledclock/n9.xpm
+share/icewm/ledclock/p.xpm
+share/icewm/ledclock/percent.xpm
+share/icewm/ledclock/slash.xpm
+share/icewm/ledclock/space.xpm
+share/icewm/mailbox/errmail.xpm
+share/icewm/mailbox/mail.xpm
+share/icewm/mailbox/newmail.xpm
+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
+share/icewm/taskbar/linux.xpm
+share/icewm/taskbar/linux1.xpm
+share/icewm/taskbar/linux2.xpm
+share/icewm/taskbar/linux20.xpm
+share/icewm/taskbar/start.xpm
+share/icewm/taskbar/windows.xpm
+share/icewm/taskbar/xfreeos2.xpm
+share/icewm/themes/Infadel2/Ergonomic.theme
+share/icewm/themes/Infadel2/Overloaded.theme
+share/icewm/themes/Infadel2/closeA.xpm
+share/icewm/themes/Infadel2/closeI.xpm
+share/icewm/themes/Infadel2/cursors/left.xpm
+share/icewm/themes/Infadel2/cursors/move.xpm
+share/icewm/themes/Infadel2/cursors/right.xpm
+share/icewm/themes/Infadel2/cursors/sizeB.xpm
+share/icewm/themes/Infadel2/cursors/sizeBL.xpm
+share/icewm/themes/Infadel2/cursors/sizeBR.xpm
+share/icewm/themes/Infadel2/cursors/sizeL.xpm
+share/icewm/themes/Infadel2/cursors/sizeR.xpm
+share/icewm/themes/Infadel2/cursors/sizeT.xpm
+share/icewm/themes/Infadel2/cursors/sizeTL.xpm
+share/icewm/themes/Infadel2/cursors/sizeTR.xpm
+share/icewm/themes/Infadel2/default.theme
+share/icewm/themes/Infadel2/depthA.xpm
+share/icewm/themes/Infadel2/depthI.xpm
+share/icewm/themes/Infadel2/fonts.dir
+share/icewm/themes/Infadel2/hideA.xpm
+share/icewm/themes/Infadel2/hideI.xpm
+share/icewm/themes/Infadel2/icons/app_16x16.xpm
+share/icewm/themes/Infadel2/icons/folder_16x16.xpm
+share/icewm/themes/Infadel2/icons/folder_32x32.xpm
+share/icewm/themes/Infadel2/mailbox/errmail.xpm
+share/icewm/themes/Infadel2/mailbox/mail.xpm
+share/icewm/themes/Infadel2/mailbox/newmail.xpm
+share/icewm/themes/Infadel2/mailbox/nomail.xpm
+share/icewm/themes/Infadel2/mailbox/unreadmail.xpm
+share/icewm/themes/Infadel2/maximizeA.xpm
+share/icewm/themes/Infadel2/maximizeI.xpm
+share/icewm/themes/Infadel2/menuButtonA.xpm
+share/icewm/themes/Infadel2/menuButtonI.xpm
+share/icewm/themes/Infadel2/minimizeA.xpm
+share/icewm/themes/Infadel2/minimizeI.xpm
+share/icewm/themes/Infadel2/restoreA.xpm
+share/icewm/themes/Infadel2/restoreI.xpm
+share/icewm/themes/Infadel2/rolldownA.xpm
+share/icewm/themes/Infadel2/rolldownI.xpm
+share/icewm/themes/Infadel2/rollupA.xpm
+share/icewm/themes/Infadel2/rollupI.xpm
+share/icewm/themes/Infadel2/snap.pcf
+share/icewm/themes/Infadel2/taskbar/linux.xpm
+share/icewm/themes/Infadel2/taskbar/windows.xpm
+share/icewm/themes/Infadel2/titleAB.xpm
+share/icewm/themes/Infadel2/titleAJ.xpm
+share/icewm/themes/Infadel2/titleAM.xpm
+share/icewm/themes/Infadel2/titleAP.xpm
+share/icewm/themes/Infadel2/titleAQ.xpm
+share/icewm/themes/Infadel2/titleAR.xpm
+share/icewm/themes/Infadel2/titleAS.xpm
+share/icewm/themes/Infadel2/titleAT.xpm
+share/icewm/themes/Infadel2/titleIB.xpm
+share/icewm/themes/Infadel2/titleIJ.xpm
+share/icewm/themes/Infadel2/titleIM.xpm
+share/icewm/themes/Infadel2/titleIP.xpm
+share/icewm/themes/Infadel2/titleIQ.xpm
+share/icewm/themes/Infadel2/titleIR.xpm
+share/icewm/themes/Infadel2/titleIS.xpm
+share/icewm/themes/Infadel2/titleIT.xpm
+share/icewm/themes/gtk2/closeA.xpm
+share/icewm/themes/gtk2/closeI.xpm
+share/icewm/themes/gtk2/default.theme
+share/icewm/themes/gtk2/maximizeA.xpm
+share/icewm/themes/gtk2/maximizeI.xpm
+share/icewm/themes/gtk2/menuButtonA.xpm
+share/icewm/themes/gtk2/menuButtonI.xpm
+share/icewm/themes/gtk2/minimizeA.xpm
+share/icewm/themes/gtk2/minimizeI.xpm
+share/icewm/themes/gtk2/restoreA.xpm
+share/icewm/themes/gtk2/restoreI.xpm
+share/icewm/themes/icedesert/closeA.xpm
+share/icewm/themes/icedesert/closeI.xpm
+share/icewm/themes/icedesert/default.theme
+share/icewm/themes/icedesert/maximizeA.xpm
+share/icewm/themes/icedesert/maximizeI.xpm
+share/icewm/themes/icedesert/menuButtonA.xpm
+share/icewm/themes/icedesert/menuButtonI.xpm
+share/icewm/themes/icedesert/minimizeA.xpm
+share/icewm/themes/icedesert/minimizeI.xpm
+share/icewm/themes/icedesert/restoreA.xpm
+share/icewm/themes/icedesert/restoreI.xpm
+share/icewm/themes/icedesert/titleAB.xpm
+share/icewm/themes/icedesert/titleAT.xpm
+share/icewm/themes/icedesert/titleIB.xpm
+share/icewm/themes/icedesert/titleIT.xpm
+share/icewm/themes/metal2/closeA.xpm
+share/icewm/themes/metal2/closeI.xpm
+share/icewm/themes/metal2/default.theme
+share/icewm/themes/metal2/depthA.xpm
+share/icewm/themes/metal2/depthI.xpm
+share/icewm/themes/metal2/dframeAB.xpm
+share/icewm/themes/metal2/dframeABL.xpm
+share/icewm/themes/metal2/dframeABR.xpm
+share/icewm/themes/metal2/dframeAL.xpm
+share/icewm/themes/metal2/dframeAR.xpm
+share/icewm/themes/metal2/dframeAT.xpm
+share/icewm/themes/metal2/dframeATL.xpm
+share/icewm/themes/metal2/dframeATR.xpm
+share/icewm/themes/metal2/dframeIB.xpm
+share/icewm/themes/metal2/dframeIBL.xpm
+share/icewm/themes/metal2/dframeIBR.xpm
+share/icewm/themes/metal2/dframeIL.xpm
+share/icewm/themes/metal2/dframeIR.xpm
+share/icewm/themes/metal2/dframeIT.xpm
+share/icewm/themes/metal2/dframeITL.xpm
+share/icewm/themes/metal2/dframeITR.xpm
+share/icewm/themes/metal2/frameAB.xpm
+share/icewm/themes/metal2/frameABL.xpm
+share/icewm/themes/metal2/frameABR.xpm
+share/icewm/themes/metal2/frameAL.xpm
+share/icewm/themes/metal2/frameAR.xpm
+share/icewm/themes/metal2/frameAT.xpm
+share/icewm/themes/metal2/frameATL.xpm
+share/icewm/themes/metal2/frameATR.xpm
+share/icewm/themes/metal2/frameIB.xpm
+share/icewm/themes/metal2/frameIBL.xpm
+share/icewm/themes/metal2/frameIBR.xpm
+share/icewm/themes/metal2/frameIL.xpm
+share/icewm/themes/metal2/frameIR.xpm
+share/icewm/themes/metal2/frameIT.xpm
+share/icewm/themes/metal2/frameITL.xpm
+share/icewm/themes/metal2/frameITR.xpm
+share/icewm/themes/metal2/hideA.xpm
+share/icewm/themes/metal2/hideI.xpm
+share/icewm/themes/metal2/maximizeA.xpm
+share/icewm/themes/metal2/maximizeI.xpm
+share/icewm/themes/metal2/menuButtonA.xpm
+share/icewm/themes/metal2/menuButtonI.xpm
+share/icewm/themes/metal2/minimizeA.xpm
+share/icewm/themes/metal2/minimizeI.xpm
+share/icewm/themes/metal2/restoreA.xpm
+share/icewm/themes/metal2/restoreI.xpm
+share/icewm/themes/metal2/rolldownA.xpm
+share/icewm/themes/metal2/rolldownI.xpm
+share/icewm/themes/metal2/rollupA.xpm
+share/icewm/themes/metal2/rollupI.xpm
+share/icewm/themes/metal2/titleAB.xpm
+share/icewm/themes/metal2/titleAL.xpm
+share/icewm/themes/metal2/titleAM.xpm
+share/icewm/themes/metal2/titleAP.xpm
+share/icewm/themes/metal2/titleAR.xpm
+share/icewm/themes/metal2/titleAS.xpm
+share/icewm/themes/metal2/titleAT.xpm
+share/icewm/themes/metal2/titleIB.xpm
+share/icewm/themes/metal2/titleIL.xpm
+share/icewm/themes/metal2/titleIM.xpm
+share/icewm/themes/metal2/titleIP.xpm
+share/icewm/themes/metal2/titleIR.xpm
+share/icewm/themes/metal2/titleIS.xpm
+share/icewm/themes/metal2/titleIT.xpm
+share/icewm/themes/motif/close.xpm
+share/icewm/themes/motif/default.theme
+share/icewm/themes/motif/maximize.xpm
+share/icewm/themes/motif/menu.xpm
+share/icewm/themes/motif/minimize.xpm
+share/icewm/themes/motif/restore.xpm
+share/icewm/themes/nice/blue.theme
+share/icewm/themes/nice/close.xpm
+share/icewm/themes/nice/default.theme
+share/icewm/themes/nice/hide.xpm
+share/icewm/themes/nice/maximize.xpm
+share/icewm/themes/nice/minimize.xpm
+share/icewm/themes/nice/restore.xpm
+share/icewm/themes/nice/rolldown.xpm
+share/icewm/themes/nice/rollup.xpm
+share/icewm/themes/nice2/closeA.xpm
+share/icewm/themes/nice2/closeI.xpm
+share/icewm/themes/nice2/default.theme
+share/icewm/themes/nice2/maximizeA.xpm
+share/icewm/themes/nice2/maximizeI.xpm
+share/icewm/themes/nice2/menuButtonA.xpm
+share/icewm/themes/nice2/menuButtonI.xpm
+share/icewm/themes/nice2/minimizeA.xpm
+share/icewm/themes/nice2/minimizeI.xpm
+share/icewm/themes/nice2/restoreA.xpm
+share/icewm/themes/nice2/restoreI.xpm
+share/icewm/themes/nice2/titleAB.xpm
+share/icewm/themes/nice2/titleAT.xpm
+share/icewm/themes/nice2/titleIB.xpm
+share/icewm/themes/nice2/titleIT.xpm
+share/icewm/themes/warp3/close.xpm
+share/icewm/themes/warp3/default.theme
+share/icewm/themes/warp3/hide.xpm
+share/icewm/themes/warp3/maximize.xpm
+share/icewm/themes/warp3/minimize.xpm
+share/icewm/themes/warp3/restore.xpm
+share/icewm/themes/warp3/rolldown.xpm
+share/icewm/themes/warp3/rollup.xpm
+share/icewm/themes/warp4/close.xpm
+share/icewm/themes/warp4/default.theme
+share/icewm/themes/warp4/hide.xpm
+share/icewm/themes/warp4/maximize.xpm
+share/icewm/themes/warp4/minimize.xpm
+share/icewm/themes/warp4/restore.xpm
+share/icewm/themes/win95/close.xpm
+share/icewm/themes/win95/default.theme
+share/icewm/themes/win95/maximize.xpm
+share/icewm/themes/win95/minimize.xpm
+share/icewm/themes/win95/restore.xpm
+share/icewm/toolbar
+share/icewm/winoptions
+${PKGLOCALEDIR}/locale/be/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
@@ -294,30 +330,36 @@ ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ja/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
 ${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/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_TW.Big5/LC_MESSAGES/icewm.mo
-@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
-@dirrm lib/X11/icewm/themes/nice
-@dirrm lib/X11/icewm/themes/motif
-@dirrm lib/X11/icewm/themes/metal2
-@dirrm lib/X11/icewm/themes/gtk2
-@dirrm lib/X11/icewm/themes
-@dirrm lib/X11/icewm
-@dirrm share/doc/html/icewm
+@dirrm share/icewm/themes/win95
+@dirrm share/icewm/themes/warp4
+@dirrm share/icewm/themes/warp3
+@dirrm share/icewm/themes/nice2
+@dirrm share/icewm/themes/nice
+@dirrm share/icewm/themes/motif
+@dirrm share/icewm/themes/metal2
+@dirrm share/icewm/themes/icedesert
+@dirrm share/icewm/themes/gtk2
+@dirrm share/icewm/themes/Infadel2/taskbar
+@dirrm share/icewm/themes/Infadel2/mailbox
+@dirrm share/icewm/themes/Infadel2/icons
+@dirrm share/icewm/themes/Infadel2/cursors
+@dirrm share/icewm/themes/Infadel2
+@dirrm share/icewm/themes
+@dirrm share/icewm/taskbar
+@dirrm share/icewm/mailbox
+@dirrm share/icewm/ledclock
+@dirrm share/icewm/icons
+@dirrm share/icewm
 @dirrm share/doc/icewm
+@dirrm share/doc/html/icewm
diff --git a/wm/icewm/DESCR b/wm/icewm/DESCR
index b141b9c6a7b..06d5db94d59 100644
--- a/wm/icewm/DESCR
+++ b/wm/icewm/DESCR
@@ -1,18 +1,14 @@
-The goal of IceWM is to provide a small, fast and familiar window
-manager for the X11 window system. Compatibility with the mwm window
-manager is desired and will be implemented where appropriate.
+IceWM provides a small, fast and familiar window manager for the X11 window
+system.  Compatibility with the mwm window manager is desired and will be
+implemented where appropriate.
 
-The IceWM is designed to emulate the look of Motif, OS/2 Warp 4, OS/2
-Warp 3 and Windows 95. Others might added in the future.
+IceWM is designed to emulate the look of Motif, OS/2 Warp 4, OS/2 Warp 3 and
+Windows 95.  It also tries to combine the feel of these systems whenever it
+is compatible.  Others might added in the future in the core distribution,
+though many themes are available through the network.
 
-It also tries to combine the feel of the above systems whenever it is
-compatible.
+Generally, it tries to make all functions available both by keyboard and by
+mouse (this is not currently possible when using mouse focus).
 
-Generally, it tries to make all functions available both by keyboard
-and by mouse (this is not currently possible when using mouse focus).
-
-Extreme configurability similiar to fvwm and many other window
-managers is NOT the goal.
-
-Author: Marko Macek <Marko.Macek@gmx.net>
-Released under the GPL.
+This package provides IceWM linked against the Xpm library for graphics
+support, which means that only Xpm files are supported as images.
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 6163a1e90c9..732cab5c354 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2003/05/03 16:38:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2003/06/03 16:04:45 jmmv Exp $
 
 PKGNAME=		${DISTNAME}
-PKGREVISION=		3
 COMMENT=		Small, fast and light-weight window manager
 
-CONFLICTS+=		icewm-gnome-[0-9]*
+CONFLICTS+=		icewm-gnome-[0-9]* icewm-imlib-[0-9]*
 
 USE_BUILDLINK2=		# defined
 
+CONFIGURE_ARGS+=	--with-gnome-menus=no
+CONFIGURE_ARGS+=	--with-imlib=no
+CONFIGURE_ARGS+=	--with-xpm=${BUILDLINK_PREFIX.xpm}
+
 .include "Makefile.common"
-.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 6065b10222a..d247e182e06 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.19 2003/05/03 16:38:12 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.20 2003/06/03 16:04:45 jmmv Exp $
 
-DISTNAME=		icewm-1.2.0
+DISTNAME=		icewm-1.2.7
 CATEGORIES=		x11 wm
 MASTER_SITES=		http://download.sourceforge.net/icewm/
 
@@ -8,7 +8,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://icewm.sourceforge.net/
 
 GNU_CONFIGURE=		# defined
-USE_X11BASE=		# defined
+USE_X11=		# defined
 USE_GMAKE=		# defined
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	# defined
@@ -20,10 +20,8 @@ PATCHDIR=		${.CURDIR}/../../wm/icewm/patches
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !exists(/usr/include/machine/apmvar.h)
-CONFIGURE_ARGS+=	--disable-apm
-.endif
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-cfgdir=${PKG_SYSCONFDIR}
 
 PKG_SYSCONFSUBDIR=	icewm
 
@@ -42,7 +40,10 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
-	for file in BUGS CHANGES COPYING FAQ README TODO; do \
+	for file in BUGS CHANGES COPYING FAQ README README.wm-session TODO; do\
 		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \
 	done
-	${INSTALL_DATA} ${WRKSRC}/doc/icewm*.html ${HTMLDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${HTMLDIR}
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index df71e2a4c8e..72761307fdf 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,264 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2003/05/03 16:38:12 jmmv Exp $
-bin/genpref
+@comment $NetBSD: PLIST,v 1.8 2003/06/03 16:04:45 jmmv Exp $
 bin/icehelp
 bin/icesh
 bin/icewm
 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
-lib/X11/icewm/icons/bomb_32x32.xpm
-lib/X11/icewm/icons/communicator-abook_16x16.xpm
-lib/X11/icewm/icons/communicator-abook_32x32.xpm
-lib/X11/icewm/icons/communicator-browser_16x16.xpm
-lib/X11/icewm/icons/communicator-browser_32x32.xpm
-lib/X11/icewm/icons/communicator-composer_16x16.xpm
-lib/X11/icewm/icons/communicator-composer_32x32.xpm
-lib/X11/icewm/icons/communicator-discussion_16x16.xpm
-lib/X11/icewm/icons/communicator-discussion_32x32.xpm
-lib/X11/icewm/icons/communicator-mail_16x16.xpm
-lib/X11/icewm/icons/communicator-mail_32x32.xpm
-lib/X11/icewm/icons/file_16x16.xpm
-lib/X11/icewm/icons/file_32x32.xpm
-lib/X11/icewm/icons/folder_16x16.xpm
-lib/X11/icewm/icons/folder_32x32.xpm
-lib/X11/icewm/icons/fte_16x16.xpm
-lib/X11/icewm/icons/fte_32x32.xpm
-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
-lib/X11/icewm/icons/navigator_32x32.xpm
-lib/X11/icewm/icons/netscape_16x16.xpm
-lib/X11/icewm/icons/netscape_32x32.xpm
-lib/X11/icewm/icons/pdf_16x16.xpm
-lib/X11/icewm/icons/pdf_32x32.xpm
-lib/X11/icewm/icons/vim_16x16.xpm
-lib/X11/icewm/icons/vim_32x32.xpm
-lib/X11/icewm/icons/vim_48x48.xpm
-lib/X11/icewm/icons/xisp_16x16.xpm
-lib/X11/icewm/icons/xisp_32x32.xpm
-lib/X11/icewm/icons/xload_16x16.xpm
-lib/X11/icewm/icons/xload_32x32.xpm
-lib/X11/icewm/icons/xterm_16x16.xpm
-lib/X11/icewm/icons/xterm_32x32.xpm
-lib/X11/icewm/icons/xv_16x16.xpm
-lib/X11/icewm/icons/xv_32x32.xpm
-lib/X11/icewm/keys
-lib/X11/icewm/ledclock/a.xpm
-lib/X11/icewm/ledclock/colon.xpm
-lib/X11/icewm/ledclock/dot.xpm
-lib/X11/icewm/ledclock/m.xpm
-lib/X11/icewm/ledclock/n0.xpm
-lib/X11/icewm/ledclock/n1.xpm
-lib/X11/icewm/ledclock/n2.xpm
-lib/X11/icewm/ledclock/n3.xpm
-lib/X11/icewm/ledclock/n4.xpm
-lib/X11/icewm/ledclock/n5.xpm
-lib/X11/icewm/ledclock/n6.xpm
-lib/X11/icewm/ledclock/n7.xpm
-lib/X11/icewm/ledclock/n8.xpm
-lib/X11/icewm/ledclock/n9.xpm
-lib/X11/icewm/ledclock/p.xpm
-lib/X11/icewm/ledclock/slash.xpm
-lib/X11/icewm/ledclock/space.xpm
-lib/X11/icewm/mailbox/errmail.xpm
-lib/X11/icewm/mailbox/mail.xpm
-lib/X11/icewm/mailbox/newmail.xpm
-lib/X11/icewm/mailbox/nomail.xpm
-lib/X11/icewm/mailbox/unreadmail.xpm
-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
-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
-lib/X11/icewm/themes/gtk2/maximizeA.xpm
-lib/X11/icewm/themes/gtk2/maximizeI.xpm
-lib/X11/icewm/themes/gtk2/menuButtonA.xpm
-lib/X11/icewm/themes/gtk2/menuButtonI.xpm
-lib/X11/icewm/themes/gtk2/minimizeA.xpm
-lib/X11/icewm/themes/gtk2/minimizeI.xpm
-lib/X11/icewm/themes/gtk2/restoreA.xpm
-lib/X11/icewm/themes/gtk2/restoreI.xpm
-lib/X11/icewm/themes/metal2/closeA.xpm
-lib/X11/icewm/themes/metal2/closeI.xpm
-lib/X11/icewm/themes/metal2/default.theme
-lib/X11/icewm/themes/metal2/depthA.xpm
-lib/X11/icewm/themes/metal2/depthI.xpm
-lib/X11/icewm/themes/metal2/dframeAB.xpm
-lib/X11/icewm/themes/metal2/dframeABL.xpm
-lib/X11/icewm/themes/metal2/dframeABR.xpm
-lib/X11/icewm/themes/metal2/dframeAL.xpm
-lib/X11/icewm/themes/metal2/dframeAR.xpm
-lib/X11/icewm/themes/metal2/dframeAT.xpm
-lib/X11/icewm/themes/metal2/dframeATL.xpm
-lib/X11/icewm/themes/metal2/dframeATR.xpm
-lib/X11/icewm/themes/metal2/dframeIB.xpm
-lib/X11/icewm/themes/metal2/dframeIBL.xpm
-lib/X11/icewm/themes/metal2/dframeIBR.xpm
-lib/X11/icewm/themes/metal2/dframeIL.xpm
-lib/X11/icewm/themes/metal2/dframeIR.xpm
-lib/X11/icewm/themes/metal2/dframeIT.xpm
-lib/X11/icewm/themes/metal2/dframeITL.xpm
-lib/X11/icewm/themes/metal2/dframeITR.xpm
-lib/X11/icewm/themes/metal2/frameAB.xpm
-lib/X11/icewm/themes/metal2/frameABL.xpm
-lib/X11/icewm/themes/metal2/frameABR.xpm
-lib/X11/icewm/themes/metal2/frameAL.xpm
-lib/X11/icewm/themes/metal2/frameAR.xpm
-lib/X11/icewm/themes/metal2/frameAT.xpm
-lib/X11/icewm/themes/metal2/frameATL.xpm
-lib/X11/icewm/themes/metal2/frameATR.xpm
-lib/X11/icewm/themes/metal2/frameIB.xpm
-lib/X11/icewm/themes/metal2/frameIBL.xpm
-lib/X11/icewm/themes/metal2/frameIBR.xpm
-lib/X11/icewm/themes/metal2/frameIL.xpm
-lib/X11/icewm/themes/metal2/frameIR.xpm
-lib/X11/icewm/themes/metal2/frameIT.xpm
-lib/X11/icewm/themes/metal2/frameITL.xpm
-lib/X11/icewm/themes/metal2/frameITR.xpm
-lib/X11/icewm/themes/metal2/hideA.xpm
-lib/X11/icewm/themes/metal2/hideI.xpm
-lib/X11/icewm/themes/metal2/maximizeA.xpm
-lib/X11/icewm/themes/metal2/maximizeI.xpm
-lib/X11/icewm/themes/metal2/menuButtonA.xpm
-lib/X11/icewm/themes/metal2/menuButtonI.xpm
-lib/X11/icewm/themes/metal2/minimizeA.xpm
-lib/X11/icewm/themes/metal2/minimizeI.xpm
-lib/X11/icewm/themes/metal2/restoreA.xpm
-lib/X11/icewm/themes/metal2/restoreI.xpm
-lib/X11/icewm/themes/metal2/rolldownA.xpm
-lib/X11/icewm/themes/metal2/rolldownI.xpm
-lib/X11/icewm/themes/metal2/rollupA.xpm
-lib/X11/icewm/themes/metal2/rollupI.xpm
-lib/X11/icewm/themes/metal2/titleAB.xpm
-lib/X11/icewm/themes/metal2/titleAL.xpm
-lib/X11/icewm/themes/metal2/titleAM.xpm
-lib/X11/icewm/themes/metal2/titleAP.xpm
-lib/X11/icewm/themes/metal2/titleAR.xpm
-lib/X11/icewm/themes/metal2/titleAS.xpm
-lib/X11/icewm/themes/metal2/titleAT.xpm
-lib/X11/icewm/themes/metal2/titleIB.xpm
-lib/X11/icewm/themes/metal2/titleIL.xpm
-lib/X11/icewm/themes/metal2/titleIM.xpm
-lib/X11/icewm/themes/metal2/titleIP.xpm
-lib/X11/icewm/themes/metal2/titleIR.xpm
-lib/X11/icewm/themes/metal2/titleIS.xpm
-lib/X11/icewm/themes/metal2/titleIT.xpm
-lib/X11/icewm/themes/motif/close.xpm
-lib/X11/icewm/themes/motif/default.theme
-lib/X11/icewm/themes/motif/maximize.xpm
-lib/X11/icewm/themes/motif/menu.xpm
-lib/X11/icewm/themes/motif/minimize.xpm
-lib/X11/icewm/themes/motif/restore.xpm
-lib/X11/icewm/themes/nice/blue.theme
-lib/X11/icewm/themes/nice/close.xpm
-lib/X11/icewm/themes/nice/default.theme
-lib/X11/icewm/themes/nice/hide.xpm
-lib/X11/icewm/themes/nice/maximize.xpm
-lib/X11/icewm/themes/nice/minimize.xpm
-lib/X11/icewm/themes/nice/restore.xpm
-lib/X11/icewm/themes/nice/rolldown.xpm
-lib/X11/icewm/themes/nice/rollup.xpm
-lib/X11/icewm/themes/warp3/close.xpm
-lib/X11/icewm/themes/warp3/default.theme
-lib/X11/icewm/themes/warp3/hide.xpm
-lib/X11/icewm/themes/warp3/maximize.xpm
-lib/X11/icewm/themes/warp3/minimize.xpm
-lib/X11/icewm/themes/warp3/restore.xpm
-lib/X11/icewm/themes/warp3/rolldown.xpm
-lib/X11/icewm/themes/warp3/rollup.xpm
-lib/X11/icewm/themes/warp4/close.xpm
-lib/X11/icewm/themes/warp4/default.theme
-lib/X11/icewm/themes/warp4/hide.xpm
-lib/X11/icewm/themes/warp4/maximize.xpm
-lib/X11/icewm/themes/warp4/minimize.xpm
-lib/X11/icewm/themes/warp4/restore.xpm
-lib/X11/icewm/themes/win95/close.xpm
-lib/X11/icewm/themes/win95/default.theme
-lib/X11/icewm/themes/win95/maximize.xpm
-lib/X11/icewm/themes/win95/minimize.xpm
-lib/X11/icewm/themes/win95/restore.xpm
-lib/X11/icewm/toolbar
-lib/X11/icewm/winoptions
 share/doc/html/icewm/icewm-1.html
 share/doc/html/icewm/icewm-10.html
 share/doc/html/icewm/icewm-11.html
@@ -267,6 +12,8 @@ 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-17.html
+share/doc/html/icewm/icewm-18.html
 share/doc/html/icewm/icewm-2.html
 share/doc/html/icewm/icewm-3.html
 share/doc/html/icewm/icewm-4.html
@@ -281,7 +28,295 @@ 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
+share/icewm/icons/app_16x16.xpm
+share/icewm/icons/app_32x32.xpm
+share/icewm/icons/bomb_16x16.xpm
+share/icewm/icons/bomb_32x32.xpm
+share/icewm/icons/communicator-abook_16x16.xpm
+share/icewm/icons/communicator-abook_32x32.xpm
+share/icewm/icons/communicator-browser_16x16.xpm
+share/icewm/icons/communicator-browser_32x32.xpm
+share/icewm/icons/communicator-composer_16x16.xpm
+share/icewm/icons/communicator-composer_32x32.xpm
+share/icewm/icons/communicator-discussion_16x16.xpm
+share/icewm/icons/communicator-discussion_32x32.xpm
+share/icewm/icons/communicator-mail_16x16.xpm
+share/icewm/icons/communicator-mail_32x32.xpm
+share/icewm/icons/emacs_16x16.xpm
+share/icewm/icons/emacs_32x32.xpm
+share/icewm/icons/file_16x16.xpm
+share/icewm/icons/file_32x32.xpm
+share/icewm/icons/folder_16x16.xpm
+share/icewm/icons/folder_32x32.xpm
+share/icewm/icons/fte_16x16.xpm
+share/icewm/icons/fte_32x32.xpm
+share/icewm/icons/gimp_16x16.xpm
+share/icewm/icons/gimp_32x32.xpm
+share/icewm/icons/gnome_16x16.xpm
+share/icewm/icons/java_16x16.xpm
+share/icewm/icons/java_32x32.xpm
+share/icewm/icons/kde_16x16.xpm
+share/icewm/icons/koules_16x16.xpm
+share/icewm/icons/koules_32x32.xpm
+share/icewm/icons/navigator_16x16.xpm
+share/icewm/icons/navigator_32x32.xpm
+share/icewm/icons/netscape_16x16.xpm
+share/icewm/icons/netscape_32x32.xpm
+share/icewm/icons/pdf_16x16.xpm
+share/icewm/icons/pdf_32x32.xpm
+share/icewm/icons/vim_16x16.xpm
+share/icewm/icons/vim_32x32.xpm
+share/icewm/icons/vim_48x48.xpm
+share/icewm/icons/xisp_16x16.xpm
+share/icewm/icons/xisp_32x32.xpm
+share/icewm/icons/xload_16x16.xpm
+share/icewm/icons/xload_32x32.xpm
+share/icewm/icons/xterm_16x16.xpm
+share/icewm/icons/xterm_32x32.xpm
+share/icewm/icons/xv_16x16.xpm
+share/icewm/icons/xv_32x32.xpm
+share/icewm/keys
+share/icewm/ledclock/a.xpm
+share/icewm/ledclock/colon.xpm
+share/icewm/ledclock/dot.xpm
+share/icewm/ledclock/m.xpm
+share/icewm/ledclock/n0.xpm
+share/icewm/ledclock/n1.xpm
+share/icewm/ledclock/n2.xpm
+share/icewm/ledclock/n3.xpm
+share/icewm/ledclock/n4.xpm
+share/icewm/ledclock/n5.xpm
+share/icewm/ledclock/n6.xpm
+share/icewm/ledclock/n7.xpm
+share/icewm/ledclock/n8.xpm
+share/icewm/ledclock/n9.xpm
+share/icewm/ledclock/p.xpm
+share/icewm/ledclock/percent.xpm
+share/icewm/ledclock/slash.xpm
+share/icewm/ledclock/space.xpm
+share/icewm/mailbox/errmail.xpm
+share/icewm/mailbox/mail.xpm
+share/icewm/mailbox/newmail.xpm
+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
+share/icewm/taskbar/linux.xpm
+share/icewm/taskbar/linux1.xpm
+share/icewm/taskbar/linux2.xpm
+share/icewm/taskbar/linux20.xpm
+share/icewm/taskbar/start.xpm
+share/icewm/taskbar/windows.xpm
+share/icewm/taskbar/xfreeos2.xpm
+share/icewm/themes/Infadel2/Ergonomic.theme
+share/icewm/themes/Infadel2/Overloaded.theme
+share/icewm/themes/Infadel2/closeA.xpm
+share/icewm/themes/Infadel2/closeI.xpm
+share/icewm/themes/Infadel2/cursors/left.xpm
+share/icewm/themes/Infadel2/cursors/move.xpm
+share/icewm/themes/Infadel2/cursors/right.xpm
+share/icewm/themes/Infadel2/cursors/sizeB.xpm
+share/icewm/themes/Infadel2/cursors/sizeBL.xpm
+share/icewm/themes/Infadel2/cursors/sizeBR.xpm
+share/icewm/themes/Infadel2/cursors/sizeL.xpm
+share/icewm/themes/Infadel2/cursors/sizeR.xpm
+share/icewm/themes/Infadel2/cursors/sizeT.xpm
+share/icewm/themes/Infadel2/cursors/sizeTL.xpm
+share/icewm/themes/Infadel2/cursors/sizeTR.xpm
+share/icewm/themes/Infadel2/default.theme
+share/icewm/themes/Infadel2/depthA.xpm
+share/icewm/themes/Infadel2/depthI.xpm
+share/icewm/themes/Infadel2/fonts.dir
+share/icewm/themes/Infadel2/hideA.xpm
+share/icewm/themes/Infadel2/hideI.xpm
+share/icewm/themes/Infadel2/icons/app_16x16.xpm
+share/icewm/themes/Infadel2/icons/folder_16x16.xpm
+share/icewm/themes/Infadel2/icons/folder_32x32.xpm
+share/icewm/themes/Infadel2/mailbox/errmail.xpm
+share/icewm/themes/Infadel2/mailbox/mail.xpm
+share/icewm/themes/Infadel2/mailbox/newmail.xpm
+share/icewm/themes/Infadel2/mailbox/nomail.xpm
+share/icewm/themes/Infadel2/mailbox/unreadmail.xpm
+share/icewm/themes/Infadel2/maximizeA.xpm
+share/icewm/themes/Infadel2/maximizeI.xpm
+share/icewm/themes/Infadel2/menuButtonA.xpm
+share/icewm/themes/Infadel2/menuButtonI.xpm
+share/icewm/themes/Infadel2/minimizeA.xpm
+share/icewm/themes/Infadel2/minimizeI.xpm
+share/icewm/themes/Infadel2/restoreA.xpm
+share/icewm/themes/Infadel2/restoreI.xpm
+share/icewm/themes/Infadel2/rolldownA.xpm
+share/icewm/themes/Infadel2/rolldownI.xpm
+share/icewm/themes/Infadel2/rollupA.xpm
+share/icewm/themes/Infadel2/rollupI.xpm
+share/icewm/themes/Infadel2/snap.pcf
+share/icewm/themes/Infadel2/taskbar/linux.xpm
+share/icewm/themes/Infadel2/taskbar/windows.xpm
+share/icewm/themes/Infadel2/titleAB.xpm
+share/icewm/themes/Infadel2/titleAJ.xpm
+share/icewm/themes/Infadel2/titleAM.xpm
+share/icewm/themes/Infadel2/titleAP.xpm
+share/icewm/themes/Infadel2/titleAQ.xpm
+share/icewm/themes/Infadel2/titleAR.xpm
+share/icewm/themes/Infadel2/titleAS.xpm
+share/icewm/themes/Infadel2/titleAT.xpm
+share/icewm/themes/Infadel2/titleIB.xpm
+share/icewm/themes/Infadel2/titleIJ.xpm
+share/icewm/themes/Infadel2/titleIM.xpm
+share/icewm/themes/Infadel2/titleIP.xpm
+share/icewm/themes/Infadel2/titleIQ.xpm
+share/icewm/themes/Infadel2/titleIR.xpm
+share/icewm/themes/Infadel2/titleIS.xpm
+share/icewm/themes/Infadel2/titleIT.xpm
+share/icewm/themes/gtk2/closeA.xpm
+share/icewm/themes/gtk2/closeI.xpm
+share/icewm/themes/gtk2/default.theme
+share/icewm/themes/gtk2/maximizeA.xpm
+share/icewm/themes/gtk2/maximizeI.xpm
+share/icewm/themes/gtk2/menuButtonA.xpm
+share/icewm/themes/gtk2/menuButtonI.xpm
+share/icewm/themes/gtk2/minimizeA.xpm
+share/icewm/themes/gtk2/minimizeI.xpm
+share/icewm/themes/gtk2/restoreA.xpm
+share/icewm/themes/gtk2/restoreI.xpm
+share/icewm/themes/icedesert/closeA.xpm
+share/icewm/themes/icedesert/closeI.xpm
+share/icewm/themes/icedesert/default.theme
+share/icewm/themes/icedesert/maximizeA.xpm
+share/icewm/themes/icedesert/maximizeI.xpm
+share/icewm/themes/icedesert/menuButtonA.xpm
+share/icewm/themes/icedesert/menuButtonI.xpm
+share/icewm/themes/icedesert/minimizeA.xpm
+share/icewm/themes/icedesert/minimizeI.xpm
+share/icewm/themes/icedesert/restoreA.xpm
+share/icewm/themes/icedesert/restoreI.xpm
+share/icewm/themes/icedesert/titleAB.xpm
+share/icewm/themes/icedesert/titleAT.xpm
+share/icewm/themes/icedesert/titleIB.xpm
+share/icewm/themes/icedesert/titleIT.xpm
+share/icewm/themes/metal2/closeA.xpm
+share/icewm/themes/metal2/closeI.xpm
+share/icewm/themes/metal2/default.theme
+share/icewm/themes/metal2/depthA.xpm
+share/icewm/themes/metal2/depthI.xpm
+share/icewm/themes/metal2/dframeAB.xpm
+share/icewm/themes/metal2/dframeABL.xpm
+share/icewm/themes/metal2/dframeABR.xpm
+share/icewm/themes/metal2/dframeAL.xpm
+share/icewm/themes/metal2/dframeAR.xpm
+share/icewm/themes/metal2/dframeAT.xpm
+share/icewm/themes/metal2/dframeATL.xpm
+share/icewm/themes/metal2/dframeATR.xpm
+share/icewm/themes/metal2/dframeIB.xpm
+share/icewm/themes/metal2/dframeIBL.xpm
+share/icewm/themes/metal2/dframeIBR.xpm
+share/icewm/themes/metal2/dframeIL.xpm
+share/icewm/themes/metal2/dframeIR.xpm
+share/icewm/themes/metal2/dframeIT.xpm
+share/icewm/themes/metal2/dframeITL.xpm
+share/icewm/themes/metal2/dframeITR.xpm
+share/icewm/themes/metal2/frameAB.xpm
+share/icewm/themes/metal2/frameABL.xpm
+share/icewm/themes/metal2/frameABR.xpm
+share/icewm/themes/metal2/frameAL.xpm
+share/icewm/themes/metal2/frameAR.xpm
+share/icewm/themes/metal2/frameAT.xpm
+share/icewm/themes/metal2/frameATL.xpm
+share/icewm/themes/metal2/frameATR.xpm
+share/icewm/themes/metal2/frameIB.xpm
+share/icewm/themes/metal2/frameIBL.xpm
+share/icewm/themes/metal2/frameIBR.xpm
+share/icewm/themes/metal2/frameIL.xpm
+share/icewm/themes/metal2/frameIR.xpm
+share/icewm/themes/metal2/frameIT.xpm
+share/icewm/themes/metal2/frameITL.xpm
+share/icewm/themes/metal2/frameITR.xpm
+share/icewm/themes/metal2/hideA.xpm
+share/icewm/themes/metal2/hideI.xpm
+share/icewm/themes/metal2/maximizeA.xpm
+share/icewm/themes/metal2/maximizeI.xpm
+share/icewm/themes/metal2/menuButtonA.xpm
+share/icewm/themes/metal2/menuButtonI.xpm
+share/icewm/themes/metal2/minimizeA.xpm
+share/icewm/themes/metal2/minimizeI.xpm
+share/icewm/themes/metal2/restoreA.xpm
+share/icewm/themes/metal2/restoreI.xpm
+share/icewm/themes/metal2/rolldownA.xpm
+share/icewm/themes/metal2/rolldownI.xpm
+share/icewm/themes/metal2/rollupA.xpm
+share/icewm/themes/metal2/rollupI.xpm
+share/icewm/themes/metal2/titleAB.xpm
+share/icewm/themes/metal2/titleAL.xpm
+share/icewm/themes/metal2/titleAM.xpm
+share/icewm/themes/metal2/titleAP.xpm
+share/icewm/themes/metal2/titleAR.xpm
+share/icewm/themes/metal2/titleAS.xpm
+share/icewm/themes/metal2/titleAT.xpm
+share/icewm/themes/metal2/titleIB.xpm
+share/icewm/themes/metal2/titleIL.xpm
+share/icewm/themes/metal2/titleIM.xpm
+share/icewm/themes/metal2/titleIP.xpm
+share/icewm/themes/metal2/titleIR.xpm
+share/icewm/themes/metal2/titleIS.xpm
+share/icewm/themes/metal2/titleIT.xpm
+share/icewm/themes/motif/close.xpm
+share/icewm/themes/motif/default.theme
+share/icewm/themes/motif/maximize.xpm
+share/icewm/themes/motif/menu.xpm
+share/icewm/themes/motif/minimize.xpm
+share/icewm/themes/motif/restore.xpm
+share/icewm/themes/nice/blue.theme
+share/icewm/themes/nice/close.xpm
+share/icewm/themes/nice/default.theme
+share/icewm/themes/nice/hide.xpm
+share/icewm/themes/nice/maximize.xpm
+share/icewm/themes/nice/minimize.xpm
+share/icewm/themes/nice/restore.xpm
+share/icewm/themes/nice/rolldown.xpm
+share/icewm/themes/nice/rollup.xpm
+share/icewm/themes/nice2/closeA.xpm
+share/icewm/themes/nice2/closeI.xpm
+share/icewm/themes/nice2/default.theme
+share/icewm/themes/nice2/maximizeA.xpm
+share/icewm/themes/nice2/maximizeI.xpm
+share/icewm/themes/nice2/menuButtonA.xpm
+share/icewm/themes/nice2/menuButtonI.xpm
+share/icewm/themes/nice2/minimizeA.xpm
+share/icewm/themes/nice2/minimizeI.xpm
+share/icewm/themes/nice2/restoreA.xpm
+share/icewm/themes/nice2/restoreI.xpm
+share/icewm/themes/nice2/titleAB.xpm
+share/icewm/themes/nice2/titleAT.xpm
+share/icewm/themes/nice2/titleIB.xpm
+share/icewm/themes/nice2/titleIT.xpm
+share/icewm/themes/warp3/close.xpm
+share/icewm/themes/warp3/default.theme
+share/icewm/themes/warp3/hide.xpm
+share/icewm/themes/warp3/maximize.xpm
+share/icewm/themes/warp3/minimize.xpm
+share/icewm/themes/warp3/restore.xpm
+share/icewm/themes/warp3/rolldown.xpm
+share/icewm/themes/warp3/rollup.xpm
+share/icewm/themes/warp4/close.xpm
+share/icewm/themes/warp4/default.theme
+share/icewm/themes/warp4/hide.xpm
+share/icewm/themes/warp4/maximize.xpm
+share/icewm/themes/warp4/minimize.xpm
+share/icewm/themes/warp4/restore.xpm
+share/icewm/themes/win95/close.xpm
+share/icewm/themes/win95/default.theme
+share/icewm/themes/win95/maximize.xpm
+share/icewm/themes/win95/minimize.xpm
+share/icewm/themes/win95/restore.xpm
+share/icewm/toolbar
+share/icewm/winoptions
+${PKGLOCALEDIR}/locale/be/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
@@ -294,30 +329,36 @@ ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/icewm.mo
 ${PKGLOCALEDIR}/locale/ja/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
 ${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/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_TW.Big5/LC_MESSAGES/icewm.mo
-@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
-@dirrm lib/X11/icewm/themes/nice
-@dirrm lib/X11/icewm/themes/motif
-@dirrm lib/X11/icewm/themes/metal2
-@dirrm lib/X11/icewm/themes/gtk2
-@dirrm lib/X11/icewm/themes
-@dirrm lib/X11/icewm
-@dirrm share/doc/html/icewm
+@dirrm share/icewm/themes/win95
+@dirrm share/icewm/themes/warp4
+@dirrm share/icewm/themes/warp3
+@dirrm share/icewm/themes/nice2
+@dirrm share/icewm/themes/nice
+@dirrm share/icewm/themes/motif
+@dirrm share/icewm/themes/metal2
+@dirrm share/icewm/themes/icedesert
+@dirrm share/icewm/themes/gtk2
+@dirrm share/icewm/themes/Infadel2/taskbar
+@dirrm share/icewm/themes/Infadel2/mailbox
+@dirrm share/icewm/themes/Infadel2/icons
+@dirrm share/icewm/themes/Infadel2/cursors
+@dirrm share/icewm/themes/Infadel2
+@dirrm share/icewm/themes
+@dirrm share/icewm/taskbar
+@dirrm share/icewm/mailbox
+@dirrm share/icewm/ledclock
+@dirrm share/icewm/icons
+@dirrm share/icewm
 @dirrm share/doc/icewm
+@dirrm share/doc/html/icewm
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index c8a0b099359..d1577306959 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.10 2003/05/03 16:38:12 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2003/06/03 16:04:45 jmmv Exp $
 
-SHA1 (icewm-1.2.0.tar.gz) = bef4daba4bb94120f08f90755a9bc3518c254c21
-Size (icewm-1.2.0.tar.gz) = 684306 bytes
-SHA1 (patch-aa) = 8dc74038552f8c9783622229981a9a83b3464512
-SHA1 (patch-ab) = bd8501ef2606efecb8f603578e1e2f978e586923
-SHA1 (patch-ac) = 5275f5e9b5dae569d8d01a1209c00f40490edcbc
-SHA1 (patch-ad) = d2f6760952be3517661829b47a3d7868aaeccbf5
-SHA1 (patch-ae) = e577de295c2024e51b0b571dc8eaaf5169ad57e4
-SHA1 (patch-af) = 61a5060c95f9110b536c3312c1afc8d722af5226
-SHA1 (patch-ag) = 1a50e341ddd7ae89248f065fa61ea2887cfcc58a
-SHA1 (patch-ah) = 8b436ee2d25177d4a2d9a06471c68a5bc26d7e73
-SHA1 (patch-ai) = 96c7d3bcb53c4bc61def387accc90498e0c0f0f1
+SHA1 (icewm-1.2.7.tar.gz) = 365698115291e32806c83293adee88cbb0730901
+Size (icewm-1.2.7.tar.gz) = 782335 bytes
+SHA1 (patch-ab) = 791868a4320a62ac81de487667f90cbdaeacd2a7
+SHA1 (patch-ac) = 756d7fa3fcae780c23f203fb1bfd6ca1f7e26fad
+SHA1 (patch-ad) = ca4f99934ab9733b990eeca07aa03ec307573f18
+SHA1 (patch-ae) = 85445be7228d65016265e862470abdda5f193898
+SHA1 (patch-af) = f6f0cc084f7016ff1df29a206208a776246cba82
diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa
deleted file mode 100644
index ba585243fd1..00000000000
--- a/wm/icewm/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/02/26 09:41:40 martti Exp $
-
---- 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 = \
--	@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 03a04b79c65..8bb9614a62a 100644
--- a/wm/icewm/patches/patch-ab
+++ b/wm/icewm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2002/05/03 10:56:39 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2003/06/03 16:04:45 jmmv Exp $
 
---- src/aapm.cc.orig	Tue Oct  9 16:54:03 2001
+--- src/aapm.cc.orig	2003-03-08 20:37:52.000000000 +0100
 +++ src/aapm.cc
-@@ -25,6 +25,12 @@
+@@ -15,6 +15,12 @@
  
  #ifdef CONFIG_APPLET_APM
  
@@ -12,21 +12,21 @@ $NetBSD: patch-ab,v 1.3 2002/05/03 10:56:39 wiz Exp $
 +#include <fcntl.h>
 +#endif
 +
- YColor *YApm::apmBg = 0;
- YColor *YApm::apmFg = 0;
- YFont *YApm::apmFont = 0;
-@@ -32,6 +38,7 @@
- extern YPixmap *taskbackPixmap;
+ #include "ylib.h"
+ #include "sysdep.h"
+ 
+@@ -47,6 +53,7 @@ extern YColor *taskBarBg;
+ 
  
  void ApmStr(char *s, bool Tool) {
 +#if !defined(__NetBSD__)
-     char buf[45];
+     char buf[80];
      int len, i, fd = open("/proc/apm", O_RDONLY);
      char driver[16];
-@@ -102,6 +109,46 @@
-             strcat(s,_(" - Charging"));
+@@ -121,6 +128,46 @@ void ApmStr(char *s, bool Tool) {
+             strcat(s, _(" - Charging"));
          else
-             strcat(s,_("M"));
+             strcat(s, _("C"));
 +#else
 +    struct apm_power_info aip;
 +    int fd = open(APMDEV, O_RDONLY);
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.3 2002/05/03 10:56:39 wiz Exp $
 +    memset(&aip, 0, sizeof(aip));
 +    if (ioctl(fd, APM_IOC_GETPOWER, &aip) == -1) {
 +        fprintf(stderr, "ioctl failed on APMDEV");
-+	close(fd);
++        close(fd);
 +        return;
 +    }
 +
@@ -69,4 +69,4 @@ $NetBSD: patch-ab,v 1.3 2002/05/03 10:56:39 wiz Exp $
 +#endif
  }
  
- YApm::YApm(YWindow *aParent): YWindow(aParent) {
+ int ignore_directory_entry(struct dirent *de) {
diff --git a/wm/icewm/patches/patch-ac b/wm/icewm/patches/patch-ac
index 148f98526f7..cd106ab6e7a 100644
--- a/wm/icewm/patches/patch-ac
+++ b/wm/icewm/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2002/02/26 09:41:40 martti Exp $
+$NetBSD: patch-ac,v 1.3 2003/06/03 16:04:45 jmmv 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 @@
+--- 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 CONFIG_APPLET_APM
-+#if defined(__NetBSD__)
-+#define APMDEV "/dev/apm"
-+#endif
-+
- class YApm: public YWindow, public YTimerListener {
- public:
-     YApm(YWindow *aParent = 0);
+-#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 637e7e047bb..4774431ec04 100644
--- a/wm/icewm/patches/patch-ad
+++ b/wm/icewm/patches/patch-ad
@@ -1,13 +1,18 @@
-$NetBSD: patch-ad,v 1.3 2002/08/26 08:29:14 martti Exp $
+$NetBSD: patch-ad,v 1.4 2003/06/03 16:04:46 jmmv Exp $
 
---- src/Makefile.orig	Sun Jun 30 18:05:18 2002
-+++ src/Makefile	Mon Aug 26 10:12:58 2002
-@@ -19,7 +19,7 @@
- 	-DEXEEXT='"$(EXEEXT)"' \
- 	-DICEWMEXE='"icewm"EXEEXT' \
- 	-DICEHELPEXE='"icehelp"EXEEXT' \
--	-DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' \
-+	-DICEHELPIDX='"$(prefix)/share/doc/html/icewm/icewm.html"' \
-         $(SYS_CFLAGS) $(SYS_INCDIRS)
- LFLAGS = $(SYS_LIBDIRS) 
- LIBS = $(SYS_LIBS)
+--- src/Makefile.in.orig	2003-03-08 20:37:53.000000000 +0100
++++ src/Makefile.in
+@@ -28,11 +28,11 @@ DEFS =          @DEFS@ \
+                 -DEXEEXT='"$(EXEEXT)"' \
+                 -DICEWMEXE='"icewm$(EXEEXT)"' \
+                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
+-                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
++                -DICEHELPIDX='"$(prefix)/share/doc/html/icewm/icewm.html"'
+ 
+ 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
index 687bc5d112b..6d04ffdcdb8 100644
--- a/wm/icewm/patches/patch-ae
+++ b/wm/icewm/patches/patch-ae
@@ -1,16 +1,20 @@
-$NetBSD: patch-ae,v 1.4 2002/08/25 21:51:35 jlam Exp $
+$NetBSD: patch-ae,v 1.5 2003/06/03 16:04:46 jmmv Exp $
 
---- src/wmtaskbar.cc.orig	Thu May 16 05:00:02 2002
-+++ src/wmtaskbar.cc	Sat May 25 09:41:09 2002
-@@ -288,7 +288,11 @@
-     } else
-         fClock = 0;
- #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() > ht) ht = fApm->height();
-     } else
+--- 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 4f6abcfaa59..853430ec851 100644
--- a/wm/icewm/patches/patch-af
+++ b/wm/icewm/patches/patch-af
@@ -1,26 +1,13 @@
-$NetBSD: patch-af,v 1.4 2002/03/08 23:17:26 jmc Exp $
+$NetBSD: patch-af,v 1.5 2003/06/03 16:04:46 jmmv Exp $
 
---- configure.in.orig	Tue Oct  9 14:54:02 2001
-+++ configure.in	Fri Mar  8 23:07:20 2002
-@@ -409,6 +409,13 @@
-     AC_DEFINE(NO_CONFIGURE, 1, [Define to disable preferences support.])
-   fi
- 
-+AC_ARG_ENABLE(apm,
-+  [  --disable-apm           Don't enable the APM status applet])
-+  if test "$enable_apm" != "no"; then
-+    AC_DEFINE(CONFIG_APPLET_APM,        1,      [APM status applet])
-+  fi
-+
-+
- AC_ARG_ENABLE(keyconf,
-   [  --disable-keyconf       Disable configurable keybindings])
-   if test "$enable_keyconf" = "no"; then
-@@ -440,7 +447,6 @@
-     AC_DEFINE(CONFIG_APPLET_CPU_STATUS,	1,	[CPU status applet])
-     AC_DEFINE(CONFIG_APPLET_NET_STATUS,	1,	[Network status applet])
-     AC_DEFINE(CONFIG_APPLET_CLOCK,	1,	[LCD clock applet])
--    AC_DEFINE(CONFIG_APPLET_APM,	1,	[APM status applet])
-     AC_DEFINE(CONFIG_ADDRESSBAR,	1,	[Address bar])
-     AC_DEFINE(CONFIG_WINLIST,		1,	[OS/2 like window list])
-     AC_DEFINE(CONFIG_WINMENU,		1,	[Window menu])
+--- po/Makefile.in.orig	2003-06-03 16:31:49.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//'` ; \
+ 	     msgdir="$(DESTDIR)$(LOCDIR)/$${lang}/LC_MESSAGES"; \
+ 	     echo "Installing language: $${lang}" ; \
+ 	     $(INSTALLDIR) "$${msgdir}"; \
diff --git a/wm/icewm/patches/patch-ag b/wm/icewm/patches/patch-ag
deleted file mode 100644
index 7365a31d803..00000000000
--- a/wm/icewm/patches/patch-ag
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2003/05/03 16:38:14 jmmv Exp $
-
---- configure.orig	2002-06-30 18:05:20.000000000 +0200
-+++ configure	2003-05-03 18:24:42.000000000 +0200
-@@ -701,6 +701,7 @@
-   --enable-movesize-fx    Move/Resize FX (experimental bloat)
-   --disable-x86-asm       Don't use optimized x86 assembly code
-   --disable-prefs         Disable configurable preferences
-+  --disable-apm           Don't enable the APM status applet
-   --disable-keyconf       Disable configurable keybindings
-   --disable-menuconf      Disable configurable menus
-   --disable-winoptions    Disable configurable window options
-@@ -8305,6 +8306,19 @@
- 
-   fi
- 
-+# Check whether --enable-apm or --disable-apm was given.
-+if test "${enable_apm+set}" = set; then
-+  enableval="$enable_apm"
-+
-+fi;
-+  if test "$enable_apm" != "no"; then
-+
-+cat >>confdefs.h <<\EOF
-+#define CONFIG_APPLET_APM 1
-+EOF
-+
-+  fi
-+
- # Check whether --enable-keyconf or --disable-keyconf was given.
- if test "${enable_keyconf+set}" = set; then
-   enableval="$enable_keyconf"
-@@ -8382,10 +8396,6 @@
- EOF
- 
- cat >>confdefs.h <<\EOF
--#define CONFIG_APPLET_APM 1
--EOF
--
--cat >>confdefs.h <<\EOF
- #define CONFIG_ADDRESSBAR 1
- EOF
- 
-@@ -8770,7 +8780,7 @@
-       cfgdatadir=$with_cfgdir
-     fi
- else
--   cfgdatadir='${sysconfdir}/X11/icewm'
-+   cfgdatadir='${sysconfdir}'
- fi;
- 
- # Check whether --with-docdir or --without-docdir was given.
diff --git a/wm/icewm/patches/patch-ah b/wm/icewm/patches/patch-ah
deleted file mode 100644
index 08919727fb4..00000000000
--- a/wm/icewm/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/05/18 13:09:03 cjep Exp $
---- Makefile.in.orig	2003-05-03 18:17:47.000000000 +0200
-+++ Makefile.in	2003-05-03 18:18:40.000000000 +0200
-@@ -76,7 +76,6 @@
-         done
- 	@echo "Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)"
- 	@$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
--	@$(INSTALLDIR) $(DESTDIR)$(CFGDIR)
- 	@for lib in $(LIBFILES) ; do \
-             $(INSTALLLIB) "$$lib" $(DESTDIR)$(LIBDIR); \
-         done
diff --git a/wm/icewm/patches/patch-ai b/wm/icewm/patches/patch-ai
deleted file mode 100644
index 871f4750566..00000000000
--- a/wm/icewm/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/05/18 13:09:03 cjep Exp $
---- install.inc.orig	2003-05-03 18:20:38.000000000 +0200
-+++ install.inc	2003-05-03 18:20:49.000000000 +0200
-@@ -9,7 +9,7 @@
- PREFIX      = /usr
- BINDIR      = ${exec_prefix}/bin
- LIBDIR      = ${libdir}/X11/icewm
--CFGDIR      = ${sysconfdir}/X11/icewm
-+CFGDIR      = ${sysconfdir}
- LOCDIR      = ${datadir}/locale
- KDEDIR 	    = /usr/share
- DOCDIR	    = ${prefix}/doc