Update to version 2.2 after repository copy.

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

5 files changed, 270 insertions, 241 deletions

diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index 07950d66a944..73bc55535588 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -1,47 +1,71 @@
 # New ports collection makefile for:	Internationalized fvwm2
-# Version required:	2.0.46
+# Version required:	2.2
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.14 1998/09/15 11:13:35 asami Exp $
+# $Id: Makefile,v 1.15 1998/09/17 00:32:57 asami Exp $
 #
 
-DISTNAME=	fvwm-2.0.46
+DISTNAME=	fvwm-${FVWM_DISTVER}
+PKGNAME=	fvwm-i18n-${FVWM_DISTVER}
 CATEGORIES=	x11-wm
-MASTER_SITES=	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/ \
-		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
+MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
+
+PATCH_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/I18N_MB/
+PATCHFILES=	fvwm-${FVWM_DISTVER}-I18N_MB-${FVWM_PATCHVER}.patch
 
 MAINTAINER=	matusita@jp.freebsd.org
 
+.if !defined(USE_XPM) || ${USE_XPM} != NO
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+.endif
+
+GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
+MAN1=		fvwm2.1 xpmroot.1 FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 \
+		FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 FvwmCommand.1 \
+		FvwmConfig.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 \
+		FvwmDebug.1 FvwmEvent.1 FvwmForm.1 FvwmGoodStuff.1 \
+		FvwmIconBox.1 FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 \
+		FvwmPager.1 FvwmRearrange.1 FvwmSave.1 FvwmSaveDesk.1 \
+		FvwmScript.1 FvwmScroll.1 FvwmTalk.1 FvwmTaskBar.1 \
+		FvwmWharf.1 FvwmWinList.1
+MANCOMPRESSED=	no
+
+FVWM_DISTVER=	2.2
+FVWM_PATCHVER=	1999042001
+FVWM_DIR=	lib/X11/fvwm2
+RC_FILES=	decor_examples new-features system.fvwm2rc \
+		system.fvwm2rc-sample-1 system.fvwm2rc-sample-2
 
-USE_IMAKE=	yes
-MAN1= 		FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
-		FvwmButtons.1 FvwmCascade.1 FvwmCpp.1 FvwmForm.1 \
-		FvwmIconBox.1 FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 \
-		FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 FvwmTile.1 \
-		FvwmWinList.1 fvwm2.1 xpmroot.1
-MANCOMPRESSED=	yes
+PLIST_SUB=	FVWM_DISTVER=${FVWM_DISTVER} FVWM_DIR=${FVWM_DIR}
 
-# filenames.
-PATCH_FIXIT=	kits/patch/fix-2.0.46
-PATCH_I18N=	kits/patch/PATCH.I18N
-USE_PATCHFILES=	${PATCH_FIXIT} ${PATCH_I18N}
+CONFIGURE_ARGS+= --enable-extras --enable-kanji
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/${FVWM_DIR}/${FVWM_DISTVER}
+CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/${FVWM_DIR}/pixmaps:/usr/include/X11/bitmaps:/usr/include/X11/pixmaps
 
-pre-patch:
-	@for i in ${USE_PATCHFILES}; do \
-		${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/$$i; \
-	 done;
+pre-configure:
+	@${TOUCH} ${WRKSRC}/aclocal.m4
+	@${TOUCH} ${WRKSRC}/stamp-h.in
+	@find ${WRKSRC} -name Makefile.in -exec ${TOUCH} \{} \;
 
 post-install:
-	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
+	@${MKDIR} ${PREFIX}/${FVWM_DIR}/${FVWM_DISTVER}
+	@for i in ${RC_FILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/$$i \
+				${PREFIX}/${FVWM_DIR}/${FVWM_DISTVER}/$$i; \
+	done
+	@${MKDIR} ${PREFIX}/${FVWM_DIR}/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${WRKSRC}/icons/*.xbm \
 			${WRKSRC}/icons/*.bitmap ${WRKSRC}/icons/*.icon \
-		${PREFIX}/lib/X11/fvwm2/pixmaps
-	@${CAT} ${PKGDIR}/MESSAGE
+		${PREFIX}/${FVWM_DIR}/pixmaps
+
+.include <bsd.port.pre.mk>
+
+.if defined(USE_RPLAY) && ${USE_RPLAY} == YES || \
+    exists(${LOCALBASE}/lib/librplay.a) && \
+    (!defined(USE_RPLAY) || ${USE_RPLAY} != NO)
+BUILD_DEPENDS=  rplay:${PORTSDIR}/audio/rplay
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fvwm2-i18n/distinfo b/x11-wm/fvwm2-i18n/distinfo
index d79a410db3be..c0bc36efbadd 100644
--- a/x11-wm/fvwm2-i18n/distinfo
+++ b/x11-wm/fvwm2-i18n/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.0.46.tar.gz) = da4a7d4c4e81e5de3ecdc02026fa1fa9
-MD5 (fvwm-users-jp-kits.97Oct04.tar.gz) = 7e4b5da259634142a76d0eb9e681a6ea
+MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
+MD5 (fvwm-2.2-I18N_MB-1999042001.patch) = dbedc4b524eea6523dc6cb3394752f78
diff --git a/x11-wm/fvwm2-i18n/files/patch-aa b/x11-wm/fvwm2-i18n/files/patch-aa
index 36929064f002..2395b6411463 100644
--- a/x11-wm/fvwm2-i18n/files/patch-aa
+++ b/x11-wm/fvwm2-i18n/files/patch-aa
@@ -1,51 +1,6 @@
---- Fvwm.tmpl.dist	Wed Jan 22 22:38:49 1997
-+++ Fvwm.tmpl	Thu Jan 30 15:27:41 1997
-@@ -97,7 +97,7 @@
-  * Set this to YES if you would like the programs in the utils directory
-  * installed.
-  *************************************************************************/
--#define InstallUtils NO
-+#define InstallUtils YES
- 
- 
- /**************************************************************************
-@@ -268,6 +268,9 @@
- /* Or if you prefer a more minimal setup, you could try something like: */
- /* OPTION_DEFINES = -DSHAPE -DVECTOR_BUTTONS */
- 
-+/* FreeBSD ports -- Assumes += notation is allowed */
-+OPTION_DEFINES += -DENABLE_REMOTE_CHANGEDESKS
-+/* FreeBSD ports */
- 
- /***************************************************************************
-  * The following section only needs to be changed if you do not want
-@@ -388,7 +391,7 @@
- #endif
- 
- #ifndef FvwmIconPath
--#define FvwmIconPath $(INCDIR)/bitmaps\:$(INCDIR)/pixmaps
-+#define FvwmIconPath $(FVWMDIR)/pixmaps\:$(INCDIR)/bitmaps\:$(INCDIR)/pixmaps
- #endif
- 
-    ICONPATH = FvwmIconPath
---- sample.fvwmrc/Imakefile.dist	Thu Apr 25 23:23:35 1996
-+++ sample.fvwmrc/Imakefile	Thu Jan 30 15:47:29 1997
-@@ -8,5 +8,12 @@
- NullMake()
- 
- #if InstallSample
-+/* FreeBSD ports -- maybe a bug(typo?). reported. */
- InstallNonExecFile(system$(FVWMRC),$(FVWMDIR))
-+/* FreeBSD ports */
-+/* FreeBSD ports -- More informations are welcomed :-) */
-+InstallNonExecFile(decor_examples,$(FVWMDIR))
-+InstallNonExecFile(system.fvwm2rc-sample-1,$(FVWMDIR))
-+InstallNonExecFile(system.fvwm2rc-sample-2,$(FVWMDIR))
-+/* FreeBSD ports */
- #endif
---- sample.fvwmrc/system.fvwm2rc.dist	Thu Jan 16 05:29:42 1997
-+++ sample.fvwmrc/system.fvwm2rc	Thu Jan 30 15:58:20 1997
-@@ -13,12 +13,12 @@
+--- sample.fvwmrc/system.fvwm2rc.dist	Mon Nov  2 03:08:40 1998
++++ sample.fvwmrc/system.fvwm2rc	Tue Apr 20 18:06:09 1999
+@@ -8,12 +8,12 @@
  ClickTime 750
  
  # make sure these fonts exist on your system:
@@ -61,7 +16,29 @@
  
  ColormapFocus FollowsMouse
  
-@@ -289,12 +289,12 @@
+@@ -282,18 +282,18 @@
+ *FvwmIconMan*Resolution  page
+ *FvwmIconMan*background  bisque3
+ *FvwmIconMan*foreground  black
+-*FvwmIconMan*font        7x13bold
++*FvwmIconMan*font        7x13bold,-*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-*
+ *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        false
++*FvwmIconMan*sort        none
+ *FvwmIconMan*plainbutton          up black bisque3
+ *FvwmIconMan*selectbutton         down black bisque3
+ *FvwmIconMan*focusbutton          up yellow firebrick
+ *FvwmIconMan*focusandselectButton down yellow firebrick
+-*FvwmIconMan*dontshow icon=Untitled name=Untitled
++*FvwmIconMan*dontshow icon=Untitled title=Untitled
+ #*FvwmIconMan*drawicons true
+ *FvwmIconMan*buttongeometry  300x0
+ *FvwmIconMan*managergeometry 1x5
+@@ -302,12 +302,12 @@
  # Just choose colors and a fonts
  *FvwmIdentBack MidnightBlue
  *FvwmIdentFore Yellow
@@ -71,12 +48,12 @@
  ########################### Pager #########################################
  *FvwmPagerBack #908090
  *FvwmPagerFore #484048
--*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+-#*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
 +*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*
+ # turn off desktop names for swallowing in above button bar example:
+ *FvwmPagerFont none
  *FvwmPagerHilight #cab3ca
- *FvwmPagerGeometry -1-1
- *FvwmPagerLabel 0 Misc
-@@ -306,7 +306,7 @@
+@@ -328,7 +328,7 @@
  ##########################FvwmWinList##################################
  *FvwmWinListBack #908090
  *FvwmWinListFore Black
@@ -85,7 +62,7 @@
  *FvwmWinListAction Click1 Iconify -1,Focus
  *FvwmWinListAction Click2 Iconify
  *FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent
-@@ -334,7 +334,7 @@
+@@ -356,7 +356,7 @@
  #*FvwmIconBoxFore       blue
  *FvwmIconBoxGeometry    5x1+0+0
  *FvwmIconBoxMaxIconSize 64x38
diff --git a/x11-wm/fvwm2-i18n/pkg-descr b/x11-wm/fvwm2-i18n/pkg-descr
index 3e859e68de61..1270db38d78e 100644
--- a/x11-wm/fvwm2-i18n/pkg-descr
+++ b/x11-wm/fvwm2-i18n/pkg-descr
@@ -4,8 +4,7 @@ shaped/color icons. It gives a very good emulation of mwm. A nice
 button-bar can be used to provide convenient access to frequently used
 functions or programs.
 
-This package uses fvwm-users-jp-kits also, to add internationalized
-feature (based on X itself) to fvwm and its modules.
+See http://www.fvwm.org/, the official FVWM home page.
 
-With this package, you may use fonts of your own language, display
-characters in everywhere in fvwm, and have fun ;-)
+This packages also employs I18N_MB patch, to add internationalized features;
+use multibyte characters in titlebar, icon name, etc.
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%%