From 5f4ce58db43c0c52156746601868a966f34f9713 Mon Sep 17 00:00:00 2001
From: Hunter Sezen <orbea@fredslev.dk>
Date: Mon, 2 Apr 2018 19:43:44 +0000
Subject: libraries/png++: Minor cleanups.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 libraries/png++/README           |  4 +++-
 libraries/png++/png++.SlackBuild | 17 ++++++++---------
 libraries/png++/png++.info       |  6 +++---
 libraries/png++/slack-desc       |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'libraries')

diff --git a/libraries/png++/README b/libraries/png++/README
index 1d6a2ff4f8..1f74c35f3d 100644
--- a/libraries/png++/README
+++ b/libraries/png++/README
@@ -4,4 +4,6 @@ the PNG reference implementation library.
 PNG++ is free software distributed under a modified variant of
 the BSD license.
 
-To install the html docs use: DOC=yes ./png++.SlackBuild
+To install the html docs use:
+
+  DOC="yes" ./png++.SlackBuild
diff --git a/libraries/png++/png++.SlackBuild b/libraries/png++/png++.SlackBuild
index 58655be584..b227d7dd80 100644
--- a/libraries/png++/png++.SlackBuild
+++ b/libraries/png++/png++.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for png++
 
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015, 2018 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,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 +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"
@@ -54,7 +54,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -69,16 +69,15 @@ 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 {} \;
 
-# Fix doc location
 sed -i 's|share/doc|doc|g' Makefile
 
-DOC=${DOC:-no}
 make CFLAGS="$SLKCFLAGS"
-if [ "${DOC:-yes}" = "yes" ]; then make docs; fi
+[ "${DOC:-0}" != 0 ] && make docs
 make install PREFIX=$PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/png++/png++.info b/libraries/png++/png++.info
index 514c76f5bd..5b3f953223 100644
--- a/libraries/png++/png++.info
+++ b/libraries/png++/png++.info
@@ -1,10 +1,10 @@
 PRGNAM="png++"
 VERSION="0.2.9"
-HOMEPAGE="http://www.nongnu.org/pngpp/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/pngpp/png++-0.2.9.tar.gz"
+HOMEPAGE="https://www.nongnu.org/pngpp/"
+DOWNLOAD="https://download.savannah.gnu.org/releases/pngpp/png++-0.2.9.tar.gz"
 MD5SUM="92863df3bee625d707cebc0e749c10df"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Hunter Sezen"
-EMAIL="orbea@fredslev.dk"
\ No newline at end of file
+EMAIL="orbea@fredslev.dk"
diff --git a/libraries/png++/slack-desc b/libraries/png++/slack-desc
index 46cd23d58a..d430908168 100644
--- a/libraries/png++/slack-desc
+++ b/libraries/png++/slack-desc
@@ -11,7 +11,7 @@ png++:
 png++: PNG++ aims to provide simple yet powerful C++ interface to libpng,
 png++: the PNG reference implementation library.
 png++:
-png++: Homepage: http://www.nongnu.org/pngpp/
+png++: Homepage: https://www.nongnu.org/pngpp/
 png++:
 png++:
 png++:
-- 
cgit v1.2.3