summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/fvwm2/Makefile54
-rw-r--r--x11/fvwm2/files/md55
-rw-r--r--x11/fvwm2/patches/patch-aa68
-rw-r--r--x11/fvwm2/patches/patch-ab38
-rw-r--r--x11/fvwm2/patches/patch-ac65
-rw-r--r--x11/fvwm2/patches/patch-ad17
-rw-r--r--x11/fvwm2/patches/patch-ae13
-rw-r--r--x11/fvwm2/pkg/COMMENT2
-rw-r--r--x11/fvwm2/pkg/PLIST126
9 files changed, 162 insertions, 226 deletions
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index 7e8b8210bef..dce50a46925 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,38 +1,50 @@
-# $NetBSD: Makefile,v 1.15 1998/11/19 15:40:47 agc Exp $
+# $NetBSD: Makefile,v 1.16 1999/03/01 01:38:45 hubertf Exp $
# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
#
-DISTNAME= fvwm-2.0.46
+DISTNAME= fvwm-2.2
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
+MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
+ 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
+ ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
+
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.hpc.uh.edu/fvwm/
DEPENDS+= xpm-3.4k:../../graphics/xpm
-DEPENDS+= xpmroot-1.01:../../x11/xpmroot
+DEPENDS+= xpmroot-2.2:../../x11/xpmroot
-USE_IMAKE= yes
-
-# filenames.
-PATCH_FIXIT= kits/patch/fix-2.0.46
-PATCH_I18N= kits/patch/PATCH.I18N
-USE_PATCHFILES= ${PATCH_FIXIT} ${PATCH_I18N}
-
-pre-patch:
- @for i in ${USE_PATCHFILES}; do \
- ${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/$$i; \
- done;
+USE_X11BASE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-extras
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2
+CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11
+CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps
post-install:
- @${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${WRKSRC}/icons/*.xbm \
- ${WRKSRC}/icons/*.bitmap ${WRKSRC}/icons/*.icon \
+ @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
+ ${INSTALL_DATA} \
+ ${WRKSRC}/icons/*.xpm \
+ ${WRKSRC}/icons/*.xbm \
+ ${WRKSRC}/icons/*.bitmap \
+ ${WRKSRC}/icons/*.icon \
${PREFIX}/lib/X11/fvwm2/pixmaps
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2
+ ${INSTALL_DATA} \
+ ${WRKSRC}/sample.fvwmrc/decor_examples \
+ ${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
+ ${PREFIX}/lib/X11/fvwm2
+ ${INSTALL_DATA} \
+ ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+ ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
+ if [ ! -f ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
+ ${INSTALL_DATA} \
+ ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
+ ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
+ fi
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/fvwm2/files/md5 b/x11/fvwm2/files/md5
index 5f6813247e9..ad023aa92d6 100644
--- a/x11/fvwm2/files/md5
+++ b/x11/fvwm2/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:29:04 agc Exp $
+$NetBSD: md5,v 1.3 1999/03/01 01:38:45 hubertf Exp $
-MD5 (fvwm-2.0.46.tar.gz) = da4a7d4c4e81e5de3ecdc02026fa1fa9
-MD5 (fvwm-users-jp-kits.97Oct04.tar.gz) = 7e4b5da259634142a76d0eb9e681a6ea
+MD5 (fvwm-2.2.tar.gz) = 6f2f57d60895c8c01057be6d0be3b21a
diff --git a/x11/fvwm2/patches/patch-aa b/x11/fvwm2/patches/patch-aa
index d7f0ba59379..89440a27574 100644
--- a/x11/fvwm2/patches/patch-aa
+++ b/x11/fvwm2/patches/patch-aa
@@ -1,52 +1,16 @@
-$NetBSD: patch-aa,v 1.4 1998/09/16 19:01:58 garbled Exp $
---- Fvwm.tmpl.orig Wed Sep 16 11:04:08 1998
-+++ Fvwm.tmpl Wed Sep 16 11:17:31 1998
-@@ -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
-
-
- /**************************************************************************
-@@ -257,17 +257,19 @@
- OPTION_DEFINES += -DVECTOR_BUTTONS -DPIXMAP_BUTTONS -DGRADIENT_BUTTONS
- OPTION_DEFINES += -DMULTISTYLE -DEXTENDED_TITLESTYLE
- OPTION_DEFINES += -DBORDERSTYLE -DUSEDECOR -DWINDOWSHADE
--
- #else
-
- /* the works, not using '+=': */
--OPTION_DEFINES = -DSHAPE -DI18N -DACTIVEDOWN_BTNS -DINACTIVE_BTNS -DMINI_ICONS -DVECTOR_BUTTONS -DPIXMAP_BUTTONS -DGRADIENT_BUTTONS -DMULTISTYLE -DEXTENDED_TITLESTYLE -DBORDERSTYLE -DUSEDECOR -DWINDOWSHADE
-+OPTION_DEFINES = -DSHAPE -DI18N -DACTIVEDOWN_BTNS -DINACTIVE_BTNS -DMINI_ICONS -DVECTOR_BUTTONS -DPIXMAP_BUTTONS -DGRADIENT_BUTTONS -DMULTISTYLE -DEXTENDED_TITLESTYLE -DBORDERSTYLE -DUSEDECOR -DWINDOWSHADE -DFVWM_CPP=\"/usr/bin/cpp\"
-
- #endif
-
- /* 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 +390,7 @@
- #endif
-
- #ifndef FvwmIconPath
--#define FvwmIconPath $(INCDIR)/bitmaps\:$(INCDIR)/pixmaps
-+#define FvwmIconPath $(FVWMDIR)/pixmaps\:$(INCDIR)/bitmaps\:$(INCDIR)/pixmaps
- #endif
-
- ICONPATH = FvwmIconPath
-@@ -397,7 +399,7 @@
-
- /* take care of libs not correctly added by Imake on some systems */
- /* #ifdef AlphaArchitecture */
--#if defined(AlphaArchitecture) && !defined(linux)
-+#if defined(AlphaArchitecture) && !defined(linux) && !defined(NetBSDArchitecture)
- KLUDGE_LIBS = -ldnet_stub
- #else
- #ifdef HPArchitecture
+--- utils/Makefile.in.orig Wed Jan 20 06:29:27 1999
++++ utils/Makefile.in Mon Feb 22 03:54:05 1999
+@@ -83,10 +83,10 @@
+ xpm_CFLAGS = @xpm_CFLAGS@
+ xpm_LIBS = @xpm_LIBS@
+
+-bin_PROGRAMS = @XPMROOT@
+-EXTRA_PROGRAMS = xpmroot
++#bin_PROGRAMS = @XPMROOT@
++#EXTRA_PROGRAMS = xpmroot
+
+-man_MANS = xpmroot.1
++#man_MANS = xpmroot.1
+ EXTRA_DIST = BuildXLockMenu fvwmrc_convert quantize_pixmaps $(man_MANS)
+
+ LDADD = -L$(top_builddir)/libs -lfvwm $(xpm_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
diff --git a/x11/fvwm2/patches/patch-ab b/x11/fvwm2/patches/patch-ab
index 0513f6a6c06..d19a0511d75 100644
--- a/x11/fvwm2/patches/patch-ab
+++ b/x11/fvwm2/patches/patch-ab
@@ -1,13 +1,31 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 11:18:02 agc Exp $
+$NetBSD: patch-ab,v 1.5 1999/03/01 01:38:45 hubertf Exp $
---- Imakefile.orig Thu Jun 12 22:06:45 1997
-+++ Imakefile Tue Mar 24 23:49:41 1998
-@@ -37,7 +37,7 @@
- sample.fvwmrc
+--- configure.orig Sun Dec 27 15:53:35 1998
++++ configure Sun Jan 10 23:46:33 1999
+@@ -648,7 +648,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- #if HasXpm
--XPMSUBDIRS = xpmroot modules/FvwmBanner
-+XPMSUBDIRS = modules/FvwmBanner
- #endif
- SUBDIRS = $(BUILDSUBDIRS) $(XPMSUBDIRS) $(SAMPLESUBDIRS)
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM:S/-s//g}'
+
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+ echo "configure:655: checking whether build environment is sane" >&5
+@@ -735,7 +735,7 @@
+ fi
+
+
+-PACKAGE=fvwm
++PACKAGE=fvwm2
+
+ VERSION=2.1.7
+
+@@ -3341,7 +3341,7 @@
+
+
+
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM:S/-s//g}'
+
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+ echo "configure:3348: checking whether ln -s works" >&5
diff --git a/x11/fvwm2/patches/patch-ac b/x11/fvwm2/patches/patch-ac
deleted file mode 100644
index 5298f36ed68..00000000000
--- a/x11/fvwm2/patches/patch-ac
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ac,v 1.4 1998/11/12 14:45:50 agc Exp $
-
---- sample.fvwmrc/system.fvwm2rc.orig Tue Aug 18 23:27:13 1998
-+++ sample.fvwmrc/system.fvwm2rc Tue Aug 18 23:26:57 1998
-@@ -4,21 +4,21 @@
- # fvwm web page (see the FAQ).
-
- # be sure to customize these paths for your installation:
--ModulePath /usr/lib/X11/fvwm2
--PixmapPath /usr/include/X11/pixmaps
--IconPath /usr/include/X11/bitmaps
-+#ModulePath /usr/lib/X11/fvwm2
-+#PixmapPath /usr/include/X11/pixmaps
-+#IconPath /usr/include/X11/bitmaps
-
- EdgeResistance 250 10
- EdgeScroll 100 100
- ClickTime 750
-
- # make sure these fonts exist on your system:
--WindowFont -adobe-times-bold-r-*-*-18-*-*-*-*-*-*-*
--IconFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
-+WindowFont -adobe-times-bold-r-*-*-18-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-18-*-*-*-*-*-*-*
-+IconFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*
-
- HilightColor black palevioletred
- DeskTopSize 2x2
--MenuStyle maroon grey60 grey40 -adobe-times-bold-r-*-*-14-*-*-*-*-*-*-* fvwm
-+MenuStyle maroon grey60 grey40 -adobe-times-bold-r-*-*-14-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-14-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-14-*-*-*-*-*-*-* fvwm
-
- ColormapFocus FollowsMouse
-
-@@ -289,12 +289,12 @@
- # Just choose colors and a fonts
- *FvwmIdentBack MidnightBlue
- *FvwmIdentFore Yellow
--*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
-+*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-*
-
- ########################### Pager #########################################
- *FvwmPagerBack #908090
- *FvwmPagerFore #484048
--*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-*-*-*-*-*-*-*
- *FvwmPagerHilight #cab3ca
- *FvwmPagerGeometry -1-1
- *FvwmPagerLabel 0 Misc
-@@ -306,7 +306,7 @@
- ##########################FvwmWinList##################################
- *FvwmWinListBack #908090
- *FvwmWinListFore Black
--*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
-+*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*
- *FvwmWinListAction Click1 Iconify -1,Focus
- *FvwmWinListAction Click2 Iconify
- *FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent
-@@ -334,7 +334,7 @@
- #*FvwmIconBoxFore blue
- *FvwmIconBoxGeometry 5x1+0+0
- *FvwmIconBoxMaxIconSize 64x38
--*FvwmIconBoxFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
-+*FvwmIconBoxFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-*
- *FvwmIconBoxSortIcons IconName
- *FvwmIconBoxPadding 4
- *FvwmIconBoxLines 10
diff --git a/x11/fvwm2/patches/patch-ad b/x11/fvwm2/patches/patch-ad
deleted file mode 100644
index af452d13658..00000000000
--- a/x11/fvwm2/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/11/12 14:45:50 agc Exp $
-
---- 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
diff --git a/x11/fvwm2/patches/patch-ae b/x11/fvwm2/patches/patch-ae
deleted file mode 100644
index 078a1988484..00000000000
--- a/x11/fvwm2/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/09/16 19:01:58 garbled Exp $
---- fvwm/alpha_header.h.orig Mon May 15 14:01:34 1995
-+++ fvwm/alpha_header.h Wed Sep 16 11:02:06 1998
-@@ -12,7 +12,7 @@
- extern size_t strlen(char *);
- #endif
-
--extern void bzero(char *, int);
-+/*extern void bzero(char *, int);
- extern int gethostname (char *, int);
--/**************************************************************************/
-+*************************************************************************/
-
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