Update xpmroot to version 2.4.0. Based on PR #13374 by Martti Kuparinen.

Below is the list of changes since version 2.2.5.

2001-07-03  Dominik Vogt  <dominik.vogt@gmx.de>

	* *: fvwm 2.4 has been released :-))

2001-06-30  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/menus.c (MenuInteraction):
	(find_entry):
	(menuShortcuts):
	(pop_menu_up):
	reduce network traffic during menu waits

2001-06-30  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/fvwm2:
	minor corrections

	* sample.fvwmrc/system.fvwm2rc-sample-95:
	Fixed several problems like position hints in WindowList should
	go before other args, invisible menu Greyed color, SelectOnRelease
	in the skipped window listing and text rewordings.
	In addition, some parts of Setup95 were based on earlier fvwm-themes,
	since then these parts are changed, so update some of them here too.
	This includes renaming desktop component to globalfeel, some changes
	in menus and more minor cleanups. It's still messy enough, but ok...

2001-06-29  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/stack.c (is_on_top_of_layer_ignore_rom):
	(is_on_top_of_layer):
	(CMD_RaiseLower):
	fixed RaiseLower with BugOpts RaiseOverUnmanaged

2001-06-28  Dominik Vogt  <dominik.vogt@gmx.de>

	* configure.in:
	changed version to 2.4.0-pre2

	* NEWS:
	* fvwm/fvwm2.1:
	* modules/**/*.1:
	updated for pre release 2.4.0-pre1

2001-06-27  Dominik Vogt  <dominik.vogt@gmx.de>

	* libs/Graphics.c (CreateGradientPixmap):
	fixed crash caused by signed/unsigned confusion

	* todo-2.4:
	updated

	* fvwm/fvwm2.1:
	corrected typo

2001-06-23  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/add_window.c (setup_icon_font):
	adjust icon title y offset when the icon font changes

	* libs/GetFontSet.c (GetFontSetOrFixed):
	reformatted error message

2001-06-23  Dan Espen  <dane@mk.telcordia.com>

	* fvwm/fvwm2.1: Make the multiple Iconboxes rule a little clearer.

	* fvwm/fvwm.c (InitVariables): Add the vendor string for Reflection X
	to automatically set RaiseHackNeeded.

2001-06-23  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/fvwm2:
	improve the WindowList double press example to work with all focus
	policies

2001-06-22  Dominik Vogt  <dominik.vogt@gmx.de>

	* NEWS, configure.in:
	changed version to 2.3.34

2001-06-22  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c (flush_property_notify):
	accidentally flushed PropertyNotify events for all windows, not just the
	given window

	* fvwm/icons.c (Iconify):
	sticky icons on desks other than 0 are mapped during a restart

	* fvwm/misc.c (UngrabEm):
	fixed ungrabbing BUSY cursor when a menu is still open

	* fvwm/events.c (HandleMapRequestKeepRaised):
	don't grab the server when 'mapping' windows that start iconic
	fixes FvwmIconMan not noticing iconic state of windows starting iconic

2001-06-17  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/functions.c (execute_function):
	fixed memory leak

	* fvwm/decorations.c (GetMwmHints):
	fixed memory leak

	* fvwm/session.c (SaveWindowStates):
	make sure the string list is properly freed

	* libs/Makefile.am (libfvwm_a_SOURCES):
	* libs/Event.c (GetSubwindowFromEvent):
	new file and function

	* fvwm/functions.c (execute_function):
	fixed UMR

	* fvwm/session.c (MatchWinToSM):
	fixed a memory leak when using session management

	* fvwm/session.c (LoadWindowStates):
	(duplicate):
	* fvwm/builtins.c (CMD_StrokeFunc):
	use saferealloc instead of realloc
	use safemalloc instead of malloc

2001-06-08  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/add_window.c (destroy_icon_font):
	check if icon_font == default font before deleting the icon_font,
	not if title_font == default font

2001-06-03  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/style.c (CMD_Style):
	accept style option Layer without argument

2001-06-03  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/virtual.c (map_window):
	prevent that dying windows are mapped again during a desk change

2001-06-01  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/focus.c (restore_focus_after_unmap):
	ignore transientfor windows on other desks and honour Skip... styles
	when restoring focus

2001-05-29  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/add_window.c (setup_key_and_button_grabs):
	fixed bug #711 (key bindings not properly removed)

	* fvwm/events.c (GetContext):
	fix to catch button presses with unclutter

2001-05-29  Mikhael Goikhman  <migo@homemail.com>

	* acconfig.h:
	a fix for autoconf-2.50

	* fvwm/module_interface.c (PositiveWrite):
	print module name and alias in "Failed to read descriptor" error

2001-05-29  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/add_window.c (destroy_window):
	unmap the window immediately when it's going to be destroyed soo so that
	it does not hang around during a wait
	(destroy_window):
	inform modules that window will be gone soon too

	* fvwm/builtins.c (CMD_Wait):
	fixed core dump

	* fvwm/misc.c (UngrabEm):
	workaround for wait hang caused "I" function patch

2001-05-28  Dan Espen  <dane@mk.telcordia.com>

	* INSTALL.fvwm: Identify LDFLAGS as a Makefile variable.

2001-05-27  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/focus.c (focus_grab_buttons_on_pointer_window):
	(MoveFocus):
	* fvwm/stack.c (LowerWindow):
	(RaiseWindow):
	grab buttons on focused window after raise/lower to make sure that
	...ClickRaises works if a window was raised above the window under the
	pointer

	* fvwm/stack.c (LowerWindow):
	(RaiseWindow):
	restored sending M_RAISE_WINDOW and M_LOWER_WINDOW that was accidentally
	removed somewhere after 2.2 - fixes missing raise/lower events in
	FvwmEvent
	(restack_windows):
	fixed an error message

2001-05-27  Dan Espen  <dane@mk.telcordia.com>

	* INSTALL.fvwm: Remove information about obsolete
	--disable-modality, --enable-move-bug-workaround.
	Supplement LDFLAGS with flags for other platforms.

2001-05-27  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/functions.c (execute_function):
	print log commands after expansion rather than before

2001-05-24  Mikhael Goikhman  <migo@homemail.com>

	* NEWS:
	* fvwm/fvwm2.1:
	* fvwm/functions.c (expand):
	(execute_function):
	Module configuration commands are now processed like any other
	commands (so "+ I $0" when $0 is "*FvwmPager..." is now recognized
	as a module command, as well as "+ I *$0" when $0 is "FvwmPager...").
	This also means that parameters are expanded now in module lines,
	except for single alphabetical-letter parameters, which are not
	expanded for backward compatibility.

	* Makefile.am:
	make older bzip2 work too

	* fvwm/read.c (run_command_stream):
	strip trailing end of line in commands

2001-05-22  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/stack.c (is_on_top_of_layer):
	never consider a window to be "on top" with windows X servers

	* fvwm/virtual.c (checkPanFrames):
	cleaned up code duplication and logic

	* fvwm/events.c (HandleConfigureRequest):
	fixed random client window size when ConfigureNotify caused a restack
	but no size change; fixes "import -frame" problem

2001-05-20  Mikhael Goikhman  <migo@homemail.com>

	* INSTALL.fvwm: remove a note about the old Cygwin (hopefully fixed)
	* configure.in: say that rplay is needed for FvwmEvent only
	* fvwm/fvwm2.1: several typos and corrections
	* fvwm/gnome.c: use True/False instead of On/Off in WindowShade
	* README: s/2.3.0/2.4.0/

2001-05-19  olicha  <olivier.chapuis@free.fr>

	* fvwm/gnome.c (GNOME_HandlePropRequest):
	Fixed GNOME Shade state

2001-05-16  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/fvwm2.1:
	more explanations about module aliases

2001-05-14  Dan Espen  <dane@mk.telcordia.com>

	* libs/Graphics.c (CreateGradientPixmap): Avoid divide by zero errors
	in S,C,Y Gradients with the help of a very smart horse.

2001-05-14  olicha  <olivier.chapuis@free.fr>

	* acinclude.m4:
	Fixed (true) IMLIB test (never used) and say that we test GDK Imlib
	in GDK Imlib test

2001-05-09  Hippo

	* fvwm/focus.c (warp_to_fvwm_window):
	WarpToWindow handles negative numbers

2001-05-11  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/focus.c (DoSetFocus):
	another attempt to fix "Globally Active" input model

2001-05-10  Mikhael Goikhman  <migo@homemail.com>

	* session.c (get_version_string):
	increment state file version since struct window_flags was changed

2001-05-10  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c (HandlePropertyNotify):
	* fvwm/icons.c (Iconify):
	* fvwm/window_flags.h (HAS_ICON_CHANGED):
	* fvwm/fvwm.h (struct):
	Fixed active icon change when window was not iconified.

	* fvwm/focus.c (DoSetFocus):
	Fixed "Globally Active" input model

2001-05-09  André Dahlqvist  <anedah-9@sm.luth.se>

	* README: Minor wording change.

2001-05-09  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/fvwm2.1:
	added default menu binding to description

2001-05-09  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/functions.c (DeferExecution):
	fixed keyboard lockup

	* fvwm/events.c (HandleLeaveNotify):
	took out the rest of the icon title expansion patch

2001-05-08  Mikhael Goikhman  <migo@homemail.com>

	* sample.fvwmrc/system.fvwm2rc-sample-95:
	several fixes; use a new module config

	* fvwm/icons.c (DrawIconWindow):
	restored behaviour "enter icon - expand title, leave icon - collapse"
	changed yesterday

2001-05-07  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/icons.c (DrawIconWindow):
	fixed icon title expansion while icon has focus
	* fvwm/events.c (HandleLeaveNotify):
	fixed enter and leave notify events for icons in scripts

2001-05-06  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/fvwm2.1:
	FVWM --> fvwm in some places

2001-05-06  Mikhael Goikhman  <migo@homemail.com>

	* acconfig.h:
	* acinclude.m4:
	* configure.in:
	* fvwm/fvwm.c:
	renamed "Imlib" support to "GDK Imlib"

2001-05-04  Mikhael Goikhman  <migo@homemail.com>

	* NEWS, configure.in:
	changed version to 2.3.33

2001-05-04  Mikhael Goikhman  <migo@homemail.com>

	* configure.in:
	report gdk-imlib support in FvwmGtk; don't report gnome-libs and
	gdk-imlib support in FvwmGtk if FvwmGtk is not installed;
	rename $*_gnome to $*_gnomewm to reduce confusion

	* INSTALL.fvwm:
	added a note for Cygwin users, other minor documentation improvements

	* NEWS:
	document latest changes

2001-05-03  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c (HandleEnterNotify):
	Another attempt to MouseFocus transition

2001-05-03  Mikhael Goikhman  <migo@homemail.com>

	* acinclude.m4:
	enabled and fixed imlib test;
	don't write all verbose tips for imlib to stdout, but to config.log

2001-05-02  Dan Espen  <dane@mk.telcordia.com>

	* fvwm/events.c (HandleEnterNotify): Backout fixed MouseFocus
	transition w/ neverfocus and clicktofocus change and some debug stmts.

2001-05-01  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c (HandleConfigureRequest):
	(HandleConfigureRequest):
	Applied Tk drawing after restack patch by Slaven Rezic
	(HandleEnterNotify):
	fixed MouseFocus transition w/ neverfocus and clicktofocus

2001-05-01  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/misc.c:
	added missing #include <time.h> needed for FVWM_DEBUG_TIME

	* configure.in:
	* acconfig.h:
	* fvwm/functions.c (execute_function):
	* INSTALL.fvwm:
	added --enable-command-log configure option using FVWM_COMMAND_LOG
	for logging all executed commands, this also enables reporting times

	* INSTALL:
	restored previous underlying style using '='

2001-04-28  Dan Espen  <dane@mk.telcordia.com>

	* libs/Graphics.c (AllocNonlinearGradient): Removed aborts from
	gradient calculation consistency checks.

2001-04-27  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c (HandleEnterNotify):
	(HandleLeaveNotify):
	tried to fix focus/grab interaction

2001-04-26  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/fvwm2.1 (Note):
	slightly better explanation of context window in functions

	* fvwm/stack.c (mark_transient_subtree):
	fixed collection of transients on same layer

2001-04-23  Dan Espen  <dane@mk.telcordia.com>

	* fvwm/placement.c (PlaceWindow): Ungrab the pointer when window
	disappears during placement.

2001-04-23  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/add_window.c (AddWindow):
	Explicitly destroy a window at the end of the function if the client
	window does not exist anymore.

2001-04-22  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c (HandleEnterNotify):
	a little event handling clean up

	* fvwm/events.h:
	EnterNotify and LeaveNotify are generated only for the decor_w and the
	client window

	* fvwm/placement.c (PlaceWindow):
	do not free window structure in placement code; fixes core dump

2001-04-21  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/fvwm.c (FvwmErrorHandler):
	suppress error messages for X_ConfigureWindow requests

	* fvwm/events.c (HandleEnterNotify):
	make sure window under pointer gets the focus after a restart

2001-04-20  Dominik Vogt  <dominik.vogt@gmx.de>

	* libs/Target.c (fvwmlib_get_target_window):
	* libs/Grab.c (MyXGrabKeyboard):
	(MyXUngrabKeyboard):
	* fvwm/placement.c (PlaceWindow):
	(PlaceWindow):
	* fvwm/move_resize.c (AnimatedMoveAnyWindow):
	(InteractiveMove):
	(CMD_Resize):
	(InteractiveMove):
	(AnimatedMoveAnyWindow):
	(CMD_Resize):
	* fvwm/functions.c (DeferExecution):
	* fvwm/builtins.c (CMD_StrokeFunc):
	* fvwm/menus.c (do_menu):
	new functions MyXGrabKeyboard and MyXUngrabKeyboard to handle multiple
	keyborad grabs
	fixes focus lost during menu animation

2001-04-19  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/fvwm2.1:
	corrected a spacing and contradicting info in FakeClick entry
	(it once suggested to use depth 1 and once depth 0 for the root)

2001-04-15  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/menus.c (get_one_menu_position_argument):
	warning fixes

	* libs/Parse.c (GetSuffixedIntegerArguments):
	(SuffixToPercentValue):
	(GetTokenIndex):
	(GetNextTokenIndex):
	use pointers instead of arrays as function parameters to suppress some
	warnings

	* fvwm/functions.c (DeferExecution):
	grab keyboard when selecting a window to fix similar problem

	* fvwm/placement.c (PlaceWindow):
	wire frame placement fix w/ keyboard

2001-04-14  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/move_resize.c (InteractiveMove):
	(CMD_Resize):
	grab keyboard during wire frame moves too so that keyboard input is not
	passed to a window below; fixed moving window frames with the keyboard
	same for resizing
	fixed X freeze when window disappeared before the server was grabbed
	check if a shaded window still exists too

2001-04-11  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/fvwm2.1 (Example):
	* fvwm/move_resize.c (CMD_SnapAttraction):
	* libs/defaults.h (DEFAULT_SNAP_ATTRACTION_ON_MODE):
	Some corrections in man page and SnapAttraction parsing

2001-04-09  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/icons.c (DeIconify):
	(Iconify):
	set focus to the correct window when iconifying transient window trees
	fix deiconifying windows on other pages

	* fvwm/icons.c (DeIconify):
	* fvwm/events.c (HandleUnmapNotify):
	* fvwm/add_window.c (destroy_window):
	* fvwm/focus.c (restore_focus_after_unmap):
	Delete and set focus when a window is moved to a desk or iconified or
	deiconified

	* fvwm/virtual.c (do_move_window_to_desk):
	delete focus when moving focused window to another desk

2001-04-08  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/borders.c (draw_clipped_decorations):
	(get_common_decorations):
	force redrawing

2001-04-07  Dan Espen  <dane@mk.telcordia.com>

	* NEWS, configure.in:
	changed version to 2.3.32

2001-04-07  Dominik Vogt  <dominik.vogt@gmx.de>

	* sample.fvwmrc/DecorWin95:
	* sample.fvwmrc/DecorMwm:
	add "Destroydecor recreate DecorBase"

	* fvwm/builtins.c (DestroyFvwmDecor):
	(CMD_DestroyDecor):
	added the recreate option to the DestroyDecor command

	* fvwm/focus.c:
	* fvwm/misc.c (UngrabEm):
	(GrabEm):
	* fvwm/icons.c (Iconify):
	* fvwm/add_window.c (destroy_window):
	* fvwm/events.c (HandleUnmapNotify):
	removed all of the code dealing with the old Scr.PreviousFocus window
	which was essentially a no-op with a host of unwanted side effects.
	The idea was to suppress the EnterNotify and LeaveNotify events caused
	by grabbing and ungrabbing the pointer by transferring the focus to
	Scr.NoFocusWin before grabbing and restoring it afterwards.  But of
	course the focus has no effent on Enter/LeaveNotify events, only on
	FocusIn/FocusOut events which are not generated by grabbing or
	ungrabbing the pointer.

	* fvwm/misc.c (GrabEm):
	(UngrabEm):
	transfer focus to Scr.NoFocusWin for GRAB_BUSY also

	* fvwm/events.c (HandleEnterNotify):
	(HandleLeaveNotify):
	fixed Prev command with MosueFocus or SloppyFocus

	* fvwm/focus.c (clear_focus_window):
	new function

	* fvwm/events.c (HandlePropertyNotify):
	small focus handling fix

	* fvwm/focus.c (FocusOn):
	a little clean up

	* fvwm/misc.c (GrabEm):
	safety patch

	* fvwm/focus.c (set_focus_window):
	(restore_prevfocus_window):
	(DoSetFocus):
	(restore_focus_after_unmap):
	fixed window list order

	* fvwm/conditional.c (Circulate):
	cleaned up

	* **/.cvsignore:
	added gmon.out

2001-04-06  Dan Espen  <dane@mk.telcordia.com>

	* sample.fvwmrc/DecorMwm:
	* sample.fvwmrc/DecorWin95: Use one decor, remove DestroyDecor.

2001-04-07  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/menus (scanForHotkeys):
	don't set hotkey if a string after a mark is empty, this fixes the
	core dump later in draw_underline()

	* fvwm/fvwm2.1:
	use bold instead of quotes in "initialization functions" section

2001-04-06  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/move_resize.c (CMD_Maximize):
	fixed maximize - move - maximize on pages other than 0 0

	* fvwm/module_interface.c (make_named_packet):
	(make_vpacket):
	truncate packets longer than allowed max size

	* fvwm/fvwm.c (CatchRedirectError):
	(CatchFatal):
	warning fix

2001-04-05  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/menus.c (DestroyMenu):
	fixed menus being overwritten by copies of other menus

2001-04-04  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/virtual.c (MoveViewport):
	do not overwrite 'previous' page when switching pages without actually
	moving the viewport

2001-04-05  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/screen.h (ScreenInfo):
	* fvwm/events.c (HandleUnmapNotify):
	(HandleFocusIn):
	(HandleKeyPress):
	(HandlePropertyNotify):
	(HandleLeaveNotify):
	(HandleEnterNotify):
	(HandleButtonPress):
	(HandleUnmapNotify):
	(HandleMapNotify):
	(HandleMapRequestKeepRaised):
	(HandleEnterNotify):
	(HandleLeaveNotify):
	* fvwm/virtual.c (MapDesk):
	(UnmapDesk):
	* fvwm/icons.c (DeIconify):
	(Iconify):
	* fvwm/fvwm.c (InitVariables):
	(InitVariables):
	* fvwm/move_resize.c (CMD_Maximize):
	(handle_stick):
	* fvwm/update.c (apply_decor_change):
	(flush_window_updates):
	* fvwm/windowlist.c (CMD_WindowList):
	* fvwm/conditional.c (Circulate):
	(MatchesConditionMask):
	* fvwm/builtins.c (CMD_WindowShade):
	* fvwm/add_window.c (CaptureAllWindows):
	(destroy_window):
	* fvwm/misc.c (GrabEm):
	removed Focus, LastScreenFocus and PreviousFocus members from screen
	struct; handle these locally in focus.c and provide access functions
	fixed Prev condition in complex functions

	* fvwm/conditional.c (MatchesConditionMask):
	fixed core dump

	* fvwm/focus.c (get_focus_window):
	(get_current_focus_window):
	(set_focus_window):
	(store_prevfocus_window):
	new functions

2001-04-04  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/functions.c (AddToFunction):
	allow "Click", "Hold", etc. in addition to single letter function
	specifiers
	(execute_complex_function):
	a little clean up
	(AddToFunction):
	added a warning when a command or function name is used as the function
	specifier

2001-03-30  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/focus.c (DoSetFocus):
	fixed keyboard input in active icons

	* fvwm/menus.c (MenuInteraction):
	fixed PopdownDelay when entering a menu item with a non existent sub
	menu
	(MenuInteraction):
	fixed core dump and screwed up warping w/ animated menus

	* fvwm/virtual.c (MapDesk):
	return focus to window on other desk when switching desks

	* fvwm/borders.c (DrawButton):
	fixed core dump

2001-03-28  Dan Espen  <dane@mk.telcordia.com>

	* sample.fvwmrc/Makefile.am (EXTRA_DIST):
	* sample.fvwmrc/DecorMwm:
	* sample.fvwmrc/DecorWin95:
	* sample.fvwmrc/decor_examples: Decors come in separate files,
	Changing to a new decor is remembered.

2001-03-29  Dominik Vogt  <dominik.vogt@gmx.de>

	* NEWS, configure.in:
	changed version to 2.3.31

2001-03-29  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/move_resize.c (DoSnapAttract):
	fixed windows snapping off screen

	* fvwm/borders.c (RedrawBorder):
	rewrote and fixed handle drawing

2001-03-28  Dominik Vogt  <dominik.vogt@gmx.de>

	* sample.fvwmrc/system.fvwm2rc:
	fixed *FvwmIconMan*sort and ...*dontshow resources

	* sample.fvwmrc/decor_examples:
	* sample.fvwmrc/system.fvwm2rc-sample-1:
	* sample.fvwmrc/system.fvwm2rc:
	fixed MenuStyle commands

	* libs/Graphics.c (AllocLinearGradient):
	fixed rounding errors
	(AllocLinearGradient):
	removed debug code

	* fvwm/move_resize.c (CMD_Resize):
	fixed resizing shaded windows

2001-03-27  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/session.c (get_version_string):
	window_flags changed, so state file version should be increased

2001-03-27  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/add_window.c (setup_style_and_decor):
	* fvwm/builtins.c (CMD_ChangeDecor):
	* fvwm/window_flags.h:
	* fvwm/fvwm.h (struct):
	fixed (?) ChangeDecor/UseDecor/Style problem

2001-03-26  Dan Espen  <dane@mk.telcordia.com>

	* fvwm/add_window.c (setup_style_and_decor): Make useDecor work again.

2001-03-26  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/focus.c (ReturnFocusWindow):
	new function

	* fvwm/misc.c (UngrabEm):
	fixed pointer grabbing/focus after a menu closes

	* fvwm/move_resize.c (CMD_Resize):
	fixed resizing shaded windows w/ titleatbottom

2001-03-25  Dominik Vogt  <dominik.vogt@gmx.de>

	* INSTALL.fvwm (Note):
	* vms/config.h:
	* fvwm/cursor.h:
	* acconfig.h:
	* configure.in:
	* fvwm/builtins.c (CMD_BugOpts):
	* fvwm/fvwm.c (InitVariables):
	removed --enable-move-bug-workaround configure option
	removed --disable-modality configure option
	removed remnants of BUSYCURSOR configure option

2001-03-24  Mikhael Goikhman  <migo@homemail.com>

	* NEWS:
	* sample.fvwmrc/system.fvwm2rc-sample-2:
	small rewording/spelling

2001-03-24  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/modconf.c (CMD_Send_ConfigInfo):
	* fvwm/module_interface.c (CMD_SendToModule):
	* fvwm/builtins.c (CMD_Beep):
	(CMD_EscapeFunc):
	* fvwm/gnome.c (CMD_GnomeShowDesks):
	(CMD_GnomeButton):
	* fvwm/modconf.c (CMD_DestroyModuleConfig):
	* fvwm/windowlist.c (CMD_WindowList):
	* fvwm/virtual.c (CMD_EdgeThickness):
	(CMD_EdgeScroll):
	(CMD_EdgeResistance):
	(CMD_DesktopSize):
	(CMD_GotoDesk):
	(CMD_GotoDeskAndPage):
	(CMD_GotoPage):
	(CMD_MoveToDesk):
	(CMD_Scroll):
	* fvwm/update.c (CMD_UpdateStyles):
	* fvwm/style.c (CMD_DestroyStyle):
	(CMD_StyleStyle):
	* fvwm/stack.c (CMD_Raise):
	(CMD_Lower):
	(CMD_RaiseLower):
	(CMD_Layer):
	(CMD_DefaultLayers):
	* fvwm/session.c (CMD_QuitSession):
	(CMD_SaveSession):
	(CMD_SaveQuitSession):
	* fvwm/repeat.c (CMD_Repeat):
	* fvwm/read.c (CMD_Read):
	(CMD_PipeRead):
	* fvwm/placement.c (CMD_PlaceAgain):
	* fvwm/move_resize.c (CMD_ResizeMove):
	(CMD_Move):
	(CMD_AnimatedMove):
	(CMD_MoveToPage):
	(CMD_MoveThreshold):
	(CMD_OpaqueMoveSize):
	(CMD_HideGeometryWindow):
	(CMD_SnapAttraction):
	(CMD_SnapGrid):
	(CMD_XorValue):
	(CMD_XorPixmap):
	(CMD_Resize):
	(CMD_Maximize):
	(CMD_Stick):
	* fvwm/module_interface.c (CMD_Module):
	(CMD_ExecuteModuleSynchronous):
	(CMD_KillModule):
	(CMD_set_mask):
	(CMD_set_sync_mask):
	(CMD_set_nograb_mask):
	* fvwm/menus.c (CMD_DestroyMenu):
	(CMD_Popup):
	(CMD_DestroyMenuStyle):
	(CMD_CopyMenuStyle):
	(CMD_MenuStyle):
	(CMD_ChangeMenuStyle):
	(CMD_AddToMenu):
	* fvwm/icons.c (CMD_Iconify):
	* fvwm/focus.c (CMD_FlipFocus):
	(CMD_Focus):
	(CMD_WarpToWindow):
	* fvwm/cursor.c (CMD_CursorStyle):
	(CMD_BusyCursor):
	* fvwm/conditional.c (CMD_Prev):
	(CMD_Next):
	(CMD_None):
	(CMD_Current):
	(CMD_All):
	(CMD_Direction):
	(CMD_Pick):
	(CMD_WindowId):
	* fvwm/builtins.c (CMD_WindowShade):
	(CMD_Bell):
	(CMD_Plus):
	(CMD_DestroyFunc):
	(CMD_AddToFunc):
	(CMD_Nop):
	(CMD_CursorMove):
	(CMD_Destroy):
	(CMD_Delete):
	(CMD_AddToDecor):
	(CMD_Close):
	(CMD_Restart):
	(CMD_ExecUseShell):
	(CMD_Exec):
	(CMD_RefreshWindow):
	(CMD_Refresh):
	(CMD_RefreshWindow):
	(CMD_Wait):
	(CMD_Quit):
	(CMD_QuitScreen):
	(CMD_Echo):
	(CMD_ColormapFocus):
	(CMD_SetClick):
	(CMD_ImagePath):
	(CMD_IconPath):
	(CMD_PixmapPath):
	(CMD_ModulePath):
	(CMD_ModuleTimeout):
	(CMD_HilightColor):
	(CMD_HilightColorset):
	(CMD_TitleStyle):
	(CMD_AddTitleStyle):
	(CMD_Colorset):
	(CMD_DefaultIcon):
	(CMD_DefaultColorset):
	(CMD_DefaultColors):
	(CMD_DefaultFont):
	(CMD_IconFont):
	(CMD_WindowFont):
	(CMD_ChangeDecor):
	(CMD_DestroyDecor):
	(CMD_AddToDecor):
	(CMD_UpdateDecor):
	(CMD_ButtonStyle):
	(CMD_AddButtonStyle):
	(CMD_SetEnv):
	(CMD_UnsetEnv):
	(CMD_GlobalOpts):
	(CMD_BugOpts):
	(CMD_Emulate):
	(CMD_ColorLimit):
	(CMD_SetAnimation):
	(CMD_WindowShadeAnimate):
	(CMD_FakeClick):
	(CMD_StrokeFunc):
	(CMD_ClickTime):
	* fvwm/borders.c (CMD_ButtonState):
	(CMD_BorderStyle):
	* fvwm/bindings.c (CMD_Stroke):
	(CMD_Mouse):
	(CMD_PointerKey):
	(CMD_Key):
	(CMD_IgnoreModifiers):
	* fvwm/add_window.c (CMD_RecaptureWindow):
	(CMD_Recapture):
	* fvwm/functions.c (CMD_Silent):
	* fvwm/functions.c (func_config):
	* fvwm/commands.h:
	renamed all functions for external commands to "CMD_commandname"

	* fvwm/functions.c (func_config):
	introduced a command table macro and added a column that hold the old
	spelling of the command names

	* NEWS:
	* fvwm/fvwm2.1 (sub-menu):
	typo corrections

	* vms/fvwmrc.dat:
	* sample.fvwmrc/system.fvwm2rc-sample-95:
	* sample.fvwmrc/system.fvwm2rc-sample-2:
	* sample.fvwmrc/system.fvwm2rc-sample-1:
	* sample.fvwmrc/system.fvwm2rc:
	* sample.fvwmrc/decor_examples:
	* sample.fvwmrc/new-features:
	* fvwm/ConfigFvwmSetup:
	converted to new placement style names

