network/tinyirc: Change default server.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

4 files changed, 22 insertions, 12 deletions

diff --git a/network/tinyirc/README b/network/tinyirc/README
index 47008dec66..98b30dab40 100644
--- a/network/tinyirc/README
+++ b/network/tinyirc/README
@@ -6,5 +6,6 @@ it have any color, but it works, and it's tiny. It's a bare bones
 IRC client which has no editing capabilities other than backspace to
 correct typing.
 
-This SlackBuild sets the default IRC server to chat.freenode.org, when
-tinyirc is run without a server argument.
+This SlackBuild sets the default IRC server to irc.libera.chat, port
+6667, when tinyirc is run without a server argument. However, you can
+change this by setting SERVER and/or PORT in the environment.
diff --git a/network/tinyirc/slack-desc b/network/tinyirc/slack-desc
index 51060e7c9b..84e94f629d 100644
--- a/network/tinyirc/slack-desc
+++ b/network/tinyirc/slack-desc
@@ -12,7 +12,7 @@ tinyirc: A very small, stripped down IRC client. It doesn't have most of the
 tinyirc: more advanced commands in the ircII family of IRC clients, nor does it
 tinyirc: have any color, but it works, and it's tiny.
 tinyirc:
-tinyirc:
+tinyirc: Default server and port: @SERVER@:@PORT@
 tinyirc:
 tinyirc:
 tinyirc:
diff --git a/network/tinyirc/tinyirc.SlackBuild b/network/tinyirc/tinyirc.SlackBuild
index 7d6ad66a8d..fe40f024af 100644
--- a/network/tinyirc/tinyirc.SlackBuild
+++ b/network/tinyirc/tinyirc.SlackBuild
@@ -6,11 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210925 bkw: BUILD=2, change default server to libera since
+# freenode has become a bad joke. Also add SERVER and PORT env vars,
+# since someone might not agree with me.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tinyirc
 VERSION=${VERSION:-1.1_4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -25,9 +29,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
@@ -68,10 +69,13 @@ for i in $( cat debian/patches/series ); do
   patch -p1 < debian/patches/$i
 done
 
+SERVER="${SERVER:-irc.libera.chat}"
+PORT="${PORT:-6667}"
+
 # Change the default server and port to something people actually use.
 make $PRGNAM \
-  SERVER="chat.freenode.net" \
-  PORT=6667 \
+  SERVER="$SERVER" \
+  PORT="$PORT" \
   CFLAGS="$SLKCFLAGS -DPOSIX -DDO_CTCP -DCURSES -DHAVE_NCURSES" \
   LIBS=-lncurses \
   CC=${CC:-gcc}
@@ -79,6 +83,9 @@ make $PRGNAM \
 mkdir -p $PKG/usr/bin
 install -m0755 -s $PRGNAM $PKG/usr/bin
 
+# Derp!
+sed -i 's|left, left|left, right|' debian/$PRGNAM.1.pod
+
 mkdir -p $PKG/usr/man/man1
 pod2man -cSlackBuilds.org -s1 -r1.1 -nTINYIRC debian/$PRGNAM.1.pod | \
   gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz
@@ -91,7 +98,9 @@ cp -a COPYING announce *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed -e "s,@SERVER@,$SERVER," \
+    -e "s,@PORT@,$PORT," \
+    $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/tinyirc/tinyirc.info b/network/tinyirc/tinyirc.info
index 6325f142f8..fefdcc22bd 100644
--- a/network/tinyirc/tinyirc.info
+++ b/network/tinyirc/tinyirc.info
@@ -1,8 +1,8 @@
 PRGNAM="tinyirc"
 VERSION="1.1_4"
 HOMEPAGE="https://github.com/nlaredo/tinyirc/"
-DOWNLOAD="http://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1.orig.tar.gz \
-          http://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1-4.debian.tar.xz"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1.orig.tar.gz \
+          https://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1-4.debian.tar.xz"
 MD5SUM="b655596125a525d54f82dba6a96a84b7 \
         e2c989de71c7324bc86fb6aa45a4d8a3"
 DOWNLOAD_x86_64=""