5 files changed, 46 insertions, 34 deletions
diff --git a/system/dosbox-dev/README b/system/dosbox-dev/README
index 7a7e9f3c7e..b2f490c7cf 100644
--- a/system/dosbox-dev/README
+++ b/system/dosbox-dev/README
@@ -4,23 +4,15 @@ as well as many apps designed to run on DOS.
 
 SDL_sound is an optional dependency.
 
-This is the latest-or-almost development version, hence it is not labeled
-stable by upstream.
-dosbox-dev does conflict with the stable dosbox 0.74 Slackbuild, and isn't
-meant to be used alongside.
-If you want to have both dosbox and dosbox-dev packages installed set
-DOSBOXDEV=yes, and man page, icon, desktop entry and dosbox binary will be
-renamed dosbox-dev.
+This is the latest-or-almost development version, hence it is not
+labeled stable by upstream.
+
+dosbox-dev does conflict with the stable dosbox 0.74 Slackbuild, and
+isn't meant to be used alongside.
 
-If you want to use another revision of the SVN codebase,
-get it and put it in a directory called dosbox-dev, then create a
-dosbox-dev-0.74.rXXXX.tar.xz archive.
-After that you can do REVISION=XXXX ./dosbox-dev.SlackBuild
-There'll be some available at :
-https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/
+If you want to have both dosbox and dosbox-dev packages installed set
+DOSBOXDEV=yes, and man page, icon, desktop entry and dosbox binary
+will be renamed dosbox-dev.
 
-For example for the latest available revision :
-# svn checkout https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk dosbox-dev
-# REVISION=$(cd dosbox-dev && LANG=C svn info | grep "Revision"| cut -d' ' -f2)
-# tar cfa dosbox-dev-0.74.r$REVISION.tar.xz dosbox-dev/
-# ./dosbox-dev.SlackBuild
+If you want to use another revision of the SVN codebase, see
+README.SBo.
diff --git a/system/dosbox-dev/README.SBo b/system/dosbox-dev/README.SBo
new file mode 100644
index 0000000000..cc1bc10874
--- /dev/null
+++ b/system/dosbox-dev/README.SBo
@@ -0,0 +1,13 @@
+If you want to use another revision of the SVN codebase,
+get it and put it in a directory called dosbox-dev, then create a
+dosbox-dev-0.74.rXXXX.tar.xz archive.
+After that you can do REVISION=XXXX ./dosbox-dev.SlackBuild
+There'll be some available at:
+https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/
+
+For example for the latest available revision:
+# svn checkout https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk dosbox-dev
+# REVISION=$(cd dosbox-dev && LANG=C svn info | grep "Revision"| cut -d' ' -f2)
+# tar cfa dosbox-dev-0.74.r$REVISION.tar.xz dosbox-dev/
+# export REVISION
+# ./dosbox-dev.SlackBuild
diff --git a/system/dosbox-dev/dosbox-dev.SlackBuild b/system/dosbox-dev/dosbox-dev.SlackBuild
index 4577846ffe..d49cb38e65 100644
--- a/system/dosbox-dev/dosbox-dev.SlackBuild
+++ b/system/dosbox-dev/dosbox-dev.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dosbox-dev
 
@@ -25,11 +25,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dosbox-dev
-REVISION=${REVISION:-4430}
-VERSION=${VERSION:-0.75_pre4430}
+REVISION=${REVISION:-4482}
+VERSION=${VERSION:-0.75_pre4482}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 DOSBOXDEV=${DOSBOXDEV:-no}
 
 if [ -z "$ARCH" ]; then
@@ -40,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -71,9 +78,9 @@ cd $PRGNAM
 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 {} \+
 
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
@@ -97,12 +104,12 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i
 install -D -m 0644 $CWD/dosbox.desktop \
   $PKG/usr/share/applications/dosbox.desktop
 
-# Add the dosbox.ico file to /usr/share/pixmaps
-install -D -m 0644 src/dosbox.ico $PKG/usr/share/pixmaps/dosbox.ico
+mkdir -p $PKG/usr/share/pixmaps
+convert 'src/dosbox.ico[1]' $PKG/usr/share/pixmaps/dosbox.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  docs/PORTING docs/README.video  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README THANKS \
+  docs/PORTING docs/README.video $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -112,11 +119,11 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 # Change dosbox filenames to $PRGNAM for using it alongside stable dosbox
 if [ "$DOSBOXDEV" = "yes" ]; then
 	mv $PKG/usr/share/applications/dosbox.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-	mv $PKG/usr/share/pixmaps/dosbox.ico $PKG/usr/share/pixmaps/$PRGNAM.ico
+	mv $PKG/usr/share/pixmaps/dosbox.png $PKG/usr/share/pixmaps/$PRGNAM.png
 	mv $PKG/usr/man/man1/dosbox.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz
 	mv $PKG/usr/bin/dosbox $PKG/usr/bin/$PRGNAM
 	sed -i "s/dosbox/dosbox-dev/g" $PKG/usr/share/applications/$PRGNAM.desktop
 fi
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/dosbox-dev/dosbox-dev.info b/system/dosbox-dev/dosbox-dev.info
index ed73e5cb9f..dd2edf62a3 100644
--- a/system/dosbox-dev/dosbox-dev.info
+++ b/system/dosbox-dev/dosbox-dev.info
@@ -1,8 +1,8 @@
 PRGNAM="dosbox-dev"
-VERSION="0.75_pre4430"
+VERSION="0.75_pre4482"
 HOMEPAGE="http://dosbox.sourceforge.net"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.75_pre4430.tar.xz"
-MD5SUM="7f9d59a9d5beb2469c1145d0cd21f01a"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.75_pre4482.tar.xz"
+MD5SUM="76c9cfb0df265b386a50e6e414af2253"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dosbox-dev/dosbox.desktop b/system/dosbox-dev/dosbox.desktop
index 9816ffd81c..55d96227ea 100644
--- a/system/dosbox-dev/dosbox.desktop
+++ b/system/dosbox-dev/dosbox.desktop
@@ -4,7 +4,7 @@ Name=dosbox
 Comment=DOS Emulator Development version
 GenericName=dosbox
 Exec=dosbox
-Icon=/usr/share/pixmaps/dosbox.ico
+Icon=/usr/share/pixmaps/dosbox.png
 Terminal=false
 Type=Application
 Categories=System;