2001-03-23  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/borders.c (RedrawButtons):
	(RedrawTitle):
	fixed core dumps

2001-03-22  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/functions.c (execute_complex_function):
	fixed button presses being passed to other applications with functions
	that only have immediate actions

	* libs/Parse.c (ParseToggleArgument):
	backed out to allow '1' and '0' as true and false because it breaks
	parsing in several places

2001-03-21  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/builtins.c (do_title_style):
	fixed typo

2001-03-22  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c (HandleMapRequestKeepRaised):
	* fvwm/virtual.c (unmap_window):
	(map_window):
	disabled ICCCM2 patch that unmaps the client window whenever the frame
	is unmapped since it causes way too mouch trouble. #define
	ICCCM2_UNMAP_WINDOW_PATCH to enable it

	* libs/Graphics.c (ParseGradient):
	added an error message if number of gradient segments does not match
	the given number of colours and percentages
	(ParseGradient):
	(CreateGradientPixmapFromString):
	improved error messages
	(ParseGradient):
	small parsing fixes

2001-03-21  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/fvwm.c (MappedNotOverride):
	* fvwm/builtins.c (RecaptureWindow):
	(Recapture):
	(do_recapture):
	* fvwm/fvwm.c (Reborder):
	(CaptureOneWindow):
	(hide_screen):
	(CaptureAllWindows):
	functions moved to add_window.c

	* fvwm/session.c (RestartInSession):
	fixed windows travelling upon restart with outdated session state file

2001-03-19  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/builtins.c (button_states):
	fixed core dump

	* fvwm/events.c (HandleUnmapNotify):
	call XSync() after releasing a client window

2001-03-18  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/borders.c (RedrawTitle):
	(RedrawButtons):
	(DrawButton):
	(draw_clipped_decorations):
	vastly improved speed of window motion with pixmap backgrounds in
	titles and buttons
	(get_button_state):
	removed debug statement

	* fvwm/builtins.c (ReadTitleButton):
	* fvwm/fvwm.c (DestroyAllButtons):
	(ResetAllButtons):
	* fvwm/borders.c (get_button_state):
	renamed button states

	* sample.fvwmrc/system.fvwm2rc-sample-2:
	* sample.fvwmrc/system.fvwm2rc-sample-1:
	* sample.fvwmrc/system.fvwm2rc:
	* sample.fvwmrc/decor_examples:
	* sample.fvwmrc/new-features:
	converted to new config file format

	* fvwm/builtins.c (SetGlobalOptions):
	cleaned up parsing, save some bytes

	* libs/Parse.c (ParseToggleArgument):
	allow '1' and '0' as toggling arguments

	* fvwm/builtins.c (ReadTitleButton):
	cleaned up parsing
	prevent unnecessary multiple parsing

	* fvwm/menus.c (MenuInteraction):
	fixed menus no longer popping up or down under certain circumstances
	(MenuInteraction):
	small performance enhancement for non animated menus
	removed old debug statements

2001-03-17  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c:
	initialise PressedW with "None"
	(HandleButtonPress):
	do not redraw decoration when an unbound mouse button is used

2001-03-14  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/session.c (MatchWinToSM):
	fixed a case when win->name becomes NULL (if there is window role);
	(new get_version_string):
	make a state file version static (2.4-1 for now);
	(new unspace_string):
	fixed matching windows with command line arguments having spaces

2001-03-14  Dominik Vogt  <dominik.vogt@gmx.de>

	* libs/WinMagic.c (SlideWindow):
	better math to protect against integer overflows
	(SlideWindow):
	fixed percent list sliding spec

	* fvwm/events.c (HandleConfigureRequest):
	fixed XMoveResize requests that leave the x/y position unchanged for
	windows with South/East gravity

	* fvwm/move_resize.c (DoSnapAttract):
	fixed core dump

2001-03-12  Dominik Vogt  <dominik.vogt@gmx.de>

	* libs/Picture.c (GetColor):
	allocate colours from a colour set
	removed unused variable

	* fvwm/move_resize.c (moveLoop):
	removed debug code
	(MoveOutline):
	(get_outline_rects):
	reactivated wire frame interleaving to reduce flickering

	* libs/defaults.h:
	* fvwm/menus.c (paint_menu):
	moved a macro to defaults.h

2001-03-11  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/move_resize.c (SetSnapAttraction):
	removed debug code

	* fvwm/icccm2.c (SetupICCCM2):
	(CloseICCCM2):
	* fvwm/fvwm.h:
	* fvwm/menus.c (do_menu):
	(make_menu_window):
	* fvwm/fvwm.c (main):
	(main):
	(MappedNotOverride):
	* fvwm/icccm2.c (SetupICCCM2):
	* fvwm/virtual.c (initPanFrames):
	* fvwm/menus.c (MenuInteraction):
	* fvwm/icons.c (CreateIconWindow):
	(CreateIconWindow):
	* fvwm/add_window.c (setup_parent_window):
	(setup_button_windows):
	(setup_decor_window):
	(setup_resize_handle_windows):
	(AddWindow):
	(setup_frame_window):
	* fvwm/events.c (HandleReparentNotify):
	(HandleMapNotify):
	* fvwm/add_window.h:
	all window event masks are defined as macros in events.h
	frame window selects VisibilityNotifyMask so that the raised/visible
	conditions work again

	* vms/make_fvwm.mms (BaseDirFix):
	* todo-2.4:
	* sample.fvwmrc/system.fvwm2rc-sample-95:
	* sample.fvwmrc/decor_examples:
	* libs/vpacket.h:
	* INSTALL.fvwm:
	* INSTALL:
	* fvwm/virtual.c:
	* fvwm/module_interface.c:
	changed some comments so that they don't look like cvs conflict markers

	* fvwm/move_resize.c (SetSnapAttraction):
	(DoSnapAttract):
	* libs/defaults.h (DEFAULT_SNAP_GRID_X):
	fixed a bug in SnapAttraction parsing
	cut down CPU requirements when verious parts of SnapAttraction are
	 disabled; this makes window movement more smooth
	fixed a bug that mad it impossible to snap to windows so that the x or y
	 coordinate became -1

	* fvwm/move_resize.c (MoveOutline):
	moving windows looks a bit more smooth

