4 files changed, 58 insertions, 19 deletions
diff --git a/development/asl/README b/development/asl/README
index 6b0782fbb8..191fe6e874 100644
--- a/development/asl/README
+++ b/development/asl/README
@@ -2,3 +2,5 @@ ASL is a portable macro cross assembler for a variety of microprocessors
 and microcontrollers. Though it is mainly targeted at embedded
 processors and single-board computers, you also find CPU families in the
 target list that are used in workstations and PCs.
+
+Note: The source downloaded is a snapshot from 20090810.
diff --git a/development/asl/asl.SlackBuild b/development/asl/asl.SlackBuild
index 97d85105fb..dae257b4aa 100644
--- a/development/asl/asl.SlackBuild
+++ b/development/asl/asl.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Oleg O. Chukaev <oleg.chukaev@mail.ru>
 
 PRGNAM=asl
-VERSION=current
+VERSION=current_20090810
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,10 +16,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
@@ -28,7 +31,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -37,18 +40,39 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cp Makefile.def.tmpl Makefile.def
-sed -i 's|/usr/local|/usr|' Makefile.def
-sed -i "s|-O3 -fomit-frame-pointer|${SLKCFLAGS}|" Makefile.def
-sed -i 's|chmod 644 ${MANPATH}/man1/$i|chmod 644 ${MANPATH}/man1/`basename $i`|' install.sh
+# Fixup the manpage installation
+patch -p1 < $CWD/fixup_manpage_install.diff
 
-make
-make docs
-PREFIX=$PKG make install
+mv Makefile.def.tmpl Makefile.def
+
+make \
+  CFLAGS="$SLKCFLAGS" \
+  BINDIR=/usr/bin \
+  INCDIR=/usr/include/asl \
+  MANDIR=/usr/man \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX}/asl \
+  DOCDIR=/usr/doc/$PRGNAM-$VERSION
+make docs \
+  CFLAGS="$SLKCFLAGS" \
+  BINDIR=/usr/bin \
+  INCDIR=/usr/include/asl \
+  MANDIR=/usr/man \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX}/asl \
+  DOCDIR=/usr/doc/$PRGNAM-$VERSION
+make install \
+  CFLAGS="$SLKCFLAGS" \
+  PREFIX=$PKG \
+  BINDIR=/usr/bin \
+  INCDIR=/usr/include/asl \
+  MANDIR=/usr/man \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX}/asl \
+  DOCDIR=/usr/doc/$PRGNAM-$VERSION
 
 ( 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 "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 || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -56,15 +80,13 @@ PREFIX=$PKG make install
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a  \
-  BENCHES INSTALL README README.DOS README.KR \
-  README.LANGS README.OS2 TODO changelog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  BENCHES INSTALL README* TODO changelog \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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/development/asl/asl.info b/development/asl/asl.info
index b21f74a6b6..cc6ea84eff 100644
--- a/development/asl/asl.info
+++ b/development/asl/asl.info
@@ -1,7 +1,10 @@
 PRGNAM="asl"
-VERSION="current"
+VERSION="current_20090810"
 HOMEPAGE="http://john.ccac.rwth-aachen.de:8000/as/"
-DOWNLOAD="http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current.tar.bz2"
-MD5SUM="4960ede60ea9caeda05e2d93dbe84620"
+DOWNLOAD="http://slackbuilds.org/sources/13.0/asl-current_20090810.tar.xz"
+MD5SUM="3123dbf298c96c4a5bbdce9843348402"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Oleg O. Chukaev"
 EMAIL="oleg.chukaev@mail.ru"
+APPROVED="rworkman"
diff --git a/development/asl/fixup_manpage_install.diff b/development/asl/fixup_manpage_install.diff
new file mode 100644
index 0000000000..3da6b3938a
--- /dev/null
+++ b/development/asl/fixup_manpage_install.diff
@@ -0,0 +1,12 @@
+diff -Nur asl-current.orig/install.sh asl-current/install.sh
+--- asl-current.orig/install.sh	2006-05-01 05:31:10.000000000 -0500
++++ asl-current/install.sh	2009-08-10 11:56:52.645489939 -0500
+@@ -54,7 +54,7 @@
+  for i in man/*.1; do
+   echo ${MANPATH}/man1/`basename $i`
+   cp $i ${MANPATH}/man1
+-  chmod 644 ${MANPATH}/man1/$i
++  chmod 644 ${MANPATH}/man1/`basename $i`
+  done
+ fi
+