textproc/scdoc: Update from 1.10.1 to 1.11.3

To: pkgsrc-users%netbsd.org@localhost
Subject: textproc/scdoc: Update from 1.10.1 to 1.11.3
From: iris000%duck.com@localhost
Date: Mon, 29 Jul 2024 23:56:24 -0400

textproc/scdoc: Update from 1.10.1 to 1.11.3

This updates textproc/scdoc from 1.10.1 (Feb 2020) to 1.11.3 (Feb 2024).

The patches for -Wstrict-prototypes and -Werror=calloc-transposed-args
were included upstream.  Its pkgconfig path also changes from
"lib/pkgconfig/" to "share/pkgconfig/".

$ git log --oneline 1.10.1..1.11.3
0528bcb Update version to 1.11.3
5ea8873 README.md: mention system packages
deb7db7 man: add section about SOURCE_DATE_EPOCH
ca7aad3 fix formatting of escaped backticks
0b4a102 Emit '\e' instead of '\\'
afeda24 get rid of some unused includes
d562d7e remove useless re-declarations of standard functions
1923fb6 Fix clang 15 -Wstrict-prototypes warnings
4af1e1e simplify list output
b16de45 scdoc(1), scdoc(5): follow conventions more closely
5061ecc use .PP for paragraph breaks
74b8daa scdoc.5: fix formatting in the preamble
eef0810 scdoc.5: fix capitalization of subsection headers
5a61910 Update version to 1.11.2
7bdbb5b Disallows differing row lengths in table
9140b4b Check for and abort on failed memory allocations
c7cb8be Add uninstall target
76953aa Escape ' at the beginning of lines
b9391f0 Clean up the installation process
badecfc Update version to 1.11.1
26bbd97 Cast ctype.h inputs to unsigned char
8b0142c string.c: swap calloc arguments
1645e3c Suppress sentence spacing after end-of-sentence characters.
97106f1 Drop flex/bison from .build.yml
922bdce .build.yml: remove unused secret
53a5fc7 .build.yml: drop annotations
274dafc Update version to 1.11.0
0917856 Fix parsing of line breaks followed by underlined text
da7d5e6 Fix parsing of line breaks without newline
059002c Add basic working tests for line breaks parsing
baaebab Allow subsection in preamble
656484e Section needs to be explicitly defined

diff --git a/textproc/scdoc/Makefile b/textproc/scdoc/Makefile
index d6a834d776dd..0b625678dda5 100644
--- a/textproc/scdoc/Makefile
+++ b/textproc/scdoc/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2022/07/25 11:12:29 wiz Exp $
+# $NetBSD$
 
-DISTNAME=      scdoc-1.10.1
+DISTNAME=      1.11.3
+PKGNAME=       scdoc-${DISTNAME}
 CATEGORIES=    textproc
-MASTER_SITES=  https://git.sr.ht/~sircmpwn/scdoc/refs/1.10.1/
+MASTER_SITES=  https://git.sr.ht/~sircmpwn/scdoc/archive/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://git.sr.ht/~sircmpwn/scdoc/
 COMMENT=       Simple man page generator
 LICENSE=       mit
 
+WRKSRC=                ${WRKDIR}/scdoc-${DISTNAME}
+
 USE_TOOLS+=    gmake
 
 PKGCONFIG_OVERRIDE+=   scdoc.pc.in
diff --git a/textproc/scdoc/PLIST b/textproc/scdoc/PLIST
index 3b4ceb15f03d..415dd43c4dcb 100644
--- a/textproc/scdoc/PLIST
+++ b/textproc/scdoc/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2020/03/23 02:29:17 riastradh Exp $
+@comment $NetBSD$
 bin/scdoc
-lib/pkgconfig/scdoc.pc
 man/man1/scdoc.1
 man/man5/scdoc.5
+share/pkgconfig/scdoc.pc
diff --git a/textproc/scdoc/distinfo b/textproc/scdoc/distinfo
index 20f087880713..e897d81af319 100644
--- a/textproc/scdoc/distinfo
+++ b/textproc/scdoc/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2024/07/02 12:05:28 tnn Exp $
+$NetBSD$
 
-BLAKE2s (scdoc-1.10.1.tar.gz) = 844030c009ec4b928ac434be87aecd0393bec6be913664a77e02b33d7afd718a
-SHA512 (scdoc-1.10.1.tar.gz) = 2b6f86263aa7d2f3b08e00772446f8ae067178b8c4ed6d53cb0ed75a8326eb96288813af5faa403a2fbcbfca131adf6e2ca614bcac90c6c3bf979b6c15ec21ad
-Size (scdoc-1.10.1.tar.gz) = 12447 bytes
-SHA1 (patch-Makefile) = db6776d997201358c442277f8ca07ee4858e6697
-SHA1 (patch-include_str.h) = 1fc9ea0660a25eb3327ba61783c8c78cb647ce52
-SHA1 (patch-src_string.c) = c6f43185e0fb3076e7b19ae9e5705c566354e059
+BLAKE2s (1.11.3.tar.gz) = 956404cbfdabd63c2bec34a4e57a93ebc08fc16adb9c8d567e9a1b5d3c40b015
+SHA512 (1.11.3.tar.gz) = fbecc505b44c396890c53c05183d34336160dbd02993ee120421fc6e2a3ec78ba349747e8acfe97af956a0081c923309290ff97fb7babafbc3ca8addc9ec92f9
+Size (1.11.3.tar.gz) = 12768 bytes
+SHA1 (patch-Makefile) = b79aab9ddbb85f0d1192f28ca2bddc72ec040604
diff --git a/textproc/scdoc/patches/patch-Makefile b/textproc/scdoc/patches/patch-Makefile
index 0efa2bc4c031..aa0577091abf 100644
--- a/textproc/scdoc/patches/patch-Makefile
+++ b/textproc/scdoc/patches/patch-Makefile
@@ -1,14 +1,15 @@
-$NetBSD: patch-Makefile,v 1.1 2020/08/31 20:01:12 js Exp $
+$NetBSD$
 
 -static does not work on macOS, and there is no reason why this needs
 to be static.
 
---- Makefile.orig      2020-02-14 21:38:03.000000000 +0000
+--- Makefile.orig      2024-02-17 09:51:31.000000000 +0000
 +++ 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.3
+ CFLAGS?=-g
+ MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
 -LDFLAGS+=-static
  INCLUDE+=-Iinclude
  PREFIX?=/usr/local
- _INSTDIR=$(DESTDIR)$(PREFIX)
+ BINDIR?=$(PREFIX)/bin
diff --git a/textproc/scdoc/patches/patch-include_str.h b/textproc/scdoc/patches/patch-include_str.h
deleted file mode 100644
index b48575a84ce6..000000000000
--- a/textproc/scdoc/patches/patch-include_str.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_str.h,v 1.1 2024/01/02 17:57:29 schmonz Exp $
-
-Satisfy -Wstrict-prototypes to fix at least macOS build.
-
---- include/str.h.orig 2020-02-14 21:38:03.000000000 +0000
-+++ 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);
diff --git a/textproc/scdoc/patches/patch-src_string.c b/textproc/scdoc/patches/patch-src_string.c
deleted file mode 100644
index 882d1628898a..000000000000
--- a/textproc/scdoc/patches/patch-src_string.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_string.c,v 1.2 2024/07/02 12:04:37 tnn Exp $
-
-Satisfy -Wstrict-prototypes to fix at least macOS build.
-Satisfy -Werror=calloc-transposed-args (GCC 14)
-
---- src/string.c.orig  2020-02-14 21:38:03.000000000 +0000
-+++ src/string.c
-@@ -15,8 +15,8 @@ static int ensure_capacity(struct str *s
-       return 1;
- }
- 
--struct str *str_create() {
--      struct str *str = calloc(sizeof(struct str), 1);
-+struct str *str_create(void) {
-+      struct str *str = calloc(1, sizeof(struct str));
-       str->str = malloc(16);
-       str->size = 16;
-       str->len = 0;

diff --git a/textproc/scdoc/Makefile b/textproc/scdoc/Makefile
index d6a834d776dd..0b625678dda5 100644
--- a/textproc/scdoc/Makefile
+++ b/textproc/scdoc/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2022/07/25 11:12:29 wiz Exp $
+# $NetBSD$
 
-DISTNAME=	scdoc-1.10.1
+DISTNAME=	1.11.3
+PKGNAME=	scdoc-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	https://git.sr.ht/~sircmpwn/scdoc/refs/1.10.1/
+MASTER_SITES=	https://git.sr.ht/~sircmpwn/scdoc/archive/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://git.sr.ht/~sircmpwn/scdoc/
 COMMENT=	Simple man page generator
 LICENSE=	mit
 
+WRKSRC=		${WRKDIR}/scdoc-${DISTNAME}
+
 USE_TOOLS+=	gmake
 
 PKGCONFIG_OVERRIDE+=	scdoc.pc.in
diff --git a/textproc/scdoc/PLIST b/textproc/scdoc/PLIST
index 3b4ceb15f03d..415dd43c4dcb 100644
--- a/textproc/scdoc/PLIST
+++ b/textproc/scdoc/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2020/03/23 02:29:17 riastradh Exp $
+@comment $NetBSD$
 bin/scdoc
-lib/pkgconfig/scdoc.pc
 man/man1/scdoc.1
 man/man5/scdoc.5
+share/pkgconfig/scdoc.pc
diff --git a/textproc/scdoc/distinfo b/textproc/scdoc/distinfo
index 20f087880713..e897d81af319 100644
--- a/textproc/scdoc/distinfo
+++ b/textproc/scdoc/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2024/07/02 12:05:28 tnn Exp $
+$NetBSD$
 
-BLAKE2s (scdoc-1.10.1.tar.gz) = 844030c009ec4b928ac434be87aecd0393bec6be913664a77e02b33d7afd718a
-SHA512 (scdoc-1.10.1.tar.gz) = 2b6f86263aa7d2f3b08e00772446f8ae067178b8c4ed6d53cb0ed75a8326eb96288813af5faa403a2fbcbfca131adf6e2ca614bcac90c6c3bf979b6c15ec21ad
-Size (scdoc-1.10.1.tar.gz) = 12447 bytes
-SHA1 (patch-Makefile) = db6776d997201358c442277f8ca07ee4858e6697
-SHA1 (patch-include_str.h) = 1fc9ea0660a25eb3327ba61783c8c78cb647ce52
-SHA1 (patch-src_string.c) = c6f43185e0fb3076e7b19ae9e5705c566354e059
+BLAKE2s (1.11.3.tar.gz) = 956404cbfdabd63c2bec34a4e57a93ebc08fc16adb9c8d567e9a1b5d3c40b015
+SHA512 (1.11.3.tar.gz) = fbecc505b44c396890c53c05183d34336160dbd02993ee120421fc6e2a3ec78ba349747e8acfe97af956a0081c923309290ff97fb7babafbc3ca8addc9ec92f9
+Size (1.11.3.tar.gz) = 12768 bytes
+SHA1 (patch-Makefile) = b79aab9ddbb85f0d1192f28ca2bddc72ec040604
diff --git a/textproc/scdoc/patches/patch-Makefile b/textproc/scdoc/patches/patch-Makefile
index 0efa2bc4c031..aa0577091abf 100644
--- a/textproc/scdoc/patches/patch-Makefile
+++ b/textproc/scdoc/patches/patch-Makefile
@@ -1,14 +1,15 @@
-$NetBSD: patch-Makefile,v 1.1 2020/08/31 20:01:12 js Exp $
+$NetBSD$
 
 -static does not work on macOS, and there is no reason why this needs
 to be static.
 
---- Makefile.orig	2020-02-14 21:38:03.000000000 +0000
+--- Makefile.orig	2024-02-17 09:51:31.000000000 +0000
 +++ 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.3
+ CFLAGS?=-g
+ MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
 -LDFLAGS+=-static
  INCLUDE+=-Iinclude
  PREFIX?=/usr/local
- _INSTDIR=$(DESTDIR)$(PREFIX)
+ BINDIR?=$(PREFIX)/bin
diff --git a/textproc/scdoc/patches/patch-include_str.h b/textproc/scdoc/patches/patch-include_str.h
deleted file mode 100644
index b48575a84ce6..000000000000
--- a/textproc/scdoc/patches/patch-include_str.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_str.h,v 1.1 2024/01/02 17:57:29 schmonz Exp $
-
-Satisfy -Wstrict-prototypes to fix at least macOS build.
-
---- include/str.h.orig	2020-02-14 21:38:03.000000000 +0000
-+++ 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);
diff --git a/textproc/scdoc/patches/patch-src_string.c b/textproc/scdoc/patches/patch-src_string.c
deleted file mode 100644
index 882d1628898a..000000000000
--- a/textproc/scdoc/patches/patch-src_string.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_string.c,v 1.2 2024/07/02 12:04:37 tnn Exp $
-
-Satisfy -Wstrict-prototypes to fix at least macOS build.
-Satisfy -Werror=calloc-transposed-args (GCC 14)
-
---- src/string.c.orig	2020-02-14 21:38:03.000000000 +0000
-+++ src/string.c
-@@ -15,8 +15,8 @@ static int ensure_capacity(struct str *s
- 	return 1;
- }
- 
--struct str *str_create() {
--	struct str *str = calloc(sizeof(struct str), 1);
-+struct str *str_create(void) {
-+	struct str *str = calloc(1, sizeof(struct str));
- 	str->str = malloc(16);
- 	str->size = 16;
- 	str->len = 0;

Follow-Ups:
- Re: textproc/scdoc: Update from 1.10.1 to 1.11.3
  - From: Thomas Klausner

Prev by Date: Re: sysutils/krusader: update to 2.8.1
Next by Date: Re: textproc/scdoc: Update from 1.10.1 to 1.11.3
Previous by Thread: x11/qt5ct: typo in MESSAGE
Next by Thread: Re: textproc/scdoc: Update from 1.10.1 to 1.11.3
Indexes:

Home | Main Index | Thread Index | Old Index