misc/bdf2psf: Updated for version 1.207, new maintainer.

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

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

2 files changed, 29 insertions, 47 deletions

diff --git a/misc/bdf2psf/bdf2psf.SlackBuild b/misc/bdf2psf/bdf2psf.SlackBuild
index 3eb90ec7084bd..97ddef580a180 100644
--- a/misc/bdf2psf/bdf2psf.SlackBuild
+++ b/misc/bdf2psf/bdf2psf.SlackBuild
@@ -2,37 +2,26 @@
 
 # Slackware build script for bdf2psf
 
-# Copyright 2015 Didier Spaier Paruis, France
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Originally written 2015 Didier Spaier Paruis, France
+# 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.
+# - relicense as WTFPL, with permission from Didier.
+# - update for v1.207.
+# - get rid of temp files.
+# - simplify build.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bdf2psf
-VERSION=${VERSION:-1.131}
+VERSION=${VERSION:-1.207}
 BUILD=${BUILD:-1}
 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.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -49,27 +38,20 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-ar xvf $CWD/$PRGNAM*deb
-rm control.tar.gz debian-binary
-mv data.tar.xz $PKG
 cd $PKG
-tar xvvf data.tar.xz
-rm data.tar.xz
+ar p $CWD/${PRGNAM}_${VERSION}_all.deb data.tar.xz | tar xvfJ -
 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 {} \;
-
-mkdir -p $PKG/usr/{doc/$PRGNAM-$VERSION,man/man1}
-mv $PKG/usr/share/doc/$PRGNAM/{README*,copyright} \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/man/man1/* $PKG/usr/man/man1
-rm -r $PKG/usr/share/{man,doc}
-
-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 {} \+
+
+mv $PKG/usr/share/man $PKG/usr/man
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+mv $PKG/usr/share/doc/$PRGNAM/* $PKGDOC
+rm -rf $PKG/usr/share/doc
+
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/bdf2psf/bdf2psf.info b/misc/bdf2psf/bdf2psf.info
index f2b452bc8a761..a8b1470b34da9 100644
--- a/misc/bdf2psf/bdf2psf.info
+++ b/misc/bdf2psf/bdf2psf.info
@@ -1,10 +1,10 @@
 PRGNAM="bdf2psf"
-VERSION="1.131"
+VERSION="1.207"
 HOMEPAGE="https://packages.qa.debian.org/c/console-setup.html"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/bdf2psf_1.131_all.deb"
-MD5SUM="b2a8b8de9a3ff82cc2504e4568895fae"
+DOWNLOAD="https://deb.debian.org/debian/pool/main/c/console-setup/bdf2psf_1.207_all.deb"
+MD5SUM="b1e5c76a85c774b4101260d02c5e3661"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Didier Spaier"
-EMAIL="didier at slint dot fr"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"