office/mtp2-fonts: Download URL changed, douninst.sh added.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

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

5 files changed, 11 insertions, 41 deletions

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
index 81b7a9ab11..690a5f6ef8 100644
--- a/office/mtp2-fonts/doinst.sh
+++ b/office/mtp2-fonts/doinst.sh
@@ -1,18 +1,3 @@
-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
+chroot . /usr/bin/mktexlsr >/dev/null 2>&1
+chroot . /usr/bin/updmap-sys --force --enable Map=mtpro2.map >/dev/null 2>&1
+chroot . /usr/bin/mktexlsr >/dev/null 2>&1
diff --git a/office/mtp2-fonts/douninst.sh b/office/mtp2-fonts/douninst.sh
new file mode 100644
index 0000000000..3b73658dfb
--- /dev/null
+++ b/office/mtp2-fonts/douninst.sh
@@ -0,0 +1,3 @@
+chroot . /usr/bin/mktexlsr >/dev/null 2>&1
+chroot . /usr/bin/updmap-sys --force --disable mtpro2.map >/dev/null 2>&1
+chroot . /usr/bin/mktexlsr >/dev/null 2>&1
diff --git a/office/mtp2-fonts/mtp2-fonts.SlackBuild b/office/mtp2-fonts/mtp2-fonts.SlackBuild
index 6e24678c7f..407fb2b8a8 100644
--- a/office/mtp2-fonts/mtp2-fonts.SlackBuild
+++ b/office/mtp2-fonts/mtp2-fonts.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mtp2-fonts
 
-# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2022, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -30,9 +30,8 @@ BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-# 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.
+ARCH=noarch
+
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -42,8 +41,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ARCH=noarch
-
 set -e
 
 rm -rf $PKG
@@ -86,6 +83,7 @@ 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
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 cd $PKG
 /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 35257db40a..bf61a4ce76 100644
--- a/office/mtp2-fonts/mtp2-fonts.info
+++ b/office/mtp2-fonts/mtp2-fonts.info
@@ -1,7 +1,7 @@
 PRGNAM="mtp2-fonts"
 VERSION="2.1a"
 HOMEPAGE="https://pctex.com/mtpro2.html"
-DOWNLOAD="http://mirrors.ctan.org/fonts/mtp2lite.zip"
+DOWNLOAD="https://mirrors.ctan.org/fonts/mtp2lite.zip"
 MD5SUM="afd69b0d82ec8b32b7b012e5cfcd7d00"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""