system/bicon: New maintainer.

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

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

5 files changed, 36 insertions, 64 deletions

diff --git a/system/bicon/README b/system/bicon/README
index d6bb8e838992..a6ed3a7559ae 100644
--- a/system/bicon/README
+++ b/system/bicon/README
@@ -1,21 +1,16 @@
 BiCon: a Bidirectional Console
 
-BiCon can be used under Linux console, or terminal emulators with
+BiCon can be used under the Linux console, or terminal emulators with
 basic Unicode rendering (UTF-8).
 
-Run "bicon" to get a console supporting Arabic or Persian according
-to LANG or specify the country on the command line, for instance:
+Run "bicon" to get a console supporting Arabic or Persian according to
+LANG or specify the country on the command line, for instance:
+
   bicon ir # for Persian (Iran)
 
 Keymaps and fonts for Arabic and Persian are included. 
 
 Use alt+shift to switch keyboard layouts in a graphical environment.
-To know more:
-
-  "man bicon"
-and
-  "man bicon.bin"
+For more information: "man bicon" and "man bicon.bin".
 
 See also /usr/doc/bicon-<VERSION>/README.Slackware for BiCon's usage.
-
-BiCon is maintained by Behdad Esfahbod.
diff --git a/system/bicon/README.Slackware b/system/bicon/README.Slackware
index 5b3b0d83f51f..af0c20406678 100644
--- a/system/bicon/README.Slackware
+++ b/system/bicon/README.Slackware
@@ -14,31 +14,31 @@ depends whether the "bicon" command is given or not an argument.
 
 1) If started as "bicon" from the console.
 
-If a two characters country code is given as argument it is considered
+If a two character country code is given as argument it is considered
 to choose the keymap, else the country (or "territory" to be accurate)
 part of LANG is used.
-_ If the country (converted to lowercase letters) is found in this list:
+- If the country (converted to lowercase letters) is found in this list:
   ae dz eg iq jo ko kw lb ly ma om qa sa sd sy tn ye
   then the keymap "arabic" is chosen.
-_ If the country is "IR" or "ir" then the keymap "ir" is chosen.
+- If the country is "IR" or "ir" then the keymap "ir" is chosen.
 
 The font bicon-8x16-512 is always used with its Unicode map.
 
 IMPORTANT. You won't be able to use the "setfont" command after having
-started bicon as a regular user. You will have to tentatively become root
+started bicon as a regular user. You will have to temporarily become root
 with "su" to change the font if you want.
 
 2) If started as "bicon" from an X terminal.
 
-You will need to use an UTF-8 able or enabled terminal.
+You will need to use an UTF-8 capable or enabled terminal.
 
-A switchable keyboard layout (us + the language that correspond to the
+A switchable keyboard layout (US + the language that corresponds to the
 country set by the user or found in LANG) is set.
 
 IMPORTANT:
-_ BiCon doesn't set the font. You'll have to do that yourself. Be careful
+- BiCon doesn't set the font. You'll have to do that yourself. Be careful
   to use a font including the needed glyphs.
-_ BiCon sets the "option" for the X server to:
+- BiCon sets the "option" for the X server to:
     "grp:alt_shift_toggle,grp_led:scroll"
   and the "layout" to:
     "us,<ir or (country code)>"
@@ -55,14 +55,14 @@ one (after having started BiCon, of course):
     -print | \
   xkbcomp -w 2 - "$DISPLAY"
 
-3) If started as bicon.bin, BiCon doesn't load any font or keyboard.
+3) If started as bicon.bin, BiCon doesn't load any font or keymap.
 You might prefer it that way if you want to keep your own settings.
 
 Reference: file bin/bicon.in in the source archive.
 
 See also:
-_ man bicon
-_ man bicon.bin
-_ documents in /usr/doc/bicon-<version>
+- man bicon
+- man bicon.bin
+- documents in /usr/doc/bicon-<version>
 
 Didier Spaier <didier at slint dot fr>, 27/07/2015
diff --git a/system/bicon/bicon.SlackBuild b/system/bicon/bicon.SlackBuild
index 96c7f3b17ba7..ce75fe12c70c 100644
--- a/system/bicon/bicon.SlackBuild
+++ b/system/bicon/bicon.SlackBuild
@@ -2,31 +2,22 @@
 
 # Slackware build script for bicon
 
-# Copyright 2015 Didier Spaier Paris, 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 by Didier Spaier Paris, 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.
+# - simplify build.
+# - slight grammar/typo fixes.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bicon
 VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +29,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
@@ -73,13 +61,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
@@ -94,19 +77,13 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS NEWS README THANKS TODO COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 
-# The file HISTORY is missing in the source tarball but can be of interest
-# to some.
+# This is missing in the source tarball but could be of interest to some:
 cp $CWD/HISTORY $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/bicon/bicon.info b/system/bicon/bicon.info
index 8f47b3eb8cb7..300b443279ef 100644
--- a/system/bicon/bicon.info
+++ b/system/bicon/bicon.info
@@ -6,5 +6,5 @@ MD5SUM="862972ed260f9e74277b8eeb7c81e126"
 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/system/bicon/slack-desc b/system/bicon/slack-desc
index 883c32ee7232..99743845f739 100644
--- a/system/bicon/slack-desc
+++ b/system/bicon/slack-desc
@@ -8,7 +8,7 @@
      |-----handy-ruler------------------------------------------------------|
 bicon: bicon (a Bidirectional Console)
 bicon:
-bicon: BiCon can be used under Linux console, or terminal emulators with
+bicon: BiCon can be used under the Linux console, or terminal emulators with
 bicon: basic Unicode rendering (UTF-8).
 bicon:
 bicon: Run "bicon" to get a console supporting Arabic or Persian according