4 files changed, 39 insertions, 29 deletions
diff --git a/source/xap/xscreensaver/dump.android.osx.sources.sh b/source/xap/xscreensaver/dump.android.osx.sources.sh
index 3993f510..4626090f 100755
--- a/source/xap/xscreensaver/dump.android.osx.sources.sh
+++ b/source/xap/xscreensaver/dump.android.osx.sources.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 # Repacks the xscreensaver tarball to remove the unneeded OSX sources.
 
-VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 
-tar xf xscreensaver-${VERSION}.tar.xz || exit 1
-mv xscreensaver-${VERSION}.tar.xz xscreensaver-${VERSION}.tar.xz.orig
+tar xf xscreensaver-${VERSION}.tar.?z || exit 1
+mv xscreensaver-${VERSION}.tar.?z xscreensaver-${VERSION}.tarball.orig
 rm -r xscreensaver-${VERSION}/OSX/*
 rm -r xscreensaver-${VERSION}/android/*
 tar cf xscreensaver-${VERSION}.tar xscreensaver-${VERSION}
 rm -r xscreensaver-${VERSION}
-xz -9 xscreensaver-${VERSION}.tar
-touch -r xscreensaver-${VERSION}.tar.xz.orig xscreensaver-${VERSION}.tar.xz
-rm xscreensaver-${VERSION}.tar.xz.orig
+plzip -9 xscreensaver-${VERSION}.tar
+touch -r xscreensaver-${VERSION}.tarball.orig xscreensaver-${VERSION}.tar.lz
+rm xscreensaver-${VERSION}.tarball.orig
diff --git a/source/xap/xscreensaver/slack-desc b/source/xap/xscreensaver/slack-desc
index ea0efe02..6394a145 100644
--- a/source/xap/xscreensaver/slack-desc
+++ b/source/xap/xscreensaver/slack-desc
@@ -1,19 +1,19 @@
 # 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------------------------------------------------------|
 xscreensaver: xscreensaver (a screen saver and locker for X)
 xscreensaver:
-xscreensaver: A modular screen saver and locker for the X Window System.  Highly
-xscreensaver: customizable:  allows the use of any program that can draw on the
-xscreensaver: root window as a display mode.  More than 100 display modes are
+xscreensaver: A modular screen saver and locker for the X Window System. Highly
+xscreensaver: customizable: allows the use of any program that can draw on the
+xscreensaver: root window as a display mode. More than 100 display modes are
 xscreensaver: included in this package.
 xscreensaver:
-xscreensaver: Homepage:  http://www.jwz.org/xscreensaver
+xscreensaver: Homepage: http://www.jwz.org/xscreensaver
 xscreensaver:
 xscreensaver:
 xscreensaver:
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index 43d7995a..f66209fe 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,9 +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)
 
-VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+PKGNAM=xscreensaver
+VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -34,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-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "i586" ]; then
@@ -50,7 +60,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-xscreensaver
 
@@ -59,7 +68,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf xscreensaver-$VERSION
-tar xvf $CWD/xscreensaver-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/xscreensaver-$VERSION.tar.?z || exit 1
 cd xscreensaver-$VERSION
 
 # Allow xscreensaver to work setgid shadow.  I'd rather avoid requiring
diff --git a/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff b/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
index bdbcbe1d..ed20ff6c 100644
--- a/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
+++ b/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
@@ -1,5 +1,5 @@
---- ./driver/prefs.c.orig	2016-05-23 22:08:27.000000000 -0500
-+++ ./driver/prefs.c	2016-05-30 15:29:36.446721679 -0500
+--- ./driver/prefs.c.orig	2018-04-09 20:21:20.000000000 -0500
++++ ./driver/prefs.c	2018-04-13 13:38:47.859002138 -0500
 @@ -1734,6 +1734,17 @@
       shipping the last version with the old license and then never
       upgrading it again -- which would be the worst possible outcome for
@@ -17,13 +17,14 @@
 +
    */
  
-   time_t now = time ((time_t *) 0);				/*       */
-@@ -1766,5 +1777,7 @@
-   months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) -	/*   h   */
-             (y * 12 + m));					/*   p   */
- 							  	/*   .   */
--  return (months >= 17);					/*       */
-+  /* Disable date checking for Slackware:  */                   /*  \�/  */
-+  /* return (months >= 17); */					/*       */
+   time_t now = time ((time_t *) 0);				/*   d   */
+@@ -1766,5 +1777,8 @@
+   mrnths = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) -	/*   h   */
+             (y * 12 + m));					/*   h   */
+ 							  	/*   p   */
+-  return (mrnths >= 17);					/*   .   */
++  /* Disable date checking for Slackware: */			/*  \■/  */
++  /* return (mrnths >= 17); */					/*   .   */
 +  return ( 0 );
++
  }