aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2015-05-29 17:28:22 -0500
committerWilliam Pitcock <nenolod@dereferenced.org>2015-05-29 17:28:22 -0500
commitf74021abf32618202b26660a7412e170b95f12ac (patch)
tree03390742bae4573b7ae45d7c09e250734a2b16e8 /main
parent1ce7a1c4bb52dad45e775857cce8f7e0fa3d5bc0 (diff)
downloadaports-f74021abf32618202b26660a7412e170b95f12ac.tar.bz2
aports-f74021abf32618202b26660a7412e170b95f12ac.tar.xz
main/mdocml: fix invocation with PAGER/MANPAGER env variable unset
Diffstat (limited to 'main')
-rw-r--r--main/mdocml/APKBUILD6
-rw-r--r--main/mdocml/default-pager.patch11
2 files changed, 16 insertions, 1 deletions
diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD
index 31f2cd5af4..7ee7cf725a 100644
--- a/main/mdocml/APKBUILD
+++ b/main/mdocml/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mdocml
pkgver=1.13.3
-pkgrel=0
+pkgrel=1
pkgdesc="mdoc/man compiler"
url="http://mdocml.bsd.lv/"
arch="all"
@@ -13,6 +13,7 @@ triggers="$pkgname.trigger=/usr/share/man/*"
subpackages="$pkgname-doc $pkgname-dev $pkgname-man"
source="http://mdocml.bsd.lv/snapshots/mdocml-$pkgver.tar.gz
shared-libmandoc.patch
+ default-pager.patch
man.conf
"
@@ -54,10 +55,13 @@ man() {
md5sums="7be80e1116a11abe2aabd6b2f04434ef mdocml-1.13.3.tar.gz
8d130a332fbd3268550819ade96c9afd shared-libmandoc.patch
+aa3421f2d2da345a7514be51707d6829 default-pager.patch
6e893bef0cf680eec807b230e6619d27 man.conf"
sha256sums="23ccab4800d50bf4c327979af5d4aa1a6a2dc490789cb67c4c3ac1bd40b8cad8 mdocml-1.13.3.tar.gz
676dd35caedc759cc83ae1dbf7fde5709d6fe4ed14c652af4cbebc5ccdbdc71b shared-libmandoc.patch
+f0a393ff3a630cd0e9e412241890b2356153ffb4ef0d419a7979edc4ed5e57e3 default-pager.patch
3381c6ceb99e7db1404fdb44419040c3b441a251d594292e53545b5e4e378e2b man.conf"
sha512sums="a3b7304e313b905b3575d79eb7ac861723e0ef3f700199c136abe4d4c698929e99ee0789bfc6e591224fb0006c709afe0e4c1bb578605a767c371ec7dee26024 mdocml-1.13.3.tar.gz
bdbe471bcc5d5009ee8a9c4fb2f7903a5114afd8da1d6807c462fefdbe4b508711386b0fe7febb92977f97751c1d4fd486f1e1ecae0b7c1ba4dc28c0a7dda0b6 shared-libmandoc.patch
+c8a4a11a5aa166670d8f8d4e0dba803068d3f1b6aee483daaf889da661a9281387fcd2f00d2dad7ef5c66e3419df205e2c75bb58fb9b055db284b4ac2f23eb7e default-pager.patch
0723c32ab70e5b1c77768ca78d7437b26bed19b90b27876b10cc463359c41332befc0105fc1e23ceae48de5a892f1aa7ac60ef7eb0b6b8f1616726c4300632fe man.conf"
diff --git a/main/mdocml/default-pager.patch b/main/mdocml/default-pager.patch
new file mode 100644
index 0000000000..06bf71e25a
--- /dev/null
+++ b/main/mdocml/default-pager.patch
@@ -0,0 +1,11 @@
+--- mdocml-1.13.3.orig/main.c
++++ mdocml-1.13.3/main.c
+@@ -989,7 +989,7 @@
+ if (pager == NULL || *pager == '\0')
+ pager = getenv("PAGER");
+ if (pager == NULL || *pager == '\0')
+- pager = "/usr/bin/more -s";
++ pager = "/bin/more -s";
+ cp = mandoc_strdup(pager);
+
+ /*