Update to V2.2

2 files changed, 83 insertions, 45 deletions

diff --git a/x11/fvwm2/pkg/COMMENT b/x11/fvwm2/pkg/COMMENT
index bfffd3af5e7..af5e47f1228 100644
--- a/x11/fvwm2/pkg/COMMENT
+++ b/x11/fvwm2/pkg/COMMENT
@@ -1 +1 @@
-Internationalized (not japan) virtual window manager for X
+Virtual window manager for X
diff --git a/x11/fvwm2/pkg/PLIST b/x11/fvwm2/pkg/PLIST
index 858cc95ac8d..f6520907433 100644
--- a/x11/fvwm2/pkg/PLIST
+++ b/x11/fvwm2/pkg/PLIST
@@ -1,31 +1,20 @@
-@comment $NetBSD: PLIST,v 1.3 1998/03/24 23:18:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/03/01 01:38:46 hubertf Exp $
 bin/fvwm2
-lib/X11/fvwm2/FvwmAudio
-lib/X11/fvwm2/FvwmAuto
-lib/X11/fvwm2/FvwmBacker
-lib/X11/fvwm2/FvwmBanner
-lib/X11/fvwm2/FvwmButtons
-lib/X11/fvwm2/FvwmCascade
-lib/X11/fvwm2/FvwmCpp
-lib/X11/fvwm2/FvwmForm
-lib/X11/fvwm2/FvwmIconBox
-lib/X11/fvwm2/FvwmIconMan
-lib/X11/fvwm2/FvwmIdent
-lib/X11/fvwm2/FvwmM4
-lib/X11/fvwm2/FvwmPager
-lib/X11/fvwm2/FvwmSave
-lib/X11/fvwm2/FvwmSaveDesk
-lib/X11/fvwm2/FvwmScroll
-lib/X11/fvwm2/FvwmTalk
-lib/X11/fvwm2/FvwmTile
-lib/X11/fvwm2/FvwmWinList
-lib/X11/fvwm2/fvwmrc_convert
-lib/X11/fvwm2/quantize_pixmaps
+bin/FvwmCommand
 lib/X11/fvwm2/decor_examples
-lib/X11/fvwm2/system.fvwm2rc
 lib/X11/fvwm2/system.fvwm2rc-sample-1
 lib/X11/fvwm2/system.fvwm2rc-sample-2
+@unexec if diff >/dev/null %D/lib/X11/fvwm2/system.fvwm2rc.example %D/lib/X11/fvwm2/system.fvwm2rc ; then rm %D/lib/X11/fvwm2/system.fvwm2rc ; fi
+lib/X11/fvwm2/system.fvwm2rc.example
+@exec if [ ! -f %D/lib/X11/fvwm2/system.fvwm2rc ]; then echo "Installing system.fvwm2rc in %D/lib/X11/fvwm2" ; /usr/bin/install -c -o root -g wheel -m 0644 %D/lib/X11/fvwm2/system.fvwm2rc.example %D/lib/X11/fvwm2/system.fvwm2rc; fi
 lib/X11/fvwm2/pixmaps/Jlock.xpm
+lib/X11/fvwm2/pixmaps/Monitor.xpm
+lib/X11/fvwm2/pixmaps/button-close.xpm
+lib/X11/fvwm2/pixmaps/button-horiz.xpm
+lib/X11/fvwm2/pixmaps/button-max.xpm
+lib/X11/fvwm2/pixmaps/button-vert.xpm
+lib/X11/fvwm2/pixmaps/button.xpm
+lib/X11/fvwm2/pixmaps/side.fvwm2.xpm
 lib/X11/fvwm2/pixmaps/Jnews.xpm
 lib/X11/fvwm2/pixmaps/Jrecycle.xpm
 lib/X11/fvwm2/pixmaps/Jxlock.xpm
@@ -94,6 +83,7 @@ lib/X11/fvwm2/pixmaps/mini.iconify.xpm
 lib/X11/fvwm2/pixmaps/mini.letter.xpm
 lib/X11/fvwm2/pixmaps/mini.lower.xpm
 lib/X11/fvwm2/pixmaps/mini.maximize-horiz.xpm
+lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/mini.maximize-vert.xpm
 lib/X11/fvwm2/pixmaps/mini.maximize.xpm
 lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
@@ -124,7 +114,6 @@ lib/X11/fvwm2/pixmaps/ocode.icon
 lib/X11/fvwm2/pixmaps/page.xpm
 lib/X11/fvwm2/pixmaps/page2.xpm
 lib/X11/fvwm2/pixmaps/prog.icon
-lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/question.xpm
 lib/X11/fvwm2/pixmaps/rbomb.xpm
 lib/X11/fvwm2/pixmaps/rcalc.xpm
