From 920ab518254caf7afacd1673c9b6e1d833cada91 Mon Sep 17 00:00:00 2001
From: Kyle Guinn
Date: Tue, 8 Aug 2017 22:48:22 -0500
Subject: system/t1utils: Updated for version 1.40.

Signed-off-by: Kyle Guinn <elyk03@gmail.com>
---
 system/t1utils/t1utils.SlackBuild | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'system/t1utils/t1utils.SlackBuild')

diff --git a/system/t1utils/t1utils.SlackBuild b/system/t1utils/t1utils.SlackBuild
index de53ae6f10..46ef078bcc 100644
--- a/system/t1utils/t1utils.SlackBuild
+++ b/system/t1utils/t1utils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for t1utils
 
-# Copyright 2013,2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2017 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=t1utils
-VERSION=${VERSION:-1.39}
+VERSION=${VERSION:-1.40}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$(uname -m) ;;
   esac
@@ -37,14 +37,17 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PRGNAM-$VERSION
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="INSTALL NEWS README"
+DOCS="INSTALL NEWS.md README.md"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -67,17 +70,19 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-CFLAGS="$SLKCFLAGS" \
+# -D_GNU_SOURCE is to fix https://github.com/kohler/t1utils/issues/8
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --infodir=/usr/info \
   --mandir=/usr/man \
+  --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-dependency-tracking \
   --build=$ARCH-slackware-linux \
-  --disable-dependency-tracking
+  CFLAGS="$SLKCFLAGS" \
+  CPPFLAGS="-D_GNU_SOURCE" \
 
 make
 make install-strip DESTDIR=$PKG
-- 
cgit v1.2.3