 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.prefs.mk,v 1.392 2017/06/01 02:15:10 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.393 2017/07/09 14:30:07 khorben 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.
 @@ -707,26 +707,32 @@ _PKGSRC_USE_FORTIFY=	yes
 _PKGSRC_USE_RELRO=	no
 .if (${PKGSRC_USE_RELRO:tl} != "no") && \
     (${_OPSYS_SUPPORTS_RELRO:Uno} == "yes")
 _PKGSRC_USE_RELRO=	yes
 .endif
 _PKGSRC_USE_SSP=	no
 .if (${PKGSRC_USE_SSP:tl} != "no") && \
     (${_OPSYS_SUPPORTS_SSP:Uno} == "yes")
 _PKGSRC_USE_SSP=	yes
 .endif
 _PKGSRC_USE_STACK_CHECK=no
 .if (${PKGSRC_USE_STACK_CHECK:tl} != "no") && \
     (${_OPSYS_SUPPORTS_STACK_CHECK:Uno} == "yes")
 _PKGSRC_USE_STACK_CHECK=yes
 .endif
 # Enable cwrappers if not building the wrappers themselves, and if the user has
 # explicitly requested them, or if they haven't but the compiler/platform is
 # known to support them.
 .if empty(PKGPATH:Mpkgtools/cwrappers) && \
     (${USE_CWRAPPERS:tl} == "yes" || \
     (${USE_CWRAPPERS:tl} == "auto" && \
      ${_OPSYS_SUPPORTS_CWRAPPERS:Uno} == "yes"))
 _USE_CWRAPPERS=		yes
 .else
 _USE_CWRAPPERS=		no
 .endif
 # Wrapper framework definitions

 @@ -1,14 +1,14 @@
-# $NetBSD: gcc.mk,v 1.179 2017/06/25 01:41:15 joerg Exp $
+# $NetBSD: gcc.mk,v 1.180 2017/07/09 14:30:07 khorben Exp $
+#
 # This is the compiler definition for the GNU Compiler Collection.
+#
 # User-settable variables:
+#
 # GCCBASE
 #	If using a native GCC and the compiler is not in $PATH then
 #	this should be set to the base installation directory.
+#
 # USE_NATIVE_GCC
 #	When set to "yes", the native gcc is used, no matter which
 #	compiler version a package requires.
+#
 @@ -362,26 +362,32 @@ _RELRO_LDFLAGS=		-Wl,-z,relro -Wl,-z,now
 _GCC_LDFLAGS+=		${_RELRO_LDFLAGS}
 CWRAPPERS_APPEND.ld+=	${_RELRO_LDFLAGS}
 .endif
 # The user can choose the level of stack smashing protection.
 .if ${PKGSRC_USE_SSP} == "all"
 _SSP_CFLAGS=		-fstack-protector-all
 .elif ${PKGSRC_USE_SSP} == "strong"
 _SSP_CFLAGS=		-fstack-protector-strong
 .else
 _SSP_CFLAGS=		-fstack-protector
 .endif
 _STACK_CHECK_CFLAGS=	-fstack-check
 .if ${_PKGSRC_USE_STACK_CHECK} == "yes"
 _GCC_CFLAGS+=		${_STACK_CHECK_CFLAGS}
 .endif
 # GCC has this annoying behaviour where it advocates in a multi-line
 # banner the use of "#include" over "#import" when including headers.
 # This generates a huge number of warnings when building practically all
 # Objective-C code where it is convention to use "#import".  Suppress
 # the warning if we're building Objective-C code using GCC.
+#
 .if !empty(_LANGUAGES.gcc:Mobjc)
 CFLAGS+=	-Wno-import
 .endif
 CFLAGS+=	${_GCC_CFLAGS}
 .if !empty(_NEED_GCC2:M[yY][eE][sS])

 @@ -1,14 +1,14 @@
-# $NetBSD: mk.conf,v 1.277 2017/07/05 15:58:30 khorben Exp $
+# $NetBSD: mk.conf,v 1.278 2017/07/09 14:30:07 khorben Exp $
+#
 # This file provides default values for variables that may be overridden
 # in the MAKECONF file, which is /etc/mk.conf by default.
+#
 # Note: This file is included after the MAKECONF file, so you cannot query
 # these default values in the MAKECONF using the ".if" and ".for"
 # preprocessing directives.
 # ************************************************************************
 # NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
 # ************************************************************************
 @@ -248,26 +248,33 @@ PKGSRC_USE_RELRO?= no
 #	no:      Do not pass any flags for RELRO
 #	partial: Pass -Wl,-z,relro
 #	full:    Pass -Wl,-z,relro -Wl,-z,now
 PKGSRC_USE_SSP?= yes
 # Configure this to enable stack smashing protection (on supported platforms).
 # Possible values:
 #	no:	Do not pass any stack protection flags
 #	yes:	Pass -fstack-protector
 #	strong:	Pass -fstack-protector-strong
 #	all:	Pass -fstack-protector-all
 # Default: yes
 PKGSRC_USE_STACK_CHECK?= no
 # Configure this to enable stack boundary verification (on supported platforms).
 # Possible values:
 #	no:	Do not pass any stack protection flags
 #	yes:	Pass -fstack-check
 # Default: no
 # The default PREFER_PKGSRC should be empty, but due to historical reasons we have the list below.
 # Please add your platform here once you have confirmed it is correct
 .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig"
 PREFER_PKGSRC?=
 .elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
      exists(/usr/X11R7/lib/libX11.so))
 PREFER_PKGSRC?=
 .elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
      exists(/usr/lib/libexpat.so))
 PREFER_PKGSRC?=		MesaLib Xft2 Xrandr Xrender fontconfig	\
 			freetype2 glu randrproto renderproto xcursor
 .elif !empty(MACHINE_PLATFORM:MLinux-*-*) && \
       (!defined(X11_TYPE) || ${X11_TYPE} == "native")

 @@ -1,14 +1,14 @@
-# $NetBSD: NetBSD.mk,v 1.51 2017/07/04 18:29:24 khorben Exp $
+# $NetBSD: NetBSD.mk,v 1.52 2017/07/09 14:30:07 khorben Exp $
+#
 # Variable definitions for the NetBSD operating system.
 # Needed for 1.6.1 and earlier due to rpcgen bugs and paths
 .if defined(CPP) && ${CPP} == "cpp"
 CPP=		/usr/bin/cpp
 .endif
 ECHO_N?=	${ECHO} -n
 IMAKE_MAKE?=	${MAKE}		# program which gets invoked by imake
 PKGLOCALEDIR?=	share
 PS?=		/bin/ps
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin
 @@ -144,22 +144,28 @@ _OPSYS_SUPPORTS_MKPIE=	yes
 .if (${MACHINE_ARCH} == "i386") || \
     (${MACHINE_ARCH} == "x86_64")
 _OPSYS_SUPPORTS_RELRO=	yes
 .endif
 # Register support for SSP on most architectures (with GCC)
 .if (${MACHINE_ARCH} != "alpha") && \
     (${MACHINE_ARCH} != "hppa") && \
     (${MACHINE_ARCH} != "ia64") && \
     (${MACHINE_ARCH} != "mips")
 _OPSYS_SUPPORTS_SSP=	yes
 .endif
 # Register support for stack check on supported architectures (with GCC)
 .if (${MACHINE_ARCH} == "i386") || \
     (${MACHINE_ARCH} == "x86_64")
 _OPSYS_SUPPORTS_STACK_CHECK=	yes
 .endif
 _OPSYS_SUPPORTS_CWRAPPERS=	yes
 # use readelf in check/bsd.check-vars.mk
 _OPSYS_CAN_CHECK_RELRO=		yes
 _OPSYS_CAN_CHECK_SHLIBS=	yes
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax