6 files changed, 38 insertions, 49 deletions
diff --git a/office/mtp2-fonts/README b/office/mtp2-fonts/README
index 519c6ad3ad..471afcfd40 100644
--- a/office/mtp2-fonts/README
+++ b/office/mtp2-fonts/README
@@ -6,8 +6,20 @@ consists of 15 fonts and replaces the Computer Modern math fonts.  The
 complete set consists of 68 fonts and provides also script, curly,
 Fraktur, bold math, blackboard bold fonts, and AMS symbols.
 
-This SlackBuild can be used with both lite and complete MTPro2 font sets
-and with both texlive and Slackware's tetex TeX distributions.
-
 The complete fonts set zip archive should be named as mtp2fonts.zip.tpm
 or mtp2fonts.zip
+
+After installation, please rebuild the filename databases with the
+command
+
+# mktexlsr
+
+and register the map file 'mtpro2.map' using the commands
+
+# updmap-sys --syncwithtrees
+# updmap-sys --force --enable Map=mtpro2.map
+
+After removal, please disable the map file 'mtpro2.map' via the commands
+
+# mktexlsr
+# updmap-sys --force --disable mtpro2.map
diff --git a/office/mtp2-fonts/README.SBo b/office/mtp2-fonts/README.SBo
deleted file mode 100644
index 6b889d31f9..0000000000
--- a/office/mtp2-fonts/README.SBo
+++ /dev/null
@@ -1,16 +0,0 @@
-To clean up your TeX installation after removing mtp2-fonts, please do
-the following (as root):
-
-1. Delete the line
-Map mtpro2.map
-from
-/usr/share/texmf-local/web2c/updmap.cfg (for texlive)
-or
-/usr/share/texmf-config/web2c/updmap.cfg (for tetex)
-
-2. For texlive, if /usr/share/texmf-local/web2c/updmap.cfg becomes
-empty, delete it.
-
-3. Run mktexlsr
-
-4. Run updmap-sys
diff --git a/office/mtp2-fonts/doinst.sh b/office/mtp2-fonts/doinst.sh
deleted file mode 100644
index 81b7a9ab11..0000000000
--- a/office/mtp2-fonts/doinst.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-if [ -x /usr/bin/mktexlsr ]; then
-  if ! grep -qFs " mtpro2.map" /usr/share/texmf-local/web2c/updmap.cfg ; then
-    mkdir -p /usr/share/texmf-local/web2c
-    echo "Map mtpro2.map" >> /usr/share/texmf-local/web2c/updmap.cfg
-  fi
-  chroot . /usr/bin/mktexlsr >/dev/null 2>&1
-  if [ -x /usr/bin/updmap-sys ]; then
-    chroot . /usr/bin/updmap-sys >/dev/null 2>&1
-  fi
-else
-  if [ -x /usr/share/texmf/bin/mktexlsr ]; then
-    chroot . /usr/share/texmf/bin/mktexlsr >/dev/null 2>&1
-  fi
-  if [ -x /usr/share/texmf/bin/updmap-sys ]; then
-    chroot . /usr/share/texmf/bin/updmap-sys --enable Map mtpro2.map \
-      >/dev/null 2>&1
-  fi
-fi
diff --git a/office/mtp2-fonts/mtp2-fonts.SlackBuild b/office/mtp2-fonts/mtp2-fonts.SlackBuild
index b4429c26c0..ee6881fb9a 100644
--- a/office/mtp2-fonts/mtp2-fonts.SlackBuild
+++ b/office/mtp2-fonts/mtp2-fonts.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for mtp2-fonts
 
-# Copyright 2017, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2023, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,18 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mtp2-fonts
 VERSION=${VERSION:-2.1a}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+ARCH=noarch
+
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ARCH=noarch
-
 set -e
 
 rm -rf $PKG
@@ -55,6 +62,11 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 rm -r texmf/dvips
+
+sed --in-place \
+  -e 's/^\\alloc@0\\count\\countdef\\insc@unt/\\newcount/' \
+  texmf/tex/latex/mtpro2/mtpro2.sty
+
 find . \
  \( -name "*.txt" -o -name "*.tex" -o -name "*.fd" -o -name "*.map" \
   -o -name "*.sty" -o -name "*.tpm" \) -exec sed -i 's/\r$//' {} \;
@@ -70,7 +82,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/office/mtp2-fonts/mtp2-fonts.info b/office/mtp2-fonts/mtp2-fonts.info
index 64a73176cd..14027c37bc 100644
--- a/office/mtp2-fonts/mtp2-fonts.info
+++ b/office/mtp2-fonts/mtp2-fonts.info
@@ -1,10 +1,10 @@
 PRGNAM="mtp2-fonts"
 VERSION="2.1a"
-HOMEPAGE="http://pctex.com/mtpro2.html"
-DOWNLOAD="http://mirrors.ctan.org/fonts/mtp2lite.zip"
+HOMEPAGE="https://pctex.com/mtpro2.html"
+DOWNLOAD="https://mirrors.ctan.org/fonts/mtp2lite.zip"
 MD5SUM="afd69b0d82ec8b32b7b012e5cfcd7d00"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="%README%"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/office/mtp2-fonts/slack-desc b/office/mtp2-fonts/slack-desc
index 58f93e53d5..6656d08ebf 100644
--- a/office/mtp2-fonts/slack-desc
+++ b/office/mtp2-fonts/slack-desc
@@ -16,4 +16,4 @@ mtp2-fonts: consists of 15 fonts and replaces the Computer Modern math fonts. Th
 mtp2-fonts: complete set consists of 68 fonts and provides also script, curly,
 mtp2-fonts: Fraktur, bold math, blackboard bold fonts, and AMS symbols.
 mtp2-fonts:
-mtp2-fonts: Homepage: http://pctex.com/mtpro2.html
+mtp2-fonts: Homepage: https://pctex.com/mtpro2.html