Update

1 files changed, 10 insertions, 16 deletions

diff --git a/dosbox/build/dosbox.SlackBuild b/dosbox/build/dosbox.SlackBuild
index 9b0f4556..3d86a116 100755
--- a/dosbox/build/dosbox.SlackBuild
+++ b/dosbox/build/dosbox.SlackBuild
@@ -13,6 +13,8 @@
 # Changelog:
 # 0.63-1:   28/Oct/2005 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
+# 0.65-1:   28/jul/2006 by Eric Hameleers <alien@slackware.com>
+#            * Update.
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -28,7 +30,7 @@ if [ "$TMP" = "" ]; then
 fi
 
 PRGNAM=dosbox
-VERSION=0.63
+VERSION=0.65
 ARCH=${ARCH:-i486}
 BUILD=1
 
@@ -40,7 +42,7 @@ DOCS="ABOUT* AUTHORS BUGS ChangeLog* COPYING CREDITS FAQ GPL* HACKING \
 # variable, and the SlackBuild script will try to download it for you.
 
 SOURCE[0]="${PRGNAM}-${VERSION}.tar.gz"
-SRCURL[0]="http://ovh.dl.sourceforge.net/sourceforge/dosbox/dosbox-0.63.tar.gz"
+SRCURL[0]="http://surfnet.dl.sourceforge.net/sourceforge/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -83,6 +85,7 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
       wget -nv -O "${CWD}/${SOURCE[$i]}" "${SRCURL[$i]}"
       if [ $? -ne 0 ]; then
         echo "Downloading '${SOURCE[$i]}' failed... aborting the build."
+        mv -f "${CWD}/${SOURCE[$i]}" "${CWD}/${SOURCE[$i]}".FAIL
         exit 1
       fi
     else
@@ -173,11 +176,11 @@ cp -a $DOCS \
       $PKG/usr/doc/$PRGNAM-$VERSION
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
-# Move incorrectly installed man pages
+# Move incorrectly installed man pages, if any
 mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share
 # Compress the man page(s)
-gzip -9f $PKG/usr/man/*/*
-gzip -9f $PKG/usr/man/*/*/*
+find PKG/usr/man -type f -name *.? -exec gzip -9f {} \;
+
 
 # Strip binaries
 ( cd $PKG
@@ -189,8 +192,6 @@ gzip -9f $PKG/usr/man/*/*/*
 # --- OWNERSHIP, RIGHTS ---
 
 chmod -R o-w $PKG
-chown root:bin $PKG/usr/bin/* $PKG/usr/sbin/* $PKG/bin/* $PKG/sbin/* \
-               $PKG/usr/X11R6/bin/* $PKG/opt/kde/bin/* 2>/dev/null
 
 
 # --- PACKAGE DESCRIPTION ---
@@ -198,11 +199,7 @@ chown root:bin $PKG/usr/bin/* $PKG/usr/sbin/* $PKG/bin/* $PKG/sbin/* \
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 if [ -f $CWD/doinst.sh ]; then
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
-fi
-# I give in :-/
-if [ -f $CWD/slack-requires ]; then
-  cat $CWD/slack-requires > $PKG/install/slack-requires
+  cat $CWD/doinst.sh >> $PKG/install/doinst.sh
 fi
 
 
@@ -213,10 +210,7 @@ cd $PKG
 makepkg --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
   2>&1 | tee $CWD/makepkg-${PRGNAM}.log
 (cd $TMP && md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5)
-cat $CWD/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
-if [ -f $CWD/slack-requires ]; then
-  cat $CWD/slack-requires > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
-fi
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
 
 
 # --- CLEANUP ---