From c18f81605673c2bc77b734c7ad42c181f65a086b Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 9 Jun 2018 09:46:04 +0200
Subject: 20180609.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 accessibility/jpilot/jpilot.SlackBuild | 23 +++++++++++------------
 accessibility/jpilot/jpilot.info       |  6 +++---
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'accessibility/jpilot')

diff --git a/accessibility/jpilot/jpilot.SlackBuild b/accessibility/jpilot/jpilot.SlackBuild
index 78eeb3f868..e2dd848145 100644
--- a/accessibility/jpilot/jpilot.SlackBuild
+++ b/accessibility/jpilot/jpilot.SlackBuild
@@ -25,13 +25,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jpilot
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.8.2}
 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
@@ -42,8 +42,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"
@@ -60,15 +60,16 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP rm -rf $PRGNAM-$VERSION
+cd $TMP
+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 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS -std=gnu89" \
 CXXFLAGS="$SLKCFLAGS -std=gnu89" \
@@ -84,10 +85,8 @@ CXXFLAGS="$SLKCFLAGS -std=gnu89" \
 make
 make install-strip DESTDIR=$PKG
 
-( cd $PKG/usr/man
-	find . -type f -exec gzip -9 {} \;
-	for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mv $PKG/usr/share/doc $PKG/usr
 mv $PKG/usr/doc/jpilot $PKG/usr/doc/jpilot-$VERSION
diff --git a/accessibility/jpilot/jpilot.info b/accessibility/jpilot/jpilot.info
index 4030813d5e..9d14b884f0 100644
--- a/accessibility/jpilot/jpilot.info
+++ b/accessibility/jpilot/jpilot.info
@@ -1,8 +1,8 @@
 PRGNAM="jpilot"
-VERSION="1.8.1"
+VERSION="1.8.2"
 HOMEPAGE="http://www.jpilot.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/jpilot-1.8.1.tar.gz"
-MD5SUM="ac59a5708f37e30d39e85b1fcedd266f"
+DOWNLOAD="http://jpilot.org/tarballs/jpilot-1.8.2.tar.gz"
+MD5SUM="8b539d8943ac75c7890fc5c071e89adb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3