office/fbpdf: Updated for version 20200617_f590024.

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

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

9 files changed, 181 insertions, 520 deletions

diff --git a/office/fbpdf/README b/office/fbpdf/README
index 7c031b3be1..14cd6c2591 100644
--- a/office/fbpdf/README
+++ b/office/fbpdf/README
@@ -1,13 +1,18 @@
 fbpdf (PDF viewer for the Linux framebuffer)
 
-fbpdf is a framebuffer pdf/djvu file viewer. It can use either mupdf or
-poppler libraries for rendering pdf files and it uses djvulibre library
-for rendering djvu files.
+fbpdf is a framebuffer pdf/djvu file viewer. It can use either mupdf
+or poppler libraries for rendering pdf files and it uses the djvulibre
+library for rendering djvu files.
 
-By default, the fbpdf2 (poppler support) executable is built, along with
-fbdjvu. If you want mupdf support, install mupdf-legacy before running
-this build and it will be auto-detected. The executable that uses mupdf
-will be called fbpdf.
+Optional dependency: mupdf.
+
+By default, the fbpdf2 (poppler support) executable is built, along
+with fbdjvu. If you want mupdf support, install mupdf before running
+this build and it will be auto-detected. The executable that uses
+mupdf will be called fbpdf. mupdf's rendering is usually faster
+and better-looking than poppler's. If you have mupdf installed,
+but want to build fbpdf without it, export MUPDF=no in the script's
+environment.
 
 This build includes a patch that makes the keyboard controls behave more
 like other PDF readers. Mainly, it lets you page through the entire
diff --git a/office/fbpdf/fbpdf.1 b/office/fbpdf/fbpdf.1
deleted file mode 100644
index 7d0fe2c4d8..0000000000
--- a/office/fbpdf/fbpdf.1
+++ /dev/null
@@ -1,236 +0,0 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-.    ds C`
-.    ds C'
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.\"
-.\" Avoid warning from groff about undefined register 'F'.
-.de IX
-..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
-..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
-.    \}
-.\}
-.rr rF
-.\" ========================================================================
-.\"
-.IX Title "FBPDF 1"
-.TH FBPDF 1 "2014-08-22" "20140822" "SlackBuilds.org"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-fbpdf \- framebuffer pdf/djvu file viewer.
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-fbpdf [options] filename
-.PP
-fbpdf2 [options] filename
-.PP
-fbdjvu [options] filename
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-fbpdf is a framebuffer pdf/djvu file viewer.  It can use either
-mupdf or poppler libraries for rendering pdf files and it uses
-djvulibre library for rendering djvu files. Note that fbpdf
-uses different binaries for each library.
-.IP "fbpdf" 4
-.IX Item "fbpdf"
-\&\s-1PDF\s0 viewer, using the mupdf rendering library.
-.IP "fbpdf2" 4
-.IX Item "fbpdf2"
-\&\s-1PDF\s0 viewer, using the poppler rendering library.
-.IP "fbdjvu" 4
-.IX Item "fbdjvu"
-DjVu viewer, using the djvulibre rendering library.
-.PP
-All of the binaries take the same options and use the same
-keystrokes.
-.SH "OPTIONS"
-.IX Header "OPTIONS"
-.IP "\fB\-r\fR \fIrotation\fR" 4
-.IX Item "-r rotation"
-Set rotation, in degrees. Same as \fBr\fR keystroke.
-.IP "\fB\-z\fR \fIzoomx10\fR" 4
-.IX Item "-z zoomx10"
-Set default zoom (will be multiplied by 10). Same as \fBz\fR keystroke.
-.IP "\fB\-p\fR \fIpage\fR" 4
-.IX Item "-p page"
-Set starting page.
-.SH "KEYS"
-.IX Header "KEYS"
-The following table describes the commands available in fbpdf.
-Most of these commands accept a numerical prefix.  For instance,
-\&'^F' tells fbpdf to go to the next page while '5^F' tells it to
-move to the fifth next page.
-.IP "\fB^F\fR, \fBJ\fR" 4
-.IX Item "^F, J"
-next page
-.IP "\fB^B\fR, \fBK\fR" 4
-.IX Item "^B, K"
-previous page
-.IP "\fBG\fR" 4
-.IX Item "G"
-go to page (the last page if no prefix)
-.IP "\fBo\fR" 4
-.IX Item "o"
-set page number (for 'G' command only)
-.IP "\fBO\fR" 4
-.IX Item "O"
-set page number and go to current page
-.IP "\fBz\fR, \fB=\fR" 4
-.IX Item "z, ="
-zoom; prefix multiplied by 10 (i.e. '12z' = 120%). Default 15.
-.IP "\fB+\fR" 4
-.IX Item "+"
-increase zoom by 10%
-.IP "\fB\-\fR" 4
-.IX Item "-"
-decrease zoom by 10%
-.IP "\fBr\fR" 4
-.IX Item "r"
-set rotation in degrees
-.IP "\fBi\fR" 4
-.IX Item "i"
-print info
-.IP "\fBq\fR" 4
-.IX Item "q"
-quit
-.IP "\fB^[\fR" 4
-.IX Item "^["
-(escape) clear numerical prefix
-.IP "\fBmx\fR" 4
-.IX Item "mx"
-mark page as 'x' (or any other letter)
-.IP "\fB'x\fR" 4
-.IX Item "'x"
-jump to the page marked as 'x'
-.IP "\fB`x\fR" 4
-.IX Item "`x"
-jump to the page and position marked as 'x'
-.IP "\fBj\fR" 4
-.IX Item "j"
-scroll down
-.IP "\fBk\fR" 4
-.IX Item "k"
-scroll up
-.IP "\fBh\fR" 4
-.IX Item "h"
-scroll left
-.IP "\fBl\fR" 4
-.IX Item "l"
-scroll right
-.IP "\fB[\fR" 4
-.IX Item "["
-align with the left edge of the page
-.IP "\fB]\fR" 4
-.IX Item "]"
-align with the right edge of the page
-.IP "\fB{\fR" 4
-.IX Item "{"
-align with the leftmost character on the page
-.IP "\fB}\fR" 4
-.IX Item "}"
-align with the rightmost character on the page
-.IP "\fBH\fR" 4
-.IX Item "H"
-show page top
-.IP "\fBM\fR" 4
-.IX Item "M"
-center the page vertically
-.IP "\fBL\fR" 4
-.IX Item "L"
-show page bottom
-.IP "\fBC\fR" 4
-.IX Item "C"
-center the page horizontally
-.IP "\fB' '\fR, \fB^D\fR" 4
-.IX Item "' ', ^D"
-(space) page down
-.IP "\fB^H\fR, \fB^U\fR" 4
-.IX Item "^H, ^U"
-(backspace) page up
-.IP "\fB^L\fR" 4
-.IX Item "^L"
-redraw
-.IP "\fBe\fR" 4
-.IX Item "e"
-reload current file
-.IP "\fBf\fR" 4
-.IX Item "f"
-zoom to fit page height
-.IP "\fBw\fR" 4
-.IX Item "w"
-zoom to fit page width
-.IP "\fBW\fR" 4
-.IX Item "W"
-zoom to fit page contents horizontally
-.IP "\fBZ\fR" 4
-.IX Item "Z"
-the default zoom level for 'z' command
-.IP "\fBd\fR" 4
-.IX Item "d"
-sleep one second before the next command
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-fbpdf was written by Ali Gholami Rudi (ali at rudi dot ir).
-.PP
-This man page created from fbpdf's \s-1README\s0 by B. Watson, for the
-SlackBuilds.org project.
diff --git a/office/fbpdf/fbpdf.SlackBuild b/office/fbpdf/fbpdf.SlackBuild
index 682faefeba..348f080383 100644
--- a/office/fbpdf/fbpdf.SlackBuild
+++ b/office/fbpdf/fbpdf.SlackBuild
@@ -6,16 +6,23 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# Source tarball made from: git clone git://repo.or.cz/fbpdf.git
-
+# 20210927 bkw:
+# - update to latest git (20200617_f590024).
+# - rework navigation.diff for this version.
+# - use upstream's man page, now that there is one (but, patch it).
+# - mupdf-legacy no longer needed, change optional dep to mupdf.
+# - add MUPDF=no option.
+# - update README and slack-desc.
+# - add git2tarxz.sh, for future updates. upstream doesn't do releases.
+# - actually use SLKCFLAGS.
 # 20200218 bkw: mupdf got updated to an incompatible version, use mupdf-legacy.
 # 20170313 bkw: update for 20161202 (commit e31a61b), need due to mupdf update.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fbpdf
-VERSION=${VERSION:-20161202}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20200617_f590024}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -27,9 +34,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
@@ -59,18 +63,23 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# This patch has been sent upstream. In my opinion, fbpdf is needlessly
-# difficult to use without it.
-# ...a year later, and upstream never responded to my email (not even to
-# say "no"). It's staying here though.
-[ "${PRISTINE:-no}" != "yes" ] && \
+# 20210929 bkw: actually use the flags.
+sed -i "s,-O2,$SLKCFLAGS," Makefile
+
+# The navigation patch has been sent upstream. In my opinion, fbpdf is
+# needlessly difficult to use without it. Upstream never responded to
+# my email (not even to say "no"). It's staying here though.
+# The manpage patch explains the difference between fbpdf, fbpdf2, fjdjvu.
+if [ "${PRISTINE:-no}" != "yes" ]; then
   patch -p1 < $CWD/navigation.diff
+  patch -p1 < $CWD/manpage.diff
+fi
 
 mkdir -p $PKG/usr/bin
 
@@ -79,16 +88,15 @@ make ${PRGNAM}2 fbdjvu
 install -s -m0755 ${PRGNAM}2 $PKG/usr/bin
 install -s -m0755 fbdjvu $PKG/usr/bin
 
-# autodetect mupdf-legacy, build fbpdf if found
-if [ -d /opt/mupdf-legacy ]; then
-  # Use old libs/headers. Works even if a newer mupdf is installed in /usr.
-  PKG_CONFIG_PATH=/opt/mupdf-legacy/lib$LIBDIRSUFFIX/pkgconfig:$PKG_CONFIG_PATH
-  export PKG_CONFIG_PATH
+WITH="WITHOUT"
 
+# autodetect mupdf, build fbpdf if found
+if [ "${MUPDF:-yes}" = "yes" ] && pkg-config --exists mupdf; then
+  WITH="WITH"
   # mupdf API keeps changing
   sed -i \
     -e '/^CFLAGS/s,$, $(shell pkg-config --cflags mupdf),' \
-    -e 's,-lmupdf -lmupdfthird,$(shell pkg-config --libs mupdf) -lharfbuzz,' \
+    -e 's,-lmupdf -lmupdf-third.*,$(shell pkg-config --libs mupdf) -lharfbuzz,' \
     Makefile
 
   make clean
@@ -96,18 +104,19 @@ if [ -d /opt/mupdf-legacy ]; then
   install -s -m0755 $PRGNAM $PKG/usr/bin
 fi
 
-# man page written for this build.
-mkdir -p $PKG/usr/man/man1
-gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-ln -s $PRGNAM.1.gz $PKG/usr/man/man1/${PRGNAM}2.1.gz
-ln -s $PRGNAM.1.gz $PKG/usr/man/man1/fbdjvu.1.gz
+PKGMAN1=$PKG/usr/man/man1
+mkdir -p $PKGMAN1
+gzip -9c < $PRGNAM.1 > $PKGMAN1/$PRGNAM.1.gz
+ln -s $PRGNAM.1.gz $PKGMAN1/${PRGNAM}2.1.gz
+ln -s $PRGNAM.1.gz $PKGMAN1/fbdjvu.1.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITH@,$WITH," < $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/office/fbpdf/fbpdf.info b/office/fbpdf/fbpdf.info
index 00b76dd479..a422781757 100644
--- a/office/fbpdf/fbpdf.info
+++ b/office/fbpdf/fbpdf.info
@@ -1,8 +1,8 @@
 PRGNAM="fbpdf"
-VERSION="20161202"
+VERSION="20200617_f590024"
 HOMEPAGE="http://litcave.rudi.ir/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/fbpdf-20161202.tar.gz"
-MD5SUM="f022012d639e1b93d3ae1e547f79df55"
+DOWNLOAD="https://slackware.uk/~urchlay/src/fbpdf-20200617_f590024.tar.xz"
+MD5SUM="859f0297f26aac8c5444cfb6a27caa79"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/fbpdf/fbpdf.pod b/office/fbpdf/fbpdf.pod
deleted file mode 100644
index 7c5b9d1f37..0000000000
--- a/office/fbpdf/fbpdf.pod
+++ /dev/null
@@ -1,225 +0,0 @@
-# pod source for fbpdf man page. Convert with:
-# pod2man --stderr -s1 -cSlackBuilds.org -r20140822 -u fbpdf.pod > fbpdf.1
-
-=pod
-
-=encoding utf8
-
-=head1 NAME
-
-fbpdf - framebuffer pdf/djvu file viewer.
-
-=head1 SYNOPSIS
-
-fbpdf [options] filename
-
-fbpdf2 [options] filename
-
-fbdjvu [options] filename
-
-=head1 DESCRIPTION
-
-fbpdf is a framebuffer pdf/djvu file viewer.  It can use either
-mupdf or poppler libraries for rendering pdf files and it uses
-djvulibre library for rendering djvu files. Note that fbpdf
-uses different binaries for each library.
-
-=over 4
-
-=item fbpdf
-
-PDF viewer, using the mupdf rendering library.
-
-=item fbpdf2
-
-PDF viewer, using the poppler rendering library.
-
-=item fbdjvu
-
-DjVu viewer, using the djvulibre rendering library.
-
-=back
-
-All of the binaries take the same options and use the same
-keystrokes.
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<-r> I<rotation>
-
-Set rotation, in degrees. Same as B<r> keystroke.
-
-=item B<-z> I<zoomx10>
-
-Set default zoom (will be multiplied by 10). Same as B<z> keystroke.
-
-=item B<-p> I<page>
-
-Set starting page.
-
-=back
-
-=head1 KEYS
-
-The following table describes the commands available in fbpdf.
-Most of these commands accept a numerical prefix.  For instance,
-'^F' tells fbpdf to go to the next page while '5^F' tells it to
-move to the fifth next page.
-
-=over 4
-
-=item B<^F>, B<J>
-
-next page
-
-=item B<^B>, B<K>
-
-previous page
-
-
-=item B<G>
-
-go to page (the last page if no prefix)
-
-=item B<o>
-
-set page number (for 'G' command only)
-
-=item B<O>
-
-set page number and go to current page
-
-=item B<z>, B<=>
-
-zoom; prefix multiplied by 10 (i.e. '12z' = 120%). Default 15.
-
-=item B<+>
-
-increase zoom by 10%
-
-=item B<->
-
-decrease zoom by 10%
-
-=item B<r>
-
-set rotation in degrees
-
-=item B<i>
-
-print info
-
-=item B<q>
-
-quit
-
-=item B<^[>
-
-(escape) clear numerical prefix
-
-=item B<mx>
-
-mark page as 'x' (or any other letter)
-
-=item B<'x>
-
-jump to the page marked as 'x'
-
-=item B<`x>
-
-jump to the page and position marked as 'x'
-
-=item B<j>
-
-scroll down
-
-=item B<k>
-
-scroll up
-
-=item B<h>
-
-scroll left
-
-=item B<l>
-
-scroll right
-
-=item B<[>
-
-align with the left edge of the page
-
-=item B<]>
-
-align with the right edge of the page
-
-=item B<{>
-
-align with the leftmost character on the page
-
-=item B<}>
-
-align with the rightmost character on the page
-
-=item B<H>
-
-show page top
-
-=item B<M>
-
-center the page vertically
-
-=item B<L>
-
-show page bottom
-
-=item B<C>
-
-center the page horizontally
-
-=item B<' '>, B<^D>
-
-(space) page down
-
-=item B<^H>, B<^U>
-
-(backspace) page up
-
-=item B<^L>
-
-redraw
-
-=item B<e>
-
-reload current file
-
-=item B<f>
-
-zoom to fit page height
-
-=item B<w>
-
-zoom to fit page width
-
-=item B<W>
-
-zoom to fit page contents horizontally
-
-=item B<Z>
-
-the default zoom level for 'z' command
-
-=item B<d>
-
-sleep one second before the next command
-
-=back
-
-=head1 AUTHOR
-
-fbpdf was written by Ali Gholami Rudi (ali at rudi dot ir).
-
-This man page created from fbpdf's README by B. Watson, for the
-SlackBuilds.org project.
diff --git a/office/fbpdf/git2tarxz.sh b/office/fbpdf/git2tarxz.sh
new file mode 100644
index 0000000000..c2c3826f9f
--- /dev/null
+++ b/office/fbpdf/git2tarxz.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Create source tarball from git repo, with generated version
+# number.
+
+# Note that this script doesn't need to be run as root. It does
+# need to be able to write to the current directory it's run from.
+
+# Takes one optional argument, which is the commit or tag to create
+# a tarball of. With no arg, HEAD is used.
+
+PRGNAM=fbpdf
+CLONE_URL=https://github.com/aligrudi/fbpdf
+
+set -e
+
+GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX )
+rm -rf $GITDIR
+git clone $CLONE_URL $GITDIR
+
+CWD="$( pwd )"
+cd $GITDIR
+
+if [ "$1" != "" ]; then
+  git reset --hard "$1" || exit 1
+fi
+
+GIT_SHA=$( git rev-parse --short HEAD )
+
+DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 )
+
+VERSION=${DATE}_${GIT_SHA}
+
+rm -rf .git
+find . -name .gitignore -print0 | xargs -0 rm -f
+
+cd "$CWD"
+rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz
+mv $GITDIR $PRGNAM-$VERSION
+tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION
+
+echo
+echo "Created tarball: $PRGNAM-$VERSION.tar.xz"
+echo "VERSION=$VERSION"
diff --git a/office/fbpdf/manpage.diff b/office/fbpdf/manpage.diff
new file mode 100644
index 0000000000..2564933970
--- /dev/null
+++ b/office/fbpdf/manpage.diff
@@ -0,0 +1,61 @@
+diff -Naur fbpdf-20200617_f590024/fbpdf.1 fbpdf-20200617_f590024.patched/fbpdf.1
+--- fbpdf-20200617_f590024/fbpdf.1	2021-09-27 04:15:02.000000000 -0400
++++ fbpdf-20200617_f590024.patched/fbpdf.1	2021-09-27 19:26:45.529385168 -0400
+@@ -1,4 +1,4 @@
+-.TH "fbpdf" 1       "2018\-01\-05" ""     "General Commands Manual"
++.TH "fbpdf" 1       "2021\-09\-27" ""     "SlackBuilds.org"
+ .SH NAME
+ .B fbpdf
+ \- view PDF files on the frame buffer
+@@ -9,6 +9,30 @@
+ [\fB\-z\fR \fIzoom_x10\fR]
+ [\fB\-p\fR \fIpage_number\fR]
+ .I file.pdf
++.br
++.B fbpdf2
++[\fB\-r\fR \fIrotation\fR]
++[\fB\-z\fR \fIzoom_x10\fR]
++[\fB\-p\fR \fIpage_number\fR]
++.I file.pdf
++.br
++.B fbdjvu
++[\fB\-r\fR \fIrotation\fR]
++[\fB\-z\fR \fIzoom_x10\fR]
++[\fB\-p\fR \fIpage_number\fR]
++.I file.djvu
++.SH DESCRIPTION
++.PP
++.B fbpdf
++is a framebuffer PDF viewer, using the mupdf rendering library.
++.br
++.B fbpdf2
++is a framebuffer PDF viewer, using the poppler rendering library.
++.br
++.B fbdjvu
++is a framebuffer DjVu viewer, using the djvulibre rendering library.
++.PP
++All 3 of these take the same options and use the same keyboard commands.
+ .SH OPTIONS
+ .PP
+ \fB\-r\fR \fIrotation\fR	Set rotation to \fIrotation\fR degrees.
+@@ -16,10 +40,8 @@
+ \fB\-z\fR \fIzoom_x10\fR	Set zoom to ten times \fIzoom_x10\fR percent.
+ .br
+ \fB\-p\fR \fIpage_number\fR	Open \fIfile.pdf\fR to page \fIpage_number\fR.
+-.SH DESCRIPTION
+-.PP
+-.B fbpdf
+-is a framebuffer PDF and djvu viewer.  The following table lists the
++.SH KEYS
++The following table lists the
+ key-bindings available in \fBfbpdf\fR.  Most of them accept a numerical prefix;
+ for instance, \fB^F\fR tells \fBfbpdf\fR to show the next page while \fB5^F\fR
+ tells it to show the fifth next page.
+@@ -34,6 +56,7 @@
+ o	set page number (for 'G' command only)
+ O	set page number and go to current page
+ z	zoom; prefix multiplied by 10 (i.e. '15z' = 150%)
++\&=	same as z
+ r	set rotation in degrees
+ i	print some information
+ I	invert colors
diff --git a/office/fbpdf/navigation.diff b/office/fbpdf/navigation.diff
index efab91be67..07b066b604 100644
--- a/office/fbpdf/navigation.diff
+++ b/office/fbpdf/navigation.diff
@@ -1,49 +1,52 @@
-diff -Naur fbpdf-20160804/README fbpdf-20160804.patched/README
---- fbpdf-20160804/README	2016-08-04 15:19:06.282346689 -0400
-+++ fbpdf-20160804.patched/README	2016-08-04 15:07:40.384322633 -0400
-@@ -22,6 +22,9 @@
+diff -Naur fbpdf-20200617_f590024/README fbpdf-20200617_f590024.patched/README
+--- fbpdf-20200617_f590024/README	2021-09-27 04:15:02.000000000 -0400
++++ fbpdf-20200617_f590024.patched/README	2021-09-29 02:31:51.610212471 -0400
+@@ -21,7 +21,9 @@
+ G		go to page (the last page if no prefix)
  o		set page number (for 'G' command only)
  O		set page number and go to current page
- z		zoom; prefix multiplied by 10 (i.e. '15z' = 150%)
+-z		zoom; prefix multiplied by 10 (i.e. '15z' = 150%)
 +z/=	zoom; prefix multiplied by 10 (i.e. '12z' = 120%). Default 15.
 ++		increase zoom by 10%
 +-		decrease zoom by 10%
  r		set rotation in degrees
  i		print some information
- q		quit
-diff -Naur fbpdf-20160804/fbpdf.c fbpdf-20160804.patched/fbpdf.c
---- fbpdf-20160804/fbpdf.c	2016-08-04 15:19:06.282346689 -0400
-+++ fbpdf-20160804.patched/fbpdf.c	2016-08-04 15:18:38.618345719 -0400
-@@ -252,6 +252,7 @@
+ I		invert colors
+diff -Naur fbpdf-20200617_f590024/fbpdf.c fbpdf-20200617_f590024.patched/fbpdf.c
+--- fbpdf-20200617_f590024/fbpdf.c	2021-09-27 04:15:02.000000000 -0400
++++ fbpdf-20200617_f590024.patched/fbpdf.c	2021-09-29 16:07:26.245764122 -0400
+@@ -269,6 +269,7 @@
  				srow = prow;
  			break;
  		case 'z':
 +		case '=':
+ 			count *= 10;
  			zoom_page(getcount(zoom_def));
  			break;
- 		case 'w':
-@@ -301,10 +302,18 @@
+@@ -319,10 +320,20 @@
  		case ' ':
  		case CTRLKEY('d'):
  			srow += srows * getcount(1) - step;
-+			if(srow > prows) {
++			if(srow >= (prow + prows)) {
 +				srow = 0;
 +				loadpage(num + 1);
++				srow = prow;
 +			}
  			break;
  		case 127:
  		case CTRLKEY('u'):
  			srow -= srows * getcount(1) - step;
-+			if(srow < 0) {
++			if(srow <= 0) {
 +				srow = prows - step;
 +				loadpage(num - 1);
++				srow = prow;
 +			}
  			break;
  		case '[':
  			scol = pcol;
-@@ -320,6 +329,14 @@
- 			break;
- 		case CTRLKEY('l'):
+@@ -342,6 +353,14 @@
+ 			invert = !invert;
+ 			loadpage(num);
  			break;
 +		case '+':
 +			count = 0;
diff --git a/office/fbpdf/slack-desc b/office/fbpdf/slack-desc
index 2406bde801..613200c8b7 100644
--- a/office/fbpdf/slack-desc
+++ b/office/fbpdf/slack-desc
@@ -8,11 +8,11 @@
      |-----handy-ruler------------------------------------------------------|
 fbpdf: fbpdf (PDF viewer for the Linux framebuffer)
 fbpdf:
-fbpdf: fbpdf is a framebuffer pdf/djvu file viewer. It can use either mupdf
-fbpdf: or poppler libraries for rendering pdf files and it uses djvulibre
-fbpdf: library for rendering djvu files.
-fbpdf:
+fbpdf: fbpdf is a framebuffer pdf/djvu file viewer. It can use either
+fbpdf: mupdf or poppler libraries for rendering pdf files and it uses
+fbpdf: the djvulibre library for rendering djvu files.
 fbpdf:
+fbpdf: This package was built @WITH@ mupdf support.
 fbpdf:
 fbpdf:
 fbpdf: