7 files changed, 544 insertions, 78 deletions

diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 7b094fb7be49..3c01321eb193 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	fvwm
-PORTVERSION=	2.6.6
+PORTVERSION=	2.6.7
 CATEGORIES=	x11-wm
-MASTER_SITES=	https://github.com/fvwmorg/fvwm/releases/download/version-2_6_6/ \
+MASTER_SITES=	https://github.com/fvwmorg/fvwm/releases/download/2.6.7/ \
 		http://www.fvwm.org/generated/icon_download/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -45,6 +45,9 @@ DISTFILES+=	${FVWM_ICONS}.tar.bz2
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
+CONFIGURE_ARGS+=	--with-iconv-library=${LOCALBASE}/lib \
+			--with-iconv-includes=${LOCALBASE}/include \
+			--enable-iconv
 USES+=			iconv
 .else
 CONFIGURE_ARGS+=	--disable-iconv
@@ -103,13 +106,6 @@ CONFIGURE_ARGS+=	--disable-nls
 
 .include <bsd.port.pre.mk>
 
-.if empty(ICONV_LIB)
-CONFIGURE_ARGS+=--without-iconv-library
-.else
-CONFIGURE_ARGS+=--with-iconv-library=${ICONV_PREFIX}/lib \
-		--with-iconv-includes=${ICONV_PREFIX}/include
-.endif
-
 .if ${PORT_OPTIONS:MICONS}
 post-extract:
 	@${MKDIR} ${WRKDIR}/icons