@@ -151,25 +140,74 @@ lib/X11/fvwm2/pixmaps/xterm-sun.xpm
 lib/X11/fvwm2/pixmaps/xterm.xpm
 lib/X11/fvwm2/pixmaps/xv.xpm
 lib/X11/fvwm2/pixmaps/xv2.xpm
-man/cat1/fvwm2.0.gz
-man/cat1/FvwmAudio.0.gz
-man/cat1/FvwmAuto.0.gz
-man/cat1/FvwmBacker.0.gz
-man/cat1/FvwmBanner.0.gz
-man/cat1/FvwmButtons.0.gz
-man/cat1/FvwmCascade.0.gz
-man/cat1/FvwmCpp.0.gz
-man/cat1/FvwmForm.0.gz
-man/cat1/FvwmIconBox.0.gz
-man/cat1/FvwmIconMan.0.gz
-man/cat1/FvwmIdent.0.gz
-man/cat1/FvwmM4.0.gz
-man/cat1/FvwmPager.0.gz
-man/cat1/FvwmSave.0.gz
-man/cat1/FvwmSaveDesk.0.gz
-man/cat1/FvwmScroll.0.gz
-man/cat1/FvwmTalk.0.gz
-man/cat1/FvwmTile.0.gz
-man/cat1/FvwmWinList.0.gz
+lib/X11/fvwm2/pixmaps/mini.directory.xpm
+lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
+lib/X11/fvwm2/pixmaps/mini.file.xpm
+lib/X11/fvwm2/pixmaps/mini.filelink.xpm
+lib/X11/fvwm2/pixmaps/xterm-bsd.xpm
+lib/X11/fvwm2/2.2/FvwmAnimate
+lib/X11/fvwm2/2.2/FvwmAudio
+lib/X11/fvwm2/2.2/FvwmAuto
+lib/X11/fvwm2/2.2/FvwmBacker
+lib/X11/fvwm2/2.2/FvwmBanner
+lib/X11/fvwm2/2.2/FvwmButtons
+lib/X11/fvwm2/2.2/FvwmCpp
+lib/X11/fvwm2/2.2/FvwmEvent
+lib/X11/fvwm2/2.2/FvwmForm
+lib/X11/fvwm2/2.2/FvwmIconBox
+lib/X11/fvwm2/2.2/FvwmIconMan
+lib/X11/fvwm2/2.2/FvwmIdent
+lib/X11/fvwm2/2.2/FvwmM4
+lib/X11/fvwm2/2.2/FvwmPager
+lib/X11/fvwm2/2.2/FvwmRearrange
+lib/X11/fvwm2/2.2/FvwmCascade
+lib/X11/fvwm2/2.2/FvwmTile
+lib/X11/fvwm2/2.2/FvwmSave
+lib/X11/fvwm2/2.2/FvwmSaveDesk
+lib/X11/fvwm2/2.2/FvwmScroll
+lib/X11/fvwm2/2.2/FvwmTalk
+lib/X11/fvwm2/2.2/FvwmWinList
+lib/X11/fvwm2/2.2/FvwmCommandS
+lib/X11/fvwm2/2.2/FvwmConfig
+lib/X11/fvwm2/2.2/FvwmConsole
+lib/X11/fvwm2/2.2/FvwmConsoleC
+lib/X11/fvwm2/2.2/FvwmConsoleC.pl
+lib/X11/fvwm2/2.2/FvwmDebug
+lib/X11/fvwm2/2.2/FvwmGoodStuff
+lib/X11/fvwm2/2.2/FvwmPipe
+lib/X11/fvwm2/2.2/FvwmScript
+lib/X11/fvwm2/2.2/FvwmTaskBar
+lib/X11/fvwm2/2.2/FvwmWharf
+@dirrm lib/X11/fvwm2/2.2
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2
+man/man1/fvwm2.1
+man/man1/FvwmAnimate.1
+man/man1/FvwmAudio.1
+man/man1/FvwmAuto.1
+man/man1/FvwmBacker.1
+man/man1/FvwmBanner.1
+man/man1/FvwmButtons.1
+man/man1/FvwmCpp.1
+man/man1/FvwmEvent.1
+man/man1/FvwmForm.1
+man/man1/FvwmIconBox.1
+man/man1/FvwmIconMan.1
+man/man1/FvwmIdent.1
+man/man1/FvwmM4.1
+man/man1/FvwmPager.1
+man/man1/FvwmSave.1
+man/man1/FvwmRearrange.1
+man/man1/FvwmSaveDesk.1
+man/man1/FvwmScroll.1
+man/man1/FvwmTalk.1
+man/man1/FvwmWinList.1
+man/man1/FvwmCommand.1
+man/man1/FvwmConfig.1
+man/man1/FvwmConsole.1
+man/man1/FvwmConsoleC.pl.1
+man/man1/FvwmDebug.1
+man/man1/FvwmGoodStuff.1
+man/man1/FvwmScript.1
+man/man1/FvwmTaskBar.1
+man/man1/FvwmWharf.1