From dcffbe97a4c34bf339972954aaaac6d9c19040fb Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Wed, 15 Apr 2020 18:59:54 -0400
Subject: libraries/SDL2_net: new maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/SDL2_net/README              |  2 ++
 libraries/SDL2_net/SDL2_net.SlackBuild | 23 +++++++++++------------
 libraries/SDL2_net/SDL2_net.info       |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'libraries/SDL2_net')

diff --git a/libraries/SDL2_net/README b/libraries/SDL2_net/README
index 3f3e632887..52a733802e 100644
--- a/libraries/SDL2_net/README
+++ b/libraries/SDL2_net/README
@@ -1,3 +1,5 @@
+SDL2_net (network library for SDL2)
+
 This SDL2 extension is a small cross platform networking library.
 
 It is safe to install alongside Slackware's SDL libraries.
diff --git a/libraries/SDL2_net/SDL2_net.SlackBuild b/libraries/SDL2_net/SDL2_net.SlackBuild
index ac25dc3fe3..d2ed7105b7 100644
--- a/libraries/SDL2_net/SDL2_net.SlackBuild
+++ b/libraries/SDL2_net/SDL2_net.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for SDL2_net
 
 # Copyright 2013 Dugan Chen Canada
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,6 +23,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20200415 bkw:
+# - take over maintenance
+# - i486 => i586
+
 PRGNAM=SDL2_net
 VERSION=${VERSION:-2.0.1}
 BUILD=${BUILD:-1}
@@ -29,7 +34,7 @@ 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 +45,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"
@@ -63,11 +68,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -83,10 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-gui
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/demo
 cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/SDL2_net/SDL2_net.info b/libraries/SDL2_net/SDL2_net.info
index d607b71b3f..94ecc23d2f 100644
--- a/libraries/SDL2_net/SDL2_net.info
+++ b/libraries/SDL2_net/SDL2_net.info
@@ -6,5 +6,5 @@ MD5SUM="5c1d9d1cfa63301b141cb5c0de2ea7c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2"
-MAINTAINER="Dugan Chen"
-EMAIL="thedoogster [at] gmail [dot] com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
-- 
cgit v1.2.3