@@ -121,7 +117,7 @@ post-patch:
 		${WRKSRC}/modules/FvwmM4/FvwmM4.c
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+	${INSTALL_DATA} ${FILESDIR}/system.fvwm2rc \
 		${STAGEDIR}${PREFIX}/etc/system.fvwm2rc.dist
 .if ${PORT_OPTIONS:MICONS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/fvwm/pixmaps
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
index 378a3fad4f5a..9667401c9f15 100644
--- a/x11-wm/fvwm2/distinfo
+++ b/x11-wm/fvwm2/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1467607673
-SHA256 (fvwm-2.6.6.tar.gz) = c5de085ff25b2128a401a80225481e63335f815f84eea139f80a5f66e606dc2c
-SIZE (fvwm-2.6.6.tar.gz) = 3455632
+TIMESTAMP = 1481896219
+SHA256 (fvwm-2.6.7.tar.gz) = 01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73
+SIZE (fvwm-2.6.7.tar.gz) = 3934327
 SHA256 (fvwm_icons-20070101.tar.bz2) = 86b0164430a3087f5cb8d55eb43a8676bbce495814b30c6844eb127f952642ab
 SIZE (fvwm_icons-20070101.tar.bz2) = 330862
diff --git a/x11-wm/fvwm2/files/patch-configure b/x11-wm/fvwm2/files/patch-configure
deleted file mode 100644
index 40f38a05bb1b..000000000000
--- a/x11-wm/fvwm2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	2012-04-20 13:03:57.000000000 +0200
-+++ configure	2014-03-28 17:42:24.000000000 +0100
-@@ -6492,7 +6492,6 @@
-   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
-   *c = &i; c = p;
-   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
--  return;
-   ;
-   return 0;
- }
diff --git a/x11-wm/fvwm2/files/patch-default-config__Makefile.in b/x11-wm/fvwm2/files/patch-default-config__Makefile.in
new file mode 100644
index 000000000000..781f0a9a41f7
--- /dev/null
+++ b/x11-wm/fvwm2/files/patch-default-config__Makefile.in
@@ -0,0 +1,16 @@
+--- default-config/Makefile.in.orig	2016-11-07 05:51:14.000000000 -0800
++++ default-config/Makefile.in	2016-12-16 12:57:51.976313000 -0800
+@@ -597,9 +597,10 @@
+ 
+ install-data-hook:
+ 	cp -r $(srcdir)/images $(inst_location)
+-	ln -sf $(inst_location)/FvwmScript-DateTime $(inst_location)/..
+-	ln -sf $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/..
+-	ln -sf $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/..
++	cd $(inst_location)
++	ln -sf FvwmScript-DateTime ..
++	ln -sf FvwmScript-ConfirmQuit ..
++	ln -sf FvwmScript-ConfirmCopyConfig ..
+ 
+ uninstall-hook:
+ 	rm -fr $(DESTDIR)/$(configdir)
diff --git a/x11-wm/fvwm2/files/patch-libs-Ficonv.c b/x11-wm/fvwm2/files/patch-libs-Ficonv.c
deleted file mode 100644
index 302368735184..000000000000
--- a/x11-wm/fvwm2/files/patch-libs-Ficonv.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/Ficonv.c.orig	2011-08-16 09:05:53.000000000 +0200
-+++ libs/Ficonv.c	2014-03-29 17:17:54.000000000 +0100
-@@ -36,7 +36,7 @@
- #if defined(USE_LIBICONV) && !defined (_LIBICONV_H)
- #error libiconv in use but included iconv.h not from libiconv
- #endif
--#if !defined(USE_LIBICONV) && defined (_LIBICONV_H)
-+#if !defined(USE_LIBICONV) && defined (_LIBICONV_H) && !defined (LIBICONV_PLUG)
- #error libiconv not in use but included iconv.h is from libiconv
- #endif
- #endif /* FiconvSupport */
diff --git a/x11-wm/fvwm2/files/system.fvwm2rc b/x11-wm/fvwm2/files/system.fvwm2rc
new file mode 100644
index 000000000000..b82b1426faeb
--- /dev/null
+++ b/x11-wm/fvwm2/files/system.fvwm2rc
@@ -0,0 +1,496 @@
+# $FreeBSD$
+#
+# this is a bare bones sample .fvwm2rc/system.fvwm2rc file for fvwm.
+# It should be customized before install.  See other sample .fvwm2rc files
+# for hints, as well as pointers from the various links on the official
+# fvwm web page (see the FAQ).
+
+EdgeResistance 250 10
+EdgeScroll 100 100
+ClickTime 750
+
+DeskTopSize 2x2
+Menustyle * fvwm, Font -adobe-times-bold-r-*-*-14-*-*-*-*-*-*-*
+MenuStyle * Foreground maroon, Background grey60, Greyed grey40
+
+ColormapFocus FollowsMouse
+
+# default Styles:
+# make sure these fonts exist on your system:
+Style *           Font -adobe-times-bold-r-*-*-18-*-*-*-*-*-*-*
+Style *           IconFont -adobe-times-bold-r-*-*-18-*-*-*-*-*-*-*
+Style *           HilightFore black, HilightBack palevioletred
+Style *           BorderWidth 7, HandleWidth 7
+Style *           Icon unknown1.xpm, Color lightgrey/dimgrey
+Style *           MWMFunctions, MWMDecor, HintOverride
+Style *           DecorateTransient, !UsePPosition
+Style *           IconBox 0 -10 -280 -1
+Style *           FocusFollowsMouse
+Style *           TileCascadePlacement
+
+# Styles for various Fvwm modules:
+Style "Fvwm*"       !Title,  Sticky, WindowListSkip
+Style "Fvwm*"       BorderWidth 2, CirculateSkipIcon, CirculateSkip
+Style "FvwmPager"   StaysOnTop
+Style "FvwmBanner"  StaysOnTop
+Style "FvwmButtons" Icon toolbox.xpm, ClickToFocus
+
+# Styles for your common terminal emulator programs:
+Style "XTerm"       Icon xterm.xpm, SloppyFocus, IconBox -70 1 -1 -140
+Style "rxvt"        Icon term.xpm, SloppyFocus, IconBox -70 1 -1 -140
+Style "rxvt"        MWMBorder, MWMButtons
+
+# Styles for various common programs:
+Style "*lock"       !Title, !Handles, Sticky, WindowListSkip, ClickToFocus
+Style "xbiff"       !Title, Sticky, WindowListSkip, ClickToFocus
+Style "xcalc"       Icon xcalc.xpm, !Button 2,ClickToFocus
+Style "xmh"         Icon mail1.xpm, !IconTitle,StickyIcon
+Style "xmh"	    !Button 2
+Style "xman"	    Icon xman.xpm, ClickToFocus
+Style "xmag"	    Icon mag_glass.xpm, ClickToFocus
+Style "xgraph"      Icon graphs.xpm, ClickToFocus
+Style "xmosaic"     Color Green/Yellow, ClickToFocus
+
+
+# some simple default key bindings:
+Key Next         A       SCM     Next (AcceptsFocus) Focus
+Key Prior        A       SCM     Prev (AcceptsFocus) Focus
+
+# some simple default mouse bindings:
+#   for the root window:
+Mouse 1	R   	A       Menu RootMenu Nop
+Mouse 2	R    	A      	Menu Window-Ops Nop
+Mouse 3	R    	A      	WindowList
+
+#   for the title bar buttons:
+Mouse 0	1    	A      	Menu Window-Ops2 Close
+Mouse 0	2    	A     	Maximize-Func
+Mouse 0	4    	A     	Iconify
+
+#   for other parts of the window/borders/icons:
+Mouse 1	F	A	Resize-or-Raise
+Mouse 1	TS	A	Move-or-Raise
+Mouse 1	I	A	Move-or-Iconify
+Mouse 2	I	A	Iconify
+Mouse 2	FST	A	Menu Window-Ops2 Nop
+Mouse 3	TSIF	A	RaiseLower
+
+######################## Initialization Functions ############################
+AddToFunc StartFunction
+ + I Module FvwmButtons
+
+AddToFunc InitFunction
+ + I exec xsetroot -mod 2 2 -fg rgb:55/40/55 -bg rgb:70/50/70
+
+# For some SM-s (like gnome-session) there is an internal background setter.
+AddToFunc SessionInitFunction
+ + I Nop
+
+######################## Menus ###################
+AddToMenu RootMenu	"Root Menu"	Title
++			"XTerm"		Exec exec xterm
++			"Rxvt"		Exec exec rxvt
++			""		Nop
++			"Remote Logins"	Popup Remote-Logins
++			""		Nop
++                       "Utilities"     Popup Utilities
++			""		Nop
++			"Fvwm Modules"	          Popup Module-Popup
++                       "Fvwm Window Ops"         Popup Window-Ops
++                       "Fvwm Simple Config Ops"  Popup Misc-Ops
++			""		Nop
++                       "Refresh Screen"   Refresh
++                       "Recapture Screen" Recapture
++			""		Nop
++			"Exit Fvwm"	Popup Quit-Verify
+
+AddToMenu Utilities     "Utilities" Title
++			"Top"		Exec exec xterm -T Top -n Top -e top
++			"Calculator"	Exec exec xcalc
++			"Xman"		Exec exec xman
++			"Xmag"		Exec exec xmag
++                       "Editres"       Exec exec editres
++			""		Nop
++			"XEmacs"	Exec exec xemacs
++                       "Mail"          MailFunction xmh "-font fixed"
++			""		Nop
++                       "XLock"         Exec exec xlock -mode random
++			""		Nop
++                       "Reset X defaults" Exec xrdb -load $HOME/.Xdefaults
+
+AddToMenu Misc-Ops "Misc Config Opts" Title
++                  "Sloppy Focus"        ChangeDefaultFocus SloppyFocus
++                  "Click To Focus"      ChangeDefaultFocus ClickToFocus
++                  "Focus Follows Mouse" ChangeDefaultFocus FocusFollowsMouse
++                  "" Nop
++                  "Colormap Follows Mouse" ColormapFocus FollowsMouse
++                  "Colormap Follows Focus" ColormapFocus FollowsFocus
++                  "" Nop
++                  "Full Paging ON"         EdgeScroll 100 100
++                  "All Paging OFF"         EdgeScroll 0 0
++                  "Horizontal Paging Only" EdgeScroll 100 0
++                  "Vertical Paging Only"   EdgeScroll 0 100
++                  "Partial Paging"         EdgeScroll 50 50
++                  "Full Paging && Edge Wrap" EdgeScroll 100000 100000
+
+AddToMenu Window-Ops	"Window Ops"	Title
++			"Move"		Move
++			"Resize"	Resize
++			"Raise"		Raise
++			"Lower"		Lower
++		 	"(De)Iconify"	Iconify
++			"(Un)Stick"	Stick
++			"(Un)Maximize"	Maximize
++			""		Nop
++			"Delete"	Delete
++			"Close"		Close
++			"Destroy"	Destroy
++			""		Nop
++			"Refresh Window" RefreshWindow
+
+AddToMenu Window-Ops2	"&Move"		Move
++			"&Resize"	Resize
++			"R&aise"	Raise
++			"&Lower"	Lower
++			"(De)&Iconify"	Iconify
++			"(Un)&Stick"	Stick
++                       "(Un)Ma&ximize" Maximize
++			""		Nop
++			"&Delete"	Delete
++			"&Close"	Close
++			"Destroy"	Destroy
++			""		Nop
++			"ScrollBar" 	Module FvwmScroll 2 2
++			"Print"         PrintFunction
++                       "Print Reverse" PrintReverseFunction
+
+# be sure to fill these in with your correct machine names:
+AddToMenu Remote-Logins	"dopey"	 Exec ssh dopey rxvt -display $HOSTDISPLAY &
++			"snoopy" Exec ssh snoopy rxvt -display $HOSTDISPLAY &
++			"grumpy" Exec ssh grumpy rxvt -display $HOSTDISPLAY &
++			"happy"	 Exec ssh happy rxvt -display $HOSTDISPLAY &
++			"bailey" Exec ssh bailey rxvt -display $HOSTDISPLAY &
++			"barnum" Exec ssh barnum rxvt -display $HOSTDISPLAY &
++			"joker"	 Exec ssh joker rxvt -display $HOSTDISPLAY &
++			"signal" Exec rxterm signal
+
+AddToMenu Module-Popup	"FvwmModules"	Title
++			"Identify"	Module	FvwmIdent
++			"Talk"  	Module	FvwmTalk
++			""		Nop
++			"Button-Bar"	Module	FvwmButtons
++			"Pager"		Module  FvwmPager 0 0
++			"Pager (2 desks)" Module  FvwmPager 0 1
++			"WinList"	Module  FvwmWinList
++			""		Nop
++			"Banner"	Module	FvwmBanner
++                       "ScrollBar"     Module  FvwmScroll 50 50
++			"Background"	Module  FvwmBacker
++                       "AutoRaise"     Module  FvwmAuto 200 Raise Nop
++                       "Stop AutoRaise" KillModule FvwmAuto
++			""		Nop
++			"IconBox"	Module	FvwmIconBox
++                       "IconMan"       Module  FvwmIconMan
++			""		Nop
++                       "Form - Rlogin"      Module FvwmForm Rlogin
++                       "Form - MyFvwmTalk"  Module FvwmForm MyFvwmTalk
++                       "Form - QuitVerify"  Module FvwmForm QuitVerify
+
+AddToMenu Quit-Verify 	"Really Quit Fvwm?" Title
++		      	"Yes, Really Quit"  Quit
++		      	""		    Nop
++                       "Restart Fvwm"      Restart
++		      	"Restart Fvwm 1.x"  Restart fvwm -s
++		      	""		    Nop
++		      	"Start twm"         Restart twm
++		      	"Start ctwm"        Restart ctwm
++		        "Start tvtwm"       Restart tvtwm
++		        "Start vtwm"        Restart vtwm
++		      	"Start mwm"    	    Restart mwm
++	      	      	"Start olwm"        Restart /usr/openwin/bin/olwm
++		      	""		    Nop
++		      	"Start dummy"       Restart xterm
++		      	""		    Nop
++		      	"No, Don't Quit"    Nop
+
+######################## Sample Functions ##########################
+
+AddToFunc MailFunction	   I Next (AcceptsFocus $0) Iconify -1
++		           I Next (AcceptsFocus $0) Focus
++			   I None (AcceptsFocus $0) Exec $0 $1
+
+AddToFunc Move-or-Raise		I Raise
++				M Move
++  				D Lower
+
+AddToFunc Move-or-Raise2	M Raise
++				M Move
++  				D Lower
+
+AddToFunc Maximize-Func		M Maximize	 0 100
++				C Maximize	 0 80
++				D Maximize	 100 100
+
+AddToFunc Move-or-Iconify	I Raise
++				M Move
++				D Iconify
+
+AddToFunc Resize-or-Raise	I Raise
++				M Resize
++				D Lower
+
+AddToFunc Resize-or-Raise2	M Raise
++				M Resize
++				D Lower
+
+AddToFunc PrintFunction		I Raise
++				I Exec xdpr -id $w
+
+AddToFunc PrintReverseFunction  I Raise
++                               I Exec xdpr 1/2 -h -rv -id $w
+
+AddToFunc Iconify-and-Raise     I Iconify
++                               I Raise
+
+# RLOGIN machine fg bg
+AddToFunc RLOGIN I Exec xterm -fg $1 -bg $2 -e rlogin $0 -8
+
+# TELNET machine fg bg
+AddToFunc TELNET I Exec xterm -fg $1 -bg $2 -e telnet $0
+
+AddToFunc FocusAndWarp I Focus
++                      I WarpToWindow 2p 2p
+
+AddToFunc DeiconifyFocusAndWarp I Iconify -1
++                               I FocusAndWarp
+
+AddToFunc ChangeDefaultFocus I Style * $0
++                            I Recapture
+
+################## FvwmButtons button-bar ################################
+*FvwmButtons: Geometry 520x100-1-1
+*FvwmButtons: Back bisque3
+*FvwmButtons: (Frame 2 Padding 2 2 Container(Rows 2 Columns 5 Frame 1 \
+                                             Padding 10 0))
+*FvwmButtons: (3x2 Frame 2 Swallow "FvwmIconMan" "Module FvwmIconMan")
+*FvwmButtons: (1x2 Frame 2 Swallow(UseOld) "FvwmPager" "Module FvwmPager 0 0")
+*FvwmButtons: (1x2 Frame 0 Container(Rows 2 Columns 2 Frame 0))
+*FvwmButtons: (Frame 2 Swallow(UseOld,NoHints,Respawn) "xbiff" `Exec exec xbiff -bg bisque3`)
+*FvwmButtons: (Frame 3 Swallow(UseOld,NoHints,Respawn) "xclock" `Exec exec xclock -bg bisque3 -fg black -hd black -hl black -padding 0 -update 1`)
+*FvwmButtons: (2x1 Frame 2 Swallow(UseOld,NoHints,Respawn) "xload" `Exec exec xload -bg bisque3 -fg black -update 5 -nolabel`)
+*FvwmButtons: (End)
+*FvwmButtons: (End)
+
+########################## Icon Manager ####################################
+# this FvwmIconMan setup is for swallowing in above button bar example
+*FvwmIconMan: numManagers 1
+*FvwmIconMan: Resolution  page
+*FvwmIconMan: background  bisque3
+*FvwmIconMan: foreground  black
+*FvwmIconMan: font        7x13bold
+*FvwmIconMan: format      "%t"
+*FvwmIconMan: action      Mouse   1 N sendcommand Focus, sendcommand "Iconify"
+*FvwmIconMan: action      Mouse   2 N sendcommand "Iconify 1"
+*FvwmIconMan: action      Mouse   3 N sendcommand "FvwmIdent"
+*FvwmIconMan: followfocus true
+*FvwmIconMan: sort        name
+*FvwmIconMan: plainbutton          up black bisque3
+*FvwmIconMan: selectbutton         down black bisque3
+*FvwmIconMan: focusbutton          up yellow firebrick
+*FvwmIconMan: focusandselectButton down yellow firebrick
+*FvwmIconMan: dontshow icon=Untitled title=Untitled
+#*FvwmIconMan: drawicons true
+*FvwmIconMan: buttongeometry  300x0
+*FvwmIconMan: managergeometry 1x5
+
+########################## Window-Identifier ###############################
+# Just choose colors and a fonts
+*FvwmIdent: Back MidnightBlue
+*FvwmIdent: Fore Yellow
+*FvwmIdent: Font -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
+
+########################### Pager #########################################
+*FvwmPager: Back #908090
+*FvwmPager: Fore #484048
+#*FvwmPager: Font -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+# turn off desktop names for swallowing in above button bar example:
+*FvwmPager: Font none
+*FvwmPager: Hilight #cab3ca
+*FvwmPager: Geometry -1-1
+*FvwmPager: Label 0 Misc
+*FvwmPager: Label 1 Maker
+*FvwmPager: Label 2 Mail
+*FvwmPager: Label 3 Matlab
+*FvwmPager: SmallFont 5x8
+*FvwmPager: Balloons            All
+*FvwmPager: BalloonBack         Yellow
+*FvwmPager: BalloonFore         Black
+*FvwmPager: BalloonFont         lucidasanstypewriter-12
+*FvwmPager: BalloonYOffset      +2
+*FvwmPager: BalloonBorderWidth  1
+*FvwmPager: BalloonBorderColor  Black
+
+##########################FvwmWinList##################################
+*FvwmWinList: Back #908090
+*FvwmWinList: Fore Black
+*FvwmWinList: Font -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+*FvwmWinList: Action Click1 Iconify -1,Focus
+*FvwmWinList: Action Click2 Iconify
+*FvwmWinList: Action Click3 Module "FvwmIdent" FvwmIdent
+*FvwmWinList: UseSkipList
+*FvwmWinList: Geometry +0-1
+
+
+*FvwmBacker: Desk 0 -solid steelblue
+*FvwmBacker: Desk 1 -solid midnightblue
+
+*FvwmScroll: Back grey40
+*FvwmScroll: Fore green
+
+############################################################
+############################################################
+# Note that icons are shown in the module
+#    only if !Icon commnand is applied.
+#Style     *  !Icon
+
+############################################################
+*FvwmIconBox: IconBack    #cfcfcf
+*FvwmIconBox: IconHiFore  black
+*FvwmIconBox: IconHiBack  LightSkyBlue
+*FvwmIconBox: Back        #5f9ea0
+#*FvwmIconBox: Fore       blue
+*FvwmIconBox: Geometry    5x1+0+0
+*FvwmIconBox: MaxIconSize 64x38
+*FvwmIconBox: Font        -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
+*FvwmIconBox: SortIcons   IconName
+*FvwmIconBox: Padding     4
+*FvwmIconBox: Lines       10
+*FvwmIconBox: SBWidth     11
+*FvwmIconBox: Placement   Left Top
+*FvwmIconBox: Pixmap      fvwm.xpm
+#*FvwmIconBo: xHideSC Horizontal
+*FvwmIconBox: SetWMIconSize
+*FvwmIconBox: HilightFocusWin
+#*FvwmIconBox: Resolution          Desk
+*FvwmIconBox: Mouse       1       Click           RaiseLower
+*FvwmIconBox: Mouse       1       DoubleClick     Iconify
+*FvwmIconBox: Mouse       2       Click           Iconify -1, Focus
+*FvwmIconBox: Mouse       3       Click           Module FvwmIdent
+*FvwmIconBox: Key         r       RaiseLower
+*FvwmIconBox: Key         space   Iconify
+*FvwmIconBox: Key         d       Close
+*FvwmIconBox: Key         n       Next
+*FvwmIconBox: Key         p       Prev
+*FvwmIconBox: Key         h       Left
+*FvwmIconBox: Key         j       Down
+*FvwmIconBox: Key         k       Up
+*FvwmIconBox: Key         l       Right
+#
+# Icon file specifications
+#
+# Mostly, you don't have to specify icon files, as FvwmIconBox now
+# reads icon files specified in Style commands.
+#
+*FvwmIconBox            "Fvwm*"         -
+
+# FvwmForm alias - rlogin or telnet to host via xterm
+*Rlogin: WarpPointer
+*Rlogin: Font         *helvetica*m*r*n*12*
+*Rlogin: ButtonFont   *helvetica*m*o*n*12*
+*Rlogin: InputFont    *cour*m*r*n*12*
+*Rlogin: Fore         Black
+*Rlogin: Back         Light Gray
+*Rlogin: ItemFore          Wheat
+*Rlogin: ItemBack          Gray50
+# begin items
+*Rlogin: Line         center
+*Rlogin: Text         "Login to Remote Host"
+*Rlogin: Line         center
+*Rlogin: Text         "Host:"
+*Rlogin: Input        HostName  30   ""
+*Rlogin: Line         center
+*Rlogin: Selection    meth single
+*Rlogin: Choice       TN TN off "telnet"
+*Rlogin: Choice       RL RL on "rlogin"
+*Rlogin: Selection    UserSel   single
+#*Rlogin: Choice       Default   Default   on   "same user"
+#*Rlogin: Choice       Custom    Custom    off  "user:"
+*Rlogin: Text         "(Userid:"
+*Rlogin: Input        UserName  10   ""
+*Rlogin: Text         ")"
+*Rlogin: Line         center
+*Rlogin: Text         "FG:"
+*Rlogin: Input        FgColor 15 ""
+*Rlogin: Text         "BG:"
+*Rlogin: Input        BgColor 15 ""
+*Rlogin: Line         expand
+*Rlogin: Button       quit "Login" ^M
+*Rlogin: Command Exec xterm  $(FgColor?-fg $(FgColor)) $(BgColor?-bg $(BgColor)) -T xterm@$(HostName) -e $(RL?rlogin) $(TN?telnet) $(HostName) $(RL?-8 $(UserName?-l $(UserName)))
+*Rlogin: Button       restart   "Clear"
+*Rlogin: Command Beep
+*Rlogin: Button       quit "Cancel"
+*Rlogin: Command Nop
+
+# FvwmForm alias - query exit ala mwm
+*QuitVerify: GrabServer
+*QuitVerify: WarpPointer
+*QuitVerify: Font          *helvetica*m*r*n*14*
+#*QuitVerify: ButtonFont    *helvetica*m*o*n*14*
+*QuitVerify: ButtonFont    7x13bold
+*QuitVerify: Fore          Black
+*QuitVerify: Back          Light Gray
+*QuitVerify: ItemFore Wheat
+*QuitVerify: ItemBack Gray50
+# begin items
+*QuitVerify: Line          center
+*QuitVerify: Text          "Do you really want to exit fvwm?"
+*QuitVerify: Line          expand
+*QuitVerify: Button   quit      " Exit "
+*QuitVerify: Command  Quit
+*QuitVerify: Button   quit      "Cancel"
+*QuitVerify: Command  Nop
+
+# MyTalk & MyFvwmTalk from Dave Goldberg
+# MyTalk Form - dissappears after use
+*MyTalk: WarpPointer
+*MyTalk: Font *helvetica*m*r*n*14*
+*MyTalk: ButtonFont *helvetica*m*o*n*14*
+*MyTalk: InputFont *cour*m*r*n*14*
+*MyTalk: Fore Red
+*MyTalk: Back Gray
+*MyTalk: ItemFore Blue
+*MyTalk: ItemBack Gray
+*MyTalk: Line center
+*MyTalk: Text "Fvwm Function"
+*MyTalk: Input Func 40 ""
+*MyTalk: Line expand
+*MyTalk: Button quit "Run" ^M
+*MyTalk: Command $(Func)
+*MyTalk: Button restart "Clear" ^R
+*MyTalk: Button quit "Cancel" ^C
+*MyTalk: Command Nop
+# MyFvwmTalk Form - sticks around
+*MyFvwmTalk: WarpPointer
+*MyFvwmTalk: Font *helvetica*m*r*n*14*
+*MyFvwmTalk: ButtonFont *helvetica*m*o*n*14*
+*MyFvwmTalk: InputFont *cour*m*r*n*14*
+*MyFvwmTalk: Fore Red
+*MyFvwmTalk: Back Gray
+*MyFvwmTalk: ItemFore Blue
+*MyFvwmTalk: ItemBack Gray
+*MyFvwmTalk: Line center
+*MyFvwmTalk: Text "Fvwm Function"
+*MyFvwmTalk: Input Func 40 ""
+*MyFvwmTalk: Line expand
+*MyFvwmTalk: Button restart "Run" ^M
+*MyFvwmTalk: Command $(Func)
+*MyFvwmTalk: Button restart "Clear" ^R
+*MyFvwmTalk: Command Nop
+*MyFvwmTalk: Button restart "Iconify" ^Z
+*MyFvwmTalk: Command Next [MyFvwmTalk] Iconify
+*MyFvwmTalk: Button quit "Quit" ^C
+*MyFvwmTalk: Command Nop
+
+# to change banner pixmap
+#*FvwmBanner: Pixmap fvwm3.xpm
+#*FvwmBanner: Timeout 2
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index 01a553a62b6c..ae914bd02627 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -1,7 +1,6 @@
 bin/FvwmCommand
 bin/fvwm-bug
 bin/fvwm-config
