main/mandoc: rename mdocml to mandoc

upstream renamed mdocml to mandoc about three years ago (concluded from
looking at download page) so we rename it to reflect upstream name

rewrite pkgdesc to more desctiptive one

add replaces and provides 'mdocml' for smooth upgrade and for some
packages which didn't changed depends to' mandoc'

7 files changed, 206 insertions, 0 deletions

diff --git a/main/mandoc/APKBUILD b/main/mandoc/APKBUILD
new file mode 100644
index 0000000000..52e66bb7d7
--- /dev/null
+++ b/main/mandoc/APKBUILD
@@ -0,0 +1,73 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=mandoc
+pkgver=1.14.5
+pkgrel=3
+pkgdesc="mandoc (formerly mdocml) UNIX manpage compiler toolset"
+url="https://mandoc.bsd.lv/"
+arch="all"
+license="ISC and BSD-2-Clause and BSD-3-Clause"
+makedepends="zlib-dev"
+checkdepends="perl"
+install="$pkgname.post-deinstall"
+triggers="$pkgname-apropos.trigger=/usr/share/man/*"
+replaces="mdocml"
+provides="mdocml=$pkgver-r$pkgrel"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-apropos $pkgname-soelim"
+source="https://mandoc.bsd.lv/snapshots/mandoc-$pkgver.tar.gz
+	shared-libmandoc.patch
+	outdated-warn-disable.patch
+	fix-tbl-null-pointer.patch
+	mandoc_configure.patch
+	"
+
+prepare() {
+	default_prepare
+
+	cat >configure.local<<-__EOF__
+	PREFIX=/usr
+	MANDIR=/usr/share/man
+	LIBDIR=/usr/lib
+	CFLAGS="$CFLAGS"
+	UTF8_LOCALE="en_US.UTF-8"
+	MANPATH_DEFAULT="/usr/share/man:/usr/local/man"
+	LN="ln -sf"
+__EOF__
+}
+
+build() {
+	HAVE_LESS_T=0 MANPATH_BASE="/usr/share/man" ./configure
+	make
+}
+
+check() {
+	LD_LIBRARY_PATH="$builddir" make regress
+}
+
+package() {
+	make -j1 DESTDIR="$pkgdir" base-install lib-install
+}
+
+apropos() {
+	pkgdesc="makewhatis/whatis and apropos tools and index"
+	mkdir -p "$subpkgdir"/usr/sbin "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/apropos \
+		"$pkgdir"/usr/bin/whatis \
+		"$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/sbin/makewhatis \
+		"$subpkgdir"/usr/sbin/
+}
+
+soelim() {
+	pkgdesc="so elimination tool"
+	depends=""
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/soelim \
+		"$subpkgdir"/usr/bin/
+}
+
+sha512sums="848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52  mandoc-1.14.5.tar.gz
+b1bd2c197584948cc8bab2310e759b8942b9f9479254ffb5a8223cfa6ba03c9e1a4d402c5440b8d9f962be9a020287d3dd8556592c17f2b46f15f405d9d373cb  shared-libmandoc.patch
+ced05e8b57fb9705c6d8d8570cd6b06ad187511a4c243ac2dbc34064aa164ca49e0c877160134161dcb98ebd5e61a5c23d5741f03ef95903ff56193dd07f36a1  outdated-warn-disable.patch
+bb46bc3a0f07881e5362b32d478632fb209f9740017c467f2258e9b7ddbece6175bba598287d8c24626c9ee7217eb92ae60e0a30aeafdfc4b0154f4d312cbcca  fix-tbl-null-pointer.patch
+a44d86fb012acbc05eb233122e7ca3170e5e01c7c49115c2fe83f49891d442ba94601a039018cfa01cc1ef3cd02d5aff4d1e01abd4230b8bc2091e649ad991db  mandoc_configure.patch"
diff --git a/main/mandoc/fix-tbl-null-pointer.patch b/main/mandoc/fix-tbl-null-pointer.patch
new file mode 100644
index 0000000000..ab68f9a1a6
--- /dev/null
+++ b/main/mandoc/fix-tbl-null-pointer.patch
@@ -0,0 +1,27 @@
+===================================================================
+RCS file: /cvs/mandoc/tbl_term.c,v
+retrieving revision 1.69
+retrieving revision 1.70
+diff -u -p -r1.69 -r1.70
+--- a/tbl_term.c	2019/03/16 21:35:48	1.69
++++ b/tbl_term.c	2019/03/18 08:00:34	1.70
+@@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
+ 
+ 		lw = cpp == NULL || cpn == NULL ||
+ 		    (cpn->pos != TBL_CELL_DOWN &&
+-		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
++		     (dpn == NULL || dpn->string == NULL ||
++		      strcmp(dpn->string, "\\^") != 0))
+ 		    ? hw : 0;
+ 		tbl_direct_border(tp, BHORIZ * lw,
+ 		    col->width + col->spacing / 2);
+@@ -675,7 +676,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
+ 
+ 		rw = cpp == NULL || cpn == NULL ||
+ 		    (cpn->pos != TBL_CELL_DOWN &&
+-		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
++		     (dpn == NULL || dpn->string == NULL ||
++		      strcmp(dpn->string, "\\^") != 0))
+ 		    ? hw : 0;
+ 
+ 		/* The line crossing at the end of this column. */
diff --git a/main/mandoc/mandoc-apropos.trigger b/main/mandoc/mandoc-apropos.trigger
new file mode 100644
index 0000000000..517480493f
--- /dev/null
+++ b/main/mandoc/mandoc-apropos.trigger
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/sbin/makewhatis -a -T utf8 /usr/share/man
diff --git a/main/mandoc/mandoc.post-deinstall b/main/mandoc/mandoc.post-deinstall
new file mode 100644
index 0000000000..77b2574d86
--- /dev/null
+++ b/main/mandoc/mandoc.post-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec rm -f /usr/share/man/mandoc.db
diff --git a/main/mandoc/mandoc_configure.patch b/main/mandoc/mandoc_configure.patch
new file mode 100644
index 0000000000..e059f6c1c2
--- /dev/null
+++ b/main/mandoc/mandoc_configure.patch
@@ -0,0 +1,12 @@
+diff -Naur a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -41,7 +41,7 @@
+ 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=
+ LDADD=
+ LDFLAGS=
diff --git a/main/mandoc/outdated-warn-disable.patch b/main/mandoc/outdated-warn-disable.patch
new file mode 100644
index 0000000000..f960de7d1d
--- /dev/null
+++ b/main/mandoc/outdated-warn-disable.patch
@@ -0,0 +1,12 @@
+diff -Naur a/main.c b/main.c
+--- a/main.c	2019-03-03 15:24:23.600767518 +0000
++++ b/main.c	2019-03-03 15:27:37.609820365 +0000
+@@ -676,8 +676,6 @@
+ 	return globres != -1;
+ 
+ found:
+-	warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
+-	    name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);
+ 	if (res == NULL) {
+ 		free(file);
+ 		return 1;
diff --git a/main/mandoc/shared-libmandoc.patch b/main/mandoc/shared-libmandoc.patch
new file mode 100644
index 0000000000..0327138382
--- /dev/null
+++ b/main/mandoc/shared-libmandoc.patch
@@ -0,0 +1,76 @@
+diff --git a/Makefile b/Makefile
+index f4e2954..d153224 100644
+--- a/Makefile
++++ b/Makefile
+@@ -367,9 +367,13 @@ WWW_INCS	 = eqn.h.html \
+ 		   tbl_int.h.html \
+ 		   tbl_parse.h.html
+ 
++LIBMANDOC        = libmandoc.so
++MANDOCLIB        = -L. -lmandoc
++
+ # === USER CONFIGURATION ===============================================
+ 
+ include Makefile.local
++CFLAGS           += -fPIC
+ 
+ # === DEPENDENCY HANDLING ==============================================
+ 
+@@ -392,7 +396,7 @@ distclean: clean
+ 	rm -f Makefile.local config.h config.h.old config.log config.log.old
+ 
+ clean:
+-	rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
++	rm -f $(LIBMANDOC) $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
+ 	rm -f mandoc $(MAIN_OBJS)
+ 	rm -f man.cgi $(CGI_OBJS)
+ 	rm -f mandocd catman catman.o $(MANDOCD_OBJS)
+@@ -431,11 +435,11 @@ base-install: mandoc demandoc soelim
+ 	$(INSTALL_MAN) makewhatis.8 \
+ 		$(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
+ 
+-lib-install: libmandoc.a
++lib-install: $(LIBMANDOC)
+ 	mkdir -p $(DESTDIR)$(LIBDIR)
+ 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man3
+-	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \
+ 		mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
+@@ -511,23 +515,23 @@ Makefile.local config.h: configure $(TESTSRCS)
+ 	@echo "$@ is out of date; please run ./configure"
+ 	@exit 1
+ 
+-libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
+-	ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
++libmandoc.so: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
++	$(CC) $(LDFLAGS) -shared -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(LDADD)
+ 
+-mandoc: $(MAIN_OBJS) libmandoc.a
+-	$(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
++mandoc: $(MAIN_OBJS) $(LIBMANDOC)
++	$(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) $(MANDOCLIB) $(LDADD)
+ 
+ man.cgi: $(CGI_OBJS) libmandoc.a
+ 	$(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
+ 
+-mandocd: $(MANDOCD_OBJS) libmandoc.a
+-	$(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) libmandoc.a $(LDADD)
++mandocd: $(MANDOCD_OBJS) $(LIBMANDOC)
++	$(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) $(LIBMANDOC) $(LDADD)
+ 
+-catman: catman.o libmandoc.a
+-	$(CC) -o $@ $(LDFLAGS) catman.o libmandoc.a $(LDADD)
++catman: catman.o $(LIBMANDOC)
++	$(CC) -o $@ $(LDFLAGS) catman.o $(LIBMANDOC) $(LDADD)
+ 
+-demandoc: $(DEMANDOC_OBJS) libmandoc.a
+-	$(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD)
++demandoc: $(DEMANDOC_OBJS) $(LIBMANDOC)
++	$(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) $(LIBMANDOC) $(LDADD)
+ 
+ soelim: $(SOELIM_OBJS)
+ 	$(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS)
+