spotted that there's a new version after looking into it due to the
building failing with clang 15.
The changelog for 1.11.2 is
- escape ' at the beginning of lines
- cleanup the installation process
- check for and abort on failed memory allocations
- disallows differing row lengths in table
and while here I'm also dropping the -Werror from the makefile. This
alone should fix the build on clang 15, but I've also backported a
commit that fixes the underlying problem (-Wstrict-prototypes.)
ok? should i drop the backport since the warning is not grave?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/textproc/scdoc/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 11 Mar 2022 20:03:30 -0000 1.4
+++ Makefile 8 Jan 2023 17:12:48 -0000
@@ -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
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/textproc/scdoc/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 16 Mar 2021 17:00:59 -0000 1.3
+++ distinfo 8 Jan 2023 17:12:59 -0000
@@ -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
Index: patches/patch-Makefile
===================================================================
RCS file: /home/cvs/ports/textproc/scdoc/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 11 Mar 2022 20:03:30 -0000 1.3
+++ patches/patch-Makefile 10 Jan 2023 11:59:08 -0000
@@ -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
Index: patches/patch-include_str_h
===================================================================
RCS file: patches/patch-include_str_h
diff -N patches/patch-include_str_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_str_h 10 Jan 2023 11:57:08 -0000
@@ -0,0 +1,15 @@
+backport of 1923fb61cd71182f05d029f280d056b21f66e8a0
+Fix clang 15 -Wstrict-prototypes warnings
+
+Index: include/str.h
+--- include/str.h.orig
++++ include/str.h
+@@ -7,7 +7,7 @@ struct str {
+ size_t len, size;
+ };
+
+-struct str *str_create();
++struct str *str_create(void);
+ void str_free(struct str *str);
+ void str_reset(struct str *str);
+ int str_append_ch(struct str *str, uint32_t ch);
Index: patches/patch-src_main_c
===================================================================
RCS file: /home/cvs/ports/textproc/scdoc/patches/patch-src_main_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_main_c
--- patches/patch-src_main_c 11 Mar 2022 20:03:30 -0000 1.2
+++ patches/patch-src_main_c 8 Jan 2023 17:20:33 -0000
@@ -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 candida
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;
}
Index: patches/patch-src_string_c
===================================================================
RCS file: patches/patch-src_string_c
diff -N patches/patch-src_string_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_string_c 10 Jan 2023 11:57:09 -0000
@@ -0,0 +1,15 @@
+backport of 1923fb61cd71182f05d029f280d056b21f66e8a0
+Fix clang 15 -Wstrict-prototypes warnings
+
+Index: src/string.c
+--- src/string.c.orig
++++ src/string.c
+@@ -12,7 +12,7 @@ static void ensure_capacity(struct str *str, size_t le
+ }
+ }
+
+-struct str *str_create() {
++struct str *str_create(void) {
+ struct str *str = xcalloc(1, sizeof(struct str));
+ str->str = xcalloc(16, 1);
+ str->size = 16;
