5 files changed, 213 insertions, 15 deletions

diff --git a/x11-wm/fvwm/distinfo b/x11-wm/fvwm/distinfo
index e14649a7728a..e5484999fd76 100644
--- a/x11-wm/fvwm/distinfo
+++ b/x11-wm/fvwm/distinfo
@@ -1,3 +1 @@
-MD5 (fvwm-core.tar.gz) = 78020645ce0ccd3c85d49b0c702994db
-MD5 (fvwm-modules.tar.gz) = cc98a361177981560eecfc32ad5f7915
-MD5 (fvwm-icons.tar.gz) = 1d4289d6924b41aad8e499a7cdbdcd04
+MD5 (fvwm-1.24r.tar.gz) = 875733e77e285566197f4b50746aefc6
diff --git a/x11-wm/fvwm/files/patch-ab b/x11-wm/fvwm/files/patch-ab
new file mode 100644
index 000000000000..eb3d98bfd568
--- /dev/null
+++ b/x11-wm/fvwm/files/patch-ab
@@ -0,0 +1,96 @@
+*** ../fvwm-1.24r/configure.h	Mon Nov 28 21:08:47 1994
+--- configure.h	Fri May 12 10:43:43 1995
+***************
+*** 1,7 ****
+! #define FVWMDIR     "/usr/lib/X11/fvwm"
+  /* #define FVWMDIR        "/local/homes/dsp/nation/modules"*/
+! #define FVWM_ICONDIR   "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
+! #define FVWMRC         "/usr/lib/X11/fvwm/system.fvwmrc"
+  
+  /* Imake command needed to put modules in desired target location */
+  /* Use the second version if it causes grief */
+--- 1,7 ----
+! #define FVWMDIR     "/usr/X11R6/lib/X11/fvwm"
+  /* #define FVWMDIR        "/local/homes/dsp/nation/modules"*/
+! #define FVWM_ICONDIR   "/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/X11/pixmaps"
+! #define FVWMRC         "/usr/X11R6/lib/X11/fvwm/system.fvwmrc"
+  
+  /* Imake command needed to put modules in desired target location */
+  /* Use the second version if it causes grief */
+***************
+*** 14,26 ****
+   * If you want to install it in a different directory, uncomment and
+   * edit the first line */
+  /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/
+! #define FVWM_BIN_DIR BINDIR=/usr/bin/X11
+  /*#define FVWM_BIN_DIR*/
+  
+  /* Compiler over-ride for Imakefiles */
+  /* Leave it as shown to get your default compiler */
+! #define COMPILER CC=gcc 
+! /* #define COMPILER */
+  
+  
+  /***************************************************************************
+--- 14,26 ----
+   * If you want to install it in a different directory, uncomment and
+   * edit the first line */
+  /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/
+! #define FVWM_BIN_DIR BINDIR=/usr/X11R6/bin
+  /*#define FVWM_BIN_DIR*/
+  
+  /* Compiler over-ride for Imakefiles */
+  /* Leave it as shown to get your default compiler */
+! /* #define COMPILER CC=gcc */
+! #define COMPILER
+  
+  
+  /***************************************************************************
+***************
+*** 69,82 ****
+   *            undefine(`include') to fix that one. Some version of m4
+   *            seem to give good error messages, others don't?
+   ***************************************************************************/
+! /* #define M4                          */
+  
+  /***************************************************************************
+   *#define NO_PAGER 
+   *   Omits the code for the built-in pager. The pager module FvwmPager
+   *   can be used instead.
+   ***************************************************************************/
+! /* #define NO_PAGER                    */
+  
+  /***************************************************************************
+   *#define NON_VIRTUAL
+--- 69,82 ----
+   *            undefine(`include') to fix that one. Some version of m4
+   *            seem to give good error messages, others don't?
+   ***************************************************************************/
+! #define M4
+  
+  /***************************************************************************
+   *#define NO_PAGER 
+   *   Omits the code for the built-in pager. The pager module FvwmPager
+   *   can be used instead.
+   ***************************************************************************/
+! #define NO_PAGER
+  
+  /***************************************************************************
+   *#define NON_VIRTUAL
+***************
+*** 100,106 ****
+   *   Caused fvwm built-in window-list to be omitted. The window-list
+   *   module FvwmWinList can be used instead 
+   ***************************************************************************/
+! /* #define NO_WINDOWLIST               */
+  
+  /***************************************************************************
+   *#define PRUNE
+--- 100,106 ----
+   *   Caused fvwm built-in window-list to be omitted. The window-list
+   *   module FvwmWinList can be used instead 
+   ***************************************************************************/
+! #define NO_WINDOWLIST
+  
+  /***************************************************************************
+   *#define PRUNE
diff --git a/x11-wm/fvwm/files/patch-ac b/x11-wm/fvwm/files/patch-ac
new file mode 100644
index 000000000000..bc2ecfba2d80
--- /dev/null
+++ b/x11-wm/fvwm/files/patch-ac
@@ -0,0 +1,49 @@
+*** ../fvwm-1.24r/sample.fvwmrc/system.fvwmrc	Fri Dec  2 19:19:12 1994
+--- sample.fvwmrc/system.fvwmrc	Fri May 12 14:33:03 1995
+***************
+*** 17,22 ****
+--- 17,26 ----
+  # If you get it wrong, the most common problem is that color or font settings
+  # are ignored
+  
++ # for m4 processing we have to undefine the include macro or pathts to
++ # /usr/.../include/... will be mangled
++ undefine(`include')
++ 
+  ###########################################################################
+  # set up the colors
+  #
+***************
+*** 63,69 ****
+  # Set windows to auto-raise after 750 milliseconds if you like it.
+  # Autoraise can sometimes obscure pop-up windows. Performance is now
+  # similar to olvwm's auto-raise feature.
+! #AutoRaise 750
+  
+  # Normally, we'll be in focus-follows mouse mode, but uncomment this 
+  # for mwm-style click-to-focus
+--- 67,73 ----
+  # Set windows to auto-raise after 750 milliseconds if you like it.
+  # Autoraise can sometimes obscure pop-up windows. Performance is now
+  # similar to olvwm's auto-raise feature.
+! AutoRaise 500
+  
+  # Normally, we'll be in focus-follows mouse mode, but uncomment this 
+  # for mwm-style click-to-focus
+***************
+*** 227,233 ****
+  
+  Function "InitFunction"
+  	Module	"I"	FvwmBanner
+! 	Exec	"I"	xpmroot /usr/include/X11/pixmaps/fvwm.xpm &
+  	Module	"I"	GoodStuff
+  	Exec	"I"	exec xterm -geometry 80x64+0+0 &
+  	Wait	"I"	xterm
+--- 231,237 ----
+  
+  Function "InitFunction"
+  	Module	"I"	FvwmBanner
+! 	Exec	"I"	xpmroot /usr/X11R6/include/X11/pixmaps/fvwm.xpm &
+  	Module	"I"	GoodStuff
+  	Exec	"I"	exec xterm -geometry 80x64+0+0 &
+  	Wait	"I"	xterm
diff --git a/x11-wm/fvwm/pkg-comment b/x11-wm/fvwm/pkg-comment
index 2782a4845ff1..b3e1f9d4d0f5 100644
--- a/x11-wm/fvwm/pkg-comment
+++ b/x11-wm/fvwm/pkg-comment
@@ -1 +1 @@
-fvwm-1.23b - version 1.23b of of the fvwm window manager - requires XPM
+fvwm-1.24r - version 1.24r of of the fvwm window manager - requires XPM
diff --git a/x11-wm/fvwm/pkg-plist b/x11-wm/fvwm/pkg-plist
index 1f59cdc4dff2..a08198944682 100644
--- a/x11-wm/fvwm/pkg-plist
+++ b/x11-wm/fvwm/pkg-plist
@@ -3,23 +3,78 @@
 @group bin
 bin/fvwm
 bin/xpmroot
-lib/X11/fvwm/FvwmBanner
-lib/X11/fvwm/FvwmClean
-lib/X11/fvwm/FvwmDebug
+lib/X11/fvwm/GoodStuff
 lib/X11/fvwm/FvwmIdent
+lib/X11/fvwm/FvwmDebug
+lib/X11/fvwm/FvwmBacker
+lib/X11/fvwm/FvwmClean
 lib/X11/fvwm/FvwmPager
+lib/X11/fvwm/FvwmAudio
+lib/X11/fvwm/FvwmScroll
+lib/X11/fvwm/FvwmIconBox
 lib/X11/fvwm/FvwmSave
+lib/X11/fvwm/FvwmSaveDesk
+lib/X11/fvwm/FvwmAuto
 lib/X11/fvwm/FvwmWinList
-lib/X11/fvwm/GoodStuff
+lib/X11/fvwm/FvwmBanner
 @mode 644
 lib/X11/fvwm/system.fvwmrc
 man/man1/fvwm.1.gz
-man/man1/FvwmWinList.1.gz
-man/man1/FvwmSave.1.gz
-man/man1/FvwmPager.1.gz
-man/man1/FvwmClean.1.gz
-man/man1/FvwmDebug.1.gz
-man/man1/FvwmIdent.1.gz
 man/man1/GoodStuff.1.gz
-man/man1/FvwmBanner.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmDebug.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmClean.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmWinList.1.gz
 man/man1/xpmroot.1.gz
+man/man1/FvwmBanner.1.gz
+include/X11/pixmaps/arrdown2.xpm
+include/X11/pixmaps/arrows2.xpm
+include/X11/pixmaps/arrup2.xpm
+include/X11/pixmaps/bomb.xpm
+include/X11/pixmaps/clamp.xpm
+include/X11/pixmaps/datebook.xpm
+include/X11/pixmaps/desk.xpm
+include/X11/pixmaps/dialog_box.xpm
+include/X11/pixmaps/editres.xpm
+include/X11/pixmaps/eps.xpm
+include/X11/pixmaps/flow_chart.xpm
+include/X11/pixmaps/folder2.xpm
+include/X11/pixmaps/folders.xpm
+include/X11/pixmaps/fvwm.xpm
+include/X11/pixmaps/fvwm2.xpm
+include/X11/pixmaps/graphs.xpm
+include/X11/pixmaps/mag_glass.xpm
+include/X11/pixmaps/mail1.xpm
+include/X11/pixmaps/mail2.xpm
+include/X11/pixmaps/map.xpm
+include/X11/pixmaps/math4.xpm
+include/X11/pixmaps/page.xpm
+include/X11/pixmaps/page2.xpm
+include/X11/pixmaps/ps.xpm
+include/X11/pixmaps/question.xpm
+include/X11/pixmaps/rbomb.xpm
+include/X11/pixmaps/rcalc.xpm
+include/X11/pixmaps/rterm.xpm
+include/X11/pixmaps/term.xpm
+include/X11/pixmaps/tiff2.xpm
+include/X11/pixmaps/toolbox.xpm
+include/X11/pixmaps/unknown1.xpm
+include/X11/pixmaps/wierd_page3.xpm
+include/X11/pixmaps/word_processor.xpm
+include/X11/pixmaps/xcalc.xpm
+include/X11/pixmaps/xman.xpm
+include/X11/pixmaps/xterm-axp.xpm
+include/X11/pixmaps/xterm-blank.xpm
+include/X11/pixmaps/xterm-dec.xpm
+include/X11/pixmaps/xterm-sgi.xpm
+include/X11/pixmaps/xterm-sol.xpm
+include/X11/pixmaps/xterm-sun.xpm
+include/X11/pixmaps/xterm.xpm