-bin/fvwm-convert-2.4
 bin/fvwm-convert-2.6
 bin/fvwm-menu-desktop
 bin/fvwm-menu-directory
@@ -27,12 +26,8 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmConsole
 libexec/fvwm/%%FVWM_VERSION%%/FvwmConsoleC
 libexec/fvwm/%%FVWM_VERSION%%/FvwmConsoleC.pl
 libexec/fvwm/%%FVWM_VERSION%%/FvwmCpp
-libexec/fvwm/%%FVWM_VERSION%%/FvwmDebug
-libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell
 libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent
 libexec/fvwm/%%FVWM_VERSION%%/FvwmForm
-libexec/fvwm/%%FVWM_VERSION%%/FvwmGtkDebug
-libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox
 libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan
 libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent
 libexec/fvwm/%%FVWM_VERSION%%/FvwmM4
@@ -40,18 +35,9 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmPager
 libexec/fvwm/%%FVWM_VERSION%%/FvwmPerl
 libexec/fvwm/%%FVWM_VERSION%%/FvwmProxy
 libexec/fvwm/%%FVWM_VERSION%%/FvwmRearrange
-libexec/fvwm/%%FVWM_VERSION%%/FvwmSave
-libexec/fvwm/%%FVWM_VERSION%%/FvwmSaveDesk
 libexec/fvwm/%%FVWM_VERSION%%/FvwmScript
