From: Daniel Sabogal <dsabogalcc@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Cc: soeren@soeren-tempel.net
Subject: [alpine-aports] [PATCH 3/3] main/mdocml: use MANPATH_DEFAULT
Date: Tue,  1 Aug 2017 16:18:42 -0400
Message-Id: <20170801201842.19837-3-dsabogalcc@gmail.com>
In-Reply-To: <20170801201842.19837-1-dsabogalcc@gmail.com>
References: <20170801201842.19837-1-dsabogalcc@gmail.com>
Precedence: list

MANPATH_DEFAULT is recommended for operating system defaults.
man.conf is recommended for machine-specific defaults.

See http://mdocml.bsd.lv/NEWS
---
 main/mdocml/APKBUILD |  8 +++-----
 main/mdocml/man.conf | 55 ----------------------------------------------------
 2 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 main/mdocml/man.conf

diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD
index 90ffcc4911..34da749486 100644
--- a/main/mdocml/APKBUILD
+++ b/main/mdocml/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=mdocml
 _pkgname=mandoc
 pkgver=1.14.2
-pkgrel=0
+pkgrel=1
 pkgdesc="mdoc/man compiler"
 url="http://mdocml.bsd.lv/"
 arch="all"
@@ -18,7 +18,6 @@ source="http://mdocml.bsd.lv/snapshots/$_pkgname-$pkgver.tar.gz
 	pager.patch
 	man_term-fix.patch
 	mdocml-apropos.trigger
-	man.conf
 	"
 
 builddir="$srcdir/$_pkgname-$pkgver"
@@ -32,6 +31,7 @@ MANDIR=/usr/share/man
 LIBDIR=/usr/lib
 CFLAGS="$CFLAGS"
 UTF8_LOCALE="en_US.UTF-8"
+MANPATH_DEFAULT="/usr/share/man:/usr/local/man"
 EOF
 }
 
@@ -49,7 +49,6 @@ check() {
 package() {
 	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" base-install lib-install
-	install -Dm644 "$srcdir"/man.conf "$pkgdir"/etc/man.conf
 	for X in usr/bin/apropos usr/bin/whatis usr/bin/man usr/sbin/makewhatis
 		do
 			rm -f "$pkgdir/$X"
@@ -85,5 +84,4 @@ sha512sums="1691e4552b0417a30a3a546cff651665f8b4b3fbe2357c734546ca29c56eef9c971a
 d127e635dfb54f9a88a28a8312f23495ec1e9356202e03ccfad1f7528f26f1cbfa7fc2c7b20c262523941d661fa7ba570a64a63c23f3e7fffc954d00bd5769c7  shared-libmandoc.patch
 04947a275df99298591c2a46fb81b74c7c3fcb9f3cf8fb718cf1e32eeae5409e90a3bca89e542f8aa1b30792e837fd3d716303a636d1a3ec165fbb9529546a64  pager.patch
 2d69ba396d05b2d1f0b91a3e31175f3a5bc306e334a341cd801b7b83a5cabf245a3f8228b5d7faded19e0c7d65bdfb31630613a9b780db49989599da0dbb3bfc  man_term-fix.patch
-704bc159acfc639e10c7d505372d303cb5784c8e9eb30084236ad89978978d4ba74f3127d4597d78594b64182c47a00c011f8bb3271d2b784f03a2a411ccb1d8  mdocml-apropos.trigger
-0723c32ab70e5b1c77768ca78d7437b26bed19b90b27876b10cc463359c41332befc0105fc1e23ceae48de5a892f1aa7ac60ef7eb0b6b8f1616726c4300632fe  man.conf"
+704bc159acfc639e10c7d505372d303cb5784c8e9eb30084236ad89978978d4ba74f3127d4597d78594b64182c47a00c011f8bb3271d2b784f03a2a411ccb1d8  mdocml-apropos.trigger"
diff --git a/main/mdocml/man.conf b/main/mdocml/man.conf
deleted file mode 100644
index e96bb2f830..0000000000
--- a/main/mdocml/man.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-#	$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
-- 
2.13.3



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---