 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.prefs.mk,v 1.424 2022/07/22 09:27:01 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.425 2022/08/01 07:58:21 wiz 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.
 @@ -845,27 +845,31 @@ _PKGSRC_USE_SSP=	no
     ${SSP_SUPPORTED:Uyes:tl} == "yes" && \
     ${_OPSYS_SUPPORTS_SSP:Uno} == "yes"
 _PKGSRC_USE_SSP=	yes
 .endif
 # Enable stack check
 # Generate code to ensure we don't exceed our given stack.
 # Impact: performance drop
+#
 _PKGSRC_USE_STACK_CHECK=no
 .if ${PKGSRC_USE_STACK_CHECK:tl} != "no" && \
     ${STACK_CHECK_SUPPORTED:Uyes:tl} == "yes" && \
     ${_OPSYS_SUPPORTS_STACK_CHECK:Uno} == "yes"
 .  if ${PKGSRC_USE_STACK_CHECK:tl} == "stack-clash"
 _PKGSRC_USE_STACK_CHECK=stack-clash
 .  else
 _PKGSRC_USE_STACK_CHECK=yes
 .  endif
 .endif
 # Enable CTF conversion if the user requested it, the OPSYS supports it, there
 # is a tool for it, and the package supports it.  We also need to explicitly
 # turn on _INSTALL_UNSTRIPPED as conversion is impossible on stripped files.
+#
 .if ${PKGSRC_USE_CTF:Uno:tl} == "yes" && \
     ${_OPSYS_SUPPORTS_CTF:Uno:tl} == "yes" && \
     defined(TOOLS_PLATFORM.ctfconvert) && \
     ${CTF_SUPPORTED:Uyes:tl} == "yes"
 _PKGSRC_USE_CTF=	yes
 _INSTALL_UNSTRIPPED=	# defined
 .else

 @@ -1,14 +1,14 @@
-# $NetBSD: gcc.mk,v 1.245 2022/07/07 16:23:39 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.246 2022/08/01 07:58:21 wiz 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.
+#
 @@ -433,29 +433,31 @@ CWRAPPERS_APPEND.cc+=	${_FORTIFY_CFLAGS}
 # The user or package can choose the level of RELRO.
 .if ${PKGSRC_USE_RELRO} != "partial" && \
     ${RELRO_SUPPORTED:Uyes:tl} != "partial"
 _RELRO_LDFLAGS=		-Wl,-zrelro -Wl,-znow
 .else
 _RELRO_LDFLAGS=		-Wl,-zrelro
 .endif
 .if !empty(_RELRO_LDFLAGS) && !empty(MACHINE_PLATFORM:MNetBSD-*-*mips*)
 _RELRO_LDFLAGS+=	-Wl,-z,common-page-size=0x10000
 .endif
 _STACK_CHECK_CFLAGS=	-fstack-check
 .if ${_PKGSRC_USE_STACK_CHECK} == "yes"
 _STACK_CHECK_CFLAGS=	-fstack-check
 _GCC_CFLAGS+=		${_STACK_CHECK_CFLAGS}
 .elif ${_PKGSRC_USE_STACK_CHECK} == "stack-clash"
 _STACK_CHECK_CFLAGS=	-fstack-clash-protection
 _GCC_CFLAGS+=		${_STACK_CHECK_CFLAGS}
 .endif
 _CTF_CFLAGS=		-gdwarf-2
 # 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

 @@ -1,14 +1,14 @@
-# $NetBSD: mk.conf,v 1.334 2022/06/07 10:04:25 jperkin Exp $
+# $NetBSD: mk.conf,v 1.335 2022/08/01 07:58:21 wiz 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.
 # ************************************************************************
 @@ -295,28 +295,29 @@ PKGSRC_USE_SSP?= strong
 # 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: strong
+#
 # Keywords: ssp
 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
+#	no:	          Do not pass any stack protection flags
-#	yes:	Pass -fstack-check
+#	yes:	          Pass -fstack-check
 #	clash-protection: Pass -fstack-clash-protection
 # 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 xcursor