CVS commit: pkgsrc/devel/scmcvs

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 11 09:08:35 UTC 2019

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

Log Message:
cvs: Disable custom getcwd() implementation on Darwin.

It completely breaks on Catalina for some reason, so just use the native
version which works fine.  This commit brought to you by a patched binary
running on Catalina.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/scmcvs/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/scmcvs/distinfo
cvs rdiff -u -r1.1 -r1.2 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/Makefile
diff -u pkgsrc/devel/scmcvs/Makefile:1.18 pkgsrc/devel/scmcvs/Makefile:1.19
--- pkgsrc/devel/scmcvs/Makefile:1.18   Mon Aug 21 22:57:45 2017
+++ pkgsrc/devel/scmcvs/Makefile        Fri Oct 11 09:08:35 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2017/08/21 22:57:45 tez Exp $
+# $NetBSD: Makefile,v 1.19 2019/10/11 09:08:35 jperkin Exp $
 
 DISTNAME=      cvs-1.12.13
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    devel scm
 MASTER_SITES=  http://ftp.gnu.org/non-gnu/cvs/source/feature/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.bz2
@@ -15,7 +15,8 @@ USE_TOOLS+=           makeinfo autoconf
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-external-zlib
 CONFIGURE_ARGS+=       --with-rsh=ssh
-CONFIGURE_ENV+=                PERL=${TOOLS_PERL5} gl_cv_func_getcwd_null=yes
+CONFIGURE_ENV+=                PERL=${TOOLS_PERL5}
+CONFIGURE_ENV+=                gl_cv_func_getcwd_null=yes
 
 CHECK_INTERPRETER_SKIP=        share/cvs/contrib/*
 INFO_FILES=            yes

Index: pkgsrc/devel/scmcvs/distinfo
diff -u pkgsrc/devel/scmcvs/distinfo:1.21 pkgsrc/devel/scmcvs/distinfo:1.22
--- pkgsrc/devel/scmcvs/distinfo:1.21   Mon Dec 18 08:51:48 2017
+++ pkgsrc/devel/scmcvs/distinfo        Fri Oct 11 09:08:35 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2017/12/18 08:51:48 adam Exp $
+$NetBSD: distinfo,v 1.22 2019/10/11 09:08:35 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) = 09a607426b672f44c1882b82812e6ca81efdcf8e
+SHA1 (patch-bb) = 54cb5ebb1f4ec9e3f8f514914958d8a3cce59dab
 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.1 pkgsrc/devel/scmcvs/patches/patch-bb:1.2
--- pkgsrc/devel/scmcvs/patches/patch-bb:1.1    Wed Aug 13 18:30:03 2014
+++ pkgsrc/devel/scmcvs/patches/patch-bb        Fri Oct 11 09:08:35 2019
@@ -1,17 +1,23 @@
-$NetBSD: patch-bb,v 1.1 2014/08/13 18:30:03 cheusov Exp $
+$NetBSD: patch-bb,v 1.2 2019/10/11 09:08:35 jperkin Exp $
 
 Do use non-standard getcwd(NULL, 0); This unbreaks cvs on Interix.
---- lib/xgetcwd.c.orig Mon Sep 19 21:12:25 2005
-+++ lib/xgetcwd.c      Wed Aug 13 17:58:42 2014
-@@ -25,6 +25,7 @@
+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 @@
  #include "xgetcwd.h"
  
  #include <errno.h>
 +#include <limits.h>
  
++#ifndef __APPLE__
  #include "getcwd.h"
++#endif
  #include "xalloc.h"
-@@ -36,8 +37,8 @@
+ 
+ /* Return the current directory, newly allocated.
+@@ -36,8 +39,8 @@
  char *
  xgetcwd (void)
  {