diff options
author | Tomasz Konojacki <me@xenu.tk> | 2014-04-14 07:21:06 +0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-04-14 07:21:06 +0700 |
commit | 2a03947f962403b18394957398fcecb8ef6c1625 (patch) | |
tree | ebd14cbaf5cbb7cdda19e6f060297aa06c2c0aeb | |
parent | 936e218d368c1843778aaff34d676e3f7ef5878f (diff) |
desktop/fvwm95: Added (window manager for X11).
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r-- | desktop/fvwm95/README | 15 | ||||
-rw-r--r-- | desktop/fvwm95/fvwm95.SlackBuild | 118 | ||||
-rw-r--r-- | desktop/fvwm95/fvwm95.info | 10 | ||||
-rw-r--r-- | desktop/fvwm95/fvwm95.patch | 717 | ||||
-rw-r--r-- | desktop/fvwm95/slack-desc | 19 | ||||
-rw-r--r-- | desktop/fvwm95/xinitrc.fvwm95 | 29 |
6 files changed, 908 insertions, 0 deletions
diff --git a/desktop/fvwm95/README b/desktop/fvwm95/README new file mode 100644 index 0000000000000..4d39fd7cf15fa --- /dev/null +++ b/desktop/fvwm95/README @@ -0,0 +1,15 @@ +Fvwm95 (window manager for X11 with familiar look and feel) + +Fvwm95 is a hack based on fvwm2. It tries to emulate the good +features of a well known product without bloating the regular fvwm +code. + +Source code is patched a bit, just to make compilation under modern +versions of Slackware possible. + +Manpages were moved to avoid collision with fvwm, e.g. if you want +to read documentation for FvwmTaskBar module, type: + + man Fvwm95TaskBar + +xpmroot was renamed to xpmroot95 to avoid collision with fvwm. diff --git a/desktop/fvwm95/fvwm95.SlackBuild b/desktop/fvwm95/fvwm95.SlackBuild new file mode 100644 index 0000000000000..78ce3ee1448de --- /dev/null +++ b/desktop/fvwm95/fvwm95.SlackBuild @@ -0,0 +1,118 @@ +#!/bin/sh + +# Slackware build script for fvwm95 + +# Copyright 2014 Tomasz Konojacki <me@xenu.tk> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=fvwm95 +VERSION=${VERSION:-2.0.43f} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Apply patch to make compilation possible +patch -p1 < $CWD/fvwm95.patch + +# Fix path on x86_64 +subdirs="libs fvwm modules utils sample.fvwmrc xpmroot pixmaps mini-icons docs" +for S in ${subdirs}; do + sed -i "s|/lib/X11|/lib${LIBDIRSUFFIX}/X11|" $S/Makefile.in +done +sed -i "s|lib_dir=@exec_prefix@/lib|lib_dir=@exec_prefix@/lib${LIBDIRSUFFIX}|" libs/Makefile.in + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make +DESTDIR=$PKG make install + +# copy xinitrc +mkdir -p $PKG/etc/X11/xinit +install -m 755 $CWD/xinitrc.fvwm95 $PKG/etc/X11/xinit + +# rename xpmroot +mv $PKG/usr/bin/xpmroot $PKG/usr/bin/xpmroot95 +mv $PKG/usr/man/man1/xpmroot.1 $PKG/usr/man/man1/xpmroot95.1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changelog README GPL INSTALL README.rouat fvwm-StackingOrder.html \ + FvwmTaskBar-plugins.patch.README $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/fvwm95/fvwm95.info b/desktop/fvwm95/fvwm95.info new file mode 100644 index 0000000000000..b2e1f1933aeeb --- /dev/null +++ b/desktop/fvwm95/fvwm95.info @@ -0,0 +1,10 @@ +PRGNAM="fvwm95" +VERSION="2.0.43f" +HOMEPAGE="http://fvwm95.sourceforge.net" +DOWNLOAD="http://sourceforge.net/projects/fvwm95/files/fvwm95/2.0.43f/fvwm95-2.0.43f.tar.gz" +MD5SUM="b6d10d18b957f0abfdc46a7f4f040d64" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Tomasz Konojacki" +EMAIL="me@xenu.tk" diff --git a/desktop/fvwm95/fvwm95.patch b/desktop/fvwm95/fvwm95.patch new file mode 100644 index 0000000000000..4e7fcabe57ede --- /dev/null +++ b/desktop/fvwm95/fvwm95.patch @@ -0,0 +1,717 @@ +diff -rNu fvwm95-2.0.43f.orig/Makefile.in fvwm95-2.0.43f/Makefile.in +--- fvwm95-2.0.43f.orig/Makefile.in 2014-04-12 15:07:09.112195143 +0200 ++++ fvwm95-2.0.43f/Makefile.in 2014-04-12 15:29:20.530444173 +0200 +@@ -8,7 +8,7 @@ + + @SET_MAKE@ + +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + subdirs=libs fvwm modules utils sample.fvwmrc xpmroot pixmaps mini-icons docs + +diff -rNu fvwm95-2.0.43f.orig/docs/Makefile.in fvwm95-2.0.43f/docs/Makefile.in +--- fvwm95-2.0.43f.orig/docs/Makefile.in 2014-04-12 15:07:09.113195104 +0200 ++++ fvwm95-2.0.43f/docs/Makefile.in 2014-04-12 15:29:20.542443713 +0200 +@@ -1,9 +1,9 @@ + + SHELL=/bin/sh + +-prefix=@prefix@ +-indexdir=@prefix@/lib/X11/fvwm95 +-htmldir=@prefix@/lib/X11/fvwm95/html ++prefix=${DESTDIR}/@prefix@ ++indexdir=${DESTDIR}/@prefix@/lib/X11/fvwm95 ++htmldir=${DESTDIR}/@prefix@/lib/X11/fvwm95/html + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -rNu fvwm95-2.0.43f.orig/fvwm/Makefile.in fvwm95-2.0.43f/fvwm/Makefile.in +--- fvwm95-2.0.43f.orig/fvwm/Makefile.in 2014-04-12 15:07:09.115195025 +0200 ++++ fvwm95-2.0.43f/fvwm/Makefile.in 2014-04-12 15:29:20.559443062 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/libs/Makefile.in fvwm95-2.0.43f/libs/Makefile.in +--- fvwm95-2.0.43f.orig/libs/Makefile.in 2014-04-12 15:07:09.385184347 +0200 ++++ fvwm95-2.0.43f/libs/Makefile.in 2014-04-12 15:29:20.572442564 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + lib_dir=@exec_prefix@/lib + x_includes=@x_includes@ +diff -rNu fvwm95-2.0.43f.orig/mini-icons/Makefile.in fvwm95-2.0.43f/mini-icons/Makefile.in +--- fvwm95-2.0.43f.orig/mini-icons/Makefile.in 2014-04-12 15:07:09.448181852 +0200 ++++ fvwm95-2.0.43f/mini-icons/Makefile.in 2014-04-12 15:29:20.589441912 +0200 +@@ -1,8 +1,8 @@ + + SHELL=/bin/sh + +-prefix=@prefix@ +-icon_dir=@prefix@/lib/X11/mini-icons ++prefix=${DESTDIR}/@prefix@ ++icon_dir=${DESTDIR}/@prefix@/lib/X11/mini-icons + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmAudio/Makefile.in fvwm95-2.0.43f/modules/FvwmAudio/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmAudio/Makefile.in 2014-04-12 15:07:09.508179479 +0200 ++++ fvwm95-2.0.43f/modules/FvwmAudio/Makefile.in 2014-04-12 15:29:20.602441415 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + # + # Libs + X_LIBRARY=-lX11 @LIBS@ +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmAuto/Makefile.in fvwm95-2.0.43f/modules/FvwmAuto/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmAuto/Makefile.in 2014-04-12 15:07:09.508179479 +0200 ++++ fvwm95-2.0.43f/modules/FvwmAuto/Makefile.in 2014-04-12 15:29:20.618440801 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmBacker/Makefile.in fvwm95-2.0.43f/modules/FvwmBacker/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmBacker/Makefile.in 2014-04-12 15:07:09.509179439 +0200 ++++ fvwm95-2.0.43f/modules/FvwmBacker/Makefile.in 2014-04-12 15:29:20.632440265 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmBanner/Makefile.in fvwm95-2.0.43f/modules/FvwmBanner/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmBanner/Makefile.in 2014-04-12 15:07:09.509179439 +0200 ++++ fvwm95-2.0.43f/modules/FvwmBanner/Makefile.in 2014-04-12 15:29:20.648439652 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmButtons/Makefile.in fvwm95-2.0.43f/modules/FvwmButtons/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmButtons/Makefile.in 2014-04-12 15:07:09.510179400 +0200 ++++ fvwm95-2.0.43f/modules/FvwmButtons/Makefile.in 2014-04-12 15:29:20.658439269 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmConsole/Makefile.in fvwm95-2.0.43f/modules/FvwmConsole/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmConsole/Makefile.in 2014-04-12 15:07:09.511179360 +0200 ++++ fvwm95-2.0.43f/modules/FvwmConsole/Makefile.in 2014-04-12 15:29:20.668438886 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmCpp/Makefile.in fvwm95-2.0.43f/modules/FvwmCpp/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmCpp/Makefile.in 2014-04-12 15:07:09.512179321 +0200 ++++ fvwm95-2.0.43f/modules/FvwmCpp/Makefile.in 2014-04-12 15:29:20.681438388 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmDebug/Makefile.in fvwm95-2.0.43f/modules/FvwmDebug/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmDebug/Makefile.in 2014-04-12 15:07:09.512179321 +0200 ++++ fvwm95-2.0.43f/modules/FvwmDebug/Makefile.in 2014-04-12 15:29:20.693437928 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmForm/Makefile.in fvwm95-2.0.43f/modules/FvwmForm/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmForm/Makefile.in 2014-04-12 15:07:09.655173666 +0200 ++++ fvwm95-2.0.43f/modules/FvwmForm/Makefile.in 2014-04-12 15:29:20.708437353 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconBox/Makefile.in fvwm95-2.0.43f/modules/FvwmIconBox/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmIconBox/Makefile.in 2014-04-12 15:07:09.656173625 +0200 ++++ fvwm95-2.0.43f/modules/FvwmIconBox/Makefile.in 2014-04-12 15:29:20.721436855 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconMan/FvwmIconMan.c fvwm95-2.0.43f/modules/FvwmIconMan/FvwmIconMan.c +--- fvwm95-2.0.43f.orig/modules/FvwmIconMan/FvwmIconMan.c 2014-04-12 15:07:09.657173585 +0200 ++++ fvwm95-2.0.43f/modules/FvwmIconMan/FvwmIconMan.c 2014-04-12 15:52:32.429033840 +0200 +@@ -320,11 +320,11 @@ + int id = manager; \ + if (id == -1) { \ + for (id = 0; id < globals.num_managers; id++) { \ +- globals.managers[id].##field = value; \ ++ globals.managers[id]. field = value; \ + } \ + } \ + else if (id < globals.num_managers) { \ +- globals.managers[id].##field = value; \ ++ globals.managers[id]. field = value; \ + } \ + else { \ + ConsoleMessage ("Internal error in SET_MANAGER: %d\n", id); \ +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconMan/Makefile.in fvwm95-2.0.43f/modules/FvwmIconMan/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmIconMan/Makefile.in 2014-04-12 15:07:09.658173545 +0200 ++++ fvwm95-2.0.43f/modules/FvwmIconMan/Makefile.in 2014-04-12 15:29:20.733436396 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIdent/Makefile.in fvwm95-2.0.43f/modules/FvwmIdent/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmIdent/Makefile.in 2014-04-12 15:07:09.659173505 +0200 ++++ fvwm95-2.0.43f/modules/FvwmIdent/Makefile.in 2014-04-12 15:29:20.748435821 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmM4/Makefile.in fvwm95-2.0.43f/modules/FvwmM4/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmM4/Makefile.in 2014-04-12 15:07:09.659173505 +0200 ++++ fvwm95-2.0.43f/modules/FvwmM4/Makefile.in 2014-04-12 15:29:20.761435323 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + PATH_DEFINES = -DFVWMDIR=\"${fvwm_dir}\" + EXTRA_DEFINES=${PATH_DEFINES} -DXPM -DSHAPE +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmPager/Makefile.in fvwm95-2.0.43f/modules/FvwmPager/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmPager/Makefile.in 2014-04-12 15:07:09.659173505 +0200 ++++ fvwm95-2.0.43f/modules/FvwmPager/Makefile.in 2014-04-12 15:29:20.778434671 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmSave/Makefile.in fvwm95-2.0.43f/modules/FvwmSave/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmSave/Makefile.in 2014-04-12 15:07:09.660173466 +0200 ++++ fvwm95-2.0.43f/modules/FvwmSave/Makefile.in 2014-04-12 15:29:20.796433982 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmSaveDesk/Makefile.in fvwm95-2.0.43f/modules/FvwmSaveDesk/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmSaveDesk/Makefile.in 2014-04-12 15:07:09.660173466 +0200 ++++ fvwm95-2.0.43f/modules/FvwmSaveDesk/Makefile.in 2014-04-12 15:29:20.811433407 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmScript/Makefile.in 2014-04-12 15:07:09.661173427 +0200 ++++ fvwm95-2.0.43f/modules/FvwmScript/Makefile.in 2014-04-12 15:29:20.828432756 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Scripts/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/Makefile.in 2014-04-12 15:07:09.662173387 +0200 ++++ fvwm95-2.0.43f/modules/FvwmScript/Scripts/Makefile.in 2014-04-12 15:29:20.846432066 +0200 +@@ -1,8 +1,8 @@ + + SHELL=/bin/sh + +-prefix=@prefix@ +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ ++prefix=${DESTDIR}/@prefix@ ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ + + + INSTALL = @INSTALL@ +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in 2014-04-12 15:07:09.663173347 +0200 ++++ fvwm95-2.0.43f/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in 2014-04-12 15:29:20.860431530 +0200 +@@ -1,8 +1,8 @@ + + SHELL=/bin/sh + +-prefix=@prefix@ +-icon_dir=@prefix@/lib/X11/icons ++prefix=${DESTDIR}/@prefix@ ++icon_dir=${DESTDIR}/@prefix@/lib/X11/icons + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Widgets/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Widgets/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmScript/Widgets/Makefile.in 2014-04-12 15:07:09.665173268 +0200 ++++ fvwm95-2.0.43f/modules/FvwmScript/Widgets/Makefile.in 2014-04-12 15:29:20.872431070 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + lib_dir=@exec_prefix@/lib + x_includes=@x_includes@ +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScroll/Makefile.in fvwm95-2.0.43f/modules/FvwmScroll/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmScroll/Makefile.in 2014-04-12 15:07:09.667173189 +0200 ++++ fvwm95-2.0.43f/modules/FvwmScroll/Makefile.in 2014-04-12 15:29:20.882430687 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTalk/Makefile.in fvwm95-2.0.43f/modules/FvwmTalk/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmTalk/Makefile.in 2014-04-12 15:07:09.667173189 +0200 ++++ fvwm95-2.0.43f/modules/FvwmTalk/Makefile.in 2014-04-12 15:29:20.899430036 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTaskBar/BatStatModule.c fvwm95-2.0.43f/modules/FvwmTaskBar/BatStatModule.c +--- fvwm95-2.0.43f.orig/modules/FvwmTaskBar/BatStatModule.c 2014-04-12 15:07:09.667173189 +0200 ++++ fvwm95-2.0.43f/modules/FvwmTaskBar/BatStatModule.c 2014-04-12 15:59:36.189492766 +0200 +@@ -229,7 +229,7 @@ + #endif + + mif = NULL; +- (void *) mif = calloc(1, sizeof(BatStatInfo_t)); ++ mif = (BatStatInfo_t *)calloc(1, sizeof(BatStatInfo_t)); + if(mif == NULL) { + perror("FvwmTaskBar. BatStatModule.Init()"); + return NULL; +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Makefile.in fvwm95-2.0.43f/modules/FvwmTaskBar/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Makefile.in 2014-04-12 15:07:09.669173110 +0200 ++++ fvwm95-2.0.43f/modules/FvwmTaskBar/Makefile.in 2014-04-12 15:29:20.912429538 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmWharf/Makefile.in fvwm95-2.0.43f/modules/FvwmWharf/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmWharf/Makefile.in 2014-04-12 15:07:09.671173031 +0200 ++++ fvwm95-2.0.43f/modules/FvwmWharf/Makefile.in 2014-04-12 15:29:20.922429155 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/FvwmWinList/Makefile.in fvwm95-2.0.43f/modules/FvwmWinList/Makefile.in +--- fvwm95-2.0.43f.orig/modules/FvwmWinList/Makefile.in 2014-04-12 15:07:09.673172952 +0200 ++++ fvwm95-2.0.43f/modules/FvwmWinList/Makefile.in 2014-04-12 15:29:20.938428542 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ +@@ -15,8 +15,8 @@ + fvwm_name=@fvwm_name@ + # + # This is where the modules will be installed +-fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +-man_dir=@prefix@/man/man1 ++fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ ++man_dir=${DESTDIR}/@prefix@/man/man1 + + # + # Libs +diff -rNu fvwm95-2.0.43f.orig/modules/Makefile.in fvwm95-2.0.43f/modules/Makefile.in +--- fvwm95-2.0.43f.orig/modules/Makefile.in 2014-04-12 15:07:09.673172952 +0200 ++++ fvwm95-2.0.43f/modules/Makefile.in 2014-04-12 15:29:20.948428159 +0200 +@@ -3,13 +3,13 @@ + + @SET_MAKE@ + +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + subdirs=FvwmAudio FvwmAuto FvwmBacker FvwmBanner FvwmButtons FvwmConsole \ + FvwmCpp FvwmDebug FvwmForm FvwmIconBox FvwmIconMan FvwmIdent FvwmM4 \ + FvwmPager FvwmSave FvwmSaveDesk FvwmScript FvwmScroll FvwmTalk \ + FvwmTaskBar FvwmWinList FvwmWharf +-modules_dir=@prefix@/lib/X11/@fvwm_name@ ++modules_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ + + all: + @for i in ${subdirs}; do \ +diff -rNu fvwm95-2.0.43f.orig/pixmaps/Makefile.in fvwm95-2.0.43f/pixmaps/Makefile.in +--- fvwm95-2.0.43f.orig/pixmaps/Makefile.in 2014-04-12 15:07:09.674172912 +0200 ++++ fvwm95-2.0.43f/pixmaps/Makefile.in 2014-04-12 15:29:20.967427431 +0200 +@@ -1,8 +1,8 @@ + + SHELL=/bin/sh + +-prefix=@prefix@ +-pixmaps_dir=@prefix@/lib/X11/pixmaps ++prefix=${DESTDIR}/@prefix@ ++pixmaps_dir=${DESTDIR}/@prefix@/lib/X11/pixmaps + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +diff -rNu fvwm95-2.0.43f.orig/sample.fvwmrc/Makefile.in fvwm95-2.0.43f/sample.fvwmrc/Makefile.in +--- fvwm95-2.0.43f.orig/sample.fvwmrc/Makefile.in 2014-04-12 15:07:09.692172200 +0200 ++++ fvwm95-2.0.43f/sample.fvwmrc/Makefile.in 2014-04-12 15:29:20.981426894 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + fvwm_rc=@fvwm_rc@ +diff -rNu fvwm95-2.0.43f.orig/utils/Makefile.in fvwm95-2.0.43f/utils/Makefile.in +--- fvwm95-2.0.43f.orig/utils/Makefile.in 2014-04-12 15:07:09.693172161 +0200 ++++ fvwm95-2.0.43f/utils/Makefile.in 2014-04-12 15:29:20.998426243 +0200 +@@ -5,7 +5,7 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + fvwm_name=@fvwm_name@ +diff -rNu fvwm95-2.0.43f.orig/xpmroot/Makefile.in fvwm95-2.0.43f/xpmroot/Makefile.in +--- fvwm95-2.0.43f.orig/xpmroot/Makefile.in 2014-04-12 15:07:09.694172121 +0200 ++++ fvwm95-2.0.43f/xpmroot/Makefile.in 2014-04-12 15:29:21.011425745 +0200 +@@ -5,13 +5,13 @@ + + top_srcdir=@top_srcdir@ + srcdir=@srcdir@ +-prefix=@prefix@ ++prefix=${DESTDIR}/@prefix@ + exec_prefix=@exec_prefix@ + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ + x_libraries=@x_libraries@ + +-man_dir=@prefix@/man/man1 ++man_dir=${DESTDIR}/@prefix@/man/man1 + + XPM_LIBRARY=-lXpm + X_LIBRARY=-lX11 @LIBS@ diff --git a/desktop/fvwm95/slack-desc b/desktop/fvwm95/slack-desc new file mode 100644 index 0000000000000..9dcb4b9aaf793 --- /dev/null +++ b/desktop/fvwm95/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fvwm95: Fvwm95 (window manager for X11) +fvwm95: +fvwm95: Fvwm95 is a hack based on fvwm2. It tries to emulate the good +fvwm95: features of a well known product without bloating the regular fvwm +fvwm95: code. +fvwm95: +fvwm95: http://fvwm95.sourceforge.net +fvwm95: +fvwm95: +fvwm95: +fvwm95: diff --git a/desktop/fvwm95/xinitrc.fvwm95 b/desktop/fvwm95/xinitrc.fvwm95 new file mode 100644 index 0000000000000..b08bba4339854 --- /dev/null +++ b/desktop/fvwm95/xinitrc.fvwm95 @@ -0,0 +1,29 @@ +#!/bin/sh +# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + /usr/bin/xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + /usr/bin/xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + /usr/bin/xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + /usr/bin/xmodmap $usermodmap +fi + +# start some nice programs + +exec /usr/bin/fvwm95 |