From 580dee656f2ec30c0d41cfa4b7efde7ccf628f15 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 14 Mar 2015 08:03:22 +0100 Subject: [PATCH] mdocml: update to 1.13.3; reenable man(1) now that it dtrt. This now replaces openbsd-man. --- srcpkgs/mdocml/files/man.conf | 55 +++++++++++++++++++++++++++++++++++ srcpkgs/mdocml/template | 15 ++++++---- 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/mdocml/files/man.conf diff --git a/srcpkgs/mdocml/files/man.conf b/srcpkgs/mdocml/files/man.conf new file mode 100644 index 0000000000..e96bb2f830 --- /dev/null +++ b/srcpkgs/mdocml/files/man.conf @@ -0,0 +1,55 @@ +# $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 diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template index ce85010674..2c081f36ed 100644 --- a/srcpkgs/mdocml/template +++ b/srcpkgs/mdocml/template @@ -1,17 +1,19 @@ # Template file for 'mdocml' pkgname=mdocml -version=1.13.2 -revision=8 +version=1.13.3 +revision=1 build_pie=yes build_style=configure makedepends="sqlite-devel" -replaces="man-db>=0" +provides="man-0_1" +replaces="man>=0" +conf_files="/etc/man.conf" short_desc="The mandoc UNIX manpage compiler toolset" maintainer="Juan RP " license="ISC" homepage="http://mdocml.bsd.lv" distfiles="${homepage}/snapshots/mdocml-$version.tar.gz" -checksum=9074755da96e8afbf9634d7ffa29c1decda2f642e13d9d844f26cd1e06d9716b +checksum=23ccab4800d50bf4c327979af5d4aa1a6a2dc490789cb67c4c3ac1bd40b8cad8 pre_configure() { sed -i 's,PREFIX=.*,PREFIX=/usr,g' configure @@ -25,11 +27,12 @@ post_install() { # Use symlinks. rm -f ${DESTDIR}/usr/bin/{apropos,man,whatis} rm -f ${DESTDIR}/usr/sbin/makewhatis - rm -f ${DESTDIR}/usr/share/man/man1/man.1 ln -sfr ${DESTDIR}/usr/bin/mandoc ${DESTDIR}/usr/sbin/makewhatis - for f in apropos whatis; do + for f in man apropos whatis; do ln -s mandoc ${DESTDIR}/usr/bin/$f done + # man(1) configuration file + vconf ${FILESDIR}/man.conf # remove devel stuff. rm -rf ${DESTDIR}/usr/{include,lib} # remove conflicting file