app-text/mandoc: add recipe (#1990)

app-text/mandoc/licenses/ISC

@@ -0,0 +1,12 @@
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

app-text/mandoc/mandoc-1.14.3.recipe

@@ -0,0 +1,110 @@
+SUMMARY="A suite of tools compiling mdoc from the OpenBSD project"
+DESCRIPTION="A suite of tools compiling mdoc, the roff macro language of \
+choice for BSD manual pages, and man, the predominant historical language for \
+UNIX manuals. It is small, ISO C, ISC-licensed, and quite fast. The main \
+component of the toolset is the mandoc utility program, based on the libmandoc \
+validating compiler, to format output for UTF-8 and ASCII UNIX terminals, \
+HTML 5, PostScript, and PDF."
+HOMEPAGE="http://mandoc.bsd.lv/"
+# Copyrights should be updated on every new release
+# http://mandoc.bsd.lv/cgi-bin/cvsweb/LICENSE
+COPYRIGHT="2008-2012, 2014 Kristaps Dzonsons
+	2010-2017 Ingo Schwarze
+	2009, 2010, 2011, 2012 Joerg Sonnenberger
+	2013 Franco Fichtner
+	2014 Baptiste Daroussin
+	2016 Ed Maste
+	2017 Michael Stapelberg
+	1999, 2004 Marc Espie
+	1998, 2004, 2010 Todd C. Miller
+	2008, 2017 Otto Moerbeek
+	2004 Ted Unangst
+	1994 Christos Zoulas
+	2003, 2007, 2008, 2014 Jason McIntyre
+	2014 Baptiste Daroussin
+	1989, 1990, 1993, 1994 The Regents of the University of California
+	1994 Christos Zoulas"
+LICENSE="ISC
+	BSD (2-clause)
+	BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="http://mandoc.bsd.lv/snapshots/mandoc-$portVersion.tar.gz"
+CHECKSUM_SHA256="0b0c8f67958c1569ead4b690680c337984b879dfd2ad4648d96924332fd99528"
+PATCHES="mandoc-$portVersion.patchset"
+
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	mandoc$secondaryArchSuffix = $portVersion
+	cmd:apropos = $portVersion
+	cmd:demandoc = $portVersion
+	cmd:makewhatis = $portVersion
+	cmd:man = $portVersion
+	cmd:mandoc = $portVersion
+	cmd:mandocd = $portVersion
+	cmd:soelim = $portVersion
+	cmd:whatis = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+CONFLICTS="
+	cmd:man
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cc$secondaryArchSuffix
+	cmd:make
+	"
+
+TEST_REQUIRES="
+	cmd:diff
+	cmd:perl
+	"
+BUILD_PREREQUIRES+="$TEST_REQUIRES"
+
+USER_SETTINGS_FILES="settings/man.conf"
+
+BUILD()
+{
+	cat > configure.local << EOF
+		CFLAGS='-O2 -pipe -D_BSD_SOURCE'
+		DBDIR='$(finddir B_SYSTEM_VAR_DIRECTORY)/mandoc'
+		HAVE_ERR=1
+		HAVE_PROGNAME=1
+		HAVE_STRSEP=1
+		LDFLAGS="-lbsd"
+		LN='ln -sf'
+		MANDIR='$manDir'
+		PREFIX='$prefix'
+		SBINDIR="\${PREFIX}/bin"
+		SYSCONFDIR='$sysconfDir'
+		UTF8_LOCALE='en.UTF-8'
+EOF
+	./configure
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	sed -i \
+		-e "s|/etc/man.conf|$(finddir B_SYSTEM_SETTINGS_DIRECTORY)/man.conf|" \
+		$manDir/man1/apropos.1 \
+		$manDir/man1/man.1 \
+		$manDir/man5/man.conf.5 \
+		$manDir/man8/makewhatis.8
+}
+
+TEST()
+{
+	make regress
+}

app-text/mandoc/patches/mandoc-1.14.3.patchset

@@ -0,0 +1,451 @@
+From 503340d0438c7738592ffe5ff3aaea16ff062bc2 Mon Sep 17 00:00:00 2001
+From: Leorize <alaviss@users.noreply.github.com>
+Date: Tue, 9 Jan 2018 13:26:14 +0700
+Subject: Introduce MANDOC_DB_DIR
+
+This allow the separation of mandoc.db from man paths. Note that this
+causes all database related operation to be done in MANDOC_DB_DIR.
+
+OSes such as Haiku use have a package management system that
+mark certain folders as read-only (in this case, man directory). This
+allows mandocdb to work in such situation.
+
+diff --git a/configure b/configure
+index f9416ce..6e7c391 100755
+--- a/configure
++++ b/configure
+@@ -98,6 +98,7 @@ INCLUDEDIR=
+ LIBDIR=
+ MANDIR=
+ HOMEBREWDIR=
++DBDIR=
+ 
+ WWWPREFIX="/var/www"
+ HTDOCDIR=
+@@ -365,6 +366,7 @@ echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
+ [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
+ [ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\""
+ [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
++[ -n "${DBDIR}" ] && echo "#define MANDOC_DB_DIR \"${DBDIR}\""
+ [ ${HAVE_EFTYPE} -eq 0 ] && echo "#define EFTYPE EINVAL"
+ [ ${HAVE_O_DIRECTORY} -eq 0 ] && echo "#define O_DIRECTORY 0"
+ [ ${HAVE_PATH_MAX} -eq 0 ] && echo "#define PATH_MAX 4096"
+diff --git a/mandocdb.c b/mandocdb.c
+index 26117cf..8559b95 100644
+--- a/mandocdb.c
++++ b/mandocdb.c
+@@ -34,6 +34,7 @@
+ #else
+ #include "compat_fts.h"
+ #endif
++#include <libgen.h>
+ #include <limits.h>
+ #if HAVE_SANDBOX_INIT
+ #include <sandbox.h>
+@@ -164,6 +165,7 @@ static	int	 render_string(char **, size_t *);
+ static	void	 say(const char *, const char *, ...)
+ 			__attribute__((__format__ (__printf__, 2, 3)));
+ static	int	 set_basedir(const char *, int);
++static	int	 set_dbpath(void);
+ static	int	 treescan(void);
+ static	size_t	 utf8(unsigned int, char [7]);
+ 
+@@ -176,6 +178,12 @@ static	int		 write_utf8; /* write UTF-8 output; else ASCII */
+ static	int		 exitcode; /* to be returned by main */
+ static	enum op		 op; /* operational mode */
+ static	char		 basedir[PATH_MAX]; /* current base directory */
++/* path to mandoc.db */
++#ifndef MANDOC_DB_DIR
++static	const	char		 dbpath[] = MANDOC_DB;
++#else
++static	char		 dbpath[PATH_MAX + NAME_MAX] = MANDOC_DB_DIR;
++#endif
+ static	struct mpage	*mpage_head; /* list of distinct manual pages */
+ static	struct ohash	 mpages; /* table of distinct manual pages */
+ static	struct ohash	 mlinks; /* table of directory entries */
+@@ -431,10 +439,11 @@ mandocdb(int argc, char *argv[])
+ 		 * Most of these deal with a specific directory.
+ 		 * Jump into that directory first.
+ 		 */
+-		if (OP_TEST != op && 0 == set_basedir(path_arg, 1))
++		if (OP_TEST != op && 0 == set_basedir(path_arg, 1) &&
++		    0 == set_dbpath())
+ 			goto out;
+ 
+-		dba = nodb ? dba_new(128) : dba_read(MANDOC_DB);
++		dba = nodb ? dba_new(128) : dba_read(dbpath);
+ 		if (dba != NULL) {
+ 			/*
+ 			 * The existing database is usable.  Process
+@@ -511,6 +520,8 @@ mandocdb(int argc, char *argv[])
+ 
+ 			if ( ! set_basedir(conf.manpath.paths[j], argc > 0))
+ 				continue;
++			if ( ! set_dbpath())
++				continue;
+ 			if (0 == treescan())
+ 				continue;
+ 			dba = dba_new(128);
+@@ -637,8 +648,10 @@ treescan(void)
+ 		 * stored directory data and handling the filename.
+ 		 */
+ 		case FTS_F:
++#ifndef MANDOC_DB_DIR
+ 			if ( ! strcmp(path, MANDOC_DB))
+ 				continue;
++#endif
+ 			if ( ! use_all && ff->fts_level < 2) {
+ 				if (warnings)
+ 					say(path, "Extraneous file");
+@@ -2120,6 +2133,13 @@ static void
+ dbwrite(struct dba *dba)
+ {
+ 	char		 tfn[32];
++#ifndef MANDOC_DB_DIR
++	const char	 dbnew[] = MANDOC_DB "~";
++#else
++	char		 dbnew[PATH_MAX + NAME_MAX];
++	char		 dbcpy[PATH_MAX + NAME_MAX];
++	char		 dbdir[PATH_MAX];
++#endif
+ 	int		 status;
+ 	pid_t		 child;
+ 
+@@ -2130,8 +2150,8 @@ dbwrite(struct dba *dba)
+ 
+ 	dba_array_start(dba->pages);
+ 	if (dba_array_next(dba->pages) == NULL) {
+-		if (unlink(MANDOC_DB) == -1 && errno != ENOENT)
+-			say(MANDOC_DB, "&unlink");
++		if (unlink(dbpath) == -1 && errno != ENOENT)
++			say(dbpath, "&unlink");
+ 		return;
+ 	}
+ 
+@@ -2140,11 +2160,48 @@ dbwrite(struct dba *dba)
+ 	 * then atomically move it into place.
+ 	 */
+ 
+-	if (dba_write(MANDOC_DB "~", dba) != -1) {
+-		if (rename(MANDOC_DB "~", MANDOC_DB) == -1) {
++#ifdef MANDOC_DB_DIR
++	if (strlcpy(dbnew, dbpath, sizeof(dbnew)) >= sizeof(dbnew)) {
++		exitcode = (int)MANDOCLEVEL_SYSERR;
++		say("", "%s: &strlcpy", dbpath);
++		return;
++	}
++
++	if (strlcat(dbnew, "~", sizeof(dbnew)) >= sizeof(dbnew)) {
++		exitcode = (int)MANDOCLEVEL_SYSERR;
++		say("", "%s: &strlcat", dbpath);
++		return;
++	}
++
++	/* dirname(3) is allowed to change the input string */
++	(void)strlcpy(dbcpy, dbnew, sizeof(dbcpy));
++	(void)strlcpy(dbdir, dirname(dbcpy), sizeof(dbdir));
++	switch (child = fork()) {
++	case -1:
++		exitcode = (int)MANDOCLEVEL_SYSERR;
++		say("", "&fork mkdir");
++		return;
++	case 0:
++		execlp("mkdir", "mkdir", "-p", dbdir, (char *)NULL);
++		say("", "&exec mkdir");
++		exit((int)MANDOCLEVEL_SYSERR);
++	default:
++		break;
++	}
++	if (waitpid(child, &status, 0) == -1) {
++		exitcode = (int)MANDOCLEVEL_SYSERR;
++		say("", "&wait mkdir");
++	} else if (WIFSIGNALED(status) || WEXITSTATUS(status)) {
++		exitcode = (int)MANDOCLEVEL_SYSERR;
++		say("", "%s: Cannot create database directory", dbdir);
++	}
++#endif
++
++	if (dba_write(dbnew, dba) != -1) {
++		if (rename(dbnew, dbpath) == -1) {
+ 			exitcode = (int)MANDOCLEVEL_SYSERR;
+-			say(MANDOC_DB, "&rename");
+-			unlink(MANDOC_DB "~");
++			say(dbpath, "&rename");
++			unlink(dbnew);
+ 		}
+ 		return;
+ 	}
+@@ -2188,8 +2245,9 @@ dbwrite(struct dba *dba)
+ 		say("", "cmp died from signal %d", WTERMSIG(status));
+ 	} else if (WEXITSTATUS(status)) {
+ 		exitcode = (int)MANDOCLEVEL_SYSERR;
+-		say(MANDOC_DB,
+-		    "Data changed, but cannot replace database");
++		say("",
++		    "Data changed, but cannot replace database: %s",
++		    dbpath);
+ 	}
+ 
+ out:
+@@ -2295,6 +2353,27 @@ set_basedir(const char *targetdir, int report_baddir)
+ 	return 1;
+ }
+ 
++static int
++set_dbpath(void)
++{
++#ifndef MANDOC_DB_DIR
++	return 1;
++#else
++	const size_t dbpathsize = sizeof(dbpath);
++	if (strlcat(dbpath, basedir, dbpathsize) >= dbpathsize) {
++		exitcode = (int)MANDOCLEVEL_SYSERR;
++		say("", "&%s: strlcat", MANDOC_DB_DIR);
++		return 0;
++	}
++	if (strlcat(dbpath, MANDOC_DB, dbpathsize) >= dbpathsize) {
++		exitcode = (int)MANDOCLEVEL_SYSERR;
++		say("", "&%s: strlcat", MANDOC_DB_DIR);
++		return 0;
++	}
++	return 1;
++#endif
++}
++
+ static void
+ say(const char *file, const char *format, ...)
+ {
+diff --git a/mansearch.c b/mansearch.c
+index 0d60c3b..287f943 100644
+--- a/mansearch.c
++++ b/mansearch.c
+@@ -88,6 +88,11 @@ mansearch(const struct mansearch *search,
+ 		struct manpage **res, size_t *sz)
+ {
+ 	char		 buf[PATH_MAX];
++#ifndef MANDOC_DB_DIR
++	const char	 dbpath[] = MANDOC_DB;
++#else
++	char		 dbpath[PATH_MAX + NAME_MAX] = MANDOC_DB_DIR;
++#endif
+ 	struct dbm_res	*rp;
+ 	struct expr	*e;
+ 	struct dbm_page	*page;
+@@ -155,9 +160,22 @@ mansearch(const struct mansearch *search,
+ 		}
+ 		chdir_status = 1;
+ 
+-		if (dbm_open(MANDOC_DB) == -1) {
++#ifdef MANDOC_DB_DIR
++		if (strlcat(dbpath, paths->paths[i],
++			    sizeof(dbpath)) >= sizeof(dbpath)) {
++			warn("%s: &strlcat", paths->paths[i]);
++			continue;
++		}
++		if (strlcat(dbpath, "/" MANDOC_DB,
++			    sizeof(dbpath)) >= sizeof(dbpath)) {
++			warn("%s: &strlcat", paths->paths[i]);
++			continue;
++		}
++#endif
++
++		if (dbm_open(dbpath) == -1) {
+ 			if (errno != ENOENT)
+-				warn("%s/%s", paths->paths[i], MANDOC_DB);
++				warn("%s", dbpath);
+ 			continue;
+ 		}
+ 
+-- 
+2.15.0
+
+
+From a6a12987a082ba6dbb2866a5177ef39804865366 Mon Sep 17 00:00:00 2001
+From: Leorize <alaviss@users.noreply.github.com>
+Date: Thu, 28 Dec 2017 20:35:14 +0700
+Subject: configure: preserve PATH
+
+
+diff --git a/configure b/configure
+index 6e7c391..379fdb9 100755
+--- a/configure
++++ b/configure
+@@ -40,7 +40,7 @@ MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"
+ OSNAME=
+ UTF8_LOCALE=
+ 
+-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
++CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i PATH="$PATH" make -sf -`
+ CFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings"
+ CFLAGS="${CFLAGS} -Wno-unused-parameter"
+ LDADD=
+-- 
+2.15.0
+
+
+From 5ea88bf54fbc5bbd6c213b75bff1bf43938f5d88 Mon Sep 17 00:00:00 2001
+From: Leorize <alaviss@users.noreply.github.com>
+Date: Tue, 9 Jan 2018 15:02:31 +0700
+Subject: configure: add SYSCONFDIR
+
+This allow changing the default /etc/man.conf path to SYSCONFDIR/man.conf
+
+diff --git a/configure b/configure
+index 379fdb9..6dbbfdd 100755
+--- a/configure
++++ b/configure
+@@ -99,6 +99,7 @@ LIBDIR=
+ MANDIR=
+ HOMEBREWDIR=
+ DBDIR=
++SYSCONFDIR="/etc"
+ 
+ WWWPREFIX="/var/www"
+ HTDOCDIR=
+@@ -360,7 +361,7 @@ __HEREDOC__
+ [ ${HAVE_GETLINE} -eq 0 ] && echo "#include <stdio.h>"
+ 
+ echo
+-echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""
++echo "#define MAN_CONF_FILE \"${SYSCONFDIR}/${MANM_MANCONF}\""
+ echo "#define MANPATH_BASE \"${MANPATH_BASE}\""
+ echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
+ [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
+@@ -510,6 +511,7 @@ BIN_FROM_SBIN	= ${BIN_FROM_SBIN}
+ INCLUDEDIR	= ${INCLUDEDIR}
+ LIBDIR		= ${LIBDIR}
+ MANDIR		= ${MANDIR}
++SYSCONFDIR	= ${SYSCONFDIR}
+ WWWPREFIX	= ${WWWPREFIX}
+ HTDOCDIR	= ${HTDOCDIR}
+ CGIBINDIR	= ${CGIBINDIR}
+-- 
+2.15.0
+
+
+From c6024ec90171af35f91550d9e89211583806b4bc Mon Sep 17 00:00:00 2001
+From: Leorize <alaviss@users.noreply.github.com>
+Date: Tue, 30 Jan 2018 19:44:52 +0700
+Subject: manpath: dynamically populate paths on Haiku
+
+
+diff --git a/configure b/configure
+index 6dbbfdd..7bf5428 100755
+--- a/configure
++++ b/configure
+@@ -362,8 +362,13 @@ __HEREDOC__
+ 
+ echo
+ echo "#define MAN_CONF_FILE \"${SYSCONFDIR}/${MANM_MANCONF}\""
+-echo "#define MANPATH_BASE \"${MANPATH_BASE}\""
+-echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
++cat << __HEREDOC__
++#ifndef __HAIKU__
++#define MANPATH_BASE "${MANPATH_BASE}"
++#define MANPATH_DEFAULT "${MANPATH_DEFAULT}"
++#endif
++
++__HEREDOC__
+ [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
+ [ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\""
+ [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
+diff --git a/manpath.c b/manpath.c
+index 54f7a6b..76133b3 100644
+--- a/manpath.c
++++ b/manpath.c
+@@ -29,6 +29,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#ifdef __HAIKU__
++#include <FindDirectory.h>
++#endif
++
+ #include "mandoc_aux.h"
+ #include "manconf.h"
+ 
+@@ -94,8 +98,26 @@ manconf_parse(struct manconf *conf, const char *file,
+ void
+ manpath_base(struct manpaths *dirs)
+ {
++#ifndef __HAIKU__
+ 	char path_base[] = MANPATH_BASE;
+ 	manpath_parseline(dirs, path_base, 0);
++#else
++	char path[PATH_MAX + NAME_MAX];
++	int i;
++
++	const directory_which dw[] = {
++		B_USER_DOCUMENTATION_DIRECTORY,
++		B_SYSTEM_DOCUMENTATION_DIRECTORY
++	};
++
++	for (i = 0; i < sizeof(dw) / sizeof(directory_which); ++i) {
++		if (find_directory(dw[i], -1, 0, path, sizeof(path)) != B_OK)
++			continue;
++		if (strlcat(path, "/man", sizeof(path)) >= sizeof(path))
++			continue;
++		manpath_add(dirs, path, 0);
++	}
++#endif
+ }
+ 
+ /*
+@@ -166,7 +188,20 @@ static void
+ manconf_file(struct manconf *conf, const char *file)
+ {
+ 	const char *const toks[] = { "manpath", "output", "_whatdb" };
++#ifndef __HAIKU__
+ 	char manpath_default[] = MANPATH_DEFAULT;
++#else
++	int ignore_default = 0;
++	int i;
++	char path[PATH_MAX + NAME_MAX];
++
++	const directory_which dw[] = {
++		B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY,
++		B_USER_DOCUMENTATION_DIRECTORY,
++		B_SYSTEM_NONPACKAGED_DOCUMENTATION_DIRECTORY,
++		B_SYSTEM_DOCUMENTATION_DIRECTORY
++	};
++#endif
+ 
+ 	FILE		*stream;
+ 	char		*line, *cp, *ep;
+@@ -211,7 +246,11 @@ manconf_file(struct manconf *conf, const char *file)
+ 			/* FALLTHROUGH */
+ 		case 0:  /* manpath */
+ 			manpath_add(&conf->manpath, cp, 0);
++#ifndef __HAIKU__
+ 			*manpath_default = '\0';
++#else
++			ignore_default = 1;
++#endif
+ 			break;
+ 		case 1:  /* output */
+ 			manconf_output(&conf->output, cp, 1);
+@@ -224,8 +263,21 @@ manconf_file(struct manconf *conf, const char *file)
+ 	fclose(stream);
+ 
+ out:
++#ifndef __HAIKU__
+ 	if (*manpath_default != '\0')
+ 		manpath_parseline(&conf->manpath, manpath_default, 0);
++#else
++	if (ignore_default)
++		return;
++
++	for (i = 0; i < sizeof(dw) / sizeof(directory_which); ++i) {
++		if (find_directory(dw[i], -1, 0, path, sizeof(path)) != B_OK)
++			continue;
++		if (strlcat(path, "/man", sizeof(path)) >= sizeof(path))
++			continue;
++		manpath_add(&conf->manpath, path, 0);
++	}
++#endif
+ }
+ 
+ int
+-- 
+2.15.0
+