From bbe2cab46caaabd380fbb4598bfa6086049594f0 Mon Sep 17 00:00:00 2001 From: Frank Caraballo Date: Wed, 12 May 2010 17:38:05 +0200 Subject: desktop/slim: Updated for version 1.3.1 --- desktop/slim/Makefile-i486.diff.gz | Bin 348 -> 0 bytes desktop/slim/Makefile-i686.diff.gz | Bin 346 -> 0 bytes desktop/slim/README | 29 ++++---------- desktop/slim/README.SLACKWARE | 19 +++++++++ desktop/slim/doinst.sh | 10 ----- desktop/slim/rc.slim | 24 ----------- desktop/slim/slack-desc | 32 +++++++-------- desktop/slim/slackware-black.tar.bz2 | Bin 0 -> 13425 bytes desktop/slim/slim.SlackBuild | 75 ++++++++++++++++++++--------------- desktop/slim/slim.conf.patch | 11 +++++ desktop/slim/slim.info | 12 +++--- 11 files changed, 102 insertions(+), 110 deletions(-) delete mode 100644 desktop/slim/Makefile-i486.diff.gz delete mode 100644 desktop/slim/Makefile-i686.diff.gz create mode 100644 desktop/slim/README.SLACKWARE delete mode 100644 desktop/slim/rc.slim create mode 100644 desktop/slim/slackware-black.tar.bz2 create mode 100644 desktop/slim/slim.conf.patch (limited to 'desktop/slim') diff --git a/desktop/slim/Makefile-i486.diff.gz b/desktop/slim/Makefile-i486.diff.gz deleted file mode 100644 index fa06c9aee2..0000000000 Binary files a/desktop/slim/Makefile-i486.diff.gz and /dev/null differ diff --git a/desktop/slim/Makefile-i686.diff.gz b/desktop/slim/Makefile-i686.diff.gz deleted file mode 100644 index 238188e2d5..0000000000 Binary files a/desktop/slim/Makefile-i686.diff.gz and /dev/null differ diff --git a/desktop/slim/README b/desktop/slim/README index afb4b3e531..6400e2ed27 100644 --- a/desktop/slim/README +++ b/desktop/slim/README @@ -1,21 +1,8 @@ -Slim is a lightweight login manager based on GNUstep's Login.app -It makes a great replacement for XDM for those who want something -that looks good, but still do not want Gnome or KDE. - -This package also includes a BSD-style rc.d script to start slim; -you will need to make /etc/rc.d/rc.slim executable: - chmod 755 /etc/rc.d/rc.slim - -Also, you will need to add something like this to /etc/rc.d/rc.local: - if [ -x /etc/rc.d/rc.slim ]; then - /etc/rc.d/rc.slim start - fi - -Note that your system should use runlevel 3 for this to work. -I (rworkman) did a bit of tinkering to try and make slim work properly -from runlevel 4 (starting it from rc.4) a few versions ago, but I was -not successful, and it wasn't worth the effort to continue. - -Finally, if you have PAM installed and wish to build slim with support -for it, have a look inside the build script for instructions; otherwise, -it will work as is. +SLiM is a lightweight login manager based on GNUstep's Login.app. It +makes a great replacement for XDM for those who want something that +looks good, but still do not want Gnome or KDE. + +Included is a custom Slackware theme that goes nicely with the lilo boot +theme. Regardless of whether you would like to use the custom theme, you +should see README.SLACKWARE for configuration hints (this file is also +installed into the package's documentation directory). diff --git a/desktop/slim/README.SLACKWARE b/desktop/slim/README.SLACKWARE new file mode 100644 index 0000000000..2f40f73436 --- /dev/null +++ b/desktop/slim/README.SLACKWARE @@ -0,0 +1,19 @@ +README.SLACKWARE for Slim + + +Frank Caraballo (the Slim maintainer for SlackBuilds.org) took the time to +create a custom Slackware theme which goes nicely with the lilo boot theme. +If you would like to use that theme, you will need to edit /etc/slim.conf +and change the 'current_theme' directive from 'default' to 'slackware-black' + + +If you would like to use SLiM as the login manager in runlevel 4, add the +following lines to /etc/rc.d/rc.4 just above the section that tries to +start gdm: + + # Try to use SLiM login manager. This comes first, because if SLiM is + # installed, then the user probably wants to use it by default: + if [ -x /usr/bin/slim ]; then + exec /usr/bin/slim + fi + diff --git a/desktop/slim/doinst.sh b/desktop/slim/doinst.sh index 49a1fd7229..d419960559 100644 --- a/desktop/slim/doinst.sh +++ b/desktop/slim/doinst.sh @@ -1,5 +1,3 @@ -#!/bin/sh - config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -13,13 +11,5 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same perms on rc.slim.new: -if [ -e etc/rc.d/rc.slim ]; then - cp -a etc/rc.d/rc.slim etc/rc.d/rc.slim.new.incoming - cat etc/rc.d/rc.slim.new > etc/rc.d/rc.slim.new.incoming - mv etc/rc.d/rc.slim.new.incoming etc/rc.d/rc.slim.new -fi - -config etc/rc.d/rc.slim.new config etc/slim.conf.new diff --git a/desktop/slim/rc.slim b/desktop/slim/rc.slim deleted file mode 100644 index 056a163842..0000000000 --- a/desktop/slim/rc.slim +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/slim: start/stop slim -# - -case $1 in -start) - /usr/bin/slim -d - ;; -stop) - killall /usr/bin/slim - rm -f /var/run/slim.lock - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -*) - echo "usage: $0 [start|stop|restart]" - ;; -esac - -# End of file diff --git a/desktop/slim/slack-desc b/desktop/slim/slack-desc index 9bd4adfb9d..06e386d990 100644 --- a/desktop/slim/slack-desc +++ b/desktop/slim/slack-desc @@ -1,19 +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 ':'. +# 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 ':'. - |-----handy-ruler------------------------------------------------------| -slim: slim (graphical login manager similar to xdm/kdm/gdm) -slim: -slim: Slim is a lightweight login manager based on GNUstep's Login.app -slim: It makes a great replacement for XDM for those who want something -slim: that looks good, but still do not want Gnome or KDE. -slim: -slim: This package also includes a BSD-style rc.d script to start slim. -slim: -slim: -slim: -slim: + |-----handy-ruler------------------------------------------------------| +slim: SLiM (graphical login manager similar to xdm/kdm/gdm) +slim: +slim: SLiM is a lightweight login manager based on GNUstep's Login.app. It +slim: makes a great replacement for XDM for those who want something that +slim: looks good, but still do not want Gnome or KDE. +slim: +slim: Homepage: http://slim.berlios.de/ +slim: +slim: +slim: +slim: diff --git a/desktop/slim/slackware-black.tar.bz2 b/desktop/slim/slackware-black.tar.bz2 new file mode 100644 index 0000000000..418205670e Binary files /dev/null and b/desktop/slim/slackware-black.tar.bz2 differ diff --git a/desktop/slim/slim.SlackBuild b/desktop/slim/slim.SlackBuild index 4c9e2879f4..ba902f6718 100644 --- a/desktop/slim/slim.SlackBuild +++ b/desktop/slim/slim.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for slim +# Slackware build script for SLiM # Copyright 2006 Martin Lefebvre # All rights reserved. @@ -22,10 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Script maintained by Frank Caraballo + PRGNAM=slim -VERSION=1.3.0 +VERSION=${VERSION:-1.3.1} ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -34,59 +36,66 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} # Since PAM is not included on a stock Slackware system, default to NO. -# If you (shudder) have PAM installed, then run the build script like this: -# PAM=YES ./slim.SlackBuild -PAM=${PAM:-NO} +# If you have PAM installed, then run the build script like this: +# USE_PAM=1 ./slim.SlackBuild +USE_PAM=${USE_PAM:-""} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +fi + +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . -chmod -R a-s,u+w,go+r-w . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; -# Edit Makefile to set proper CFLAGS/CXXFLAGS -# If you want different flags, then you'll need to modify the patch(es) -if [ "$ARCH" = "i486" ]; then - zcat $CWD/Makefile-i486.diff.gz | patch -p0 || exit 1 -elif [ "$ARCH" = "i686" ]; then - zcat $CWD/Makefile-i686.diff.gz | patch -p0 || exit 1 -fi +# Correct the path used for suspend: +patch -p0 < $CWD/slim.conf.patch -if [ "$PAM" = "YES" ]; then - make USE_PAM=1 -else - make || exit 1 -fi +make \ + CFLAGS+="$SLKCFLAGS" \ + USE_PAM=${USE_PAM} +make install DESTDIR=$PKG + +# Don't overwrite existing config file: +mv $PKG/etc/slim.conf $PKG/etc/slim.conf.new -make install DESTDIR=$PKG || exit 1 +# Add the slackware-black theme to the package: +tar xvf $CWD/slackware-black.tar.bz2 -C $PKG/usr/share/slim/themes ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) -if [ -d $PKG/usr/man ]; then -( cd $PKG/usr/man +( cd $PKG/usr/man || exit 1 find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done + for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) -fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING ChangeLog INSTALL README THEMES TODO xinitrc.sample \ +cp -a ChangeLog COPYING INSTALL README THEMES TODO xinitrc.sample \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -mkdir -p $PKG/etc/rc.d -cat $CWD/rc.slim > $PKG/etc/rc.d/rc.slim.new -mv $PKG/etc/slim.conf $PKG/etc/slim.conf.new - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/desktop/slim/slim.conf.patch b/desktop/slim/slim.conf.patch new file mode 100644 index 0000000000..e2edc801ba --- /dev/null +++ b/desktop/slim/slim.conf.patch @@ -0,0 +1,11 @@ +--- slim.conf.orig 2008-12-05 13:47:44.512494201 -0600 ++++ slim.conf 2008-12-05 13:51:51.449743538 -0600 +@@ -8,7 +8,7 @@ + halt_cmd /sbin/shutdown -h now + reboot_cmd /sbin/shutdown -r now + console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" +-#suspend_cmd /usr/sbin/suspend ++suspend_cmd /usr/sbin/pm-suspend + + # Full path to the xauth binary + xauth_path /usr/bin/xauth diff --git a/desktop/slim/slim.info b/desktop/slim/slim.info index 696f2eac95..6e503d04a8 100644 --- a/desktop/slim/slim.info +++ b/desktop/slim/slim.info @@ -1,8 +1,8 @@ PRGNAM="slim" -VERSION="1.3.0" -HOMEPAGE="http://slim.berlios.de" -DOWNLOAD="http://download.berlios.de/slim/slim-1.3.0.tar.gz" -MD5SUM="1c1a87f3cbd3c334c874585e42701961" -MAINTAINER="Martin Lefebvre" -EMAIL="dadexter@gmail.com" +VERSION="1.3.1" +HOMEPAGE="http://slim.berlios.de/" +DOWNLOAD="http://download.berlios.de/slim/slim-1.3.1.tar.gz" +MD5SUM="727d0acb24c0fbf0751134c37a9c895f" +MAINTAINER="Frank Caraballo" +EMAIL="fecaraballo{at}gmail{dot}com" APPROVED="rworkman" -- cgit v1.2.3-80-g2a13