From 2632267746381b0c397dc461e0e50c8a1b5d9906 Mon Sep 17 00:00:00 2001
From: Chris Walker
Date: Sun, 16 Sep 2018 14:53:45 +0100
Subject: development/gnustep-base: Updated for version 1.25.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 development/gnustep-base/README                  | 19 ++++++++++---------
 development/gnustep-base/gnustep-base.SlackBuild | 19 +++++++++----------
 development/gnustep-base/gnustep-base.info       |  8 ++++----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/development/gnustep-base/README b/development/gnustep-base/README
index bde6a5d34b..962f3a6cc3 100644
--- a/development/gnustep-base/README
+++ b/development/gnustep-base/README
@@ -1,10 +1,11 @@
-GNUstep is a free, object-oriented, cross-platform development environment
-that strives for simplicity and elegance.  GNUstep is based on and completely
-compatible with the OpenStep specification developed by NeXT (now Apple
-Computer Inc.) as well as implementing the extensions added by Apple in the
-form of Cocoa.
+GNUstep is a free, object-oriented, cross-platform development
+environment that strives for simplicity and elegance.  GNUstep is based
+on and completely compatible with the OpenStep specification developed
+by NeXT (now Apple Computer Inc.) as well as implementing the
+extensions added by Apple in the form of Cocoa.
 
-This package contains GNUstep-base component of the core libraries needed to
-write non-graphic tools in Objective-C.  It includes all of the classes
-necessary for writing an incredible array of tools, from wrappers for system
-tools to tools for communicating with web and other types of servers.
+This package contains GNUstep-base component of the core libraries
+needed to write non-graphic tools in Objective-C.  It includes all of
+the classes necessary for writing an incredible array of tools, from
+wrappers for system tools to tools for communicating with web and other
+types of servers.
diff --git a/development/gnustep-base/gnustep-base.SlackBuild b/development/gnustep-base/gnustep-base.SlackBuild
index 339400f1bf..d610b4b7f0 100644
--- a/development/gnustep-base/gnustep-base.SlackBuild
+++ b/development/gnustep-base/gnustep-base.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnustep-base
 #
-# Copyright 2013 Christopher Walker Copperas Cove, TX
+# Copyright 2013-2018 Chris Walker Kempner, TX
 # 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=gnustep-base
-VERSION=${VERSION:-1.24.3}
+VERSION=${VERSION:-1.25.0}
 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
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,23 +69,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-. /usr/share/GNUstep/Makefiles/GNUstep-reset.sh
-. /usr/share/GNUstep/Makefiles/GNUstep.sh
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --enable-ffcall \
   --build=$ARCH-slackware-linux
+
 make
 make install DESTDIR=$PKG GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
-chown -R root:root $PKG/usr/lib${LIBDIRSUFFIX}/GNUstep/Libraries
-chmod -R go-w $PKG/usr/lib${LIBDIRSUFFIX}/GNUstep/Libraries
+chown -R root:root $PKG/usr/lib/GNUstep/Libraries
+chmod -R go-w $PKG/usr/lib/GNUstep/Libraries
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
diff --git a/development/gnustep-base/gnustep-base.info b/development/gnustep-base/gnustep-base.info
index a4864e00ac..aed79db5d1 100644
--- a/development/gnustep-base/gnustep-base.info
+++ b/development/gnustep-base/gnustep-base.info
@@ -1,10 +1,10 @@
 PRGNAM="gnustep-base"
-VERSION="1.24.3"
+VERSION="1.25.0"
 HOMEPAGE="http://www.gnustep.org"
-DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.3.tar.gz"
-MD5SUM="57923f238d6af2cac8bda232e2284dd4"
+DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.25.0.tar.gz"
+MD5SUM="f968ab0a43ac59f14dabeb6b66476806"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnustep-make"
-MAINTAINER="Christopher Walker"
+MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"
-- 
cgit v1.2.3