Module Name: pkgsrc
Committed By: schmonz
Date: Thu May 18 14:46:05 UTC 2023
Modified Files:
pkgsrc/devel/rcs: Makefile distinfo
Added Files:
pkgsrc/devel/rcs/patches: patch-src_b-isr.c
Log Message:
DEPENDS+=editors/ed if there's no /bin/ed or /usr/bin/ed. Fix
preprocessor error. Probably no change on systems where this already
configured and built.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/rcs/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/rcs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/rcs/patches/patch-src_b-isr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/rcs/Makefile
diff -u pkgsrc/devel/rcs/Makefile:1.43 pkgsrc/devel/rcs/Makefile:1.44
--- pkgsrc/devel/rcs/Makefile:1.43 Thu Sep 6 09:29:57 2018
+++ pkgsrc/devel/rcs/Makefile Thu May 18 14:46:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2018/09/06 09:29:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2023/05/18 14:46:04 schmonz Exp $
DISTNAME= rcs-5.9.4
PKGREVISION= 1
@@ -14,6 +14,11 @@ LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
USE_TOOLS+= gmake gsoelim diff:run diff3:run
+.if !exists(/bin/ed) && !exists(/usr/bin/ed)
+DEPENDS+= ed-[0-9]*:../../editors/ed
+CONFIGURE_ENV+= ac_cv_path_ED=${PREFIX:Q}/bin/ged
+.endif
+
.include "../../mk/bsd.prefs.mk"
# the native diff/diff3 is not sufficient for rcs
Index: pkgsrc/devel/rcs/distinfo
diff -u pkgsrc/devel/rcs/distinfo:1.21 pkgsrc/devel/rcs/distinfo:1.22
--- pkgsrc/devel/rcs/distinfo:1.21 Tue Oct 26 10:19:20 2021
+++ pkgsrc/devel/rcs/distinfo Thu May 18 14:46:04 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2021/10/26 10:19:20 nia Exp $
+$NetBSD: distinfo,v 1.22 2023/05/18 14:46:04 schmonz Exp $
BLAKE2s (rcs-5.9.4.tar.xz) = 5dd467ce0e301d2896eb1a55c3f2c4136b6ebfe301851e10490e2d09af31b48b
SHA512 (rcs-5.9.4.tar.xz) = c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
@@ -6,4 +6,5 @@ Size (rcs-5.9.4.tar.xz) = 801360 bytes
SHA1 (patch-lib_vasnprintf.c) = d15a5441d028bdf97d72b02d4acda51cf4cbe5b6
SHA1 (patch-src_b-complain.h) = 5e0f688e59692b115f5a4ce1d9d571c4081325f3
SHA1 (patch-src_b-fb.h) = ede2d0ef5af0b16eada75a95e09451d9efa41077
+SHA1 (patch-src_b-isr.c) = d48646cd16c740dee4f5e1bac6a2a1f0c7b90d55
SHA1 (patch-src_base.h) = 721a2cede835ca897f040e14e63548f110cbc50a
Added files:
Index: pkgsrc/devel/rcs/patches/patch-src_b-isr.c
diff -u /dev/null pkgsrc/devel/rcs/patches/patch-src_b-isr.c:1.1
--- /dev/null Thu May 18 14:46:05 2023
+++ pkgsrc/devel/rcs/patches/patch-src_b-isr.c Thu May 18 14:46:04 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_b-isr.c,v 1.1 2023/05/18 14:46:04 schmonz Exp $
+
+Avoid 'error: missing binary operator before token "("'.
+
+--- src/b-isr.c.orig 2015-01-21 11:51:02.000000000 +0000
++++ src/b-isr.c
+@@ -197,8 +197,6 @@ setup_catchsig (size_t count, int const
+
+ #if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
+ #define ISR_STACK_SIZE (10 * SIGSTKSZ)
+-#else
+-#define ISR_STACK_SIZE 0
+ #endif
+
+ struct isr_scratch *
+@@ -206,7 +204,7 @@ isr_init (bool *be_quiet)
+ {
+ struct isr_scratch *scratch = ZLLOC (1, struct isr_scratch);
+
+-#if ISR_STACK_SIZE
++#if defined ISR_STACK_SIZE
+ stack_t ss =
+ {
+ .ss_sp = alloc (PLEXUS, "sigaltstack", ISR_STACK_SIZE),