From ce5bff46e2d2f0c71e5102b2dab51b5bd3bc0de8 Mon Sep 17 00:00:00 2001
From: Erik Falor <ewfalor@gmail.com>
Date: Mon, 23 Jan 2017 23:53:17 +0000
Subject: network/xombrero: Updated for version 1.6.4.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 network/xombrero/xombrero.SlackBuild | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'network/xombrero/xombrero.SlackBuild')

diff --git a/network/xombrero/xombrero.SlackBuild b/network/xombrero/xombrero.SlackBuild
index d3d7ae01fb..3c025a605c 100644
--- a/network/xombrero/xombrero.SlackBuild
+++ b/network/xombrero/xombrero.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xombrero
 
-# Copyright 2014 Erik Falor, Utah, USA
+# Copyright 2017 Erik Falor, Utah, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xombrero
-VERSION=${VERSION:-1.6.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.6.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PRGNAM_UPPER=$(echo $PRGNAM | tr '[:lower:]' '[:upper:]')
+VERSION_UNDERSCORE=$(echo $VERSION | tr . _)
 
 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 +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"
@@ -54,28 +56,26 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-${PRGNAM_UPPER}_${VERSION_UNDERSCORE}
+tar xvf $CWD/$PRGNAM-${PRGNAM_UPPER}_${VERSION_UNDERSCORE}.tar.gz
+cd $PRGNAM-${PRGNAM_UPPER}_${VERSION_UNDERSCORE}
 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Patch xombrero.h to not expect resources in /usr/local/share/xombrero
-# https://opensource.conformal.com/flyspray/index.php?do=details&task_id=372
-patch -i $CWD/xombrero.h.patch
 
-sed -i 's|https://www.cyphertite.com|http://www.slackware.com|' xombrero.{c,conf,h}
+sed -i 's|https://www.cyphertite.com|http://www.slackware.com|' xombrero.{conf,h}
 sed -i 's|/etc/ssl/cert.pem|/etc/ssl/certs/ca-certificates.crt|' xombrero.conf
 
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 PREFIX=/usr \
-- 
cgit v1.2.3