4 files changed, 29 insertions, 33 deletions
diff --git a/system/gdm/README b/system/gdm/README
index fc619007f1..3463e8ea43 100644
--- a/system/gdm/README
+++ b/system/gdm/README
@@ -1,11 +1,11 @@
 The Gnome Display Manager (GDM) is a display manager that
 implements all significant features required for managing
-local and remote displays.   For full information about
-GDM features, refer to the documentation.
+local and remote displays. For full information about GDM
+features, refer to the documentation.
 
 The Sessions that gdm uses are installed in /etc/X11/gdm/Sessions.
 Several example files are included for blackbox, fluxbox, fvwm2,
 kde, twm, windowmaker, and xfce.
 
-libgnomecanvas and gnome-doc-utils (also available at SBo) are
+gnome-doc-utils and libgnomecanvas (available at SBo) are
 required to build GDM.
diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild
index f9ef8f5985..d5a46fb09c 100644
--- a/system/gdm/gdm.SlackBuild
+++ b/system/gdm/gdm.SlackBuild
@@ -1,15 +1,15 @@
 #!/bin/sh
 
-# Slackbuild Script for gdm
+# Slackbuild Script for GDM
 #
 # Written by James Rich james@chowhouse.com
 #
 # Assumed to be in public domain per our submission guidelines
 # Modified by the SlackBuilds.org project
-# Script maintained by Frank Caraballo <fecaraballo{at}gmail{dot}com>
+# Modified by Frank Caraballo <fecaraballo{at}gmail{dot}com>
 
 PRGNAM=gdm
-VERSION=2.20.7
+VERSION=${VERSION:-2.20.9}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -23,14 +23,18 @@ 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.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -43,26 +47,18 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc/X11 \
-  --localstatedir=/var/lib/$PRGNAM \
+  --localstatedir=/var/lib \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --program-prefix="" \
-  --program-suffix="" \
   --disable-scrollkeeper \
   --enable-console-helper=no \
-  --enable-shared=yes \
   --enable-static=no \
   --enable-ipv6=yes \
   --with-dmconfdir=/etc/X11/$PRGNAM \
-  || exit 1
-
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+  --build=$ARCH-slackware-linux
 
-( cd $PKG
-  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
-)
+make
+make install-strip DESTDIR=$PKG
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
diff --git a/system/gdm/gdm.info b/system/gdm/gdm.info
index 830e426a6f..ad544388c7 100644
--- a/system/gdm/gdm.info
+++ b/system/gdm/gdm.info
@@ -1,8 +1,8 @@
 PRGNAM="gdm"
-VERSION="2.20.7"
+VERSION="2.20.9"
 HOMEPAGE="http://www.gnome.org/projects/gdm/"
-DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/gdm/2.20/gdm-2.20.7.tar.bz2"
-MD5SUM="15be72743003cb1e36c9ce2ac2de5381"
-MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo{at}gmail{dot}com"
+DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/gdm/2.20/gdm-2.20.9.tar.bz2"
+MD5SUM="bdc7265f77b2e26e90d48ac512136e54"
+MAINTAINER="nobody"
+EMAIL="nobody@nowhere"
 APPROVED="rworkman"
diff --git a/system/gdm/slack-desc b/system/gdm/slack-desc
index f7c6eac114..c183ebd2e6 100644
--- a/system/gdm/slack-desc
+++ b/system/gdm/slack-desc
@@ -1,17 +1,17 @@
 # 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------------------------------------------------------|
-gdm: gdm (GNOME Display Manager)
+gdm: GDM (GNOME Display Manager)
 gdm:
 gdm: The Gnome Display Manager (GDM) is a display manager that
 gdm: implements all significant features required for managing
-gdm: local and remote displays.   For full information about
-gdm: GDM features, refer to the documentation.
+gdm: local and remote displays. For full information about GDM
+gdm: features, refer to the documentation.
 gdm:
 gdm: Homepage: http://www.gnome.org/projects/gdm/
 gdm: