1 files changed, 25 insertions, 43 deletions
diff --git a/development/mit-scheme/mit-scheme.SlackBuild b/development/mit-scheme/mit-scheme.SlackBuild
index f4cf6b96ff..a3b01c355b 100644
--- a/development/mit-scheme/mit-scheme.SlackBuild
+++ b/development/mit-scheme/mit-scheme.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$(uname -m) ;;
   esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   TARARCH="i386"
 elif [ "$ARCH" = "i686" ]; then
@@ -69,72 +69,54 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd src
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
-  --build=$ARCH-slackware-linux
-make
-make install DESTDIR=$PKG
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib$LIBDIRSUFFIX \
+    --build=$ARCH-slackware-linux
+
+  make
+  make install DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file \
-  | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null \
-  || true
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/man/man1
 cp -a doc/scheme.1 $PKG/usr/man/man1/mit-scheme.1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # take prebuilt info doc rather than build them by ourselves
 mkdir -p $PKG/usr/info
 tar xvf $CWD/$PRGNAM-$VERSION-doc-info.tar.gz
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-cp -a $PRGNAM-$VERSION/doc/*.info $PKG/usr/info
-find $PKG/usr/info -type f -exec gzip -9 {} \;
-rm -rf $PRGNAM-$VERSION
+install -o root -g root -m 644 $PRGNAM-$VERSION/doc/*.info $PKG/usr/info
+gzip -9 $PKG/usr/info/*.info*
 
 # ditto for html ones
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-tar xvf $CWD/$PRGNAM-$VERSION-doc-html.tar.gz
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-cp -a $PRGNAM-$VERSION/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/html
-rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-doc-html.tar.gz \
+  -C $PKG/usr/doc/$PRGNAM-$VERSION/html \
+  --strip-components=2
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/html
 
 # ditto for pdf ones
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pdf
 tar xvf $CWD/$PRGNAM-$VERSION-doc-pdf.tar.gz
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-cp -a $PRGNAM-$VERSION/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/pdf
-rm -rf $PRGNAM-$VERSION
+install -o root -g root -m 644 $PRGNAM-$VERSION/doc/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION/pdf
 
 cp -a changelog.txt src/COPYING src/README.txt $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}