2001-03-10  Dominik Vogt  <dominik.vogt@gmx.de>

	* tests/FvwmButtons/FvwmButtons.sh:
	Make sure some styles are set properly for FvwmButtons
	new options -S and -k
	simplified a bit

	* tests/purify/purify.fvwm2rc:
	merged ImagePath and SetEnv tests and enhanced SetEnv tests

	* fvwm/move_resize.c (MoveOutline):
	revised outline drawing code for small windows and simplified code

2001-03-10  Dan Espen  <dane@mk.telcordia.com>

	* tests/FvwmButtons/FvwmButtons.sh: More tests.
	* tests/purify/purify.fvwm2rc: Add xbm bitmap as a side pic,
 	default icon.

2001-03-10  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/events.c (HandleReparentNotify):
	* fvwm/add_window.c (setup_frame_window):
	* fvwm/add_window.h:
	discard events after window was reparented

	* fvwm/stack.c (mark_transient_subtree):
	fixed core dump

	* libs/ColorUtils.c (GetShadowOrHiliteColor):
	attempt to 'fix' UMR

	* fvwm/colors.c (FreeColors):
	* fvwm/builtins.c (SetDefaultColors):
	* fvwm/module_interface.c (send_list_func):
	* fvwm/events.c (HandleFocusIn):
	* fvwm/cursor.c (CursorStyle):
	* fvwm/menus.c (NewMenuStyle):
	(UpdateMenuStyle):
	* fvwm/fvwm.c (InitVariables):
	(CreateGCs):
	(InitVariables):
	* libs/defaults.h (DEFAULT_BACK_COLOR):
	Define some default colours in defaults.h and use them everywhere.

	* libs/Colorset.c (AllocColorset):
	hardware portability patch; don't assume layout of the colorset_struct
	type

	* libs/envvar.c (getEnv):
	initialise a temporary variable

	* fvwm/builtins.c (add_to_env_list):
	fixed SetEnv memory leak

	* fvwm/session.c (saveQuitSession):
	removed c++ comment

	* libs/envvar.c (strIns):
	commented debug code
	(envDupExpand):
	removed debug code

	* fvwm/add_window.c (free_window_names):
	fixed memory leak

	* libs/Picture.c (LoadPicture):
	fixed core dump with xmb files

	* fvwm/menus.c (MenuInteraction):
	fixed core dump

2001-03-10  Mikhael Goikhman  <migo@homemail.com>

	* fvwm/fvwm2.1:
	documented xsm DiscardCommand workaround using $SESSION_MANAGER_NAME

	* fvwm/windowlist.c:
	safety fix, this fixes core dump in WindowList under xsm

2001-03-07  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/menus.c (DestroyMenu):
	(copy_menu_root):
	fixed handling of continuation menus with dynamic menu actions

	* fvwm/menus.c (pop_menu_down):
	(DestroyMenu):
	(destroy_menu):
	(merge_continuation_menus):
	* fvwm/windowlist.c (do_windowList):
	fixed deleting menus from dynamic menu actions

	* fvwm/menus.c (DestroyMenu):
	Fixed menu list corruption
	(make_menu):
	do not resize menu if it has other mapped copies
	(update_menu):
	do not update menu style for menus with copies
	(DestroyMenu):
	returns if menu was actually destroyed or not

2001-03-05  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/menus.c (size_menu_vertically):
	fixed continuation menus with embedded spacing and quoting characters in
	their name

	* libs/Parse.c (EscapeStripng):
	new function

2001-03-04  Dan Espen  <dane@mk.telcordia.com>

	* tests/FvwmButtons/FvwmButtons.sh: Framework for tests.

2001-03-02  Dan Espen  <dane@mk.telcordia.com>

	* fvwm/fvwm2.1 (FakeClick): Add example.  Style changes focusing on
	the word "will".

2001-03-03  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/geometry.c (get_unshaded_geometry):
	* fvwm/update.c (apply_window_updates):
	fixed recapturing shaded windows on pages other than 0 0

	* fvwm/builtins.c (fake_click):
	fixed a bug in button number parsing
	(fake_click):
	properly deliver faked events

	* libs/ColorUtils.c (GetShadowColor):
	(GetHiliteColor):
	finished reverting back to 2.3.22 colour calculations

	* fvwm/menus.c (MenuInteraction):
	fixed busy wait with PopupDelay menu style

2001-03-02  Dan Espen  <dane@mk.telcordia.com>

	* AUTHORS: Added some nice background information for Chuck Hines.

2001-03-02  Dominik Vogt  <dominik.vogt@gmx.de>

	* NEWS, configure.in:
	changed version to 2.3.30

2001-03-02  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/fvwm2.1:
	* fvwm/builtins.c (do_recapture):
	* fvwm/stack.h:
	* fvwm/externs.h:
	* fvwm/stack.c (verify_stack_ring_consistency):
	(dump_stack_ring):
	(verify_stack_ring_consistency):
	* fvwm/fvwm.c (main):
	disabled stack ring debugging by default
	to enable use the -debug_stack_ring option
	verify stack ring consistency after a recapture

	* fvwm/borders.c (draw_clipped_decorations):
	(get_common_decorations):
	further performance enhancement

	* fvwm/borders.c (draw_clipped_decorations):
	removed duplicate get_common_decorations call

	* fvwm/borders.c (draw_clipped_decorations):
	* fvwm/window_flags.h (SET_WINDOW_BORDER_DRAWN):
	* fvwm/fvwm.h:
	force resetting the window border background on initial border drawing

	* libs/ColorUtils.c (GetHiliteColor):
	(GetShadowColor):
	fixed parameters to GetShadowOrHiliteColor calls screwing up colour
	calculations

	* fvwm/events.c (HandleMapRequestKeepRaised):
	icon position hint was sometimes used although it was not set
	(fake_map_unmap_notify):
	(HandleMapRequestKeepRaised):
	simply fake a MapNotify if a MapRequest for an already mapped window
	arrives
	fake an UnmapNotify when a window starts iconic

