2

[alpine-aports] main/mdocml: simplify default configuration file

Sören Tempel
Details
Message ID
<20170321002022.12176-1-soeren+git@soeren-tempel.net>
Sender timestamp
1490055620
DKIM signature
missing
Download raw message
CCing Daniel Sabogal, because he is the person who upgraded mdocml when the
configuration format change was introduced. I would like to hear his opinion on
those changes.



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 1/2] main/mdocml: simplify default configuration file

Sören Tempel
Details
Message ID
<20170321002022.12176-2-soeren+git@soeren-tempel.net>
In-Reply-To
<20170321002022.12176-1-soeren+git@soeren-tempel.net> (view parent)
Sender timestamp
1490055621
DKIM signature
missing
Download raw message
Patch: +5 -58
The man.conf(5) format has been simplified with the OpenBSD 5.8 release
of mdocml. The only configuration options supported since then are:
manpath, output and _whatdb.

The default configuration file is:

manpath /usr/share/man
manpath /usr/X11R6/man
manpath /usr/local/man

Since we don't use /usr/X111R6 we simply provide a configuration file
using only /usr/share/man and /usr/local/man for the man path.
---
 main/mdocml/APKBUILD |  6 +++---
 main/mdocml/man.conf | 57 ++--------------------------------------------------
 2 files changed, 5 insertions(+), 58 deletions(-)

diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD
index 9e5537a6dc..3afbaa0aeb 100644
--- a/main/mdocml/APKBUILD
+++ b/main/mdocml/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mdocml
 pkgver=1.14.1
-pkgrel=0
+pkgrel=1
 pkgdesc="mdoc/man compiler"
 url="http://mdocml.bsd.lv/"
 arch="all"
@@ -75,4 +75,4 @@ sha512sums="90f00297d162faa404fe4e530f95422c210b8d23a0be5a115c2c8c17255d366e2244
 ca0f68f6d3d67800eaae7649dacddd04b9159c636bc922840cdb30b741026e708a9527571af656b22642c83b2dc0f9cd9f0b83b43db7a64b0e15fb0654e935a6  shared-libmandoc.patch
 04947a275df99298591c2a46fb81b74c7c3fcb9f3cf8fb718cf1e32eeae5409e90a3bca89e542f8aa1b30792e837fd3d716303a636d1a3ec165fbb9529546a64  pager.patch
 704bc159acfc639e10c7d505372d303cb5784c8e9eb30084236ad89978978d4ba74f3127d4597d78594b64182c47a00c011f8bb3271d2b784f03a2a411ccb1d8  mdocml-apropos.trigger
-0723c32ab70e5b1c77768ca78d7437b26bed19b90b27876b10cc463359c41332befc0105fc1e23ceae48de5a892f1aa7ac60ef7eb0b6b8f1616726c4300632fe  man.conf"
+ebe205fb3c94132f7397f87c6600dffe7f72c25db107d961c777c219f5b01ea0c1fb6507562a92368cff1aa5c310ce19215b87b1a954b44d00957789b95038c8  man.conf"
diff --git a/main/mdocml/man.conf b/main/mdocml/man.conf
index e96bb2f830..4a72943739 100644
--- a/main/mdocml/man.conf
+++ b/main/mdocml/man.conf
@@ -1,55 +1,2 @@
-#	$OpenBSD: man.conf,v 1.20 2014/02/24 20:11:53 espie Exp $
-
-# Sheer, raging paranoia...
-_version	BSD.2
-
-# The whatis/apropos database.
-_whatdb 	/usr/share/man/mandoc.db
-_whatdb 	/usr/local/share/man/mandoc.db
-
-# Subdirectories for paths ending in '/', IN SEARCH ORDER.
-_subdir		{cat,man}0p {cat,man}1 {cat,man}1p {cat,man}8 {cat,man}6 {cat,man}2 {cat,man}3 {cat,man}5 {cat,man}7 {cat,man}4 {cat,man}9 {cat,man}3p {cat,man}3f {cat,man}n
-
-# Files typed by suffix and their commands.
-_suffix		.0
-_build		.0.gz			/usr/bin/zcat %s
-_build		.[0-9n]			/usr/bin/mandoc -Tutf8 %s
-_build		.[0-9n].gz		/usr/bin/zcat %s | /usr/bin/mandoc -Tutf8
-_build		.[0-9][a-z]		/usr/bin/mandoc -Tutf8 %s
-_build		.[0-9][a-z].gz		/usr/bin/zcat %s | /usr/bin/mandoc -Tutf8
-_build		.[0-9][a-z][a-z]	/usr/bin/mandoc -Tutf8 %s
-_build		.[0-9][a-z][a-z].gz	/usr/bin/zcat %s | /usr/bin/mandoc -Tutf8
-_build		.[0-9][a-z][a-z][a-z]	/usr/bin/mandoc -Tutf8 %s
-_build		.[0-9][a-z][a-z][a-z].gz	/usr/bin/zcat %s | /usr/bin/mandoc -Tutf8
-_build		.tbl			/usr/bin/mandoc -Tutf8 %s
-_build		.tbl.gz			/usr/bin/zcat %s | /usr/bin/mandoc -Tutf8
-
-# Sections and their directories.
-# All paths ending in '/' are the equivalent of entries specifying that
-# directory with all of the subdirectories listed for the keyword _subdir.
-
-# default
-_default	/usr/{share,local/share}/man/
-
-# Other sections that represent complete man subdirectories.
-local		/usr/local/share/man/
-
-# Specific section/directory combinations.
-0p		/usr/{share,local/share}/man/{cat,man}0p
-1		/usr/{share,local/share}/man/{cat,man}1
-1p		/usr/{share,local/share}/man/{cat,man}1p
-2		/usr/{share,local/share}/man/{cat,man}2
-3		/usr/{share,local/share}/man/{cat,man}3
-3F		/usr/{share,local/share}/man/{cat,man}3f
-3f		/usr/{share,local/share}/man/{cat,man}3f
-3P		/usr/{share,local/share}/man/{cat,man}3p
-3p		/usr/{share,local/share}/man/{cat,man}3p
-3x		/usr/{share,local/share}/man/{cat,man}3
-3am		/usr/{share,local/share}/man/{cat,man}3
-4		/usr/{share,local/share}/man/{cat,man}4
-5		/usr/{share,local/share}/man/{cat,man}5
-6		/usr/{share,local/share}/man/{cat,man}6
-7		/usr/{share,local/share}/man/{cat,man}7
-8		/usr/{share,local/share}/man/{cat,man}8
-9		/usr/{share,local/share}/man/{cat,man}9
-n		/usr/{share,local/share}/man/{cat,man}n
+manpath /usr/share/man
+manpath /usr/local/man
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 2/2] main/mdocml: simplify mdocml-apropos trigger

Sören Tempel
Details
Message ID
<20170321002022.12176-3-soeren+git@soeren-tempel.net>
In-Reply-To
<20170321002022.12176-1-soeren+git@soeren-tempel.net> (view parent)
Sender timestamp
1490055622
DKIM signature
missing
Download raw message
Patch: +3 -4
makewhatis(8) parses the mdocml configuration file to figure out the
manpath and then creates an index for each directory of the manpath.

I also removed the -a option because it caused makewhatis(8) to also add
man pages in non-standard locations such as `/usr/share/man/nl` to the
manpath which resulted in man(1) preferring those over the english man
pages. So when I ran `man nmap` I got a man page in a language that I
didn't understand.
---
 main/mdocml/APKBUILD               | 4 ++--
 main/mdocml/mdocml-apropos.trigger | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD
index 3afbaa0aeb..971c4f5b13 100644
--- a/main/mdocml/APKBUILD
+++ b/main/mdocml/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mdocml
 pkgver=1.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="mdoc/man compiler"
 url="http://mdocml.bsd.lv/"
 arch="all"
@@ -74,5 +74,5 @@ soelim() {
 sha512sums="90f00297d162faa404fe4e530f95422c210b8d23a0be5a115c2c8c17255d366e224444901842affb06ed8aaf8febd3e5c79966ff713fa7daf00e8c48b7a857c6  mdocml-1.14.1.tar.gz
 ca0f68f6d3d67800eaae7649dacddd04b9159c636bc922840cdb30b741026e708a9527571af656b22642c83b2dc0f9cd9f0b83b43db7a64b0e15fb0654e935a6  shared-libmandoc.patch
 04947a275df99298591c2a46fb81b74c7c3fcb9f3cf8fb718cf1e32eeae5409e90a3bca89e542f8aa1b30792e837fd3d716303a636d1a3ec165fbb9529546a64  pager.patch
-704bc159acfc639e10c7d505372d303cb5784c8e9eb30084236ad89978978d4ba74f3127d4597d78594b64182c47a00c011f8bb3271d2b784f03a2a411ccb1d8  mdocml-apropos.trigger
+1af9627ee519ecf7d4962db52c83b28f3eb4e9fc6bf38e674bd5e17b21076c3c74c9eed2a1161812f8ac0c75471986b73fcf0acfc7065bc2c15280e1d696a00b  mdocml-apropos.trigger
 ebe205fb3c94132f7397f87c6600dffe7f72c25db107d961c777c219f5b01ea0c1fb6507562a92368cff1aa5c310ce19215b87b1a954b44d00957789b95038c8  man.conf"
diff --git a/main/mdocml/mdocml-apropos.trigger b/main/mdocml/mdocml-apropos.trigger
index 517480493f..8a59a0cba3 100644
--- a/main/mdocml/mdocml-apropos.trigger
+++ b/main/mdocml/mdocml-apropos.trigger
@@ -1,3 +1,2 @@
 #!/bin/sh
-
-exec /usr/sbin/makewhatis -a -T utf8 /usr/share/man
+exec /usr/sbin/makewhatis -T utf8
-- 
2.11.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---