CVS commit: pkgsrc/devel/rcs

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Sep  6 09:29:57 UTC 2018

Modified Files:
        pkgsrc/devel/rcs: Makefile distinfo
Added Files:
        pkgsrc/devel/rcs/patches: patch-lib_vasnprintf.c

Log Message:
rcs: Don't use %n format strings on Darwin.

Patch from Homebrew, fixes joyent/pkgsrc#137.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/rcs/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/rcs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/rcs/patches/patch-lib_vasnprintf.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.42 pkgsrc/devel/rcs/Makefile:1.43
--- pkgsrc/devel/rcs/Makefile:1.42      Wed Nov  4 13:27:59 2015
+++ pkgsrc/devel/rcs/Makefile   Thu Sep  6 09:29:57 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2015/11/04 13:27:59 tnn Exp $
+# $NetBSD: Makefile,v 1.43 2018/09/06 09:29:57 jperkin Exp $
 
 DISTNAME=              rcs-5.9.4
+PKGREVISION=           1
 CATEGORIES=            devel scm
 MASTER_SITES=          ${MASTER_SITE_GNU:=rcs/}
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/devel/rcs/distinfo
diff -u pkgsrc/devel/rcs/distinfo:1.18 pkgsrc/devel/rcs/distinfo:1.19
--- pkgsrc/devel/rcs/distinfo:1.18      Tue Nov  3 03:29:19 2015
+++ pkgsrc/devel/rcs/distinfo   Thu Sep  6 09:29:57 2018
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 03:29:19 agc Exp $
+$NetBSD: distinfo,v 1.19 2018/09/06 09:29:57 jperkin Exp $
 
 SHA1 (rcs-5.9.4.tar.xz) = e87fb2e587fa165204ef69f69b7d5cd354c4e44d
 RMD160 (rcs-5.9.4.tar.xz) = 90a62da2391d6fd3d36db0f97cdf1ee995ee4917
 SHA512 (rcs-5.9.4.tar.xz) = c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
 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_base.h) = 721a2cede835ca897f040e14e63548f110cbc50a

Added files:

Index: pkgsrc/devel/rcs/patches/patch-lib_vasnprintf.c
diff -u /dev/null pkgsrc/devel/rcs/patches/patch-lib_vasnprintf.c:1.1
--- /dev/null   Thu Sep  6 09:29:57 2018
+++ pkgsrc/devel/rcs/patches/patch-lib_vasnprintf.c     Thu Sep  6 09:29:57 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_vasnprintf.c,v 1.1 2018/09/06 09:29:57 jperkin Exp $
+
+Don't use %n on Darwin.
+
+--- lib/vasnprintf.c.orig      2015-01-08 01:12:58.000000000 +0000
++++ lib/vasnprintf.c
+@@ -4858,7 +4858,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *
+ #endif
+                   *fbp = dp->conversion;
+ #if USE_SNPRINTF
+-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
++# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+                 fbp[1] = '%';
+                 fbp[2] = 'n';
+                 fbp[3] = '\0';