summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/dosemu/README3
-rw-r--r--system/dosemu/dosemu.SlackBuild45
-rw-r--r--system/dosemu/dosemu.info12
-rw-r--r--system/dosemu/patch-1.4.0.1.gzbin0 -> 69968 bytes
4 files changed, 31 insertions, 29 deletions
diff --git a/system/dosemu/README b/system/dosemu/README
index 9a518dda1a..848e1f0221 100644
--- a/system/dosemu/README
+++ b/system/dosemu/README
@@ -4,9 +4,6 @@ DOSEMU is a user-level program which uses certain special features
of the Linux kernel and the 80386 processor to run MS-DOS/FreeDOS
in what we in the biz call a 'DOS box'
-This SlackBuild script needs two downloads: the dosemu source file, and
-the dosemu-freedos-1.0-bin.tgz file, both available from the DOSEMU homepage.
-
This script does not build support for X by default - to enable X,
run the script as follows:
WITH_X=yes ./dosemu.SlackBuild
diff --git a/system/dosemu/dosemu.SlackBuild b/system/dosemu/dosemu.SlackBuild
index c098cde472..4aadadd71c 100644
--- a/system/dosemu/dosemu.SlackBuild
+++ b/system/dosemu/dosemu.SlackBuild
@@ -22,14 +22,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Safety and debugging first
-set -e
-
PRGNAM=dosemu
VERSION=1.4.0
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -39,19 +37,19 @@ OUTPUT=${OUTPUT:-/tmp}
# To enable X, run the build script as: WITH_X=yes ./dosemu.SlackBuild
WITH_X=${WITH_X:-no}
-if [ ! -e $CWD/dosemu-freedos-1.0-bin.tgz ]; then
- echo "Please download dosemu-freedos-1.0-bin.tgz first from"
- echo "http://downloads.sourceforge.net/dosemu/dosemu-freedos-1.0-bin.tgz"
- echo "and place it in the same directory as the dosemu source."
- exit 1
-fi
-
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@@ -61,12 +59,17 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R a-s,u+w,go+r-w .
+# patch to upgrade version to 1.4.0.1 (1.4.1 pre-release)
+# http://dosemu.sourceforge.net/prereleases/patch-1.4.0.1.gz
+zcat $CWD/patch-1.4.0.1.gz | patch -p1
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--with-x="$WITH_X" \
--with-svgalib \
--with-fdtarball=$CWD/dosemu-freedos-1.0-bin.tgz
@@ -75,16 +78,16 @@ make
make install DESTDIR=$PKG
( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
)
-if [ -d $PKG/usr/man ]; then
- ( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
- )
-fi
+( cd $PKG/usr/man
+ find . -type f -exec gzip -9 {} \;
+ for i in $(find . -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
@@ -102,4 +105,4 @@ 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} \ No newline at end of file
diff --git a/system/dosemu/dosemu.info b/system/dosemu/dosemu.info
index 68cb728fe2..1af2588a88 100644
--- a/system/dosemu/dosemu.info
+++ b/system/dosemu/dosemu.info
@@ -1,8 +1,10 @@
PRGNAM="dosemu"
VERSION="1.4.0"
HOMEPAGE="http://www.dosemu.org"
-DOWNLOAD="http://downloads.sourceforge.net/dosemu/dosemu-1.4.0.tgz"
-MD5SUM="0bba530637266f99d404ba15e3f118d4"
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@sekurity.com"
-APPROVED="rworkman"
+DOWNLOAD="http://downloads.sourceforge.net/dosemu/dosemu-1.4.0.tgz http://downloads.sourceforge.net/dosemu/dosemu-freedos-1.0-bin.tgz"
+MD5SUM="0bba530637266f99d404ba15e3f118d4 2e09774fe91cff4372cb4a393eb467f5"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Niklas 'Nille' �kerstr�m"
+EMAIL="nille.kungen@gmail.com"
+APPROVED="dsomero"
diff --git a/system/dosemu/patch-1.4.0.1.gz b/system/dosemu/patch-1.4.0.1.gz
new file mode 100644
index 0000000000..cc3712b305
--- /dev/null
+++ b/system/dosemu/patch-1.4.0.1.gz
Binary files differ