 @@ -1,14 +1,14 @@
-# $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.
+#
 # Packages should include this file before any of the .if directives, as
 # well as before modifying variables like CFLAGS, LDFLAGS, and so on.
 # Otherwise the behavior may be unexpected.
+#
 # When mk.conf is included by this file, the following variables are
 # defined:
+#
 # ACCEPTABLE_LICENSES
 #	This variable is set to the list of Open Source licenses. See
 #	mk/license.mk for details.
 @@ -379,48 +379,26 @@ MAKE_ENV+=		USETOOLS=no
 # Set this before <bsd.own.mk> does, since it doesn't know about Darwin
 .if ${OPSYS} == "Darwin"
 OBJECT_FMT?=		Mach-O
 .endif
 ACCEPTABLE_LICENSES?=	${DEFAULT_ACCEPTABLE_LICENSES}
 # Provide PKGPATH early on so that mk.conf can use it.
 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
 .  else
 OBJECT_FMT?=	a.out
 .  endif
 .elif ${OPSYS} == "FreeBSD"
 OBJECT_FMT?=	ELF
 .elif ${OPSYS} == "DragonFly"
 OBJECT_FMT=	ELF
 .elif ${OPSYS} == "MirBSD"
 OBJECT_FMT=	ELF
 MKPROFILE=	no

 @@ -1,14 +1,14 @@
-# $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
 BUILTIN_FIND_LIBS:=		curses
 BUILTIN_FIND_HEADERS_VAR:=	H_CURSES
 BUILTIN_FIND_HEADERS.H_CURSES=	curses.h
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_HALFDELAY
 BUILTIN_FIND_FILES.H_CURSES_HALFDELAY=	${BUILTIN_FIND_FILES.H_CURSES}
 BUILTIN_FIND_GREP.H_CURSES_HALFDELAY=	halfdelay
 BUILTIN_FIND_FILES_VAR+=	 H_CURSES_RESIZETERM
 BUILTIN_FIND_FILES.H_CURSES_RESIZETERM=	${BUILTIN_FIND_FILES.H_CURSES}
 @@ -116,28 +116,27 @@ USE_BUILTIN.curses=	no
 .      if !empty(MACHINE_PLATFORM:MNetBSD-[0-4].*-*)
 USE_BUILTIN.curses=	no
 .      endif
 .    else
 USE_BUILTIN.curses=	no
 .    endif
 .  endif
 .endif
 # Even if the package requested tests above pass,
 # 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]*-*			\
+_INCOMPAT_CURSES?=
 			NetBSD-1.4.*-* NetBSD-1.4[A-X]-*
 .for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
 .  if !empty(MACHINE_PLATFORM:M${_pattern_})
 USE_BUILTIN.curses=	no
 .  endif
 .endfor
 MAKEVARS+=	USE_BUILTIN.curses
 # Define BUILTIN_LIBNAME.curses to be the base name of the built-in
 # curses library.
+#
 .if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.curses=		curses

 @@ -1,14 +1,14 @@
-# $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.
+#
 # User-settable variables:
+#
 # EMUL_TYPE.${EMUL_OPSYS}
 #	Specifies the "type" or "variant" of ${EMUL_OPSYS} to use, e.g.
 #	${EMUL_TYPE.linux} == "suse".
+#
 # EMUL_PLATFORM
 #	Specifies the platform to emulate, and is of the form
 #	${EMUL_OPSYS}-${EMUL_ARCH}, e.g. linux-i386.  By default
 @@ -76,31 +76,27 @@ _EMUL_OPSYS.SunOS=	solaris
 _EMUL_OPSYS=		${_EMUL_OPSYS.${OPSYS}}
 .else
 _EMUL_OPSYS=		${LOWER_OPSYS}
 .endif
 _EMUL_MACHINE_PLATFORM=	${_EMUL_OPSYS}-${MACHINE_ARCH}
 _EMUL_PREFER.netbsd-alpha=	osf1-alpha linux-alpha
 _EMUL_PREFER.netbsd-arm=	linux-arm
 _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
 _EMUL_PREFER.solaris-sparc64=	solaris-sparc
 _EMUL_PREFER.solaris-x86_64=	solaris-i386
 _EMUL_PREFER.linux-sparc64=	linux-sparc
 _EMUL_PREFER.linux-x86_64=	linux-i386
 # Prefer "emulating" the native operating system, then fall back to
 # the other preferences listed above.
+#

 @@ -1,14 +1,14 @@
-# $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.
 TOOLS_PLATFORM.[?=		[			# shell builtin
 TOOLS_PLATFORM.awk?=		/usr/bin/awk
 TOOLS_PLATFORM.basename?=	/usr/bin/basename
 TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
 .if exists(/usr/bin/bzcat)
 TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
 .endif
 TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
 TOOLS_PLATFORM.cat?=		/bin/cat
 TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
 @@ -22,29 +22,26 @@ TOOLS_PLATFORM.date?=		/bin/date
 TOOLS_PLATFORM.diff?=		/usr/bin/diff
 TOOLS_PLATFORM.diff3?=		/usr/bin/diff3
 TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
 TOOLS_PLATFORM.echo?=		echo			# shell builtin
 TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
 TOOLS_PLATFORM.env?=		/usr/bin/env
 TOOLS_PLATFORM.expr?=		/bin/expr
 TOOLS_PLATFORM.false?=		false			# shell builtin
 TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
 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
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
 TOOLS_PLATFORM.groff?=		/usr/bin/groff
 TOOLS_PLATFORM.gsoelim?=	${TOOLS_PLATFORM.soelim}	# GNUish
 TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
 TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
 TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.ident?=		/usr/bin/ident