2001-03-01  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/style.c (ProcessNewStyle):
	fixed reversers window group options

2001-02-28  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/fvwm2.1:
	* fvwm/style.c (ProcessNewStyle):
	* fvwm/style.h:
	* fvwm/window_flags.h (DO_ICONIFY_WINDOW_GROUPS):
	* fvwm/fvwm.h (struct):
	* fvwm/stack.h (mark_transient_subtree):
	* fvwm/stack.c (mark_transient_subtree):
	(collect_transients_recursive):
	* fvwm/icons.c (DeIconify):
	(Iconify):
	new styles IconifyWindowGroups/IconifyWindowGroupsOff.

	* fvwm/placement.c (PlaceWindow):
	fixed a small bug in window group handling

	* fvwm/placement.c (PlaceWindow):
	* fvwm/style.c (ProcessNewStyle):
	* fvwm/style.h:
	* fvwm/window_flags.h (DO_IGNORE_WINDOW_GROUP_HINT):
	* fvwm/fvwm.h (struct):
	new styles KeepWindowGroupsOnDesk/ScatterWindowGroups for use with
	mozilla which misuses the window group hint

2001-02-27  Dominik Vogt  <dominik.vogt@gmx.de>

	* fvwm/menus.c (do_menu):
	gixed event selection when returning from submenus

	* fvwm/placement.c (PlaceWindow):
	small performance enhancement

	* fvwm/gnome.c:
	commented unused code

2001-02-26  Dan Espen  <dane@mk.telcordia.com>

	* NEWS:  Update  news with 2.2.5,  identify   2.2.5 as  the latest
 	stable release.

4 files changed, 20 insertions, 45 deletions

diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index e1adc1c1550..d45bfb5549b 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,27 +1,35 @@
-# $NetBSD: Makefile,v 1.16 2001/06/29 13:58:52 zuntum Exp $
+# $NetBSD: Makefile,v 1.17 2001/07/10 17:51:14 nra Exp $
 #
 
 DISTNAME=       fvwm-${PKG_VERSION}
 PKGNAME=	xpmroot-${PKG_VERSION}
-PKG_VERSION=	2.2.5
 CATEGORIES=	x11
-MASTER_SITES=   ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
-		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
-		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
+MASTER_SITES=   ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
+		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.fvwm.org/generated/manpages/xpmroot.html
 COMMENT=	Sets the root window to an Xpm pixmap
 
+PKG_VERSION=		2.4.0
 USE_BUILDLINK_ONLY=	YES
-USE_X11BASE=	YES
-WRKSRC=		${WRKDIR}/${DISTNAME}/utils
+USE_X11BASE=		YES
+GNU_CONFIGURE=		YES
 
 MAKE_ENV+=	INSTALL_PROGRAM='${INSTALL_PROGRAM}'
 MAKE_ENV+=	INSTALL_MAN='${INSTALL_MAN}'
 MAKE_ENV+=	VERSION=${PKG_VERSION}
+CONFIGURE_ARGS+=	--without-extras --disable-dmalloc --without-gnome
+
+do-build:
+	@(cd ${WRKSRC}/libs && \
+		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all)
+	@(cd ${WRKSRC}/utils && \
+		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xpmroot)
+
+do-install:
+	${INSTALL_PROGRAM}	${WRKSRC}/utils/xpmroot	${PREFIX}/bin
+	${INSTALL_MAN}		${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1
 
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/distinfo b/x11/xpmroot/distinfo
index a23cb9ab1af..6c8b83fe79b 100644
--- a/x11/xpmroot/distinfo
+++ b/x11/xpmroot/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/06/29 13:58:52 zuntum Exp $
+$NetBSD: distinfo,v 1.3 2001/07/10 17:51:14 nra Exp $
 
-SHA1 (fvwm-2.2.5.tar.gz) = 2cb0c6dbd1a361987a301956315d9f3b9a68f78b
-Size (fvwm-2.2.5.tar.gz) = 1080046 bytes
-SHA1 (patch-aa) = 0942aa827c56def48c44e71f81f7678db6ff8192
-SHA1 (patch-ab) = bc7424b13dbe85e2fa4949280e4242dba86af4b1
+SHA1 (fvwm-2.4.0.tar.gz) = b7c4c74a7bfad13f0e0a08f0a5d84e45b43fd129
+Size (fvwm-2.4.0.tar.gz) = 1636066 bytes
diff --git a/x11/xpmroot/patches/patch-aa b/x11/xpmroot/patches/patch-aa
deleted file mode 100644
index 497163106bf..00000000000
--- a/x11/xpmroot/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1999/11/01 08:50:50 rh Exp $
-
---- xpmroot.c.BAK	Mon Feb 22 04:04:55 1999
-+++ xpmroot.c	Mon Feb 22 04:04:58 1999
-@@ -6,8 +6,6 @@
-  * this program or anything related to it.
-  ****************************************************************************/
-
--#include "config.h"
--
- #include <stdio.h>
- #include <signal.h>
- #include <string.h>
diff --git a/x11/xpmroot/patches/patch-ab b/x11/xpmroot/patches/patch-ab
deleted file mode 100644
index b55ed3af72e..00000000000
--- a/x11/xpmroot/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- /dev/null	Fri Jun 29 12:54:37 2001
-+++ Makefile	Fri Jun 29 12:55:05 2001
-@@ -0,0 +1,15 @@
-+#CFLAGS+=	-ggdb
-+CFLAGS+=	-O2
-+
-+CPPFLAGS+=	-DVERSION=\"${VERSION}\"
-+CPPFLAGS+=	-I${X11BASE}/include
-+
-+LDFLAGS+=	-L${X11BASE}/lib
-+
-+all: xpmroot
-+xpmroot: xpmroot.c
-+	${CC} ${CFLAGS} ${CPPFLAGS} -o xpmroot xpmroot.c ${LDFLAGS} -lXpm -lX11
-+
-+install:
-+	${INSTALL_PROGRAM} xpmroot	${PREFIX}/bin
-+	${INSTALL_MAN} xpmroot.1	${PREFIX}/man/man1