Remove NetBSD 0.x and 1.x settings, these have long since been unsupported.

4 files changed, 5 insertions, 35 deletions

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 51e26380b99..cfd28f8b1d6 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.367 2015/07/25 15:11:09 sevan Exp $
+# $NetBSD: bsd.prefs.mk,v 1.368 2015/09/08 11:36:34 jperkin Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -389,28 +389,6 @@ PKGPATH?=		${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
 # Load the settings from MAKECONF, which is /etc/mk.conf by default.
 .include <bsd.own.mk>
 
-# /usr/share/mk/bsd.own.mk on NetBSD 1.3 does not define OBJECT_FMT
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.3*)
-.  if ${MACHINE_ARCH} == "alpha" || \
-      ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-      ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
-OBJECT_FMT?=		ELF
-.  else
-OBJECT_FMT?=		a.out
-.  endif
-# override what bootstrap-pkgsrc sets, which isn't right for NetBSD
-# 1.4.
-# XXX other ELF platforms in 1.4 need to be added to here.
-.elif !empty(MACHINE_PLATFORM:MNetBSD-1.4*)
-.  if ${MACHINE_ARCH} == "alpha" || \
-      ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-      ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
-OBJECT_FMT=		ELF
-.  else
-OBJECT_FMT=		a.out
-.  endif
-.endif
-
 .if ${OPSYS} == "OpenBSD"
 .  if defined(ELF_TOOLCHAIN) && ${ELF_TOOLCHAIN} == "yes"
 OBJECT_FMT?=	ELF
diff --git a/mk/curses.builtin.mk b/mk/curses.builtin.mk
index 8cb637af1b7..0b4f4a9d169 100644
--- a/mk/curses.builtin.mk
+++ b/mk/curses.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: curses.builtin.mk,v 1.8 2014/03/09 10:15:32 roy Exp $
+# $NetBSD: curses.builtin.mk,v 1.9 2015/09/08 11:36:34 jperkin Exp $
 
 BUILTIN_PKG:=	curses
 
@@ -126,8 +126,7 @@ USE_BUILTIN.curses=	no
 # some system curses just are not good enough.
 # If your system is one, add it here so a suitable
 # curses from pkgsrc can be installed.
-_INCOMPAT_CURSES?=	NetBSD-0.*-* NetBSD-1.[0123]*-*			\
-			NetBSD-1.4.*-* NetBSD-1.4[A-X]-*
+_INCOMPAT_CURSES?=
 .for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
 .  if !empty(MACHINE_PLATFORM:M${_pattern_})
 USE_BUILTIN.curses=	no
diff --git a/mk/emulator/emulator-vars.mk b/mk/emulator/emulator-vars.mk
index b25d55fa07b..180b5e480ac 100644
--- a/mk/emulator/emulator-vars.mk
+++ b/mk/emulator/emulator-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emulator-vars.mk,v 1.8 2007/10/09 20:34:48 rillig Exp $
+# $NetBSD: emulator-vars.mk,v 1.9 2015/09/08 11:36:34 jperkin Exp $
 #
 # This file is included by bsd.prefs.mk only if EMUL_PLATFORMS is defined
 # and non-empty.
@@ -86,11 +86,7 @@ _EMUL_PREFER.netbsd-i386=	linux-i386 freebsd-i386 solaris-i386 darwin-i386
 _EMUL_PREFER.netbsd-m68k=	sunos-m68k linux-m68k
 _EMUL_PREFER.netbsd-powerpc=	linux-powerpc darwin-powerpc
 _EMUL_PREFER.netbsd-sparc64=	netbsd-sparc solaris-sparc64 solaris-sparc sunos-sparc
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.*-sparc*)
-_EMUL_PREFER.netbsd-sparc=	sunos-sparc
-.else
 _EMUL_PREFER.netbsd-sparc=	solaris-sparc sunos-sparc
-.endif
 _EMUL_PREFER.netbsd-x86_64=	netbsd-i386 linux-x86_64 linux-i386
 
 _EMUL_PREFER.dragonfly-i386=	linux-i386
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index a8bcee7a6ce..188cd5677a9 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.56 2015/02/16 11:01:40 jperkin Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.57 2015/09/08 11:36:34 jperkin Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -32,9 +32,6 @@ TOOLS_PLATFORM.file?=		/usr/bin/file
 TOOLS_PLATFORM.find?=		/usr/bin/find
 TOOLS_PLATFORM.flex?=		/usr/bin/lex
 TOOLS_PLATFORM.ftp?=		/usr/bin/ftp
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*-*)
-TOOLS_PLATFORM.gawk?=		${TOOLS_PLATFORM.awk}
-.endif
 .if exists(/usr/bin/gettext)
 TOOLS_PLATFORM.gettext?=	/usr/bin/gettext
 .endif