3 files changed, 337 insertions, 331 deletions

diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 40b6a903dee0..a311af3e775e 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.5.8
-PORTREVISION=	2
+PORTVERSION=	2.5.10
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -22,10 +21,15 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Popular virtual window manager for X
 
-CONFIGURE_ARGS=	--with-iconv-library=${LOCALBASE}/lib \
-		--with-iconv-includes=${LOCALBASE}/include
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft \
-		biconv.2:${PORTSDIR}/converters/iconv
+.if defined(WITHOUT_ICONV)
+CONFIGURE_ARGS+=	--disable-iconv
+.else
+LIB_DEPENDS+=	biconv.2:${PORTSDIR}/converters/iconv
+CONFIGURE_ARGS+=	--with-iconv-library=${LOCALBASE}/lib \
+			--with-iconv-includes=${LOCALBASE}/include
+.endif
+
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 .if defined(WITH_STROKE)
@@ -80,14 +84,16 @@ PKGNAMESUFFIX=	-imlib
 CONFIGURE_ARGS+=	--enable-gtktest --enable-imlibtest
 PLIST_SUB+=	GTK=""
 .else
-CONFIGURE_ARGS+=	--disable-gtktest --disable-imlibtest
+CONFIGURE_ARGS+=	--disable-gtktest --disable-imlibtest \
+			--with-gtk-prefix=/no/dir --with-imlib-prefix=/no/dir
 PLIST_SUB+=	GTK="@comment not installed: "
+WITHOUT_GNOME=	true
 .endif
 
-.if !defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=	--with-gnome --enable-gnome-hints
-.else
+.if defined(WITHOUT_GNOME)
 CONFIGURE_ARGS+=	--without-gnome --disable-gnome-hints
+.else
+CONFIGURE_ARGS+=	--with-gnome --enable-gnome-hints
 .endif
 
 MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
@@ -126,9 +132,9 @@ post-install:
 	fi
 
 .if !defined(WITHOUT_ICONS)
-	@${MKDIR} ${PREFIX}/share/fvwm2/pixmaps
+	@${MKDIR} ${PREFIX}/share/fvwm/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/icons/fvwm_icons/*.xpm \
-		${PREFIX}/share/fvwm2/pixmaps
+		${PREFIX}/share/fvwm/pixmaps
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index 17ecf90f1e09..1fd687e3f799 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.5.8.tar.bz2) = c702d873d124a475f95c45432b8bd7d7
+MD5 (fvwm-2.5.10.tar.bz2) = b3c86e2af2a4eabe692c9c849ff4b243
 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index 7b79bdedbea7..d694e95b3c68 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -58,322 +58,322 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmWindowMenu
 man/man1/fvwm2.1.gz
 man/man1/xpmroot.1.gz
 @comment End of symlink list
-%%ICONS%%share/fvwm2/pixmaps/Jlock.xpm
-%%ICONS%%share/fvwm2/pixmaps/Jnews.xpm
-%%ICONS%%share/fvwm2/pixmaps/Jrecycle.xpm
-%%ICONS%%share/fvwm2/pixmaps/Jxlock.xpm
-%%ICONS%%share/fvwm2/pixmaps/Monitor.xpm
-%%ICONS%%share/fvwm2/pixmaps/Mosaic.xpm
-%%ICONS%%share/fvwm2/pixmaps/Xfm.xpm
-%%ICONS%%share/fvwm2/pixmaps/arrdown2.xpm
-%%ICONS%%share/fvwm2/pixmaps/arrows2.xpm
-%%ICONS%%share/fvwm2/pixmaps/arrup2.xpm
-%%ICONS%%share/fvwm2/pixmaps/banner.fvwm_blue_cursive.xpm
-%%ICONS%%share/fvwm2/pixmaps/banner.fvwm_bracket.xpm
-%%ICONS%%share/fvwm2/pixmaps/banner.fvwm_cat_thing.xpm
-%%ICONS%%share/fvwm2/pixmaps/banner.fvwm_red_3D.xpm
-%%ICONS%%share/fvwm2/pixmaps/banner.fvwm_red_cursive.xpm
-%%ICONS%%share/fvwm2/pixmaps/banner.fvwm_tiger.xpm
-%%ICONS%%share/fvwm2/pixmaps/banner.fvwm_tiger_tail.xpm
-%%ICONS%%share/fvwm2/pixmaps/bckgnd1.xpm
-%%ICONS%%share/fvwm2/pixmaps/bckgnd3.xpm
-%%ICONS%%share/fvwm2/pixmaps/bell.xpm
-%%ICONS%%share/fvwm2/pixmaps/bomb.xpm
-%%ICONS%%share/fvwm2/pixmaps/button-close.xpm
-%%ICONS%%share/fvwm2/pixmaps/button-horiz.xpm
-%%ICONS%%share/fvwm2/pixmaps/button-max.xpm
-%%ICONS%%share/fvwm2/pixmaps/button-vert.xpm
-%%ICONS%%share/fvwm2/pixmaps/button.xpm
-%%ICONS%%share/fvwm2/pixmaps/clamp.xpm
-%%ICONS%%share/fvwm2/pixmaps/date.xpm
-%%ICONS%%share/fvwm2/pixmaps/datebook.xpm
-%%ICONS%%share/fvwm2/pixmaps/default.xpm
-%%ICONS%%share/fvwm2/pixmaps/desk.xpm
-%%ICONS%%share/fvwm2/pixmaps/desktop.xpm
-%%ICONS%%share/fvwm2/pixmaps/dialog_box.xpm
-%%ICONS%%share/fvwm2/pixmaps/display.xpm
-%%ICONS%%share/fvwm2/pixmaps/documents.xpm
-%%ICONS%%share/fvwm2/pixmaps/doomface.xpm
-%%ICONS%%share/fvwm2/pixmaps/editres.xpm
-%%ICONS%%share/fvwm2/pixmaps/eps.xpm
-%%ICONS%%share/fvwm2/pixmaps/exit.xpm
-%%ICONS%%share/fvwm2/pixmaps/find1.xpm
-%%ICONS%%share/fvwm2/pixmaps/flow_chart.xpm
-%%ICONS%%share/fvwm2/pixmaps/folder.xpm
-%%ICONS%%share/fvwm2/pixmaps/folder2.xpm
-%%ICONS%%share/fvwm2/pixmaps/folders.xpm
-%%ICONS%%share/fvwm2/pixmaps/fvwm.xpm
-%%ICONS%%share/fvwm2/pixmaps/fvwm2.xpm
-%%ICONS%%share/fvwm2/pixmaps/fvwm2_big.xpm
-%%ICONS%%share/fvwm2/pixmaps/fvwm3.xpm
-%%ICONS%%share/fvwm2/pixmaps/gimp.xpm
-%%ICONS%%share/fvwm2/pixmaps/gnu-animal.xpm
-%%ICONS%%share/fvwm2/pixmaps/graphs.xpm
-%%ICONS%%share/fvwm2/pixmaps/gv.xpm
-%%ICONS%%share/fvwm2/pixmaps/help.xpm
-%%ICONS%%share/fvwm2/pixmaps/jx.xpm
-%%ICONS%%share/fvwm2/pixmaps/keyboard.xpm
-%%ICONS%%share/fvwm2/pixmaps/lemacs.xpm
-%%ICONS%%share/fvwm2/pixmaps/mag_glass.xpm
-%%ICONS%%share/fvwm2/pixmaps/mail1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mail2.xpm
-%%ICONS%%share/fvwm2/pixmaps/map.xpm
-%%ICONS%%share/fvwm2/pixmaps/math4.xpm
-%%ICONS%%share/fvwm2/pixmaps/menu.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.arch.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.audiovol.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.audiovol2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.ball.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.ball2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.bball.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.blah.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.bomb.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.bomb2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.book1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.book2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.book3.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.book4.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.books.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.briefcase.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.bug1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.bug2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.bx2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.calc.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.calc2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.calendar.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.camera.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.cat.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.cave.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.cd.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.cdlabel.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.chart.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.checkmark.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.chinese.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.clipboard.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.clock.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.clock2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.colors.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.connect.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.crosbone.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.cross.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.cut.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.delete.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.desktop.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.destroy.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.diff.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.directory.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.dirlink.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.diskette.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.display.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.doc.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.doc1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.dog.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.ear.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.edit.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.espada.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.excl.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.exclam.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.exit.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.exp.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.eye.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.eye2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.eyes.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.f1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.fax.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.fdisk.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.file.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.filelink.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.filemgr.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.floppy.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.folder.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.font.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.fractal.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.frame.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.ftp.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.fvwm.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.gball.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.gimp.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.gnome.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.gnu.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.go.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.gopher.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.graph.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.graph2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.gv.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.hammer.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.happy.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.hdisk.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.heart.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.hex.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.hextris.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.ibm.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.iconify.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.iconify1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.icons.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.kde.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.keyboard.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.keys.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.letter.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.line.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.lock.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.lower.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.lower2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.lower3.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.mag.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.mail.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.mail2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.manual.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.max1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.maximize-horiz.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.maximize-horiz1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.maximize-vert.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.maximize-vert1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.maximize.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.maximize1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.maximize2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.maze.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.modules.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.monitor.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.mouse.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.move.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.move1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.move2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.move3.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.mwm.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.netscape.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.news.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.nscape.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.ofolder.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.olwm.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.pager.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.paint.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.paint2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.palette.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.paper.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.pdf.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.pencil.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.penguin.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.perf.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.picture.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.question.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.rainbow.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.raise.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.raise2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.raise3.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.ray.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.rball.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.refresh.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.resize.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.resize2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.resize3.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.resize4.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.roach.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.run.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.sh.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.sh1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.shade1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.slon.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.sound.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.start.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.stick.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.stick1.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.stick2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.stickpressed.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.stop.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.telnet.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.term.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.term2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.tetris.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.trebol.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.turn.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.twm.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.winXX-close.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.winXX-maximize.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.winXX-minimize.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.winXX-normalize.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.winXX-sysmenu.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.window.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.window2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.windows.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.windowshade.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.x.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.x2.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xaniroc.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xarchie.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xbiff.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xboing.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xfig.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xjewel.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xkeycaps.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xlander.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xlock.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xmag.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xmahjongg.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xman.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xpaint.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xsnow.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xterm.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.xv.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.zircon.xpm
-%%ICONS%%share/fvwm2/pixmaps/mini.zoom.xpm
-%%ICONS%%share/fvwm2/pixmaps/modules.xpm
-%%ICONS%%share/fvwm2/pixmaps/nscape.xpm
-%%ICONS%%share/fvwm2/pixmaps/page.xpm
-%%ICONS%%share/fvwm2/pixmaps/page2.xpm
-%%ICONS%%share/fvwm2/pixmaps/pointer.xpm
-%%ICONS%%share/fvwm2/pixmaps/programs.xpm
-%%ICONS%%share/fvwm2/pixmaps/ps.xpm
-%%ICONS%%share/fvwm2/pixmaps/question.xpm
-%%ICONS%%share/fvwm2/pixmaps/rbomb.xpm
-%%ICONS%%share/fvwm2/pixmaps/rbomb2.xpm
-%%ICONS%%share/fvwm2/pixmaps/rcalc.xpm
-%%ICONS%%share/fvwm2/pixmaps/rcalc2.xpm
-%%ICONS%%share/fvwm2/pixmaps/resize.rainbow.xpm
-%%ICONS%%share/fvwm2/pixmaps/rterm.xpm
-%%ICONS%%share/fvwm2/pixmaps/rterm2.xpm
-%%ICONS%%share/fvwm2/pixmaps/run.xpm
-%%ICONS%%share/fvwm2/pixmaps/screen.xpm
-%%ICONS%%share/fvwm2/pixmaps/settings.xpm
-%%ICONS%%share/fvwm2/pixmaps/shells.xpm
-%%ICONS%%share/fvwm2/pixmaps/shutdown.xpm
-%%ICONS%%share/fvwm2/pixmaps/shutdown2.xpm
-%%ICONS%%share/fvwm2/pixmaps/side.fvwm2.xpm
-%%ICONS%%share/fvwm2/pixmaps/side.fvwm2_1.xpm
-%%ICONS%%share/fvwm2/pixmaps/side.fvwm2_2.xpm
-%%ICONS%%share/fvwm2/pixmaps/side.utilities.xpm
-%%ICONS%%share/fvwm2/pixmaps/small.Paint2.xpm
-%%ICONS%%share/fvwm2/pixmaps/small.Shell2.xpm
-%%ICONS%%share/fvwm2/pixmaps/small.exit.xpm
-%%ICONS%%share/fvwm2/pixmaps/small.lock.xpm
-%%ICONS%%share/fvwm2/pixmaps/small.man.next.xpm
-%%ICONS%%share/fvwm2/pixmaps/small.note.next.xpm
-%%ICONS%%share/fvwm2/pixmaps/small.tools2_3d.xpm
-%%ICONS%%share/fvwm2/pixmaps/term.xpm
-%%ICONS%%share/fvwm2/pixmaps/textedit.xpm
-%%ICONS%%share/fvwm2/pixmaps/tiff2.xpm
-%%ICONS%%share/fvwm2/pixmaps/toolbox.xpm
-%%ICONS%%share/fvwm2/pixmaps/unknown1.xpm
-%%ICONS%%share/fvwm2/pixmaps/wierd_page3.xpm
-%%ICONS%%share/fvwm2/pixmaps/window.xpm
-%%ICONS%%share/fvwm2/pixmaps/word_processor.xpm
-%%ICONS%%share/fvwm2/pixmaps/wterm.xpm
-%%ICONS%%share/fvwm2/pixmaps/xcalc.xpm
-%%ICONS%%share/fvwm2/pixmaps/xemacs.xpm
-%%ICONS%%share/fvwm2/pixmaps/xlock.xpm
-%%ICONS%%share/fvwm2/pixmaps/xman.xpm
-%%ICONS%%share/fvwm2/pixmaps/xpaint.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm-axp.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm-blank.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm-bsd.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm-dec.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm-linux.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm-sgi.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm-sol.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm-sun.xpm
-%%ICONS%%share/fvwm2/pixmaps/xterm.xpm
-%%ICONS%%share/fvwm2/pixmaps/xv.xpm
-%%ICONS%%share/fvwm2/pixmaps/xv2.xpm
-%%ICONS%%share/fvwm2/pixmaps/xview.xpm
+%%ICONS%%share/fvwm/pixmaps/Jlock.xpm
+%%ICONS%%share/fvwm/pixmaps/Jnews.xpm
+%%ICONS%%share/fvwm/pixmaps/Jrecycle.xpm
+%%ICONS%%share/fvwm/pixmaps/Jxlock.xpm
+%%ICONS%%share/fvwm/pixmaps/Monitor.xpm
+%%ICONS%%share/fvwm/pixmaps/Mosaic.xpm
+%%ICONS%%share/fvwm/pixmaps/Xfm.xpm
+%%ICONS%%share/fvwm/pixmaps/arrdown2.xpm
+%%ICONS%%share/fvwm/pixmaps/arrows2.xpm
+%%ICONS%%share/fvwm/pixmaps/arrup2.xpm
+%%ICONS%%share/fvwm/pixmaps/banner.fvwm_blue_cursive.xpm
+%%ICONS%%share/fvwm/pixmaps/banner.fvwm_bracket.xpm
+%%ICONS%%share/fvwm/pixmaps/banner.fvwm_cat_thing.xpm
+%%ICONS%%share/fvwm/pixmaps/banner.fvwm_red_3D.xpm
+%%ICONS%%share/fvwm/pixmaps/banner.fvwm_red_cursive.xpm
+%%ICONS%%share/fvwm/pixmaps/banner.fvwm_tiger.xpm
+%%ICONS%%share/fvwm/pixmaps/banner.fvwm_tiger_tail.xpm
+%%ICONS%%share/fvwm/pixmaps/bckgnd1.xpm
+%%ICONS%%share/fvwm/pixmaps/bckgnd3.xpm
+%%ICONS%%share/fvwm/pixmaps/bell.xpm
+%%ICONS%%share/fvwm/pixmaps/bomb.xpm
+%%ICONS%%share/fvwm/pixmaps/button-close.xpm
+%%ICONS%%share/fvwm/pixmaps/button-horiz.xpm
+%%ICONS%%share/fvwm/pixmaps/button-max.xpm
+%%ICONS%%share/fvwm/pixmaps/button-vert.xpm
+%%ICONS%%share/fvwm/pixmaps/button.xpm
+%%ICONS%%share/fvwm/pixmaps/clamp.xpm
+%%ICONS%%share/fvwm/pixmaps/date.xpm
+%%ICONS%%share/fvwm/pixmaps/datebook.xpm
+%%ICONS%%share/fvwm/pixmaps/default.xpm
+%%ICONS%%share/fvwm/pixmaps/desk.xpm
+%%ICONS%%share/fvwm/pixmaps/desktop.xpm
+%%ICONS%%share/fvwm/pixmaps/dialog_box.xpm
+%%ICONS%%share/fvwm/pixmaps/display.xpm
+%%ICONS%%share/fvwm/pixmaps/documents.xpm
+%%ICONS%%share/fvwm/pixmaps/doomface.xpm
+%%ICONS%%share/fvwm/pixmaps/editres.xpm
+%%ICONS%%share/fvwm/pixmaps/eps.xpm
+%%ICONS%%share/fvwm/pixmaps/exit.xpm
+%%ICONS%%share/fvwm/pixmaps/find1.xpm
+%%ICONS%%share/fvwm/pixmaps/flow_chart.xpm
+%%ICONS%%share/fvwm/pixmaps/folder.xpm
+%%ICONS%%share/fvwm/pixmaps/folder2.xpm
+%%ICONS%%share/fvwm/pixmaps/folders.xpm
+%%ICONS%%share/fvwm/pixmaps/fvwm.xpm
+%%ICONS%%share/fvwm/pixmaps/fvwm2.xpm
+%%ICONS%%share/fvwm/pixmaps/fvwm2_big.xpm
+%%ICONS%%share/fvwm/pixmaps/fvwm3.xpm
+%%ICONS%%share/fvwm/pixmaps/gimp.xpm
+%%ICONS%%share/fvwm/pixmaps/gnu-animal.xpm
+%%ICONS%%share/fvwm/pixmaps/graphs.xpm
+%%ICONS%%share/fvwm/pixmaps/gv.xpm
+%%ICONS%%share/fvwm/pixmaps/help.xpm
+%%ICONS%%share/fvwm/pixmaps/jx.xpm
+%%ICONS%%share/fvwm/pixmaps/keyboard.xpm
+%%ICONS%%share/fvwm/pixmaps/lemacs.xpm
+%%ICONS%%share/fvwm/pixmaps/mag_glass.xpm
+%%ICONS%%share/fvwm/pixmaps/mail1.xpm
+%%ICONS%%share/fvwm/pixmaps/mail2.xpm
+%%ICONS%%share/fvwm/pixmaps/map.xpm
+%%ICONS%%share/fvwm/pixmaps/math4.xpm
+%%ICONS%%share/fvwm/pixmaps/menu.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.arch.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.audiovol.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.audiovol2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.ball.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.ball2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.bball.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.blah.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.bomb.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.bomb2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.book1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.book2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.book3.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.book4.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.books.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.briefcase.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.bug1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.bug2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.bx2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.calc.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.calc2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.calendar.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.camera.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.cat.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.cave.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.cd.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.cdlabel.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.chart.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.checkmark.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.chinese.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.clipboard.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.clock.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.clock2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.colors.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.connect.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.crosbone.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.cross.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.cut.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.delete.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.desktop.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.destroy.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.diff.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.directory.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.dirlink.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.diskette.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.display.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.doc.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.doc1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.dog.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.ear.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.edit.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.espada.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.excl.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.exclam.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.exit.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.exp.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.eye.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.eye2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.eyes.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.f1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.fax.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.fdisk.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.file.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.filelink.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.filemgr.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.floppy.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.folder.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.font.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.fractal.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.frame.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.ftp.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.fvwm.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.gball.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.gimp.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.gnome.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.gnu.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.go.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.gopher.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.graph.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.graph2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.gv.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.hammer.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.happy.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.hdisk.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.heart.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.hex.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.hextris.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.ibm.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.iconify.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.iconify1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.icons.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.kde.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.keyboard.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.keys.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.letter.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.line.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.lock.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.lower.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.lower2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.lower3.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.mag.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.mail.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.mail2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.manual.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.max1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.maximize-horiz.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.maximize-horiz1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.maximize-vert.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.maximize-vert1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.maximize.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.maximize1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.maximize2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.maze.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.modules.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.monitor.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.mouse.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.move.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.move1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.move2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.move3.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.mwm.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.netscape.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.news.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.nscape.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.ofolder.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.olwm.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.pager.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.paint.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.paint2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.palette.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.paper.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.pdf.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.pencil.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.penguin.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.perf.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.picture.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.question.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.rainbow.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.raise.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.raise2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.raise3.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.ray.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.rball.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.refresh.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.resize.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.resize2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.resize3.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.resize4.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.roach.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.run.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.sh.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.sh1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.shade1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.slon.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.sound.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.start.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.stick.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.stick1.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.stick2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.stickpressed.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.stop.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.telnet.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.term.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.term2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.tetris.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.trebol.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.turn.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.twm.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.winXX-close.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.winXX-maximize.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.winXX-minimize.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.winXX-normalize.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.winXX-sysmenu.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.window.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.window2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.windows.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.windowshade.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.x.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.x2.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xaniroc.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xarchie.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xbiff.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xboing.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xfig.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xjewel.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xkeycaps.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xlander.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xlock.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xmag.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xmahjongg.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xman.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xpaint.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xsnow.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xterm.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.xv.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.zircon.xpm
+%%ICONS%%share/fvwm/pixmaps/mini.zoom.xpm
+%%ICONS%%share/fvwm/pixmaps/modules.xpm
+%%ICONS%%share/fvwm/pixmaps/nscape.xpm
+%%ICONS%%share/fvwm/pixmaps/page.xpm
+%%ICONS%%share/fvwm/pixmaps/page2.xpm
+%%ICONS%%share/fvwm/pixmaps/pointer.xpm
+%%ICONS%%share/fvwm/pixmaps/programs.xpm
+%%ICONS%%share/fvwm/pixmaps/ps.xpm
+%%ICONS%%share/fvwm/pixmaps/question.xpm
+%%ICONS%%share/fvwm/pixmaps/rbomb.xpm
+%%ICONS%%share/fvwm/pixmaps/rbomb2.xpm
+%%ICONS%%share/fvwm/pixmaps/rcalc.xpm
+%%ICONS%%share/fvwm/pixmaps/rcalc2.xpm
+%%ICONS%%share/fvwm/pixmaps/resize.rainbow.xpm
+%%ICONS%%share/fvwm/pixmaps/rterm.xpm
+%%ICONS%%share/fvwm/pixmaps/rterm2.xpm
+%%ICONS%%share/fvwm/pixmaps/run.xpm
+%%ICONS%%share/fvwm/pixmaps/screen.xpm
+%%ICONS%%share/fvwm/pixmaps/settings.xpm
+%%ICONS%%share/fvwm/pixmaps/shells.xpm
+%%ICONS%%share/fvwm/pixmaps/shutdown.xpm
+%%ICONS%%share/fvwm/pixmaps/shutdown2.xpm
+%%ICONS%%share/fvwm/pixmaps/side.fvwm2.xpm
+%%ICONS%%share/fvwm/pixmaps/side.fvwm2_1.xpm
+%%ICONS%%share/fvwm/pixmaps/side.fvwm2_2.xpm
+%%ICONS%%share/fvwm/pixmaps/side.utilities.xpm
+%%ICONS%%share/fvwm/pixmaps/small.Paint2.xpm
+%%ICONS%%share/fvwm/pixmaps/small.Shell2.xpm
+%%ICONS%%share/fvwm/pixmaps/small.exit.xpm
+%%ICONS%%share/fvwm/pixmaps/small.lock.xpm
+%%ICONS%%share/fvwm/pixmaps/small.man.next.xpm
+%%ICONS%%share/fvwm/pixmaps/small.note.next.xpm
+%%ICONS%%share/fvwm/pixmaps/small.tools2_3d.xpm
+%%ICONS%%share/fvwm/pixmaps/term.xpm
+%%ICONS%%share/fvwm/pixmaps/textedit.xpm
+%%ICONS%%share/fvwm/pixmaps/tiff2.xpm
+%%ICONS%%share/fvwm/pixmaps/toolbox.xpm
+%%ICONS%%share/fvwm/pixmaps/unknown1.xpm
+%%ICONS%%share/fvwm/pixmaps/wierd_page3.xpm
+%%ICONS%%share/fvwm/pixmaps/window.xpm
+%%ICONS%%share/fvwm/pixmaps/word_processor.xpm
+%%ICONS%%share/fvwm/pixmaps/wterm.xpm
+%%ICONS%%share/fvwm/pixmaps/xcalc.xpm
+%%ICONS%%share/fvwm/pixmaps/xemacs.xpm
+%%ICONS%%share/fvwm/pixmaps/xlock.xpm
+%%ICONS%%share/fvwm/pixmaps/xman.xpm
+%%ICONS%%share/fvwm/pixmaps/xpaint.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm-axp.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm-blank.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm-bsd.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm-dec.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm-linux.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm-sgi.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm-sol.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm-sun.xpm
+%%ICONS%%share/fvwm/pixmaps/xterm.xpm
+%%ICONS%%share/fvwm/pixmaps/xv.xpm
+%%ICONS%%share/fvwm/pixmaps/xv2.xpm
+%%ICONS%%share/fvwm/pixmaps/xview.xpm
 share/fvwm/ConfigFvwmBacker
 share/fvwm/ConfigFvwmButtons
 share/fvwm/ConfigFvwmDefaults
@@ -420,6 +420,7 @@ share/fvwm/perllib/FVWM/Module/Gtk.pm
 share/fvwm/perllib/FVWM/Module/Gtk2.pm
 share/fvwm/perllib/FVWM/Module/Tk.pm
 share/fvwm/perllib/FVWM/Module/Toolkit.pm
+share/fvwm/perllib/FVWM/Module/Terminal.pm
 share/fvwm/perllib/FVWM/Module.pm
 share/fvwm/perllib/FVWM/Tracker.pm
 share/fvwm/perllib/FVWM/Tracker/Colorsets.pm
@@ -435,8 +436,7 @@ share/fvwm/perllib/General/Parse.pm
 @dirrm share/fvwm/perllib/FVWM/Module
 @dirrm share/fvwm/perllib/FVWM
 @dirrm share/fvwm/perllib
+%%ICONS%%@dirrm share/fvwm/pixmaps
 @dirrm share/fvwm
-%%ICONS%%@dirrm share/fvwm2/pixmaps
-%%ICONS%%@dirrm share/fvwm2
 @dirrm libexec/fvwm/%%FVWM_VERSION%%
 @dirrm libexec/fvwm