1 files changed, 6 insertions, 11 deletions
diff --git a/system/dosemu/dosemu.SlackBuild b/system/dosemu/dosemu.SlackBuild
index de2d660d742d4..58b842b584c33 100644
--- a/system/dosemu/dosemu.SlackBuild
+++ b/system/dosemu/dosemu.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for dosemu
 
 # Copyright 2007 Martin Lefebvre <dadexter@sekurity.com>
+# Copyright 2014 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +25,7 @@
 
 PRGNAM=dosemu
 VERSION=${VERSION:-20130804_35054ba}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,10 +41,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# This script builds dosemu without X support by default.
-# To enable X, run the build script as:  WITH_X=yes ./dosemu.SlackBuild
-WITH_X=${WITH_X:-no}
-
 if [ "$ARCH" = "i486" ]; then
    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
    LIBDIRSUFFIX=""
@@ -74,14 +71,13 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc/dosemu \
-  --localstatedir=/var \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-x="$WITH_X" \
+  --with-x \
   --with-svgalib \
+  --with-docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-fdtarball=$CWD/dosemu-freedos-1.0-bin.tgz
 
 make
@@ -93,10 +89,7 @@ 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
-mv $PKG/usr/share/doc/dosemu $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-rmdir $PKG/usr/share/doc
 
 ( cd $PKG/etc/dosemu
   mv dosemu.conf dosemu.conf.new
@@ -104,6 +97,8 @@ rmdir $PKG/usr/share/doc
   mv global.conf global.conf.new
 )
 
+find $PKG -type d ! -perm 755 -exec chmod 0755 '{}' \;
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh