3 files changed, 34 insertions, 21 deletions
diff --git a/system/man-pages-fr/README b/system/man-pages-fr/README
index 89d72a6805..e613b1418b 100644
--- a/system/man-pages-fr/README
+++ b/system/man-pages-fr/README
@@ -3,8 +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, and
-possibly also install man-db.
+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 1df4988113..ccfeaa74b1 100644
--- a/system/man-pages-fr/man-pages-fr.SlackBuild
+++ b/system/man-pages-fr/man-pages-fr.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for man-pages-fr
 
@@ -22,7 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Now maintained by B. Watson <yalhcru@gmail.com>
+# Now maintained by B. Watson <urchlay@slackware.uk>
+
+# 20230109 bkw: BUILD=4
+# - get rid of empty /usr/doc/man-pages-fr/ dir.
+# - remove a couple of *English* man pages (how'd those get there?)
+
+# 20210828 bkw: BUILD=3.
+# - Make UTF8=yes the default (works better with man-db).
 
 # 20170626 bkw:
 # - Take over maintenance, BUILD=2.
@@ -31,15 +38,22 @@
 #   not the other.
 # - Add UTF8 option.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=man-pages-fr
 VERSION=${VERSION:-3.03.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 # Hardcode ARCH
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,17 +61,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
@@ -72,7 +81,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
@@ -98,8 +108,6 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 fix_perms
 
-[ "$UTF8" != "yes" ] && ENC="--encoding=latin1"
-
 ./configure \
   --prefix=$PKG/usr \
   $ENC \
@@ -109,15 +117,19 @@ make
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/doc/$PRGNAM/* $PKG/usr/doc/$XTRANAM-$XTRAVER $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/doc/$PRGNAM
 
 # These two are included in Slackware.
 rm $PKG/usr/man/fr/man5/passwd.5.gz
 rm $PKG/usr/man/fr/man3/getspnam.3.gz
 
+# 20230109 bkw: These aren't even in French.
+rm -f $PKG/usr/man/fr/man8/ld-linux.*
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/system/man-pages-fr/man-pages-fr.info b/system/man-pages-fr/man-pages-fr.info
index d0d0902505..1c1908ff28 100644
--- a/system/man-pages-fr/man-pages-fr.info
+++ b/system/man-pages-fr/man-pages-fr.info
@@ -9,4 +9,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"