CVS commit: pkgsrc/devel/scmcvs

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 11 09:27:16 UTC 2019

Modified Files:
        pkgsrc/devel/scmcvs: distinfo
        pkgsrc/devel/scmcvs/patches: patch-bb

Log Message:
cvs: Ensure unistd.h is included for getcwd().

Ride previous PKGREVISION bump.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/scmcvs/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/scmcvs/patches/patch-bb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/scmcvs/distinfo
diff -u pkgsrc/devel/scmcvs/distinfo:1.22 pkgsrc/devel/scmcvs/distinfo:1.23
--- pkgsrc/devel/scmcvs/distinfo:1.22   Fri Oct 11 09:08:35 2019
+++ pkgsrc/devel/scmcvs/distinfo        Fri Oct 11 09:27:15 2019
@@ -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) = 4bcfb17e86cd772dd9e182
 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

Index: pkgsrc/devel/scmcvs/patches/patch-bb
diff -u pkgsrc/devel/scmcvs/patches/patch-bb:1.2 pkgsrc/devel/scmcvs/patches/patch-bb:1.3
--- pkgsrc/devel/scmcvs/patches/patch-bb:1.2    Fri Oct 11 09:08:35 2019
+++ pkgsrc/devel/scmcvs/patches/patch-bb        Fri Oct 11 09:27:16 2019
@@ -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)
  {