summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2019-10-11 09:27:15 +0000
committerjperkin <jperkin@pkgsrc.org>2019-10-11 09:27:15 +0000
commit57959d938a11f29d3dfdd78a72000e63b44090cb (patch)
tree954deb59c8b1a41329f80c722c671e5a49a17c9a
parent7bf49ac8c3cf38927ca31c3f375f30c5d6b26971 (diff)
downloadpkgsrc-57959d938a11f29d3dfdd78a72000e63b44090cb.tar.gz
cvs: Ensure unistd.h is included for getcwd().
Ride previous PKGREVISION bump.
-rw-r--r--devel/scmcvs/distinfo4
-rw-r--r--devel/scmcvs/patches/patch-bb10
2 files changed, 8 insertions, 6 deletions
diff --git a/devel/scmcvs/distinfo b/devel/scmcvs/distinfo
index d0245b42968..2c17e261e48 100644
--- a/devel/scmcvs/distinfo
+++ b/devel/scmcvs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2019/10/11 09:08:35 jperkin Exp $
+$NetBSD: distinfo,v 1.23 2019/10/11 09:27:15 jperkin Exp $
SHA1 (cvs-1.12.13.tar.bz2) = 93a8dacc6ff0e723a130835713235863f1f5ada9
RMD160 (cvs-1.12.13.tar.bz2) = ba3048e3e2d99ae78f6a759889b615acf65dd487
@@ -25,7 +25,7 @@ SHA1 (patch-av) = 4bcfb17e86cd772dd9e182384f048c593462f5a8
SHA1 (patch-ay) = 6ce1c3c21dbc478248068f8b8850c21b0cb48c42
SHA1 (patch-az) = 9dfd460ae6617f1492e0e6861387ff80080a7d5d
SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07
-SHA1 (patch-bb) = 54cb5ebb1f4ec9e3f8f514914958d8a3cce59dab
+SHA1 (patch-bb) = 153dc447751f3d52bca5033f33a95f408c5775db
SHA1 (patch-lib_mktime.c) = 526a0e24c6399d527ae6a463ea91e993f9f7e920
SHA1 (patch-lib_vasnprintf.c) = fbba4d923d3c61ebcf79e82779919dc1f8a570c0
SHA1 (patch-m4_fpending.m4) = 6b7c96d8f092e179d2cfdf036bcbfd3855292e0f
diff --git a/devel/scmcvs/patches/patch-bb b/devel/scmcvs/patches/patch-bb
index 672d906fba9..5205783cb2f 100644
--- a/devel/scmcvs/patches/patch-bb
+++ b/devel/scmcvs/patches/patch-bb
@@ -1,23 +1,25 @@
-$NetBSD: patch-bb,v 1.2 2019/10/11 09:08:35 jperkin Exp $
+$NetBSD: patch-bb,v 1.3 2019/10/11 09:27:16 jperkin Exp $
Do use non-standard getcwd(NULL, 0); This unbreaks cvs on Interix.
Disable broken custom getcwd() on Apple, it breaks on Catalina.
--- lib/xgetcwd.c.orig 2005-09-19 21:12:25.000000000 +0000
+++ lib/xgetcwd.c
-@@ -25,8 +25,11 @@
+@@ -25,8 +25,13 @@
#include "xgetcwd.h"
#include <errno.h>
+#include <limits.h>
-+#ifndef __APPLE__
++#ifdef __APPLE__
++#include <unistd.h>
++#else
#include "getcwd.h"
+#endif
#include "xalloc.h"
/* Return the current directory, newly allocated.
-@@ -36,8 +39,8 @@
+@@ -36,8 +41,8 @@
char *
xgetcwd (void)
{