1 files changed, 17 insertions, 16 deletions
diff --git a/academic/gnucap/gnucap.SlackBuild b/academic/gnucap/gnucap.SlackBuild
index 24b68142d722..a350ac9121eb 100644
--- a/academic/gnucap/gnucap.SlackBuild
+++ b/academic/gnucap/gnucap.SlackBuild
@@ -23,14 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnucap
-VERSION=${VERSION:-2009-12-07}
-PKGVER=20091207
+VERSION=${VERSION:-20091207}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER="$( echo $VERSION | sed 's|\(....\)\(..\)\(..\)|\1-\2-\3|' )"
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,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=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,9 +61,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -78,7 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGVER \
+  --docdir=/usr/doc/$VERSION \
   --build=$ARCH-slackware-linux
 make
 make install DESTDIR=$PKG
@@ -93,12 +94,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVER
-cp -a AUTHORS COPYING README INSTALL $PKG/usr/doc/$PRGNAM-$PKGVER
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild
-cp $CWD/$PRGNAM.png $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.png
-cp $PKG/usr/share/gnucap/doc/acs-tutorial $PKG/usr/doc/$PRGNAM-$PKGVER/acs-tutorial
-mv $PKG/usr/share/gnucap/examples $PKG/usr/doc/$PRGNAM-$PKGVER/examples
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp $CWD/$PRGNAM.png $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.png
+cp $PKG/usr/share/gnucap/doc/acs-tutorial $PKG/usr/doc/$PRGNAM-$VERSION/acs-tutorial
+mv $PKG/usr/share/gnucap/examples $PKG/usr/doc/$PRGNAM-$VERSION/examples
 rm -rf $PKG/usr/share/gnucap
 
 mkdir -p $PKG/install
@@ -120,4 +121,4 @@ StartupNotify=true
 EOF
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}