network/irssi_otr: Updated for version 1.2.3.

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

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

3 files changed, 32 insertions, 31 deletions

diff --git a/network/irssi_otr/README b/network/irssi_otr/README
index 62aee9b553..eddc6003a3 100644
--- a/network/irssi_otr/README
+++ b/network/irssi_otr/README
@@ -2,9 +2,5 @@ irssi_otr (OTR plugin for irssi)
 
 Off-the-Record Messaging (OTR) plugin for the irssi IRC client
 
-To use OTR within irssi, install this package, then "/load libotr"
-and "/otr help" for usage instructions. Also see the README in
-/usr/doc/irssi_otr-$VERSION.
-
-irssi_otr formerly had support for xchat, but it was removed by
-upstream. Be aware of this when upgrading.
+To use OTR within irssi: install this package, then "/load otr".
+See "/otr help" for usage instructions.
diff --git a/network/irssi_otr/irssi_otr.SlackBuild b/network/irssi_otr/irssi_otr.SlackBuild
index 4e45c29c59..c6c714a974 100644
--- a/network/irssi_otr/irssi_otr.SlackBuild
+++ b/network/irssi_otr/irssi_otr.SlackBuild
@@ -6,6 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210914 bkw: updated for v1.2.3. There is no longer a separate
+# irssi-otr source: it's now included in the irssi source. However,
+# Slackware's irssi package doesn't include it because Slackware
+# doesn't include libotr.
+
 # 20170302 bkw: use long-format github URL
 
 # 20170121 bkw:
@@ -29,7 +34,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=irssi_otr
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -42,9 +47,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,7 +70,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-TARNAM=$( echo $PRGNAM | sed 's/_/-/g' )
+TARNAM=irssi
 
 set -e
 
@@ -76,35 +78,38 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $TARNAM-$VERSION
-tar xvf $CWD/$TARNAM-$VERSION.tar.gz
+tar xvf $CWD/$TARNAM-$VERSION.tar.?z
 cd $TARNAM-$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 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-./bootstrap
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# This bit's modified from PV's irssi.SlackBuild.
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --with-irssi-module-dir=/usr/lib$LIBDIRSUFFIX/irssi/modules \
+  --with-otr=yes \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --sysconfdir=/etc \
+  --docdir=/usr/doc/irssi-$VERSION \
+  --enable-true-color \
+  --with-textui \
+  --with-perl-lib=vendor \
+  --with-proxy \
   --build=$ARCH-slackware-linux
 
-make V=1
+# Don't have to build all of irssi, just our one module.
+cd src/otr
+make
 make install-strip DESTDIR=$PKG
 
-# AUTHORS is a 0-byte placeholder.
+# Don't need the static lib nor .la
+rm -f $PKG/usr/lib$LIBDIRSUFFIX/irssi/modules/*a
+
+# Include our own README
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/irssi_otr/irssi_otr.info b/network/irssi_otr/irssi_otr.info
index f7e86366b1..3e7ade5c3a 100644
--- a/network/irssi_otr/irssi_otr.info
+++ b/network/irssi_otr/irssi_otr.info
@@ -1,8 +1,8 @@
 PRGNAM="irssi_otr"
-VERSION="1.0.2"
-HOMEPAGE="https://github.com/cryptodotis/irssi-otr"
-DOWNLOAD="https://github.com/cryptodotis/irssi-otr/archive/v1.0.2/irssi-otr-1.0.2.tar.gz"
-MD5SUM="5f217dade49593f8505fecc5a5d322d2"
+VERSION="1.2.3"
+HOMEPAGE="https://irssi.org/modules/"
+DOWNLOAD="https://github.com/irssi/irssi/releases/download/1.2.3/irssi-1.2.3.tar.xz"
+MD5SUM="381d3af259ad15d658be50c0a01f0c28"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libotr"