diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/pinfo/fix_f9_f10_binds.diff | 16 | ||||
| -rw-r--r-- | misc/pinfo/man_page.diff | 62 | ||||
| -rw-r--r-- | misc/pinfo/pinfo.SlackBuild | 20 |
3 files changed, 91 insertions, 7 deletions
diff --git a/misc/pinfo/fix_f9_f10_binds.diff b/misc/pinfo/fix_f9_f10_binds.diff new file mode 100644 index 000000000000..130c2e399c2b --- /dev/null +++ b/misc/pinfo/fix_f9_f10_binds.diff @@ -0,0 +1,16 @@ +diff --git a/src/parse_config.c b/src/parse_config.c +index 6345e7d..84abb1d 100644 +--- a/src/parse_config.c ++++ b/src/parse_config.c +@@ -877,9 +877,9 @@ parse_line(char *line) + *key = KEY_F(7); + else if (!(strncmp(temp + 4, "F(8)", 4))) + *key = KEY_F(8); +- else if (!(strncmp(temp + 4, "(F9)", 4))) ++ else if (!(strncmp(temp + 4, "F(9)", 4))) + *key = KEY_F(9); +- else if (!(strncmp(temp + 4, "(F10)", 5))) ++ else if (!(strncmp(temp + 4, "F(10)", 5))) + *key = KEY_F(10); + else if (!(strncmp(temp + 4, "F(11)", 5))) + *key = KEY_F(11); diff --git a/misc/pinfo/man_page.diff b/misc/pinfo/man_page.diff new file mode 100644 index 000000000000..fd4afa9f9929 --- /dev/null +++ b/misc/pinfo/man_page.diff @@ -0,0 +1,62 @@ +diff --git a/doc/pinfo.1.in b/doc/pinfo.1.in +index bb285cc..bf16aef 100644 +--- a/doc/pinfo.1.in ++++ b/doc/pinfo.1.in +@@ -1,4 +1,4 @@ +-.TH PINFO 1 "01 Dec 2001" ++.TH PINFO 1 "25 Apr 2023" + .SH NAME + .B pinfo + \- is user-friendly, console-based viewer for Info documents +@@ -6,6 +6,10 @@ + .B pinfo + [\fIoptions\fR] + [\fBinfopage\fR] ++.P ++.B pman ++[\fIman-options\fR] ++[\fBman-page\fR] + .SH DESCRIPTION + This is a program for viewing info files. You specify which page you want to + read by passing it an +@@ -46,13 +50,7 @@ to the `\fIman\fR' program. Don't be confused if pinfo options, which + followed `\fB-m\fR' don't work. When using this option, pinfo does not parse + the info options as usual! It invokes the man part of program. + .P +-You can also call the man function of pinfo in another way. When pinfo is +-called with an argv[0] (the program file name), which contains the word 'man' +-in its name, the man functions are enabled automatically. +-.P +-Previously there was a symlink to pinfo, called pman, but I had to remove it +-from the distribution, since its name was in conflict with some other +-utility. Anyway, you can feel free to create such a link if you wish. ++You can also call the man function of pinfo by running \fBpman\fR. + .P + .BR "-r", + .BR --raw-filename +diff --git a/doc/pinfo.texi b/doc/pinfo.texi +index 9925202..a617e62 100644 +--- a/doc/pinfo.texi ++++ b/doc/pinfo.texi +@@ -90,6 +90,9 @@ Keys + + @value{PROGRAM} [@var{options}] [@var{info_page}] + ++@noindent ++@file{pman} [@var{man-options}] [@var{man_page}] ++ + @value{PROGRAM} is a program for viewing info files. You specify which + page you want to read by passing it an @var{info_page} argument. This argument + contains the name of an info page (i.e. @samp{bash}). The program +@@ -130,10 +133,7 @@ When @value{PROGRAM} is called with an @code{argv[0]} (the program file + name), which contains the word @code{man} in its name, the man + functions are enabled automatically. + +-Previously there was a symlink to @value{PROGRAM}, called @code{pman}, +-but I had to remove it from the distribution, since its name was in +-conflict with some other utility. Anyway, you can feel free to create +-such a link if you wish. ++You can also call the man function of pinfo by running @code{pman}. + @item -r, --raw-filename + uses a raw filename first (i.e. the name which you specified as + infopage is considered to be a real file in the specified location). diff --git a/misc/pinfo/pinfo.SlackBuild b/misc/pinfo/pinfo.SlackBuild index dcc2d2d05f66..d12c03f286f0 100644 --- a/misc/pinfo/pinfo.SlackBuild +++ b/misc/pinfo/pinfo.SlackBuild @@ -24,6 +24,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20230425 bkw: BUILD=4 +# - add bugfix from upstream. +# - document pman link in man and info pages. + # 20230308 bkw: BUILD=3, add douninst.sh to clean up GNU info dir. # 20200708 bkw: BUILD=2 @@ -41,7 +45,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pinfo VERSION=${VERSION:-0.6.13} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,7 +86,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.[bg]z* # allow old .bz2 and new .gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ @@ -90,6 +94,8 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ patch -p1 < $CWD/gcc10-stringop.diff patch -p1 < $CWD/ncurses-6.3.diff +patch -p1 < $CWD/fix_f9_f10_binds.diff # commit 05f967c +patch -p1 < $CWD/man_page.diff # my own work [ -e configure ] || sh autogen.sh @@ -114,14 +120,14 @@ rm -f $PKG/usr/info/dir mv $PKG/etc/pinforc $PKG/etc/pinforc.new # Upstream removed this as it conflicted with something on his system. -# It doesn't conflict with ours. +# It doesn't conflict with ours. man_page.diff documents this, too. ln -s $PRGNAM $PKG/usr/bin/pman ln -s $PRGNAM.1.gz $PKG/usr/man/man1/pman.1.gz -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS Change[lL]og* COPYING NEWS README* TECHSTUFF \ - $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 AUTHORS Change[lL]og* COPYING NEWS README* TECHSTUFF $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc |