system/man-pages-fr: Default to UTF-8.

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

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

2 files changed, 14 insertions, 18 deletions

diff --git a/system/man-pages-fr/README b/system/man-pages-fr/README
index fbf9b3516b..e613b1418b 100644
--- a/system/man-pages-fr/README
+++ b/system/man-pages-fr/README
@@ -3,7 +3,9 @@ man-pages-fr (french system documentation)
 French translation files for the man pages. This build includes both
 "man-pages-fr" and "man-pages-extra-fr".
 
-By default, the man pages are converted to ISO-8859-1 (aka Latin-1)
-encoding, which works well with LANG=fr_FR. If you're using a UTF-8
-locale, and the pages don't display accented characters properly,
-try rebuilding the package with UTF8=yes set in the environment.
+By default, the man pages are installed as UTF-8. This should work
+with man-db regardless of whether you use a Unicode (fr_FR.UTF-8) or
+ISO-8859-1/Latin-1 (fr_FR) setting for LANG.
+
+If you set UTF8=no in the environment, the man pages will be converted
+to Latin-1. This is not recommended for Slackware 15.0 and up.
diff --git a/system/man-pages-fr/man-pages-fr.SlackBuild b/system/man-pages-fr/man-pages-fr.SlackBuild
index 4446f5f70f..ac4c3dcd03 100644
--- a/system/man-pages-fr/man-pages-fr.SlackBuild
+++ b/system/man-pages-fr/man-pages-fr.SlackBuild
@@ -24,6 +24,9 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20210828 bkw: BUILD=3.
+# - Make UTF8=yes the default (works better with man-db).
+
 # 20170626 bkw:
 # - Take over maintenance, BUILD=2.
 # - Combine old man-pages-extras-fr build with this one. I can't
@@ -35,16 +38,13 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=man-pages-fr
 VERSION=${VERSION:-3.03.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 # Hardcode ARCH
 ARCH=noarch
 
-# 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
@@ -57,17 +57,12 @@ OUTPUT=${OUTPUT:-/tmp}
 XTRANAM=man-pages-extras-fr
 XTRAVER=${XTRAVER:-0.8.1}
 
-UTF8=${UTF8:-no}
-
 set -e
 
 fix_perms() {
   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 {} \+
+  find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+          \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 }
 
 rm -rf $PKG
@@ -82,7 +77,8 @@ cd $XTRANAM-$XTRAVER
 fix_perms
 make DESTDIR=$PKG MANDIR=/usr/man/fr install
 
-if [ "$UTF8" != "yes" ]; then
+if [ "${UTF8:-yes}" != "yes" ]; then
+  ENC="--encoding=latin1"
   echo "Converting to latin-1..."
   cd $PKG/usr/man/fr
   for MANPAGE in man*/* ; do
@@ -108,8 +104,6 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 fix_perms
 
-[ "$UTF8" != "yes" ] && ENC="--encoding=latin1"
-
 ./configure \
   --prefix=$PKG/usr \
   $ENC \