From d9c3bd49840f3e177728a1bc55865891ac81a2cf Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Sat, 2 Nov 2019 17:02:56 +0000
Subject: lang/clisp: fix build failure on macOS

---
 lang/clisp/buildlink3.mk    |  4 ++--
 lang/clisp/distinfo         |  4 ++--
 lang/clisp/patches/patch-aa | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'lang')

diff --git a/lang/clisp/buildlink3.mk b/lang/clisp/buildlink3.mk
index 05fff083d6d..49cc98916e3 100644
--- a/lang/clisp/buildlink3.mk
+++ b/lang/clisp/buildlink3.mk
@@ -1,5 +1,5 @@
-# $NetBSD: buildlink3.mk,v 1.1 2010/07/09 18:08:05 asau Exp $
-
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/02 17:02:56 rillig Exp $
+#
 # BUILDLINK_DEPMETHOD.clisp?=	build # -- not checked yet
 
 BUILDLINK_TREE+=	clisp
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 42b29f87cf8..bd55bd371a6 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.36 2018/01/29 17:38:23 jperkin Exp $
+$NetBSD: distinfo,v 1.37 2019/11/02 17:02:56 rillig Exp $
 
 SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323
 RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76
 SHA512 (clisp-2.49.tar.gz) = 7885956b373a4c1d04a0b43c229fe8c8694d89982cadce09da6ef03cb56a5705b92f94b564981075c36bb9773a9f16b0b95fef23e942f6245604aefa6600ef98
 Size (clisp-2.49.tar.gz) = 9823111 bytes
-SHA1 (patch-aa) = aa7e25685ed5818f45b550eba0011683dc36bc90
+SHA1 (patch-aa) = 65938825a9d219ddf93f09b306feb857bd83e0b6
 SHA1 (patch-ab) = 93aef2c423ce9e5eabebc20cdc144c83845b19cb
 SHA1 (patch-ac) = c31fcd65d7d37aeaf69c0eee9499bff596b6619b
 SHA1 (patch-modules_readline_readline.lisp) = 1463cb15f6a21374dffc0e585670ac89bb758ff3
diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa
index d72125d15b7..5d7b4686f74 100644
--- a/lang/clisp/patches/patch-aa
+++ b/lang/clisp/patches/patch-aa
@@ -1,12 +1,26 @@
-$NetBSD: patch-aa,v 1.19 2014/05/14 11:24:25 jperkin Exp $
+$NetBSD: patch-aa,v 1.20 2019/11/02 17:02:56 rillig Exp $
 
 Override library subdirectory name for consistency.
 Don't use cache file to avoid trailing space problem.
 Support staged installation of modules.
 Fix SunOS linking.
 
+https://mail-index.netbsd.org/pkgsrc-users/2019/11/02/msg029846.html
+https://sourceforge.net/p/clisp/bugs/740/ (macOS build failure)
+
 --- src/makemake.in.orig	2010-07-07 15:15:35.000000000 +0000
 +++ src/makemake.in
+@@ -577,8 +577,8 @@
+      CROSS=false
+      if [ -z "$HSYS" ]; then # not win32gcc
+        # some shells (A/UX and OSF/1) need the parentheses around "arch" below.
+-       HSYS=`((arch) 2>/dev/null || uname -m 2>/dev/null) | $tolower` # system name in lowercase
+-       HSYSOS=`((uname) 2>/dev/null || arch 2>/dev/null) | $tolower` # OS name in lowercase
++       HSYS=`( (arch) 2>/dev/null || uname -m 2>/dev/null) | $tolower` # system name in lowercase
++       HSYSOS=`( (uname) 2>/dev/null || arch 2>/dev/null) | $tolower` # OS name in lowercase
+        if [ "$HSYS" = 386bsd -o "$HSYS" = sun386 -o "$HSYS" = "386/at" -o "$HSYS" = i86pc ] ; then
+          HSYS='i386'
+        fi
 @@ -1416,42 +1416,42 @@ if [ "${with_dynamic_modules}" != no ];
        XCC_PICFLAG=''
        ;;
-- 
cgit v1.2.3