1 files changed, 15 insertions, 21 deletions
diff --git a/network/nordvpn/nordvpn.SlackBuild b/network/nordvpn/nordvpn.SlackBuild
index 399f74f5cf2c..a65d05b5d3b6 100644
--- a/network/nordvpn/nordvpn.SlackBuild
+++ b/network/nordvpn/nordvpn.SlackBuild
@@ -28,42 +28,40 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nordvpn
 VERSION=${VERSION:-3.12.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 # Select nordvpn's default group
 NORD_GROUP=${NORD_GROUP:-nordvpn}
 
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    x86_64) ARCH=amd64 ;;
-    i?86) ARCH=i386 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "amd64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
+if [ "$ARCH" = "i586" ]; then
+  DEBARCH="i386"
+elif [ "$ARCH" = "i686" ]; then
+  DEBARCH="i386"
+elif [ "$ARCH" = "x86_64" ]; then
+  DEBARCH="amd64"
 else
-  echo "Package for $(uname -m) architecture is not available."
+  echo "Package for $ARCH architecture is not available."
   exit 1
 fi
 
@@ -88,7 +86,7 @@ rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 
 cd $PKG
-ar p $CWD/${PRGNAM}_${VERSION}_${ARCH}.deb data.tar.gz | tar zxv
+ar p $CWD/${PRGNAM}_${VERSION}_${DEBARCH}.deb data.tar.gz | tar zxv
 
 rm -fR etc usr/lib
 
@@ -105,9 +103,5 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 mkdir -p $PKG/etc/rc.d
 install -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
 
-if [ "$ARCH" = "amd64" ]; then
-  ARCH="x86_64"
-fi
-
 cd $PKG
 /sbin/makepkg -l y -p -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE