Update to version 2.2 after repository copy.

PR:		11277
Submitted by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.ORG>

1 files changed, 182 insertions, 153 deletions

diff --git a/x11-wm/fvwm2-i18n/pkg-plist b/x11-wm/fvwm2-i18n/pkg-plist
index af31397f3be4..b7160f419903 100644
--- a/x11-wm/fvwm2-i18n/pkg-plist
+++ b/x11-wm/fvwm2-i18n/pkg-plist
@@ -1,155 +1,184 @@
 bin/fvwm2
 bin/xpmroot
-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
-lib/X11/fvwm2/decor_examples
-lib/X11/fvwm2/system.fvwm2rc
-lib/X11/fvwm2/system.fvwm2rc-sample-1
-lib/X11/fvwm2/system.fvwm2rc-sample-2
-lib/X11/fvwm2/pixmaps/Jlock.xpm
-lib/X11/fvwm2/pixmaps/Jnews.xpm
-lib/X11/fvwm2/pixmaps/Jrecycle.xpm
-lib/X11/fvwm2/pixmaps/Jxlock.xpm
-lib/X11/fvwm2/pixmaps/Mosaic.xpm
-lib/X11/fvwm2/pixmaps/arrdown2.xpm
-lib/X11/fvwm2/pixmaps/arrows2.xpm
-lib/X11/fvwm2/pixmaps/arrup2.xpm
-lib/X11/fvwm2/pixmaps/bomb.xpm
-lib/X11/fvwm2/pixmaps/ccode.icon
-lib/X11/fvwm2/pixmaps/clamp.xpm
-lib/X11/fvwm2/pixmaps/colormap.xpm
-lib/X11/fvwm2/pixmaps/datebook.xpm
-lib/X11/fvwm2/pixmaps/default.xbm
-lib/X11/fvwm2/pixmaps/desk.xpm
-lib/X11/fvwm2/pixmaps/dialog_box.xpm
-lib/X11/fvwm2/pixmaps/doomface.xpm
-lib/X11/fvwm2/pixmaps/editres.xpm
-lib/X11/fvwm2/pixmaps/eps.xpm
-lib/X11/fvwm2/pixmaps/exit.xpm
-lib/X11/fvwm2/pixmaps/flow_chart.xpm
-lib/X11/fvwm2/pixmaps/folder2.xpm
-lib/X11/fvwm2/pixmaps/folders.xpm
-lib/X11/fvwm2/pixmaps/fvwm.bitmap
-lib/X11/fvwm2/pixmaps/fvwm.xpm
-lib/X11/fvwm2/pixmaps/fvwm2.xpm
-lib/X11/fvwm2/pixmaps/fvwm2_big.xpm
-lib/X11/fvwm2/pixmaps/fvwm3.xpm
-lib/X11/fvwm2/pixmaps/gnu-animal.xpm
-lib/X11/fvwm2/pixmaps/graphs.xpm
-lib/X11/fvwm2/pixmaps/hcode.icon
-lib/X11/fvwm2/pixmaps/jball.xpm
-lib/X11/fvwm2/pixmaps/jbomb.xpm
-lib/X11/fvwm2/pixmaps/jbook1.xpm
-lib/X11/fvwm2/pixmaps/jbook2.xpm
-lib/X11/fvwm2/pixmaps/jcalc.xpm
-lib/X11/fvwm2/pixmaps/jclock.xpm
-lib/X11/fvwm2/pixmaps/jf.xpm
-lib/X11/fvwm2/pixmaps/jgraph.xpm
-lib/X11/fvwm2/pixmaps/jline.xpm
-lib/X11/fvwm2/pixmaps/jlower.xpm
-lib/X11/fvwm2/pixmaps/jmag.xpm
-lib/X11/fvwm2/pixmaps/jmail.xpm
-lib/X11/fvwm2/pixmaps/jmove.xpm
-lib/X11/fvwm2/pixmaps/jpaint.xpm
-lib/X11/fvwm2/pixmaps/jraise.xpm
-lib/X11/fvwm2/pixmaps/jresize.xpm
-lib/X11/fvwm2/pixmaps/jterm.xpm
-lib/X11/fvwm2/pixmaps/jwindow.xpm
-lib/X11/fvwm2/pixmaps/jx.xpm
-lib/X11/fvwm2/pixmaps/mag_glass.xpm
-lib/X11/fvwm2/pixmaps/mail1.xpm
-lib/X11/fvwm2/pixmaps/mail2.xpm
-lib/X11/fvwm2/pixmaps/map.xpm
-lib/X11/fvwm2/pixmaps/math4.xpm
-lib/X11/fvwm2/pixmaps/mini.audiovol.xpm
-lib/X11/fvwm2/pixmaps/mini.blah.xpm
-lib/X11/fvwm2/pixmaps/mini.bomb.xpm
-lib/X11/fvwm2/pixmaps/mini.checkmark.xpm
-lib/X11/fvwm2/pixmaps/mini.cut.xpm
-lib/X11/fvwm2/pixmaps/mini.destroy.xpm
-lib/X11/fvwm2/pixmaps/mini.excl.xpm
-lib/X11/fvwm2/pixmaps/mini.exit.xpm
-lib/X11/fvwm2/pixmaps/mini.eye.xpm
-lib/X11/fvwm2/pixmaps/mini.fvwm.xpm
-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/mini.maximize-vert.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize.xpm
-lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
-lib/X11/fvwm2/pixmaps/mini.move.xpm
-lib/X11/fvwm2/pixmaps/mini.netscape.xpm
-lib/X11/fvwm2/pixmaps/mini.rainbow.xpm
-lib/X11/fvwm2/pixmaps/mini.raise.xpm
-lib/X11/fvwm2/pixmaps/mini.refresh.xpm
-lib/X11/fvwm2/pixmaps/mini.resize.xpm
-lib/X11/fvwm2/pixmaps/mini.resize2.xpm
-lib/X11/fvwm2/pixmaps/mini.stick.xpm
-lib/X11/fvwm2/pixmaps/mini.stick2.xpm
-lib/X11/fvwm2/pixmaps/mini.stickpressed.xpm
-lib/X11/fvwm2/pixmaps/mini.winXX-close.xpm
-lib/X11/fvwm2/pixmaps/mini.winXX-maximize.xpm
-lib/X11/fvwm2/pixmaps/mini.winXX-minimize.xpm
-lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
-lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
-lib/X11/fvwm2/pixmaps/mini.xboing.xpm
-lib/X11/fvwm2/pixmaps/mini.xlock.xpm
-lib/X11/fvwm2/pixmaps/mini.xmag.xpm
-lib/X11/fvwm2/pixmaps/mini.xman.xpm
-lib/X11/fvwm2/pixmaps/mini.xpaint.xpm
-lib/X11/fvwm2/pixmaps/mini.xpm
-lib/X11/fvwm2/pixmaps/mini.xterm.xpm
-lib/X11/fvwm2/pixmaps/mini.zircon.xpm
-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
-lib/X11/fvwm2/pixmaps/rterm.xpm
-lib/X11/fvwm2/pixmaps/term.xpm
-lib/X11/fvwm2/pixmaps/tiff2.xpm
-lib/X11/fvwm2/pixmaps/toolbox.xpm
-lib/X11/fvwm2/pixmaps/unknown1.xpm
-lib/X11/fvwm2/pixmaps/wierd_page3.xpm
-lib/X11/fvwm2/pixmaps/word_processor.xpm
-lib/X11/fvwm2/pixmaps/world.xpm
-lib/X11/fvwm2/pixmaps/xcalc.xpm
-lib/X11/fvwm2/pixmaps/xemacs.xpm
-lib/X11/fvwm2/pixmaps/xlock.xpm
-lib/X11/fvwm2/pixmaps/xman.xpm
-lib/X11/fvwm2/pixmaps/xpaint.xpm
-lib/X11/fvwm2/pixmaps/xterm-axp.xpm
-lib/X11/fvwm2/pixmaps/xterm-blank.xpm
-lib/X11/fvwm2/pixmaps/xterm-dec.xpm
-lib/X11/fvwm2/pixmaps/xterm-linux.xpm
-lib/X11/fvwm2/pixmaps/xterm-sgi.xpm
-lib/X11/fvwm2/pixmaps/xterm-sol.xpm
-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
-@dirrm lib/X11/fvwm2/pixmaps
-@dirrm lib/X11/fvwm2
+bin/FvwmCommand
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmAnimate
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmAudio
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmAuto
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmBacker
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmBanner
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmButtons
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmCpp
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmEvent
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmForm
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmIconBox
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmIconMan
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmIdent
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmM4
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmPager
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmRearrange
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmCascade
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmTile
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmSave
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmSaveDesk
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmScroll
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmTalk
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmWinList
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmCommandS
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmConfig
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmConsole
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmConsoleC
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmConsoleC.pl
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmDebug
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmGoodStuff
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmPipe
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmScript
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmTaskBar
+libexec/fvwm/%%FVWM_DISTVER%%/FvwmWharf
+%%FVWM_DIR%%/%%FVWM_DISTVER%%/decor_examples
+%%FVWM_DIR%%/%%FVWM_DISTVER%%/new-features
+%%FVWM_DIR%%/%%FVWM_DISTVER%%/system.fvwm2rc
+%%FVWM_DIR%%/%%FVWM_DISTVER%%/system.fvwm2rc-sample-1
+%%FVWM_DIR%%/%%FVWM_DISTVER%%/system.fvwm2rc-sample-2
+%%FVWM_DIR%%/pixmaps/Jlock.xpm
+%%FVWM_DIR%%/pixmaps/Jnews.xpm
+%%FVWM_DIR%%/pixmaps/Jrecycle.xpm
+%%FVWM_DIR%%/pixmaps/Jxlock.xpm
+%%FVWM_DIR%%/pixmaps/Monitor.xpm
+%%FVWM_DIR%%/pixmaps/Mosaic.xpm
+%%FVWM_DIR%%/pixmaps/arrdown2.xpm
+%%FVWM_DIR%%/pixmaps/arrows2.xpm
+%%FVWM_DIR%%/pixmaps/arrup2.xpm
+%%FVWM_DIR%%/pixmaps/bomb.xpm
+%%FVWM_DIR%%/pixmaps/button-close.xpm
+%%FVWM_DIR%%/pixmaps/button-horiz.xpm
+%%FVWM_DIR%%/pixmaps/button-max.xpm
+%%FVWM_DIR%%/pixmaps/button-vert.xpm
+%%FVWM_DIR%%/pixmaps/button.xpm
+%%FVWM_DIR%%/pixmaps/ccode.icon
+%%FVWM_DIR%%/pixmaps/clamp.xpm
+%%FVWM_DIR%%/pixmaps/colormap.xpm
+%%FVWM_DIR%%/pixmaps/datebook.xpm
+%%FVWM_DIR%%/pixmaps/default.xbm
+%%FVWM_DIR%%/pixmaps/desk.xpm
+%%FVWM_DIR%%/pixmaps/dialog_box.xpm
+%%FVWM_DIR%%/pixmaps/doomface.xpm
+%%FVWM_DIR%%/pixmaps/editres.xpm
+%%FVWM_DIR%%/pixmaps/eps.xpm
+%%FVWM_DIR%%/pixmaps/exit.xpm
+%%FVWM_DIR%%/pixmaps/flow_chart.xpm
+%%FVWM_DIR%%/pixmaps/folder2.xpm
+%%FVWM_DIR%%/pixmaps/folders.xpm
+%%FVWM_DIR%%/pixmaps/fvwm.bitmap
+%%FVWM_DIR%%/pixmaps/fvwm.xpm
+%%FVWM_DIR%%/pixmaps/fvwm2.xpm
+%%FVWM_DIR%%/pixmaps/fvwm2_big.xpm
+%%FVWM_DIR%%/pixmaps/fvwm3.xpm
+%%FVWM_DIR%%/pixmaps/gnu-animal.xpm
+%%FVWM_DIR%%/pixmaps/graphs.xpm
+%%FVWM_DIR%%/pixmaps/hcode.icon
+%%FVWM_DIR%%/pixmaps/jball.xpm
+%%FVWM_DIR%%/pixmaps/jbomb.xpm
+%%FVWM_DIR%%/pixmaps/jbook1.xpm
+%%FVWM_DIR%%/pixmaps/jbook2.xpm
+%%FVWM_DIR%%/pixmaps/jcalc.xpm
+%%FVWM_DIR%%/pixmaps/jclock.xpm
+%%FVWM_DIR%%/pixmaps/jf.xpm
+%%FVWM_DIR%%/pixmaps/jgraph.xpm
+%%FVWM_DIR%%/pixmaps/jline.xpm
+%%FVWM_DIR%%/pixmaps/jlower.xpm
+%%FVWM_DIR%%/pixmaps/jmag.xpm
+%%FVWM_DIR%%/pixmaps/jmail.xpm
+%%FVWM_DIR%%/pixmaps/jmove.xpm
+%%FVWM_DIR%%/pixmaps/jpaint.xpm
+%%FVWM_DIR%%/pixmaps/jraise.xpm
+%%FVWM_DIR%%/pixmaps/jresize.xpm
+%%FVWM_DIR%%/pixmaps/jterm.xpm
+%%FVWM_DIR%%/pixmaps/jwindow.xpm
+%%FVWM_DIR%%/pixmaps/jx.xpm
+%%FVWM_DIR%%/pixmaps/mag_glass.xpm
+%%FVWM_DIR%%/pixmaps/mail1.xpm
+%%FVWM_DIR%%/pixmaps/mail2.xpm
+%%FVWM_DIR%%/pixmaps/map.xpm
+%%FVWM_DIR%%/pixmaps/math4.xpm
+%%FVWM_DIR%%/pixmaps/mini.audiovol.xpm
+%%FVWM_DIR%%/pixmaps/mini.blah.xpm
+%%FVWM_DIR%%/pixmaps/mini.bomb.xpm
+%%FVWM_DIR%%/pixmaps/mini.checkmark.xpm
+%%FVWM_DIR%%/pixmaps/mini.cut.xpm
+%%FVWM_DIR%%/pixmaps/mini.destroy.xpm
+%%FVWM_DIR%%/pixmaps/mini.directory.xpm
+%%FVWM_DIR%%/pixmaps/mini.dirlink.xpm
+%%FVWM_DIR%%/pixmaps/mini.excl.xpm
+%%FVWM_DIR%%/pixmaps/mini.exit.xpm
+%%FVWM_DIR%%/pixmaps/mini.eye.xpm
+%%FVWM_DIR%%/pixmaps/mini.file.xpm
+%%FVWM_DIR%%/pixmaps/mini.filelink.xpm
+%%FVWM_DIR%%/pixmaps/mini.fvwm.xpm
+%%FVWM_DIR%%/pixmaps/mini.iconify.xpm
+%%FVWM_DIR%%/pixmaps/mini.letter.xpm
+%%FVWM_DIR%%/pixmaps/mini.lower.xpm
+%%FVWM_DIR%%/pixmaps/mini.maximize-horiz.xpm
+%%FVWM_DIR%%/pixmaps/mini.maximize-vert.xpm
+%%FVWM_DIR%%/pixmaps/mini.maximize.xpm
+%%FVWM_DIR%%/pixmaps/mini.maximize2.xpm
+%%FVWM_DIR%%/pixmaps/mini.move.xpm
+%%FVWM_DIR%%/pixmaps/mini.netscape.xpm
+%%FVWM_DIR%%/pixmaps/mini.rainbow.xpm
+%%FVWM_DIR%%/pixmaps/mini.raise.xpm
+%%FVWM_DIR%%/pixmaps/mini.refresh.xpm
+%%FVWM_DIR%%/pixmaps/mini.resize.xpm
+%%FVWM_DIR%%/pixmaps/mini.resize2.xpm
+%%FVWM_DIR%%/pixmaps/mini.stick.xpm
+%%FVWM_DIR%%/pixmaps/mini.stick2.xpm
+%%FVWM_DIR%%/pixmaps/mini.stickpressed.xpm
+%%FVWM_DIR%%/pixmaps/mini.winXX-close.xpm
+%%FVWM_DIR%%/pixmaps/mini.winXX-maximize.xpm
+%%FVWM_DIR%%/pixmaps/mini.winXX-minimize.xpm
+%%FVWM_DIR%%/pixmaps/mini.xarchie.xpm
+%%FVWM_DIR%%/pixmaps/mini.xbiff.xpm
+%%FVWM_DIR%%/pixmaps/mini.xboing.xpm
+%%FVWM_DIR%%/pixmaps/mini.xlock.xpm
+%%FVWM_DIR%%/pixmaps/mini.xmag.xpm
+%%FVWM_DIR%%/pixmaps/mini.xman.xpm
+%%FVWM_DIR%%/pixmaps/mini.xpaint.xpm
+%%FVWM_DIR%%/pixmaps/mini.xpm
+%%FVWM_DIR%%/pixmaps/mini.xterm.xpm
+%%FVWM_DIR%%/pixmaps/mini.zircon.xpm
+%%FVWM_DIR%%/pixmaps/ocode.icon
+%%FVWM_DIR%%/pixmaps/page.xpm
+%%FVWM_DIR%%/pixmaps/page2.xpm
+%%FVWM_DIR%%/pixmaps/prog.icon
+%%FVWM_DIR%%/pixmaps/ps.xpm
+%%FVWM_DIR%%/pixmaps/question.xpm
+%%FVWM_DIR%%/pixmaps/rbomb.xpm
+%%FVWM_DIR%%/pixmaps/rcalc.xpm
+%%FVWM_DIR%%/pixmaps/rterm.xpm
+%%FVWM_DIR%%/pixmaps/side.fvwm2.xpm
+%%FVWM_DIR%%/pixmaps/term.xpm
+%%FVWM_DIR%%/pixmaps/tiff2.xpm
+%%FVWM_DIR%%/pixmaps/toolbox.xpm
+%%FVWM_DIR%%/pixmaps/unknown1.xpm
+%%FVWM_DIR%%/pixmaps/wierd_page3.xpm
+%%FVWM_DIR%%/pixmaps/word_processor.xpm
+%%FVWM_DIR%%/pixmaps/world.xpm
+%%FVWM_DIR%%/pixmaps/xcalc.xpm
+%%FVWM_DIR%%/pixmaps/xemacs.xpm
+%%FVWM_DIR%%/pixmaps/xlock.xpm
+%%FVWM_DIR%%/pixmaps/xman.xpm
+%%FVWM_DIR%%/pixmaps/xpaint.xpm
+%%FVWM_DIR%%/pixmaps/xterm-axp.xpm
+%%FVWM_DIR%%/pixmaps/xterm-blank.xpm
+%%FVWM_DIR%%/pixmaps/xterm-bsd.xpm
+%%FVWM_DIR%%/pixmaps/xterm-dec.xpm
+%%FVWM_DIR%%/pixmaps/xterm-linux.xpm
+%%FVWM_DIR%%/pixmaps/xterm-sgi.xpm
+%%FVWM_DIR%%/pixmaps/xterm-sol.xpm
+%%FVWM_DIR%%/pixmaps/xterm-sun.xpm
+%%FVWM_DIR%%/pixmaps/xterm.xpm
+%%FVWM_DIR%%/pixmaps/xv.xpm
+%%FVWM_DIR%%/pixmaps/xv2.xpm
+@dirrm libexec/fvwm/%%FVWM_DISTVER%%
+@dirrm libexec/fvwm
+@dirrm %%FVWM_DIR%%/%%FVWM_DISTVER%%
+@dirrm %%FVWM_DIR%%/pixmaps
+@dirrm %%FVWM_DIR%%