From 5204a5fba0d04502b5c5bae449d835355cc69344 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 26 Feb 2021 20:18:10 +0200 Subject: [PATCH] 66: fix manpage generation, fix INSTALL.msg. --- srcpkgs/66/INSTALL.msg | 5 ++-- srcpkgs/66/patches/man_page_fix.diff | 40 ++++++++++++++++++++++++++++ srcpkgs/66/template | 2 +- 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/66/patches/man_page_fix.diff diff --git a/srcpkgs/66/INSTALL.msg b/srcpkgs/66/INSTALL.msg index 48212a333c1..cc530a3ed81 100644 --- a/srcpkgs/66/INSTALL.msg +++ b/srcpkgs/66/INSTALL.msg @@ -1,6 +1,5 @@ CAUTION: package revision 0.6.1.1_2 changes the default system-dir from /var/lib/66 to /etc/66/lib. The change requires user intervention. -Users who upgrade from an earlier version should either copy the -contents of the old dir to the new one after installation, or re-create -trees and re-enable services. That should be done before rebooting/halting +Users who upgrade from an earlier version should re-create all trees +and re-enable services in them. That should be done before rebooting/halting the system. diff --git a/srcpkgs/66/patches/man_page_fix.diff b/srcpkgs/66/patches/man_page_fix.diff new file mode 100644 index 00000000000..2d25a6ccf4a --- /dev/null +++ b/srcpkgs/66/patches/man_page_fix.diff @@ -0,0 +1,40 @@ +diff --git a/doc/make-man.sh b/doc/make-man.sh +index fd5d9cd..0c3fee6 100755 +--- a/doc/make-man.sh ++++ b/doc/make-man.sh +@@ -14,29 +14,26 @@ done + + for i in ${man1}; do + lowdown -s -Tman doc/"${i}".md -o doc/man/man1/"${i}".1 || exit 1 +- var=$(head -n1 < doc/man/man1/"${i}".1) ++ var=$( sed -n -e '/^.TH/p' < doc/man/man1/"${i}".1) + var=$(printf '%s' "$var" | tr '7' '1') +- var="${var} \"\" \"General Commands Manual\"" + sed -i "s!^.TH.*!${var}!" doc/man/man1/"${i}".1 || exit 1 +- sed -i '2,5d' doc/man/man1/"${i}".1 || exit 1 ++ sed -i '4,8d' doc/man/man1/"${i}".1 || exit 1 + done + + for i in ${man5}; do + lowdown -s -Tman doc/"${i}".md -o doc/man/man5/"${i}".5 || exit 1 +- var=$(head -n1 < doc/man/man5/"${i}".5) ++ var=$( sed -n -e '/^.TH/p' < doc/man/man5/"${i}".5) + var=$(printf '%s' "$var" | tr '7' '5') +- var="${var} \"\" \"File Formats Manual\"" + sed -i "s!^.TH.*!${var}!" doc/man/man5/"${i}".5 || exit 1 +- sed -i '2,5d' doc/man/man5/"${i}".5 || exit 1 ++ sed -i '4,8d' doc/man/man5/"${i}".5 || exit 1 + done + + for i in ${man8}; do + lowdown -s -Tman doc/"${i}".md -o doc/man/man8/"${i}".8 || exit 1 +- var=$(head -n1 < doc/man/man8/"${i}".8) ++ var=$( sed -n -e '/^.TH/p' < doc/man/man8/"${i}".8) + var=$(printf '%s' "$var" | tr '7' '8') +- var="${var} \"\" \"System Administration\"" + sed -i "s!^.TH.*!${var}!" doc/man/man8/"${i}".8 || exit 1 +- sed -i '2,5d' doc/man/man8/"${i}".8 || exit 1 ++ sed -i '4,8d' doc/man/man8/"${i}".8 || exit 1 + done + + exit 0 diff --git a/srcpkgs/66/template b/srcpkgs/66/template index a89b5257868..849e5c42c37 100644 --- a/srcpkgs/66/template +++ b/srcpkgs/66/template @@ -1,7 +1,7 @@ # Template file for '66' pkgname=66 version=0.6.1.1 -revision=2 +revision=3 wrksrc="66-v${version}" build_style=configure configure_args="--prefix=/usr