From 017c7f13a330a143dcf052d03b884090e0152b02 Mon Sep 17 00:00:00 2001 From: op Date: Tue, 10 Jan 2023 14:03:58 +0000 Subject: [PATCH] update textproc/scdoc to 1.11.2 changelog: - escape ' at the beginning of lines - cleanup the installation process - check for and abort on failed memory allocations - disallows differing row lengths in table while here regen patches and drop -Werror (which would break the build on clang 15 due to -Wstrict-prototypes.) ok sthen@ jca@ --- textproc/scdoc/Makefile | 2 +- textproc/scdoc/distinfo | 4 ++-- textproc/scdoc/patches/patch-Makefile | 11 +++++++---- textproc/scdoc/patches/patch-src_main_c | 5 +++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/textproc/scdoc/Makefile b/textproc/scdoc/Makefile index 24b0f9d24c5..6a56776eb07 100644 --- a/textproc/scdoc/Makefile +++ b/textproc/scdoc/Makefile @@ -1,5 +1,5 @@ COMMENT = convert scdoc text files to man(7) pages -VERSION = 1.11.1 +VERSION = 1.11.2 DISTNAME = scdoc-${VERSION} CATEGORIES = textproc HOMEPAGE = https://git.sr.ht/~sircmpwn/scdoc diff --git a/textproc/scdoc/distinfo b/textproc/scdoc/distinfo index b5714ae5183..39e1089ba8f 100644 --- a/textproc/scdoc/distinfo +++ b/textproc/scdoc/distinfo @@ -1,2 +1,2 @@ -SHA256 (scdoc-1.11.1.tar.gz) = EJih7S4IdZb8Cz9lfByKXgBBImeqS682GeNoJDBmRbE= -SIZE (scdoc-1.11.1.tar.gz) = 12510 +SHA256 (scdoc-1.11.2.tar.gz) = 6f+ZgbWFQwF4mmd47mTvH20eX0gpqd0+WKmmPqzC5vA= +SIZE (scdoc-1.11.2.tar.gz) = 12746 diff --git a/textproc/scdoc/patches/patch-Makefile b/textproc/scdoc/patches/patch-Makefile index e191ccb2106..c915e93c2a0 100644 --- a/textproc/scdoc/patches/patch-Makefile +++ b/textproc/scdoc/patches/patch-Makefile @@ -1,12 +1,15 @@ In OpenBSD, we do not compile programs statically when it isn't necessary. +Drop -Werror Index: Makefile --- Makefile.orig +++ Makefile -@@ -1,6 +1,5 @@ - VERSION=1.10.1 - CFLAGS+=-g -DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter +@@ -1,7 +1,6 @@ + VERSION=1.11.2 + CFLAGS?=-g +-MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter -LDFLAGS+=-static ++MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Wno-unused-parameter INCLUDE+=-Iinclude PREFIX?=/usr/local - _INSTDIR=$(DESTDIR)$(PREFIX) + BINDIR?=$(PREFIX)/bin diff --git a/textproc/scdoc/patches/patch-src_main_c b/textproc/scdoc/patches/patch-src_main_c index 48f287699cc..01e358c8128 100644 --- a/textproc/scdoc/patches/patch-src_main_c +++ b/textproc/scdoc/patches/patch-src_main_c @@ -1,7 +1,8 @@ Simple software acting as an stdio filter, no third party libraries, not big churn, so this is a good candidate for pledge. ---- src/main.c.old +Index: src/main.c +--- src/main.c.orig +++ src/main.c @@ -15,6 +15,7 @@ @@ -11,7 +12,7 @@ not big churn, so this is a good candidate for pledge. static struct str *parse_section(struct parser *p) { struct str *section = str_create(); -@@ -755,6 +756,12 @@ int main(int argc, char **argv) { +@@ -770,6 +771,12 @@ int main(int argc, char **argv) { fprintf(stderr, "Usage: scdoc < input.scd > output.roff\n"); return 1; }