[pkgsrc/trunk]: pkgsrc/devel/nspr Don't pass "--with-macos-sdk=/nonexistent"....

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aea8e9750fa0
branches:  trunk
changeset: 439566:aea8e9750fa0
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Sep 20 20:01:19 2020 +0000

description:
Don't pass "--with-macos-sdk=/nonexistent". Fixes this error on Catalina
with Xcode 12:

configure: error: SDK not found.  When using --with-macos-sdk, you must
specify a valid SDK.  SDKs are installed when the optional cross-development
tools are selected during the Xcode/Developer Tools installation.

While here, merge some of the Darwin conditional logic.

diffstat:

 devel/nspr/Makefile |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (27 lines):

diff -r 1cf888c4a41c -r aea8e9750fa0 devel/nspr/Makefile
--- a/devel/nspr/Makefile       Sun Sep 20 18:33:13 2020 +0000
+++ b/devel/nspr/Makefile       Sun Sep 20 20:01:19 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2020/09/19 23:53:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.109 2020/09/20 20:01:19 schmonz Exp $
 
 DISTNAME=      nspr-${NSPR_RELEASE:S/.0$//}
 NSPR_RELEASE=  4.29.0
@@ -85,15 +85,12 @@
 .endif
 
 .if ${OPSYS} == "Darwin"
-# Avoid using invalid deployment targets.
-CONFIGURE_ARGS+=       --with-macos-sdk=/nonexistent
 .  if defined(ABI) && ${ABI} == "64"
 CONFIGURE_ARGS+=       --enable-64bit
 .  endif
-.endif
-
-.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon)
+.  if exists(/Developer/Headers/FlatCarbon)
 BUILDLINK_PASSTHRU_DIRS+=      Developer/Headers/FlatCarbon
+.  endif
 .endif
 
 pre-configure: