 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.pkg.mk,v 1.2027 2017/09/16 09:34:25 wiz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.2028 2017/11/12 13:34:14 khorben Exp $
+#
 # This file is in the public domain.
+#
 # Please see the pkgsrc/doc/guide manual for details on the
 # variables used in this make file template.
+#
 # Default sequence for "all" is:
+#
 #    bootstrap-depends
 #    fetch
 #    checksum
 #    depends
 #    tools
 @@ -305,26 +305,30 @@ OVERRIDE_DIRDEPTH?=	2
 # Handle alternatives
+#
 .include "alternatives.mk"
 # Handle alternative init systems
+#
 .if ${_USE_NEW_PKGINSTALL:Uno} == "no"
 .if ${INIT_SYSTEM} == "smf"
 .  include "smf.mk"
 .endif
 .endif
 # Handle Reproducible Builds
+#
 .include "repro/repro.mk"
 # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree
 # of dependencies for building, and the current target.
 _PKGSRC_IN?=		===${SMART_MESSAGES:D> ${.TARGET} [${PKGNAME}${_PKGSRC_DEPS}] ===}
 # Used to print all the '===>' style prompts - override this to turn them off.
 ECHO_MSG?=		${ECHO}
 PHASE_MSG?=		${ECHO_MSG} ${_PKGSRC_IN:Q}\>
 STEP_MSG?=		${ECHO_MSG} "=>"
 INFO_MSG?=		${ECHO_MSG} "INFO:"
 WARNING_MSG?=		${ECHO_MSG} 1>&2 "WARNING:"
 ERROR_MSG?=		${ECHO_MSG} 1>&2 "ERROR:"
 FAIL_MSG?=		${FAIL} ${ERROR_MSG}

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.prefs.mk,v 1.394 2017/11/03 18:07:40 bsiegert Exp $
+# $NetBSD: bsd.prefs.mk,v 1.395 2017/11/12 13:34:14 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.
 @@ -695,26 +695,32 @@ PREPEND_PATH+=		${LOCALBASE}/bin
 .if ${_USE_NEW_PKGINSTALL:Uno} == "no"
 # Support alternative init systems.
+#
 INIT_SYSTEM?=		rc.d
 _BUILD_DEFS+=		INIT_SYSTEM
 .endif
 _PKGSRC_MKPIE=	no
 .if (${PKGSRC_MKPIE:tl} == "yes") && \
     (${_OPSYS_SUPPORTS_MKPIE:Uno} == "yes")
 _PKGSRC_MKPIE=	yes
 .endif
 _PKGSRC_MKREPRO=	no
 .if (${PKGSRC_MKREPRO:tl} == "yes") && \
     (${_OPSYS_SUPPORTS_MKREPRO:Uno} == "yes")
 _PKGSRC_MKREPRO=	yes
 .endif
 _PKGSRC_USE_FORTIFY=	no
 .if (${PKGSRC_USE_FORTIFY:tl} != "no") && \
     (${_OPSYS_SUPPORTS_FORTIFY:Uno} == "yes")
 _PKGSRC_USE_FORTIFY=	yes
 .endif
 _PKGSRC_USE_RELRO=	no
 .if (${PKGSRC_USE_RELRO:tl} != "no") && \
     (${_OPSYS_SUPPORTS_RELRO:Uno} == "yes")
 _PKGSRC_USE_RELRO=	yes
 .endif
 _PKGSRC_USE_SSP=	no

 @@ -1,14 +1,14 @@
-# $NetBSD: gcc.mk,v 1.186 2017/11/07 16:57:58 khorben Exp $
+# $NetBSD: gcc.mk,v 1.187 2017/11/12 13:34:14 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.
+#
 @@ -337,26 +337,37 @@ _MKPIE_CFLAGS.gcc=	-fPIC
 #_MKPIE_CFLAGS.gcc=	-fPIE
 # XXX for libraries a sink wrapper around gcc is required and used instead
 _MKPIE_LDFLAGS.gcc=	-fPIC -pie
 .endif
 .if ${_PKGSRC_MKPIE} == "yes"
 _GCC_CFLAGS+=		${_MKPIE_CFLAGS.gcc}
 #_GCC_LDFLAGS+=		${_MKPIE_LDFLAGS.gcc}
 CWRAPPERS_APPEND.cc+=	${_MKPIE_CFLAGS.gcc}
 # this differs for libraries and executables (handled in mk/cwrappers.mk)
 # CWRAPPERS_APPEND.ld+=	${_MKPIE_LDFLAGS.gcc}
 .endif
 .if ${_PKGSRC_MKREPRO} == "yes"
 .export WRKDIR
 # XXX the dollar sign should not be expanded by the shell
 _GCC_CFLAGS+=		-fdebug-prefix-map=$$$$WRKDIR/=
 .endif
 .if ${_PKGSRC_MKREPRO} == "yes"
 _GCC_CFLAGS+=		${_MKREPRO_CFLAGS.gcc}
 CWRAPPERS_APPEND.cc+=	${_MKREPRO_CFLAGS.gcc}
 .endif
 # The user can choose the level of FORTIFY.
 .if ${PKGSRC_USE_FORTIFY} == "weak"
 _FORTIFY_CFLAGS=	-D_FORTIFY_SOURCE=1
 .else
 _FORTIFY_CFLAGS=	-D_FORTIFY_SOURCE=2
 .endif
 .if ${_PKGSRC_USE_FORTIFY} == "yes"
 _GCC_CFLAGS+=		${_FORTIFY_CFLAGS}
 CWRAPPERS_APPEND.cc+=	${_FORTIFY_CFLAGS}
 .endif
 # The user can choose the level of RELRO.

 @@ -1,14 +1,14 @@
-# $NetBSD: mk.conf,v 1.285 2017/10/28 15:56:48 schmonz Exp $
+# $NetBSD: mk.conf,v 1.286 2017/11/12 13:34:14 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.
 # ************************************************************************
 @@ -221,26 +221,37 @@ PKGSRC_RUN_TEST?=	no
 # their tests, so need to make sure that there are always enough random
 # numbers on your machine. The package security/bitstir may help here.
+#
 # Possible: yes, no
 # Default: no
 PKGSRC_MKPIE?= no
 # If no, create regular executables. Otherwise create PIE (Position Independent
 # Executables, on supported platforms). This option is necessary to fully
 # leverage ASLR as a mitigation for security vulnerabilities.
 # Possible: yes, no
 # Default: no
 PKGSRC_MKREPRO?= no
 # If no, do not alter the build process. Otherwise, try to build reproducibly.
 # This allows packages built from the same tree and options to produce identical
 # results bit by bit.
 # This option should be combined with ASLR and PKGSRC_MKPIE to avoid predictable
 # address offsets for attackers attempting to exploit security vulnerabilities.
 # Possible: yes, no
 # Default: no
+#
 # Keywords: reproducible
 PKGSRC_USE_FORTIFY?= strong
 # Turns on substitute wrappers for commonly used functions that do not bounds
 # checking regularly, but could in some cases. This is effectively in use only
 # when both enabled and supported.
 # Possible values:
 #	no:     Do not pass any flags for FORTIFY
 #	weak:   Pass -D_FORTIFY_SOURCE=1
 #	strong: Pass -D_FORTIFY_SOURCE=2
 # Default: strong
+#
 # Keywords: fortify FORTIFY_SOURCE
 PKGSRC_USE_RELRO?= no

 @@ -1,14 +1,14 @@
-# $NetBSD: NetBSD.mk,v 1.56 2017/10/03 13:18:00 jperkin Exp $
+# $NetBSD: NetBSD.mk,v 1.57 2017/11/12 13:34:14 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
 @@ -132,26 +132,29 @@ _OPSYS_SUPPORTS_FORTIFY=yes
 # Register support for PIE on supported architectures (with GCC)
 .if (${MACHINE_ARCH} == "i386") || \
     (${MACHINE_ARCH} == "x86_64")
 _OPSYS_SUPPORTS_MKPIE=	yes
 .endif
 # Register support for RELRO on supported architectures (with GCC)
 .if (${MACHINE_ARCH} == "i386") || \
     (${MACHINE_ARCH} == "x86_64")
 _OPSYS_SUPPORTS_RELRO=	yes
 .endif
 # Register support for REPRO (with GCC)
 _OPSYS_SUPPORTS_MKREPRO=	yes
 # 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