system/aterm: Updated for version 1.0.0

4 files changed, 32 insertions, 25 deletions

diff --git a/system/aterm/README b/system/aterm/README
index a4bc5d3117aef..64752066ae1c8 100644
--- a/system/aterm/README
+++ b/system/aterm/README
@@ -1,7 +1,3 @@
-aterm is designed to provide pleasing visual effects, while
-performing such a mundane function as terminal emulation under X. It is
-largely based on rxvt code. Several points set it apart from other
-similar applications:
-* fast pseudo-transparency, that does not consume any additional resources.
-* optional off-focus fading of text - when aterm looses focus its contents is dimmed.
-* NeXT-ish scrollbar
+aterm is designed to provide pleasing visual effects while performing such 
+a mundane function as terminal emulation under X.  It is largely based on
+rxvt code.
diff --git a/system/aterm/aterm.SlackBuild b/system/aterm/aterm.SlackBuild
index 17da443fae602..39f7c043901aa 100644
--- a/system/aterm/aterm.SlackBuild
+++ b/system/aterm/aterm.SlackBuild
@@ -29,6 +29,7 @@ VERSION=1.0.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -36,16 +37,21 @@ 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
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $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 .
 chmod -R a-s,u+w,go+r-w .
 
@@ -53,17 +59,20 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-transparency \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 ( 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
+  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
@@ -81,4 +90,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/system/aterm/aterm.info b/system/aterm/aterm.info
index 0133042189196..f690a42a7d0a0 100644
--- a/system/aterm/aterm.info
+++ b/system/aterm/aterm.info
@@ -3,6 +3,8 @@ VERSION="1.0.0"
 HOMEPAGE="http://www.afterstep.org/aterm.php"
 DOWNLOAD="http://downloads.sourceforge.net/aterm/aterm-1.0.0.tar.bz2"
 MD5SUM="ceb64c62ae243a7fc3ddb0d6f9a19faa"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Martin Lefebvre"
 EMAIL="dadexter@gmail.com"
 APPROVED="rworkman"
diff --git a/system/aterm/slack-desc b/system/aterm/slack-desc
index ec6fe6e9803a9..9570108ec380a 100644
--- a/system/aterm/slack-desc
+++ b/system/aterm/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 aterm: aterm (Terminal emulator with nice visual effects)
 aterm: 
-aterm: aterm is designed to provide pleasing visual effects, while
-aterm: performing such a mundane function as terminal emulation under X. It 
-aterm: is largely based on rxvt code. Several points set it apart from other
-aterm: similar applications:
-aterm: # fast pseudo-transparency, that does not consume any additional
-aterm:   resources.
-aterm: # optional off-focus fading of text - when aterm looses focus its 
-aterm:   contents is dimmed.
-aterm: # NeXT-ish scrollbar
+aterm: aterm is designed to provide pleasing visual effects while performing
+aterm: such a mundane function as terminal emulation under X.  It is largely
+aterm: based on rxvt code.
+aterm:
+aterm: Several points set it apart from similar apps:
+aterm: * fast pseudo-transparency
+aterm: * optional off-focus fading of text
+aterm: * NeXT-ish scrollbar
+aterm: