[PR PATCH] 66: fix manpage generation, fix INSTALL.msg.

[PR PATCH] 66: fix manpage generation, fix INSTALL.msg.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1613 bytes --]

There is a new pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages 66_doc_fixes
https://github.com/void-linux/void-packages/pull/29076

66: fix manpage generation, fix INSTALL.msg.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29076.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-66_doc_fixes-29076.patch --]
[-- Type: text/x-diff, Size: 3294 bytes --]

From 1815b55610f1c056ccda50954991b4abe655f98a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
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

Re: [PR REVIEW] 66: fix manpage generation, fix INSTALL.msg.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29076#discussion_r583833631

Comment:
Would be nice to get a new release and avoid so much patching :/

Re: [PR REVIEW] 66: fix manpage generation, fix INSTALL.msg.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New review comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/29076#discussion_r583834236

Comment:
I agree, I have send my patch upstream :)

Re: [PR REVIEW] 66: fix manpage generation, fix INSTALL.msg.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/29076#discussion_r583834236

Comment:
 I have send my patch upstream :)

Re: [PR PATCH] [Updated] 66: fix manpage generation, fix INSTALL.msg.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages 66_doc_fixes
https://github.com/void-linux/void-packages/pull/29076

66: fix manpage generation, fix INSTALL.msg.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29076.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-66_doc_fixes-29076.patch --]
[-- Type: text/x-diff, Size: 3294 bytes --]

From 5204a5fba0d04502b5c5bae449d835355cc69344 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
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

Re: [PR REVIEW] 66: fix manpage generation, fix INSTALL.msg.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

New review comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/29076#discussion_r584093844

Comment:
Patch accepted: https://framagit.org/Obarun/66/-/commit/c0af2428c8271646b9fd4927f860b7ff6a28e3db

Re: 66: fix manpage generation, fix INSTALL.msg.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/29076#issuecomment-787041168

Comment:
The man page generation fix was made after @flexibeast discovered that (some ? ) man pages where displayed as raw roff and  found the source of the problem (missing header in the correct position). 

Re: [PR PATCH] [Merged]: 66: fix manpage generation, fix INSTALL.msg.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]

There's a merged pull request on the void-packages repository

66: fix manpage generation, fix INSTALL.msg.
https://github.com/void-linux/void-packages/pull/29076

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->