-libexec/fvwm/%%FVWM_VERSION%%/FvwmScroll
-libexec/fvwm/%%FVWM_VERSION%%/FvwmTabs
 libexec/fvwm/%%FVWM_VERSION%%/FvwmTalk
-libexec/fvwm/%%FVWM_VERSION%%/FvwmTaskBar
-libexec/fvwm/%%FVWM_VERSION%%/FvwmTheme
 libexec/fvwm/%%FVWM_VERSION%%/FvwmTile
-libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
-libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
-libexec/fvwm/%%FVWM_VERSION%%/FvwmWindowMenu
 man/man1/FvwmAnimate.1.gz
 man/man1/FvwmAuto.1.gz
 man/man1/FvwmBacker.1.gz
@@ -61,12 +47,8 @@ man/man1/FvwmCommand.1.gz
 man/man1/FvwmConsole.1.gz
 man/man1/FvwmConsoleC.pl.1.gz
 man/man1/FvwmCpp.1.gz
-man/man1/FvwmDebug.1.gz
-man/man1/FvwmDragWell.1.gz
 man/man1/FvwmEvent.1.gz
 man/man1/FvwmForm.1.gz
-man/man1/FvwmGtkDebug.1.gz
-man/man1/FvwmIconBox.1.gz
 man/man1/FvwmIconMan.1.gz
 man/man1/FvwmIdent.1.gz
 man/man1/FvwmM4.1.gz
@@ -74,19 +56,9 @@ man/man1/FvwmPager.1.gz
 man/man1/FvwmPerl.1.gz
 man/man1/FvwmProxy.1.gz
 man/man1/FvwmRearrange.1.gz
-man/man1/FvwmSave.1.gz
-man/man1/FvwmSaveDesk.1.gz
 man/man1/FvwmScript.1.gz
-man/man1/FvwmScroll.1.gz
-man/man1/FvwmTabs.1.gz
-man/man1/FvwmTaskBar.1.gz
-man/man1/FvwmTheme.1.gz
-man/man1/FvwmWharf.1.gz
-man/man1/FvwmWinList.1.gz
-man/man1/FvwmWindowMenu.1.gz
 man/man1/fvwm-bug.1.gz
 man/man1/fvwm-config.1.gz
-man/man1/fvwm-convert-2.4.1.gz
 man/man1/fvwm-convert-2.6.1.gz
 man/man1/fvwm-perllib.1.gz
 man/man1/fvwm-menu-desktop.1.gz
@@ -416,28 +388,20 @@ man/man1/xpmroot.1.gz
 %%DATADIR%%/ConfigFvwmBacker
 %%DATADIR%%/ConfigFvwmButtons
 %%DATADIR%%/ConfigFvwmDefaults
-%%DATADIR%%/ConfigFvwmIconBox
 %%DATADIR%%/ConfigFvwmIconMan
 %%DATADIR%%/ConfigFvwmIdent
 %%DATADIR%%/ConfigFvwmPager
 %%DATADIR%%/ConfigFvwmProxyDefaults
-%%DATADIR%%/ConfigFvwmTabs
-%%DATADIR%%/ConfigFvwmScroll
-%%DATADIR%%/ConfigFvwmSetup
-%%DATADIR%%/ConfigFvwmTaskBar
-%%DATADIR%%/ConfigFvwmWinList
 %%DATADIR%%/FvwmForm-Capture
 %%DATADIR%%/FvwmForm-Desktop
 %%DATADIR%%/FvwmForm-Form
-%%DATADIR%%/FvwmForm-GenOptionHelp
-%%DATADIR%%/FvwmForm-MultiMenuHelp
 %%DATADIR%%/FvwmForm-QuitVerify
 %%DATADIR%%/FvwmForm-Rlogin
 %%DATADIR%%/FvwmForm-RootCursor
-%%DATADIR%%/FvwmForm-Setup
-%%DATADIR%%/FvwmForm-SingleMenuHelp
 %%DATADIR%%/FvwmForm-Talk
 %%DATADIR%%/FvwmForm-TalkHelp
+%%DATADIR%%/FvwmForm-XDGMenuHelp
+%%DATADIR%%/FvwmForm-XDGOptionsHelp
 %%DATADIR%%/FvwmScript-BaseConfig
 %%DATADIR%%/FvwmScript-BellSetup
 %%DATADIR%%/FvwmScript-Buttons
@@ -451,19 +415,34 @@ man/man1/xpmroot.1.gz
 %%DATADIR%%/FvwmScript-Quit
 %%DATADIR%%/FvwmScript-ScreenDump
 %%DATADIR%%/FvwmScript-ScreenSetup
-%%DATADIR%%/FvwmScript-Setup95
 %%DATADIR%%/FvwmScript-WidgetDemo
-%%DATADIR%%/FvwmTabs-DefaultSetup
 %%DATADIR%%/fvwm-menu-desktop-config.fpl
 %%DATADIR%%/fvwm-script-ComExample.pl
-%%DATADIR%%/fvwm-script-setup95.pl
-%%DATADIR%%/system.fvwm2rc-sample-95
+%%DATADIR%%/default-config/.stalonetrayrc
+%%DATADIR%%/default-config/FvwmScript-ConfirmCopyConfig
+%%DATADIR%%/default-config/FvwmScript-ConfirmQuit
+%%DATADIR%%/default-config/FvwmScript-DateTime
+%%DATADIR%%/default-config/config
+%%DATADIR%%/default-config/images/background/bg1.png
+%%DATADIR%%/default-config/images/background/bg2.png
+%%DATADIR%%/default-config/images/background/bg3.png
+%%DATADIR%%/default-config/images/bgicons/bg1.png
+%%DATADIR%%/default-config/images/bgicons/bg2.png
+%%DATADIR%%/default-config/images/bgicons/bg3.png
+%%DATADIR%%/default-config/images/fvwm-logo-small.png
+%%DATADIR%%/default-config/images/icons/apps.png
+%%DATADIR%%/default-config/images/icons/conf.png
+%%DATADIR%%/default-config/images/icons/help.png
+%%DATADIR%%/default-config/images/icons/programs.png
+%%DATADIR%%/default-config/images/icons/quit.png
+%%DATADIR%%/default-config/images/icons/refresh.png
+%%DATADIR%%/default-config/images/icons/restart.png
+%%DATADIR%%/default-config/images/icons/terminal.png
+%%DATADIR%%/default-config/images/icons/wallpaper.png
 %%DATADIR%%/perllib/FVWM/Commands.pm
 %%DATADIR%%/perllib/FVWM/Constants.pm
 %%DATADIR%%/perllib/FVWM/Event.pm
 %%DATADIR%%/perllib/FVWM/EventNames.pm
-%%DATADIR%%/perllib/FVWM/Module/Gtk.pm
-%%DATADIR%%/perllib/FVWM/Module/Gtk2.pm
 %%DATADIR%%/perllib/FVWM/Module/Tk.pm
 %%DATADIR%%/perllib/FVWM/Module/Toolkit.pm
 %%DATADIR%%/perllib/FVWM/Module/Terminal.pm