sbcl: remove patches that were removed from distinfo during 2.0.7 update

While here, clean up some pkglint

4 files changed, 4 insertions, 75 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 2c93470dfb5..24f61a74e23 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2020/08/10 23:18:51 rjs Exp $
+# $NetBSD: Makefile,v 1.89 2020/08/13 07:24:41 wiz Exp $
 
 DISTNAME=		${PKGNAME_NOREV}-source
 PKGNAME=		sbcl-2.0.7
@@ -67,6 +67,8 @@ SUBST_SED.fix-bins+=		-e 's,ggrep,grep,'
 SUBST_SED.fix-bins+=		-e 's,=199506L,=200112L,'
 SUBST_SED.fix-bins+=		-e 's,=500,=600,'
 
+BUILD_DEFS+=			VARBASE
+
 .if defined(TOOLS_PLATFORM.paxctl)
 SBCL_PAXCTL=	${PAXCTL} +m
 MAKE_ENV+=	SBCL_PAXCTL=${SBCL_PAXCTL:Q}
@@ -74,7 +76,7 @@ MAKE_ENV+=	SBCL_PAXCTL=${SBCL_PAXCTL:Q}
 
 INSTALL_ENV+=	BUILD_ROOT=${DESTDIR:Q}
 INSTALL_ENV+=	INSTALL_ROOT=${PREFIX:Q}
-INSTALL_ENV+=	MAN_DIR=${PREFIX:Q}/${PKGMANDIR} 
+INSTALL_ENV+=	MAN_DIR=${PREFIX:Q}/${PKGMANDIR}
 
 NOT_PAX_MPROTECT_SAFE+=	bin/sbcl
 
diff --git a/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd b/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd
deleted file mode 100644
index 645d137f269..00000000000
--- a/lang/sbcl/patches/patch-src_runtime_Config.arm-netbsd
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_runtime_Config.arm-netbsd,v 1.2 2019/11/10 16:58:31 he Exp $
-
-Use Config.generic-netbsd, don't override OS_LIBS, but add to it.
-
---- src/runtime/Config.arm-netbsd.orig	2019-09-28 09:49:01.000000000 +0000
-+++ src/runtime/Config.arm-netbsd
-@@ -9,14 +9,10 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
-+include Config.generic-netbsd
- include Config.arm-bsd
- 
--ASSEM_SRC += ldso-stubs.S
--OS_LIBS = -lutil -larm
--
--ifdef LISP_FEATURE_SB_THREAD
--  OS_LIBS += -lpthread -lrt
--endif
-+OS_LIBS += -larm
- 
- LINKFLAGS += -export-dynamic
- LDFLAGS += -export-dynamic
diff --git a/lang/sbcl/patches/patch-src_runtime_Config.x86-netbsd b/lang/sbcl/patches/patch-src_runtime_Config.x86-netbsd
deleted file mode 100644
index 141212001b9..00000000000
--- a/lang/sbcl/patches/patch-src_runtime_Config.x86-netbsd
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_runtime_Config.x86-netbsd,v 1.2 2019/11/08 14:42:28 he Exp $
-
-Use Config.generic-netbsd and override OS_SRC
-because Config.x86-bsd should be split into Config.x86-bsd and Config.bsd...
-
---- src/runtime/Config.x86-netbsd.orig	2019-09-28 09:49:01.000000000 +0000
-+++ src/runtime/Config.x86-netbsd
-@@ -10,9 +10,11 @@
- # files for more information.
- 
- include Config.x86-bsd
-+include Config.generic-netbsd
- 
--ASSEM_SRC += ldso-stubs.S
-+OS_SRC = bsd-os.c x86-bsd-os.c
- OS_SRC += undefineds.c
-+
- LINKFLAGS += -dynamic -export-dynamic
- 
- CFLAGS = -g -Wall -O2 -fno-omit-frame-pointer
diff --git a/lang/sbcl/patches/patch-src_runtime_config.arm-bsd b/lang/sbcl/patches/patch-src_runtime_config.arm-bsd
deleted file mode 100644
index ceecd5d37eb..00000000000
--- a/lang/sbcl/patches/patch-src_runtime_config.arm-bsd
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_runtime_config.arm-bsd,v 1.1 2019/11/10 16:58:31 he Exp $
-
-Use Config.generic-bsd.
-Don't set, but add to common vars.
-
---- src/runtime/Config.arm-bsd.orig	2019-09-28 09:49:01.000000000 +0000
-+++ src/runtime/Config.arm-bsd
-@@ -9,19 +9,18 @@
- # provided with absolutely no warranty. See the COPYING and CREDITS
- # files for more information.
- 
-+include Config.generic-bsd
-+
- ASSEM_SRC = arm-assem.S
- ARCH_SRC = arm-arch.c
- 
--OS_SRC = bsd-os.c arm-bsd-os.c
-+OS_SRC += arm-bsd-os.c
- 
- ifdef LISP_FEATURE_GENCGC
-   GC_SRC = fullcgc.c gencgc.c traceroot.c
- else
-   GC_SRC = cheneygc.c
- endif
--ifdef LISP_FEATURE_SB_CORE_COMPRESSION
--  OS_LIBS += -lz
--endif
- 
- # Nothing to do for after-grovel-headers.
- .PHONY: after-grovel-headers