diff options
| -rw-r--r-- | desktop/afterstep/afterstep.SlackBuild | 18 | ||||
| -rw-r--r-- | desktop/afterstep/afterstep.info | 10 | ||||
| -rw-r--r-- | desktop/afterstep/slack-desc | 22 | ||||
| -rw-r--r-- | desktop/afterstep/xinitrc.afterstep | 5 |
4 files changed, 31 insertions, 24 deletions
diff --git a/desktop/afterstep/afterstep.SlackBuild b/desktop/afterstep/afterstep.SlackBuild index 2b5579e2777ce..05d0d4ae93027 100644 --- a/desktop/afterstep/afterstep.SlackBuild +++ b/desktop/afterstep/afterstep.SlackBuild @@ -4,7 +4,7 @@ # Written by NetrixTardis (netrixtardis@stealth3.com) PRGNAM=afterstep -VERSION=${VERSION:-2.2.8} +VERSION=${VERSION:-2.2.9} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -14,14 +14,17 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -SRCNAM=${SRCNAM:-AfterStep} # leave this alone +SRCNAM=AfterStep # leave this alone if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -39,11 +42,14 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --enable-i18n \ --enable-alsa \ + --with-helpcommand="rxvt -e man" \ + --with-imageloader="" \ --build=$ARCH-slackware-linux make @@ -56,6 +62,9 @@ make install DESTDIR=$PKG xargs strip --strip-unneeded 2> /dev/null ) +# Take care of default xinitrc +install -D -m 0755 $CWD/xinitrc.afterstep $PKG/etc/X11/xinit/xinitrc.afterstep + mkdir -p $PKG/usr/doc mv $PKG/usr/share/afterstep/doc/ $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYRIGHT ChangeLog INSTALL NEW README TEAM UPGRADE doc/menu.txt \ @@ -67,11 +76,8 @@ cp -a COPYRIGHT ChangeLog INSTALL NEW README TEAM UPGRADE doc/menu.txt \ for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done ) -# Take care of default xinitrc -install -D -m 0755 $CWD/xinitrc.afterstep $PKG/etc/X11/xinit/xinitrc.afterstep - 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.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/afterstep/afterstep.info b/desktop/afterstep/afterstep.info index 90c66147768ae..d4447019d5f88 100644 --- a/desktop/afterstep/afterstep.info +++ b/desktop/afterstep/afterstep.info @@ -1,8 +1,10 @@ -PRGNAM="AfterStep" -VERSION="2.2.8" +PRGNAM="afterstep" +VERSION="2.2.9" HOMEPAGE="http://www.afterstep.org" -DOWNLOAD="ftp://ftp.afterstep.org/stable/AfterStep-2.2.8.tar.bz2" -MD5SUM="8734622c9cb549f5baa8b3262312db70" +DOWNLOAD="ftp://ftp.afterstep.org/stable/AfterStep-2.2.9.tar.bz2" +MD5SUM="59d739b2416ac18201027d7cc0888c20" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="NetrixTardis" EMAIL="netrixtardis@stealth3.com" APPROVED="rworkman" diff --git a/desktop/afterstep/slack-desc b/desktop/afterstep/slack-desc index dc298e1cdc020..c60a042d49f21 100644 --- a/desktop/afterstep/slack-desc +++ b/desktop/afterstep/slack-desc @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |--------handy-ruler-------------------------------------------------| -afterstep: AfterStep (a lightweight window manager) + |--------handy-ruler---------------------------------------------------| +afterstep: AfterStep (a lightweight window manager) afterstep: -afterstep: AfterStep is a window manager for the Unix X Window System. -afterstep: Originally based on the look and feel of the NeXTStep interface, -afterstep: it provides end users with a consistent, clean, and elegant -afterstep: desktop. The goal of AfterStep development is to provide for -afterstep: flexibility of desktop configuration, improving aestetics, and -afterstep: efficient use of system resources. -afterstep: Some of the distinguishing features of AfterStep compared to other -afterstep: window managers are its low usage of resources, stability and -afterstep: configurability. +afterstep: AfterStep is a window manager for the Unix X Window System. +afterstep: Originally based on the look and feel of the NeXTStep interface, +afterstep: it provides end users with a consistent, clean, and elegant +afterstep: desktop. The goal of AfterStep development is to provide for +afterstep: flexibility of desktop configuration, improving aestetics, and +afterstep: efficient use of system resources. +afterstep: Some of the distinguishing features of AfterStep compared to other +afterstep: window managers are its low usage of resources, stability and +afterstep: configurability. diff --git a/desktop/afterstep/xinitrc.afterstep b/desktop/afterstep/xinitrc.afterstep index f699f7b1c19c8..009f5b89d471b 100644 --- a/desktop/afterstep/xinitrc.afterstep +++ b/desktop/afterstep/xinitrc.afterstep @@ -1,10 +1,9 @@ #!/bin/sh -# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/lib/X11/xinit/.Xresources -sysmodmap=/usr/lib/X11/xinit/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps [ -f $sysresources ] && xrdb -merge $sysresources |