system/vice: Updated for version 2.1

1 files changed, 25 insertions, 17 deletions

diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 871ea9600a88..66d51ae8b7ad 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -35,10 +35,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 # Exit on most errors
@@ -58,7 +61,10 @@ find . \
 
 # Set the help path correctly with respect to the actually installed doc
 # folder (the folder set up by "make install" is quite broken).
-patch -p1 <$CWD/vice-fix-help.patch
+patch -p1 <$CWD/patches/vice-fix-help.patch
+
+# Use /usr/lib64 on 64-bit Slackware
+[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.1-64bit.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -68,7 +74,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-gnomeui \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --build=$ARCH
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -83,14 +89,27 @@ make install DESTDIR=$PKG
 )
 
 rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
+gzip -9 $PKG/usr/info/*
+
+# Create link to documentation folder in the place VICE expects to find it.
+( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc )
+
+# Copy the CBM.ttf font to the fonts directory
+# ('make install' spits an error on this, I haven't investigated why)
+mkdir -p $PKG/usr/share/fonts/TTF
+cp data/fonts/CBM.ttf $PKG/usr/share/fonts/TTF
+
+# Install icon and menu entries
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cp $CWD/config/*.desktop $PKG/usr/share/applications
+cp $CWD/config/vice.png $PKG/usr/share/pixmaps
 
 # Remove the documentation folder installed by "make install", which
 # is a broken mess of almost unrelated files in the wrong place
-rm -rf $PKG/usr/lib$LIBSUFFIX/$PRGNAM/doc
+rm -rf $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc
 # Copy the original documentation folder to the usual place
 mkdir -p $PKG/usr/doc
-cp -R doc $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -name "Makefile*" -exec rm -f {} \;
 find $PKG/usr/doc/$PRGNAM-$VERSION -name "tex*" -exec rm -f {} \;
 # Copy additional program documentation
@@ -98,20 +117,9 @@ cp -a AUTHORS ChangeLog COPYING FEEDBACK INSTALL NEWS README \
    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Create link to documentation folder in the place VICE expects
-# to find it.
-( cd $PKG/usr/lib/$PRGNAM
-  ln -s /usr/doc/$PRGNAM-$VERSION doc
-)
-
-# Install icon and menu entries
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cp $CWD/*.desktop $PKG/usr/share/applications
-cp $CWD/vice.png $PKG/usr/share/pixmaps
-
 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}