diff options
| -rw-r--r-- | desktop/slock/README | 2 | ||||
| -rw-r--r-- | desktop/slock/config.mk.patch | 21 | ||||
| -rw-r--r-- | desktop/slock/slack-desc | 14 | ||||
| -rw-r--r-- | desktop/slock/slock.SlackBuild | 23 | ||||
| -rw-r--r-- | desktop/slock/slock.info | 2 |
5 files changed, 31 insertions, 31 deletions
diff --git a/desktop/slock/README b/desktop/slock/README index 6825e2e629..7170cbcb86 100644 --- a/desktop/slock/README +++ b/desktop/slock/README @@ -1 +1 @@ -slock is a simple X display locker +slock is a simple X display locker. diff --git a/desktop/slock/config.mk.patch b/desktop/slock/config.mk.patch index 7c659ee51d..b6eba0aee0 100644 --- a/desktop/slock/config.mk.patch +++ b/desktop/slock/config.mk.patch @@ -1,25 +1,12 @@ ---- a/config.mk 2009-01-01 02:25:45.983700591 -0600 -+++ b/config.mk 2009-01-01 02:27:16.479701293 -0600 -@@ -4,10 +4,10 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = /usr - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = /usr/include/X11 -+X11LIB = /usr/lib/X11 - - # includes and libs - INCS = -I. -I/usr/include -I${X11INC} +diff -Nur slock-0.9.orig/config.mk slock-0.9/config.mk +--- slock-0.9.orig/config.mk 2008-07-29 13:22:46.000000000 -0500 ++++ slock-0.9/config.mk 2009-07-06 00:50:51.209930578 -0500 @@ -15,7 +15,7 @@ # flags CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -+CFLAGS = _SLACKCFLAGS_ -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} ++CFLAGS = @SLACKCFLAGS@ -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS} # On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH diff --git a/desktop/slock/slack-desc b/desktop/slock/slack-desc index 7985a02b13..2b69972b05 100644 --- a/desktop/slock/slack-desc +++ b/desktop/slock/slack-desc @@ -9,11 +9,11 @@ slock: slock (Simple X display locker) slock: slock: slock is a simple X display locker. -slock: -slock: It is stable and quite a lot people in the suckless -slock: community are using it every day when they are out -slock: with friends or fetching some food from the local pub. -slock: +slock: slock: Homepage: http://www.suckless.org/programs/slock.html -slock: -slock: +slock: +slock: +slock: +slock: +slock: +slock: diff --git a/desktop/slock/slock.SlackBuild b/desktop/slock/slock.SlackBuild index eeca7c2756..92d0e687d3 100644 --- a/desktop/slock/slock.SlackBuild +++ b/desktop/slock/slock.SlackBuild @@ -18,10 +18,13 @@ 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" fi set -e @@ -39,15 +42,23 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# This uses our CFLAGS defined above, changes the prefix to /usr and -# corrects the X11 includes and libs directories -sed "s/_SLACKCFLAGS_/$SLKCFLAGS/" $CWD/config.mk.patch | patch -p1 +# This uses our CFLAGS defined above +sed "s/@SLACKCFLAGS@/$SLKCFLAGS/" $CWD/config.mk.patch | patch -p1 # This makes slock requires sgid shadow instead of suid root patch -p1 < $CWD/slock-use_shadow_group.patch -make -make install DESTDIR=$PKG +make \ + PREFIX=/usr \ + X11INC=/usr/include/X11 \ + X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 + +make install \ + PREFIX=/usr \ + X11INC=/usr/include/X11 \ + X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \ + DESTDIR=$PKG + strip --strip-unneeded $PKG/usr/bin/slock chown root:shadow $PKG/usr/bin/slock chmod 2755 $PKG/usr/bin/slock @@ -60,4 +71,4 @@ 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/slock/slock.info b/desktop/slock/slock.info index 59fdea71e7..f7b28d5c4a 100644 --- a/desktop/slock/slock.info +++ b/desktop/slock/slock.info @@ -3,6 +3,8 @@ VERSION="0.9" HOMEPAGE="http://tools.suckless.org/slock" DOWNLOAD="http://code.suckless.org/dl/tools/slock-0.9.tar.gz" MD5SUM="df342ad129cf2c3b8eb8da9d9d0ab845" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Grigorios Bouzakis" EMAIL="grbzks@gmail.com" APPROVED="rworkman" |