python/nyx: build with python3.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 19 insertions, 32 deletions

diff --git a/python/nyx/README b/python/nyx/README
index dbd8ba5ccfbd..3a9c1e943c8a 100644
--- a/python/nyx/README
+++ b/python/nyx/README
@@ -1,7 +1,15 @@
 Nyx is a command-line monitor for Tor.
 
-With this you can get detailed real-time information about your relay
-such as bandwidth usage, connections, logs, and much more.
+With this you can get detailed real-time information about
+your relay such as bandwidth usage, connections, logs, and
+much more.
+
+Nyx works with Python 2.7 and greater, including the Python
+3.x series.
+Please note that Nyx by now is defacto unmaintained.
 
 Having Tor installed is not required for building.
 The Tor installation does not have to be from SBo.
+
+A python 3 module will be compiled.
+In case you need a python 2 module adapt the script.
diff --git a/python/nyx/nyx.SlackBuild b/python/nyx/nyx.SlackBuild
index 15cc7c3e0038..b6fe1d81dfce 100644
--- a/python/nyx/nyx.SlackBuild
+++ b/python/nyx/nyx.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nyx
 
-# Copyright 2017-2019 Markus Reichelt, Aachen, DE
+# Copyright 2017-2023 Markus Reichelt, Aachen, DE
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,12 +22,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # Markus Reichelt <slackbuilds@mareichelt.de>, 0xCCEEF115
+# 20230526 bkw: modified slightly by SlackBuilds.org
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=nyx
 VERSION=${VERSION:-2.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -39,9 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -51,20 +49,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -76,22 +60,17 @@ 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 \
+ -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 {} +
 
-python2 setup.py install --root=$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
+python3 setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1
 cp -a web/ LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a nyx.1 $PKG/usr/man/man1
+gzip -9c < nyx.1 > $PKG/usr/man/man1/nyx.1.gz
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/python/nyx/nyx.info b/python/nyx/nyx.info
index 241fad83fd8d..fe9c90b4c0a3 100644
--- a/python/nyx/nyx.info
+++ b/python/nyx/nyx.info
@@ -1,7 +1,7 @@
 PRGNAM="nyx"
 VERSION="2.1.0"
 HOMEPAGE="https://nyx.torproject.org/"
-DOWNLOAD="https://files.pythonhosted.org/packages/f4/da/68419425cb0f64f996e2150045c7043c2bb61f77b5928c2156c26a21db88/nyx-2.1.0.tar.gz"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/n/nyx/nyx-2.1.0.tar.gz"
 MD5SUM="31b49f434c0caf65f402d5ac3aa54da8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/python/nyx/slack-desc b/python/nyx/slack-desc
index 09a869c5615d..327a9684d150 100644
--- a/python/nyx/slack-desc
+++ b/python/nyx/slack-desc
@@ -10,10 +10,10 @@ nyx: nyx (Terminal status monitor for Tor)
 nyx:
 nyx: Nyx is a command-line monitor for Tor. With this you get real-time
 nyx: information about your relay.
+nyx: Please note that Nyx by now is defacto unmaintained.
 nyx:
 nyx: Homepage: https://nyx.torproject.org/
 nyx:
 nyx:
 nyx:
 nyx:
-nyx: