misc/txt2tags: Updated for version 3.7, new maintainer.

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

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

4 files changed, 35 insertions, 60 deletions

diff --git a/misc/txt2tags/doinst.sh b/misc/txt2tags/doinst.sh
deleted file mode 100644
index 5fb28930db0b9..0000000000000
--- a/misc/txt2tags/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/misc/txt2tags/txt2tags.SlackBuild b/misc/txt2tags/txt2tags.SlackBuild
index ea959bc735ded..95198d5d06249 100644
--- a/misc/txt2tags/txt2tags.SlackBuild
+++ b/misc/txt2tags/txt2tags.SlackBuild
@@ -2,26 +2,26 @@
 
 # Slackware Build script for txt2tags
 
-# Copyright (c) 2009, eviljames <storgeek [at] gmail [dot] com>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Modified by the SlackBuilds.org project
+# Originally written 2009, eviljames <storgeek [at] gmail [dot] com>
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220110 bkw:
+# - take over maintenance.
+# - update for v3.7.
+
+# Note: the old version had a lot of things that are missing from
+# the 3.x branch. See https://github.com/txt2tags/txt2tags/ for
+# details. The 3.x branch has the sole advantage of being written in
+# python 3. Since this is only included on SBo as a dependency for
+# xdgmenumaker, I don't care... but maybe someone might want to do a
+# txt2tags-legacy2 build if they need it.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=txt2tags
-VERSION=${VERSION:-r1172}
+VERSION=${VERSION:-3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -34,9 +34,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
@@ -69,42 +66,23 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-mkdir -p $PKG/usr/man/man1
-gzip -9 -c doc/English/manpage.man       > $PKG/usr/man/man1/$PRGNAM.1.gz
-# Install the available translations
-for i in pt de fr es zh eu ca it; do mkdir -p $PKG/usr/man/$i/man1; done
-gzip -9 -c doc/Portuguese/manpage-pt.man > $PKG/usr/man/pt/man1/$PRGNAM.1.gz
-gzip -9 -c doc/German/manpage-de.man     > $PKG/usr/man/de/man1/$PRGNAM.1.gz
-gzip -9 -c doc/French/manpage-fr.man     > $PKG/usr/man/fr/man1/$PRGNAM.1.gz
-gzip -9 -c doc/Spanish/manpage-es.man    > $PKG/usr/man/es/man1/$PRGNAM.1.gz
-gzip -9 -c doc/Chinese/manpage-zh.man    > $PKG/usr/man/zh/man1/$PRGNAM.1.gz
-gzip -9 -c doc/Basque/manpage-eu.man     > $PKG/usr/man/eu/man1/$PRGNAM.1.gz
-gzip -9 -c doc/Catalan/manpage-ca.man    > $PKG/usr/man/ca/man1/$PRGNAM.1.gz
-gzip -9 -c doc/Italian/manpage-it.man    > $PKG/usr/man/it/man1/$PRGNAM.1.gz
-
-mkdir -p $PKG/usr/share/applications
-install -m 0644 dist/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-mkdir -p $PKG/usr/share/pixmaps
-install -m 0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog README extras samples test \
-  doc/English/txt2tags-quickref.pdf doc/English/userguide.pdf \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+python3 setup.py install --root=$PKG
+
+cd docs
+sh build-docs.sh
+rm */*.t2t *.sh
+cd -
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a COPYING *.md extras samples test docs/* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/txt2tags/txt2tags.info b/misc/txt2tags/txt2tags.info
index afbd3baa7ae9b..afa3918542691 100644
--- a/misc/txt2tags/txt2tags.info
+++ b/misc/txt2tags/txt2tags.info
@@ -1,10 +1,10 @@
 PRGNAM="txt2tags"
-VERSION="r1172"
+VERSION="3.7"
 HOMEPAGE="https://txt2tags.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/txt2tags-r1172.tar.xz"
-MD5SUM="13dc51b155824cdd9ae2ada885a503fd"
+DOWNLOAD="https://github.com/txt2tags/txt2tags/archive/3.7/txt2tags-3.7.tar.gz"
+MD5SUM="be2e337af31142e54c47269f9bdedc41"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Didier Spaier"
-EMAIL="didier at slint dot fr"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/misc/txt2tags/txt2tags.png b/misc/txt2tags/txt2tags.png
deleted file mode 100644
index 5ff00fcb7d25f..0000000000000
--- a/misc/txt2tags/txt2tags.png
+++ /dev/null