diff options
| author | Logan Rathbone <poprocks@gmail.com> | 2020-05-30 02:03:17 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2020-06-01 08:46:33 +0700 |
| commit | 159a356f214d3c5e2c074c6e982e2bfe199b2657 (patch) | |
| tree | 8415a303b923ca290b29382e84cc6847f020daf1 /desktop/fvwm95/fvwm95.SlackBuild | |
| parent | b5d424006b6658f159ff8d73fef75a9d5d3b02c0 (diff) | |
| download | slackbuilds-159a356f214d3c5e2c074c6e982e2bfe199b2657.tar.gz | |
desktop/fvwm95: Updated for version 2.0.43f.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'desktop/fvwm95/fvwm95.SlackBuild')
| -rw-r--r-- | desktop/fvwm95/fvwm95.SlackBuild | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/desktop/fvwm95/fvwm95.SlackBuild b/desktop/fvwm95/fvwm95.SlackBuild index 682021a832..cf80d297d3 100644 --- a/desktop/fvwm95/fvwm95.SlackBuild +++ b/desktop/fvwm95/fvwm95.SlackBuild @@ -3,6 +3,8 @@ # Slackware build script for fvwm95 # Copyright 2014 Tomasz Konojacki <me@xenu.tk> +# Copyright 2020 Logan Rathbone <poprocks@gmail.com> +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +26,12 @@ PRGNAM=fvwm95 VERSION=${VERSION:-2.0.43f} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -109,6 +111,14 @@ 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 +# plop the old Slackware <= 10.0 default config into /usr/doc as a little Easter Egg +cat $CWD/fvwm95rc-slack10_0.in | sed -e "s,@libdir@,/usr/lib${LIBDIRSUFFIX},g" \ + > $PKG/usr/doc/$PRGNAM-$VERSION/fvwm95rc-slack10_0 + +# ... this also needs to be there for the Start button to work: +install -m 644 $CWD/fvwm95-menu.xpm \ + $PKG/usr/lib${LIBDIRSUFFIX}/X11/pixmaps/fvwm95-menu.xpm + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc |