Commit c0b0c9db authored by Sören Tempel's avatar Sören Tempel
Browse files

testing/docbook2mdoc: new aport

See #11674.
parent 8bfa2a6c
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer:
pkgname=docbook2mdoc
pkgver=1.1.0
pkgrel=0
pkgdesc="DocBook to mdoc converter"
url="https://mandoc.bsd.lv/docbook2mdoc/"
arch="all"
license="ISC"
makedepends="bsd-compat-headers"
subpackages="$pkgname-doc"
options="!check" # no test suite
source="https://mandoc.bsd.lv/docbook2mdoc/snapshots/docbook2mdoc-$pkgver.tgz
fix-mandir.patch
strtonum.patch"
build() {
make
}
package() {
make DESTDIR="$pkgdir" PREFIX=/usr install
}
sha512sums="d935a12de59a1b91f51b3ddcc1047ce6e46f0490852c3ab1191402f6c2f9d8e79c57b1ad67ac7b2527c9aa4788f027ca6b83dffbcfed756af0422858713101be docbook2mdoc-1.1.0.tgz
ff477e2f01275fa1dbcdb9c157c7086de76a66683855fba5cd7ac4c1fe0d258fde4869f4de12a740b5c0eee76e4f89d9e89fea9c528cfa0a4f2cf5bd9ebe3982 fix-mandir.patch
d39eab31a4724bebc173f8b1a632049c4cf05c5aac9301b505fc968817fbed07a9227d8dffb1f059c59be8f2d93ed4ead18a8b09458cbff29d1643ecfa7b946d strtonum.patch"
OpenBSD uses $(PREFIX)/man as a MANDIR, we use $(PREFIX)/share/man.
diff -upr docbook2mdoc-1.1.0.orig/Makefile docbook2mdoc-1.1.0/Makefile
--- docbook2mdoc-1.1.0.orig/Makefile 2020-12-29 10:24:38.687808981 +0100
+++ docbook2mdoc-1.1.0/Makefile 2020-12-29 10:25:00.454608509 +0100
@@ -20,9 +20,9 @@ www: docbook2mdoc.1.html docbook2mdoc-$(
install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin
- mkdir -p $(DESTDIR)$(PREFIX)/man/man1
+ mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
install -m 0755 docbook2mdoc $(DESTDIR)$(PREFIX)/bin
- install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/man/man1
+ install -m 0444 docbook2mdoc.1 $(DESTDIR)$(PREFIX)/share/man/man1
installwww: www
mkdir -p $(WWWPREFIX)/snapshots
musl doesn't have strtonum, import it from OpenBSD.
diff -upr docbook2mdoc-1.1.0.orig/Makefile docbook2mdoc-1.1.0/Makefile
--- docbook2mdoc-1.1.0.orig/Makefile 2020-12-29 10:20:53.933977196 +0100
+++ docbook2mdoc-1.1.0/Makefile 2020-12-29 10:21:24.500779954 +0100
@@ -4,8 +4,8 @@ WWWPREFIX = /var/www/vhosts/mdocml.bsd.l
PREFIX = /usr/local
HEADS = xmalloc.h node.h parse.h reorg.h macro.h format.h
-SRCS = xmalloc.c node.c parse.c reorg.c macro.c docbook2mdoc.c tree.c main.c
-OBJS = xmalloc.o node.o parse.o reorg.o macro.o docbook2mdoc.o tree.o main.o
+SRCS = xmalloc.c node.c parse.c reorg.c macro.c docbook2mdoc.c tree.c main.c strtonum.c
+OBJS = xmalloc.o node.o parse.o reorg.o macro.o docbook2mdoc.o tree.o main.o strtonum.o
DISTFILES = Makefile NEWS docbook2mdoc.1
all: docbook2mdoc
diff -upr docbook2mdoc-1.1.0.orig/strtonum.c docbook2mdoc-1.1.0/strtonum.c
--- docbook2mdoc-1.1.0.orig/strtonum.c 2020-12-29 10:22:06.460966781 +0100
+++ docbook2mdoc-1.1.0/strtonum.c 2020-12-29 10:21:09.747380938 +0100
@@ -0,0 +1,66 @@
+/* $OpenBSD: strtonum.c,v 1.8 2015/09/13 08:31:48 guenther Exp $ */
+
+/*
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#define INVALID 1
+#define TOOSMALL 2
+#define TOOLARGE 3
+
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
+ const char **errstrp)
+{
+ long long ll = 0;
+ int error = 0;
+ char *ep;
+ struct errval {
+ const char *errstr;
+ int err;
+ } ev[4] = {
+ { NULL, 0 },
+ { "invalid", EINVAL },
+ { "too small", ERANGE },
+ { "too large", ERANGE },
+ };
+
+ ev[0].err = errno;
+ errno = 0;
+ if (minval > maxval) {
+ error = INVALID;
+ } else {
+ ll = strtoll(numstr, &ep, 10);
+ if (numstr == ep || *ep != '\0')
+ error = INVALID;
+ else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
+ error = TOOSMALL;
+ else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
+ error = TOOLARGE;
+ }
+ if (errstrp != NULL)
+ *errstrp = ev[error].errstr;
+ errno = ev[error].err;
+ if (error)
+ ll = 0;
+
+ return (ll);
+}
+DEF_WEAK(strtonum);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment