4 files changed, 34 insertions, 37 deletions
diff --git a/source/a/dosfstools/dosfstools.SlackBuild b/source/a/dosfstools/dosfstools.SlackBuild
index 046062363..6bc670f8d 100755
--- a/source/a/dosfstools/dosfstools.SlackBuild
+++ b/source/a/dosfstools/dosfstools.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2011, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011, 2013, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,11 @@
 #  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)
 
 PKGNAM=dosfstools
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -35,6 +36,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i586" ]; then
@@ -51,7 +60,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -70,21 +78,22 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/dosfstools.paths.diff.gz | patch -p1 --verbose || exit 1
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --sbindir=/sbin \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-compat-symlinks \
+  --build=$ARCH-slackware-linux || exit 1
 
-# Build and install:
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# We can handle this:
-rm -r $PKG/usr/doc
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  COPYING* README* \
-  doc/ANNOUNCE* doc/README* doc/TODO* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
 # Strip binaries:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -114,6 +123,11 @@ if [ -d $PKG/usr/info ]; then
   )
 fi
 
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  COPYING* NEWS README* TODO* doc/* \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
 if [ -r ChangeLog ]; then
diff --git a/source/a/dosfstools/dosfstools.paths.diff b/source/a/dosfstools/dosfstools.paths.diff
deleted file mode 100644
index cdd473df7..000000000
--- a/source/a/dosfstools/dosfstools.paths.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./Makefile.orig	2010-04-04 02:36:49.000000000 -0500
-+++ ./Makefile	2011-02-25 13:45:41.443999917 -0600
-@@ -19,10 +19,10 @@
- # can be found in /usr/share/common-licenses/GPL-3 file.
- 
- DESTDIR =
--PREFIX = /usr/local
--SBINDIR = $(PREFIX)/sbin
--DOCDIR = $(PREFIX)/share/doc
--MANDIR = $(PREFIX)/share/man
-+PREFIX = /usr
-+SBINDIR = /sbin
-+DOCDIR = $(PREFIX)/doc
-+MANDIR = $(PREFIX)/man
- 
- #OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- OPTFLAGS = -O2 -fomit-frame-pointer $(shell getconf LFS_CFLAGS)
diff --git a/source/a/dosfstools/dosfstools.url b/source/a/dosfstools/dosfstools.url
index 945cf15f0..42670d944 100644
--- a/source/a/dosfstools/dosfstools.url
+++ b/source/a/dosfstools/dosfstools.url
@@ -1 +1 @@
-lftpget http://github.com/dosfstools/dosfstools/releases/download/v3.0.28/dosfstools-3.0.28.tar.xz
+lftpget https://github.com/dosfstools/dosfstools/releases/download/v4.1/dosfstools-4.1.tar.xz{,.sig}
diff --git a/source/a/dosfstools/slack-desc b/source/a/dosfstools/slack-desc
index 2ac81136a..3e3e6cb22 100644
--- a/source/a/dosfstools/slack-desc
+++ b/source/a/dosfstools/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
@@ -11,7 +11,7 @@ dosfstools:
 dosfstools: Utilities for creating FAT filesystems (mkdosfs), and for checking
 dosfstools: and repairing them (dosfsck).
 dosfstools:
-dosfstools: Homepage:  http://daniel-baumann.ch/software/dosfstools
+dosfstools: Homepage: http://daniel-baumann.ch/software/dosfstools
 dosfstools:
 dosfstools:
 dosfstools: