development/gnustep-make: Updated for version 2.7.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 29 insertions, 27 deletions

diff --git a/development/gnustep-make/README b/development/gnustep-make/README
index e0d549855a..0c8f8f36d5 100644
--- a/development/gnustep-make/README
+++ b/development/gnustep-make/README
@@ -1,9 +1,10 @@
-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-make component of the core libraries needed to
-write non-graphic tools in Objective-C.  It allows you to setup a simple and
-powerful system for building, installing and packaging your tools.
+This package contains GNUstep-make component of the core libraries
+needed to write non-graphic tools in Objective-C. It allows you to
+setup a simple and powerful system for building, installing and
+packaging your tools.
diff --git a/development/gnustep-make/gnustep-make.SlackBuild b/development/gnustep-make/gnustep-make.SlackBuild
index 7bf02224e4..63ceec3029 100644
--- a/development/gnustep-make/gnustep-make.SlackBuild
+++ b/development/gnustep-make/gnustep-make.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnustep-make
 #
-# 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-make
-VERSION=${VERSION:-2.6.3}
+VERSION=${VERSION:-2.7.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"
@@ -75,32 +75,33 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --mandir=/usr/man \
   --infodir=/usr/info \
-  --with-layout=fhs-system \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-layout=fhs-system \
   --with-config-file=/etc/GNUstep/GNUstep.conf \
   --with-library-combo=gnu-gnu-gnu \
   --build=$ARCH-slackware-linux
 
-# I guess those configure flags are worthless
-sed -i GNUstep.conf \
- -e "s,/usr/share/man,/usr/man,g" \
- -e "s,/usr/local/share/man,/usr/local/man,g" \
- -e "s,/usr/share/info,/usr/info,g" \
- -e "s,/usr/local/share/info,/usr/local/info,g" \
- -e "s,/usr/lib,/usr/lib${LIBDIRSUFFIX},g" \
- -e "s,/usr/local/lib,/usr/local/lib${LIBDIRSUFFIX},g"
 
 make
 make install DESTDIR=$PKG
 
 mv $PKG/etc/GNUstep/GNUstep.conf $PKG/etc/GNUstep/GNUstep.conf.new
 
+sed -e "s,/usr/lib$,/usr/lib${LIBDIRSUFFIX},g" \
+ -e "s,/usr/local/lib$,/usr/local/lib${LIBDIRSUFFIX},g" \
+ -e "s,/usr/local/share/info,/usr/local/info,g" \
+ -e "s,/usr/local/share/man,/usr/local/man,g" \
+ -e "s,/usr/share/info,/usr/info,g" \
+ -e "s,/usr/share/man,/usr/man,g" \
+ -i $PKG/etc/GNUstep/GNUstep.conf.new
+
 # Move man pages to correct spot
 mv $PKG/usr/share/man $PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ANNOUNCE COPYING ChangeLog FAQ GNUstep-HOWTO INSTALL NEWS README README.Packaging RELEASENOTES \
+  ANNOUNCE COPYING ChangeLog ChangeLog.1 FAQ GNUstep-HOWTO INSTALL NEWS \
+  README README.Packaging RELEASENOTES \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/gnustep-make/gnustep-make.info b/development/gnustep-make/gnustep-make.info
index b2251a075f..192054bdc9 100644
--- a/development/gnustep-make/gnustep-make.info
+++ b/development/gnustep-make/gnustep-make.info
@@ -1,10 +1,10 @@
 PRGNAM="gnustep-make"
-VERSION="2.6.3"
+VERSION="2.7.0"
 HOMEPAGE="http://www.gnustep.org"
-DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.3.tar.gz"
-MD5SUM="a1606e33317b956aa6b34ce47557ccfb"
+DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.7.0.tar.gz"
+MD5SUM="bd3981da51667df1d011f807895db65d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Christopher Walker"
+MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"