Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.2011 2015/03/07 21:14:32 tnn Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.2013 2015/04/29 14:23:23 jperkin Exp $
 #
 # This file is in the public domain.
 #
@@ -406,10 +406,11 @@ fake-home: ${FAKEHOMEDIR}
 ${FAKEHOMEDIR}:
 	${RUN} ${MKDIR} ${.TARGET}

-.include "wrapper/bsd.wrapper.mk"
-
-.if ${USE_CWRAPPERS:tl} != "no"
+# Use C-based wrappers or legacy shell versions.
+.if ${_USE_CWRAPPERS} == "yes"
 .include "cwrappers.mk"
+.else
+.include "wrapper/bsd.wrapper.mk"
 .endif

 .if defined(ABI_DEPENDS) || defined(BUILD_ABI_DEPENDS)
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.58 2014/12/30 15:13:19 wiz Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.59 2015/05/04 19:23:19 joerg Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -80,10 +80,8 @@ BUILD_DEFS+=		KERBEROS

 #
 # PKG_LIBTOOL is the path to the libtool script installed by libtool-base.
-# _LIBTOOL is the path the libtool used by the build, which could be the
-#	path to a libtool wrapper script.
 # LIBTOOL is the publicly-readable variable that should be used by
-#	Makefiles to invoke the proper libtool.
+#	Makefiles to invoke the proper (wrapped) libtool.
 #
 .if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran) || \
    defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran77)
@@ -106,10 +104,8 @@ PKG_LIBTOOL?=		${LOCALBASE}/bin/libtool
 PKG_SHLIBTOOL?=		${LOCALBASE}/bin/shlibtool
 .  endif
 .endif
-_LIBTOOL?=		${PKG_LIBTOOL}
-_SHLIBTOOL?=		${PKG_SHLIBTOOL}
-LIBTOOL?=		${PKG_LIBTOOL}
-SHLIBTOOL?=		${PKG_SHLIBTOOL}
+LIBTOOL?=		${WRAPPER_BINDIR}/libtool
+SHLIBTOOL?=		${WRAPPER_BINDIR}/shlibtool
 .if defined(USE_LIBTOOL)
 LIBTOOL_REQD?=		2.2.6bnb3
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.361 2015/03/14 17:37:19 sevan Exp $
+# $NetBSD: bsd.prefs.mk,v 1.365 2015/06/04 15:48:46 sevan Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -147,6 +147,13 @@ LOWER_VENDOR?=		ibm
 .elif ${OPSYS} == "BSDOS"
 LOWER_OPSYS?=		bsdi

+.elif ${OPSYS} == "Bitrig"
+LOWER_OPSYS?= 		bitrig
+LOWER_ARCH!= 		${UNAME} -p
+MACHINE_ARCH= 		${LOWER_ARCH}
+MAKEFLAGS+= 		LOWER_ARCH=${LOWER_ARCH:Q}
+LOWER_VENDOR?= 		unknown
+
 .elif ${OPSYS} == "Cygwin"
 LOWER_OPSYS?=		cygwin
 LOWER_VENDOR?=		pc
@@ -281,9 +288,12 @@ LOWER_VENDOR?=		dec

 .elif ${OPSYS} == "HPUX"
 OS_VERSION:=		${OS_VERSION:C/^B.//}
-.if ${MACHINE_ARCH} == "9000"
-MACHINE_ARCH=		hppa
-.endif
+.  if ${MACHINE_ARCH} == "9000"
+ABI?=			32
+MACHINE_ARCH.32=	hppa
+MACHINE_ARCH.64=	hppa64
+MACHINE_ARCH=		${MACHINE_ARCH.${ABI}}
+.  endif
 LOWER_OPSYS?=		hpux
 LOWER_OPSYS_VERSUFFIX?=	${OS_VERSION}
 LOWER_VENDOR?=		hp
@@ -417,9 +427,12 @@ OBJECT_FMT=	XCOFF
 .elif ${OPSYS} == "OSF1"
 OBJECT_FMT=	ECOFF
 .elif ${OPSYS} == "HPUX"
-.  if ${MACHINE_ARCH} == "ia64" || (defined(ABI) && ${ABI} == "64")
+.  if ${MACHINE_ARCH} == "ia64"
 OBJECT_FMT=	ELF
-.  else
+.  elif ${MACHINE_ARCH} == "hppa64"
+# it is ELF but for most purposes behaves like SOM (.sl suffix, ...)
+OBJECT_FMT=	SOM
+.  else # hppa
 OBJECT_FMT=	SOM
 .  endif
 .elif ${OPSYS} == "Cygwin"
@@ -477,6 +490,8 @@ DISTFILES=		# none
 PLIST_SRC=		# none
 CHECK_PERMS=		no
 USE_LANGUAGES=		# empty
+WRKSRC=			${WRKDIR}
+
 do-patch:
 	@${DO_NADA}
 do-install:
@@ -791,6 +806,13 @@ PREPEND_PATH+=		${LOCALBASE}/bin
 INIT_SYSTEM?=		rc.d
 _BUILD_DEFS+=		INIT_SYSTEM

+# Enable cwrappers if requested unless we're building the wrappers themselves.
+.if ${USE_CWRAPPERS:tl} != "no" && empty(PKGPATH:Mpkgtools/cwrappers)
+_USE_CWRAPPERS=		yes
+.else
+_USE_CWRAPPERS=		no
+.endif
+
 # Wrapper framework definitions
 .include "wrapper/wrapper-defs.mk"

--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.234 2015/03/15 21:18:32 joerg Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.236 2015/05/04 19:23:19 joerg Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -77,7 +77,7 @@
 .if ${PKG_DEBUG_LEVEL} > 0
 ECHO_BUILDLINK_MSG?=	${ECHO}
 .else
-ECHO_BUILDLINK_MSG?=	${ECHO_WRAPPER_MSG}
+ECHO_BUILDLINK_MSG?=	${TRUE}
 .endif
 BUILDLINK_DIR=		${WRKDIR}/.buildlink
 BUILDLINK_BINDIR=	${BUILDLINK_DIR}/bin
@@ -1069,8 +1069,6 @@ WRAPPER_TRANSFORM_CMDS+=	${_BLNK_TRANSFORM}
 .if defined(USE_LIBTOOL)
 WRAPPEES+=		LIBTOOL
 WRAPPEES+=		SHLIBTOOL
-_LIBTOOL=		${WRAPPER_LIBTOOL}
-_SHLIBTOOL=		${WRAPPER_SHLIBTOOL}
 .endif
 _WRAP_ALIASES.LIBTOOL=		libtool
 _WRAP_ALIASES.SHLIBTOOL=	shlibtool
--- a/mk/check/check-interpreter.mk
+++ b/mk/check/check-interpreter.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-interpreter.mk,v 1.28 2014/10/12 23:39:17 joerg Exp $
+# $NetBSD: check-interpreter.mk,v 1.29 2015/04/29 13:05:28 jperkin Exp $
 #
 # This file checks that after installation, all files of the package
 # that start with a "#!" line will find their interpreter. Files that
@@ -53,7 +53,7 @@ _check-interpreter: error-check .PHONY
 		${_CHECK_INTERP_SKIP:@p@${p}) continue ;;@}		\
 		*) ;;							\
 		esac;							\
-		if [ ! -f "$$file" ]; then				\
+		if [ ! -x "$$file" ]; then				\
 			continue;					\
 		fi;							\
 		if [ ! -r "$$file" ]; then				\
@@ -74,15 +74,8 @@ _check-interpreter: error-check .PHONY
 			fi;						\
 			continue;;					\
 		esac;							\
-									\
 		if { [ ! -f ${DESTDIR:Q}"$$interp" ] &&			\
 		     [ ! -f "$$interp" ]; }; then			\
-									\
-			if [ -x "$$file" ]; then			\
-				${DELAYED_ERROR_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"${DESTDIR}${PREFIX}/$$file\" does not exist."; \
-			else						\
-									\
-				${DELAYED_WARNING_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"${DESTDIR}${PREFIX}/$$file\" does not exist."; \
-			fi;						\
+			${DELAYED_ERROR_MSG} "[check-interpreter.mk] The interpreter \"$$interp\" of \"${DESTDIR}${PREFIX}/$$file\" does not exist."; \
 		fi;							\
 	done
--- a/mk/check/check-wrkref.mk
+++ b/mk/check/check-wrkref.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.23 2014/10/12 23:39:17 joerg Exp $
+# $NetBSD: check-wrkref.mk,v 1.24 2015/04/29 13:39:43 jperkin Exp $
 #
 # This file checks that the installed files don't contain any strings
 # that point to the directory where the package had been built, to make
@@ -93,10 +93,8 @@ _check-wrkref: error-check .PHONY
 		*) ;;							\
 		esac;							\
 		${SHCOMMENT} "[$$file]";				\
-		for d in ${_CHECK_WRKREF_DIRS}; do			\
-			grep "$$d" "${DESTDIR}$$file" 2>/dev/null |	\
-			sed -e "s|^|$$file:	|";			\
-		done;							\
+		${EGREP} "${_CHECK_WRKREF_DIRS:ts|}" "${DESTDIR}$$file" \
+		    2>/dev/null | ${SED} -e "s|^|$$file:	|";	\
 	done
 	${RUN}								\
 	exec 1>>${ERROR_DIR}/${.TARGET};				\
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.155 2015/02/04 14:11:50 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.161 2015/04/27 10:33:49 tnn Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -338,16 +338,16 @@ CFLAGS+=	-Wno-import

 .if !empty(_NEED_GCC2:M[yY][eE][sS])
 #
-# We require gcc-2.x in the lang/gcc directory.
+# We require gcc-2.x in the lang/gcc2 directory.
 #
-_GCC_PKGBASE=		gcc
-.  if !empty(PKGPATH:Mlang/gcc)
+_GCC_PKGBASE=		gcc2
+.  if !empty(PKGPATH:Mlang/gcc2)
 _IGNORE_GCC=		yes
 MAKEFLAGS+=		_IGNORE_GCC=yes
 .  endif
 .  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
-_GCC_PKGSRCDIR=		../../lang/gcc
-_GCC_DEPENDENCY=	gcc>=${_GCC_REQD}:../../lang/gcc
+_GCC_PKGSRCDIR=		../../lang/gcc2
+_GCC_DEPENDENCY=	gcc2>=${_GCC_REQD}:../../lang/gcc2
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
        !empty(_LANGUAGES.gcc:Mfortran77) || \
        !empty(_LANGUAGES.gcc:Mobjc)
@@ -668,12 +668,12 @@ _GCC_ARCHDIR!=		\
 .    if defined(MABIFLAG) && !empty(MABIFLAG)
 _GCC_PREFIX:=		${_GCC_ARCHDIR:H:H:H:H:H}/
 _GCC_SUBPREFIX:=	${_GCC_ARCHDIR:H:H:H:H:H:T}/
-.    else
-_GCC_PREFIX:=		${_GCC_ARCHDIR:H:H:H:H}/
-_GCC_SUBPREFIX:=	${_GCC_ARCHDIR:H:H:H:H:T}/
 .    endif
 .  endif
-_GCC_LIBDIRS=	${_GCC_ARCHDIR} ${_GCC_PREFIX}lib
+_GCC_LIBDIRS=	${_GCC_ARCHDIR}
+.  if empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
+_GCC_LIBDIRS+=	${_GCC_PREFIX}lib${LIBABISUFFIX}
+.  endif
 _GCC_LDFLAGS=	# empty
 .  for _dir_ in ${_GCC_LIBDIRS:N*not_found*}
 _GCC_LDFLAGS+=	-L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_}
@@ -786,9 +786,14 @@ _COMPILER_STRIP_VARS+=	${_GCC_VARS}
 IMAKEOPTS+=	-DHasGcc2=YES -DHasGcc2ForCplusplus=YES
 .endif

-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
-_COMPILER_ABI_FLAG.32=  -m32
-_COMPILER_ABI_FLAG.64=  -m64
+# On HP-UX the GCC toolchain must be specifically targeted to an ABI,
+# -m32 or -m64 are not recognized.
+.if ${OPSYS} == "HPUX"
+_COMPILER_ABI_FLAG.32=	# empty
+_COMPILER_ABI_FLAG.64=	# empty
+.else
+_COMPILER_ABI_FLAG.32=	-m32
+_COMPILER_ABI_FLAG.64=	-m64
 .endif

 .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.48 2013/04/06 18:09:43 tez Exp $
+# $NetBSD: sunpro.mk,v 1.49 2015/05/03 23:16:41 joerg Exp $
 #
 # This is the compiler definition for the SUNWspro C compiler.
 #
@@ -16,7 +16,7 @@ COMPILER_SUNPRO_MK=	defined
 .include "../../mk/bsd.prefs.mk"

 SUNWSPROBASE?=		/opt/SUNWspro
-.if !exists($SUNWSPROBASE)
+.if !exists(${SUNWSPROBASE})
 SUNWSPROBASE!=         /bin/ls -d /opt/solstudio*
 .endif

--- a/mk/configure/libtool-override.mk
+++ b/mk/configure/libtool-override.mk
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-override.mk,v 1.10 2008/02/07 21:36:13 rillig Exp $
+# $NetBSD: libtool-override.mk,v 1.11 2015/05/04 19:23:19 joerg Exp $

 ######################################################################
 ### {libtool,shlibtool}-override (PRIVATE)
@@ -14,8 +14,8 @@ do-configure-post-hook: shlibtool-override
 OVERRIDE_DIRDEPTH.libtool?=	${OVERRIDE_DIRDEPTH}
 OVERRIDE_DIRDEPTH.shlibtool?=	${OVERRIDE_DIRDEPTH}

-_OVERRIDE_PATH.libtool=		${_LIBTOOL}
-_OVERRIDE_PATH.shlibtool=	${_SHLIBTOOL}
+_OVERRIDE_PATH.libtool=		${LIBTOOL}
+_OVERRIDE_PATH.shlibtool=	${SHLIBTOOL}

 .for _script_ in libtool shlibtool
 _SCRIPT.${_script_}-override=						\
--- a/mk/cwrappers.mk
+++ b/mk/cwrappers.mk
@@ -1,12 +1,14 @@
-# $NetBSD: cwrappers.mk,v 1.22 2015/03/17 18:41:20 jperkin Exp $
+# $NetBSD: cwrappers.mk,v 1.26 2015/05/04 19:23:19 joerg Exp $
 #
 # This Makefile fragment implements integration of pkgtools/cwrappers.

+.include "../../mk/wrapper/wrapper-defs.mk"
+.include "../../mk/buildlink3/bsd.buildlink3.mk"
+
 BUILD_DEPENDS+=		cwrappers>=20150314:../../pkgtools/cwrappers

 # XXX This should be PREFIX, but USE_CROSSBASE overrides it.
 CWRAPPERS_SRC_DIR=	${LOCALBASE}/libexec/cwrappers
-CWRAPPERS_BIN_DIR=	${WRKDIR}/.cwrapper/bin
 CWRAPPERS_CONFIG_DIR=	${WRKDIR}/.cwrapper/config
 CONFIGURE_ENV+=		CWRAPPERS_CONFIG_DIR=${CWRAPPERS_CONFIG_DIR}
 MAKE_ENV+=		CWRAPPERS_CONFIG_DIR=${CWRAPPERS_CONFIG_DIR}
@@ -57,15 +59,16 @@ CWRAPPERS_APPEND.imake+=	${IMAKEOPTS}

 .PHONY: generate-cwrappers

-do-wrapper: generate-cwrappers
+.for _target_ in ${WRAPPER_TARGETS}
+generate-cwrappers: ${_target_}
+.endfor

 generate-cwrappers:
-	${RUN}${MKDIR} ${CWRAPPERS_CONFIG_DIR} ${CWRAPPERS_BIN_DIR}
 .for wrappee in as cxx cc cpp f77 imake ld libtool shlibtool
 	${RUN}echo worklog=${WRKLOG:Q} > ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
 	${RUN}echo wrksrc=${WRKSRC:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
 	${RUN}case ${wrappee} in *libtool) ;; *) echo path=${_PATH_ORIG:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}};; esac
-	${RUN}echo exec_path=${CWRAPPERS_BIN_DIR}/${CWRAPPERS_ALIASES.${wrappee}:[1]} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
+	${RUN}echo exec_path=${WRAPPER_BINDIR}/${CWRAPPERS_ALIASES.${wrappee}:[1]} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
 	${RUN}echo exec=${CWRAPPERS_WRAPPEE.${wrappee}:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
 .  for cmd in ${WRAPPER_REORDER_CMDS}
 	${RUN}echo reorder=${cmd:S/^reorder://:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
@@ -80,12 +83,69 @@ generate-cwrappers:
 	${RUN}echo unwrap=${cmd:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
 .  endfor
 .  for alias in ${CWRAPPERS_ALIASES.${wrappee}}
-	${RUN}ln -s ${CWRAPPERS_SRC_DIR}/${CWRAPPERS_CONFIG.${wrappee}}-wrapper ${CWRAPPERS_BIN_DIR}/${alias}
+	${RUN}ln -s ${CWRAPPERS_SRC_DIR}/${CWRAPPERS_CONFIG.${wrappee}}-wrapper ${WRAPPER_BINDIR}/${alias}
 .  endfor
 .endfor

-.if defined(USE_LIBTOOL)
-_LIBTOOL=		${CWRAPPERS_BIN_DIR}/libtool
-_SHLIBTOOL=		${CWRAPPERS_BIN_DIR}/shlibtool
+PREPEND_PATH+=		${WRAPPER_BINDIR}
+
+_COOKIE.wrapper=	${WRKDIR}/.wrapper_done
+
+.PHONY: wrapper
+.if !target(wrapper)
+.  if exists(${_COOKIE.wrapper})
+wrapper:
+	@${DO_NADA}
+.  elif defined(_PKGSRC_BARRIER)
+wrapper: check-vulnerable patch acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock
+.  else
+wrapper: barrier
+.  endif
 .endif
-PREPEND_PATH+=		${CWRAPPERS_BIN_DIR}
+
+.PHONY: acquire-wrapper-lock release-wrapper-lock
+acquire-wrapper-lock: acquire-lock
+release-wrapper-lock: release-lock
+
+.if exists(${_COOKIE.wrapper})
+${_COOKIE.wrapper}:
+	@${DO_NADA}
+.else
+${_COOKIE.wrapper}: real-wrapper
+.endif
+
+.PHONY: real-wrapper
+real-wrapper: wrapper-message wrapper-dirs wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie error-check
+
+.PHONY: wrapper-message
+wrapper-message:
+	@${PHASE_MSG} "Creating toolchain wrappers for ${PKGNAME}"
+
+.PHONY: wrapper-dirs
+wrapper-dirs:
+	${RUN}${MKDIR} ${CWRAPPERS_CONFIG_DIR} ${WRAPPER_BINDIR}
+
+.PHONY: pre-wrapper do-wrapper post-wrapper
+
+do-wrapper: generate-cwrappers
+
+.if !target(do-wrapper)
+do-wrapper:
+	@${DO_NADA}
+.endif
+
+.if !target(pre-wrapper)
+pre-wrapper:
+	@${DO_NADA}
+.endif
+
+.if !target(post-wrapper)
+post-wrapper:
+	@${DO_NADA}
+.endif
+
+.PHONY: wrapper-cookie
+wrapper-cookie:
+	${RUN} [ ! -f ${_COOKIE.wrapper} ]
+	${RUN} ${MKDIR} ${_COOKIE.wrapper:H}
+	${RUN} ${ECHO} ${PKGNAME} > ${_COOKIE.wrapper}
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.255 2015/02/25 10:39:50 tnn Exp $
+# $NetBSD: mk.conf,v 1.256 2015/04/19 09:21:33 tnn Exp $
 #

 # This file provides default values for variables that may be overridden
@@ -13,7 +13,7 @@
 # ************************************************************************

 USE_CWRAPPERS?= no
-# build packages using the newer rpkgtools/cwrapper infrastructure.
+# build packages using the newer pkgtools/cwrappers infrastructure.
 # WARNING: Experimental!
 # Possible: yes, no
 # Default: no
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -74,6 +74,7 @@ catalog-mysql		Store Bacula catalog in MySQL database.
 catalog-pgsql		Store Bacula catalog in PostgreSQL database.
 catalog-sqlite		Store Bacula catalog in SQLite database.
 catalog-sqlite3		Store Bacula catalog in SQLite 3 database.
+cdb			Enable CDB support.
 cdparanoia		Use cdparanoia to rip CDDA media.
 cg			Add support for the Cg compiler.
 cgi			Enable CGI support.
@@ -97,6 +98,7 @@ curl			Enable curl support.
 curses			Enable curses support.
 cvs			Enable CVS support.
 cvsgraph		Enable cvsgraph support.
+cython			Enable Cython support.
 dar-int32		Use 32-bit integers for file lengths in Dar.
 dar-int64		Use 64-bit integers for file lengths in Dar.
 darwin			Build and/or run on Darwin and Mac OS X.
@@ -152,7 +154,6 @@ elinks-fastmem		Allow direct use of system memory allocation functions.
 elinks-html-highlight	Enable HTML highlighting using DOM engine.
 elinks-root-exec	Allow elinks to run as root.
 emacs-w3m		W3m browser extention.
-emacs-xaw3d		Emacs should use Xaw3D for the scrollbar.
 embedded-server		Enable embedded server support for MySQL.
 enchant			Add spell checking support using enchant.
 enchant-zemberek	Add spell checking support for Turkish.
@@ -264,6 +265,7 @@ halfops			Halfops are similar to plain ops, but can't kick/deop plain ops.
 hawknl			Enable HawkNL network API support.
 hping-suid		Install hping executable setuid root.
 hpn-patch		High Performance Enabled SSH/SCP for OpenSSH.
+http2			Add support for HTTP/2.
 hunspell		Add spell checking support using hunspell.
 i586-optimized		Optimize for i586 (only).
 ibus			Enable Intelligent Input Bus support.
@@ -310,6 +312,7 @@ javascript		Enable Javascript support.
 jdbc-mysql31		Enable MySQL JDBC driver.
 jdbc-mysql5		Enable MySQL JDBC driver.
 jpeg			Enable JPEG support.
+json			Enable JSON (JavaScript Object Notation) support.
 jwhois-enable-cache	Enable cache support.
 kde			Enable KDE support.
 kde3			Enable support for KDE 3.
@@ -405,6 +408,7 @@ libmp4v2		Enable MP4 support using libmp4v2.
 libmpdclient		Enable MPD client support.
 libmpg123		Enable mpg123 project's core decoder library support.
 libmtp			Enable MTP via libmtp support.
+libnotify		Enable libnotify support.
 libofa			Enable Open Fingerprint Architecture library support.
 libofx			Enable OFX support.
 libsmi			Use libsmi for SMI MIB support.
@@ -426,6 +430,7 @@ links-xz		Enable lzma support for the links WWW browser.
 links-zlib		Enable zlib support for the links WWW browser.
 lirc			Enable LIRC receiving and sending IR signals support.
 live			Enable live555 support.
+lmdb			Enable lmdb support.
 lprng-priv-ports	Connections must be made from privileged ports.
 lprng-suid		Install LPRng executables setuid root.
 lsof-less-secure-sockets	If 'lsof-more-secure' is set, allow all sockets to be viewed at all times.
@@ -515,6 +520,8 @@ nextstep		Enable Cocoa or GNUstep support.
 nfdump-ftconv		Build the flow-tools to nfdump converter.
 nfdump-nfprofile	Build the netflow profiler.
 nfdump-sflow		Build sflow collector sfcpad.
+nghttp2-asio		Build the nghttp2 ASIO C++ library.
+nghttp2-tools		Build the supplied nghttp2 apps and tools.
 ninja-build		Enable build by ninja-build.
 nls			Use native language support.
 nntp			Enable Network News Transport Protocol (NNTP) support.
@@ -618,6 +625,7 @@ scapy-pyx		Add in py-X support.
 sdl			Use SDL as display library.
 sdl2			Use SDL2 as display library.
 seamonkey		Use seamonkey as gecko rendering engine.
+secret			Enable libsecret support.
 sendmail-ffr-tls	Enable various FFR_TLS_* options.  FFR = For Future Release.
 sendmail-milter		Build the milter with support for the Sendmail MTA.
 sendmail-socketmap	Enable Sendmail SOCKETMAP support.
@@ -774,6 +782,7 @@ x265			Enable x265 support.
 xapian-flint-backend	Enable "Flint" format Xapian database support.
 xapian-quartz-backend	Enable "Quartz" format Xapian database support.
 xaw			Enable Xaw support.
+xaw3d			Enable Xaw3D support.
 xblast-mini		Use a 480x392 window instead a 960x784 window in xblast.
 xcb			Enable XCB (libxcb) support.
 xcursor			Enable Xcursor support.
--- a/mk/emulator/linux.mk
+++ b/mk/emulator/linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: linux.mk,v 1.28 2015/03/02 18:20:23 tnn Exp $
+# $NetBSD: linux.mk,v 1.29 2015/04/12 12:21:29 wiz Exp $
 #
 # Linux binary emulation framework
 #
@@ -103,8 +103,10 @@ _EMUL_MODULES+=		resmgr
 _EMUL_MODULES+=		slang
 _EMUL_MODULES+=		sqlite3
 _EMUL_MODULES+=		tiff
+_EMUL_MODULES+=		webp
 _EMUL_MODULES+=		x11
 _EMUL_MODULES+=		xml2
+_EMUL_MODULES+=		xslt

 .if ${_EMUL_TYPE} == "builtin"
 EMUL_DISTRO=		builtin-linux	# managed outside pkgsrc
--- a/mk/emulator/netbsd-compat.mk
+++ b/mk/emulator/netbsd-compat.mk
@@ -1,4 +1,4 @@
-# $NetBSD: netbsd-compat.mk,v 1.4 2013/02/17 17:28:42 spz Exp $
+# $NetBSD: netbsd-compat.mk,v 1.5 2015/05/03 15:01:11 spz Exp $
 #
 # COMPAT_* for NetBSD -- see options(4).
 #
@@ -42,6 +42,7 @@ _EMUL_PKG.compat-4.0=	compat40
 _EMUL_PKG.compat-5.0=	compat50
 _EMUL_PKG.compat-5.1=	compat51
 _EMUL_PKG.compat-6.0=	compat60
+_EMUL_PKG.compat-6.1=	compat61
 _EMUL_PKG.compat=	# defined, but empty

 # EMUL_TYPE.netbsd can be "compat" or "compat-[0-9]*".  If a particular
@@ -82,9 +83,12 @@ _EMUL_PKG.compat=	# defined, but empty
 .  elif !empty(NETBSD_VERSION_REQD:M5.[1-9]*)
 .    include "${PKGSRCDIR}/emulators/${_EMUL_PKG.compat-5.1}/emulator.mk"

-.  elif !empty(NETBSD_VERSION_REQD:M6.*)
+.  elif !empty(NETBSD_VERSION_REQD:M6.0.*)
 .    include "${PKGSRCDIR}/emulators/${_EMUL_PKG.compat-6.0}/emulator.mk"

+.  elif !empty(NETBSD_VERSION_REQD:M6.1.*)
+.    include "${PKGSRCDIR}/emulators/${_EMUL_PKG.compat-6.1}/emulator.mk"
+
 .  endif

 .else
--- a/mk/fetch/sites.mk
+++ b/mk/fetch/sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.126 2015/03/26 07:54:51 dsainty Exp $
+# $NetBSD: sites.mk,v 1.128 2015/05/16 20:02:21 tsutsui Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -17,7 +17,6 @@ MASTER_SITE_GNU+=       \
 	ftp://ftp.gnu.org/pub/gnu/ \
 	ftp://ftp.funet.fi/pub/gnu/prep/ \
 	ftp://ftp.kddlabs.co.jp/pub/gnu/gnu/ \
-	ftp://ftp.dti.ad.jp/pub/GNU/ \
 	ftp://mirrors.kernel.org/gnu/ \
 	ftp://ftp.lip6.fr/pub/gnu/ \
 	http://gd.tuwien.ac.at/gnu/gnusrc/
@@ -70,12 +69,11 @@ MASTER_SITE_GNOME+=     \
 	ftp://ftp.gnome.org/pub/GNOME/ \
 	http://ftp.tuwien.ac.at/hci/gnome.org/ \
 	ftp://ftp.cse.buffalo.edu/pub/Gnome/ \
-	ftp://ftp.dti.ad.jp/pub/X/gnome/ \
 	ftp://ftp.kddlabs.co.jp/pub/GNOME/ \
 	ftp://ftp.dit.upm.es/linux/gnome/

 MASTER_SITE_KDE+=	\
-	ftp://ftp.kde.org/pub/kde/stable/ \
+	http://download.kde.org/stable/ \
 	ftp://www.dnsbalance.ring.gr.jp/pub/X/kde/stable/ \
 	http://www.dnsbalance.ring.gr.jp/archives/X/kde/stable/ \
 	ftp://ftp.kddlabs.co.jp/pub/X/kde/stable/ \
@@ -127,7 +125,6 @@ MASTER_SITE_MOZILLA_ESR+=	\
 MASTER_SITE_XEMACS+=    \
 	http://ftp.xemacs.org/pub/xemacs/ \
 	ftp://ftp.xemacs.org/pub/xemacs/ \
-	ftp://ftp.dti.ad.jp/pub/unix/editor/xemacs/ \
 	ftp://ftp.pasteur.fr/pub/computing/xemacs/ \
 	ftp://mirror.aarnet.edu.au/pub/xemacs/ \
 	ftp://mirror.cict.fr/xemacs/ \
--- a/mk/gnu-config/config.guess
+++ b/mk/gnu-config/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2015 Free Software Foundation, Inc.

-timestamp='2015-02-23'
+timestamp='2015-03-04'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -947,6 +947,9 @@ EOF
    crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
    frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
--- a/mk/gnu-config/config.sub
+++ b/mk/gnu-config/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2015 Free Software Foundation, Inc.

-timestamp='2015-02-22'
+timestamp='2015-03-08'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -259,7 +259,7 @@ case $basic_machine in
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
+	| e2k | epiphany \
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
@@ -381,7 +381,7 @@ case $basic_machine in
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -518,6 +518,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
+        asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -1373,7 +1376,7 @@ case $os in
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
--- a/mk/help/ulimit.help
+++ b/mk/help/ulimit.help
@@ -1,4 +1,4 @@
-# $NetBSD: ulimit.help,v 1.1 2009/05/10 16:10:18 rillig Exp $
+# $NetBSD: ulimit.help,v 1.3 2015/04/25 11:28:08 wiz Exp $
 #

 # UNLIMIT_RESOURCES
@@ -6,8 +6,9 @@
 #	during the configure, build and install phases. The possible
 #	values are the following, which can be combined:
 #
+#	* cputime
 #	* datasize
-#	* stacksize
 #	* memorysize
+#	* stacksize
 #
-# Keywords: ulimit unlimit memory ENOMEM
+# Keywords: ulimit unlimit memory cputime ENOMEM
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.101 2015/03/06 18:28:45 szptvlfn Exp $
+# $NetBSD: java-vm.mk,v 1.102 2015/06/02 20:37:01 ryoon Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -10,7 +10,7 @@
 #	The JVM that should be used if nothing particular is specified.
 #
 #	Possible values: kaffe openjdk7 openjdk8
-#		sun-jdk6 sun-jdk7
+#		sun-jdk6 sun-jdk7 oracle-jdk8
 #	Default value: (platform-dependent)
 #
 # Package-settable variables:
@@ -70,7 +70,7 @@ PKG_JVMS_ACCEPTED?=	${_PKG_JVMS}

 # This is a list of all of the JDKs that may be used.
 #
-_PKG_JVMS.8=		openjdk8
+_PKG_JVMS.8=		openjdk8 oracle-jdk8
 _PKG_JVMS.7=		${_PKG_JVMS.8} openjdk7 sun-jdk7
 _PKG_JVMS.6=		${_PKG_JVMS.7} sun-jdk6 jdk16
 _PKG_JVMS.1.5=		${_PKG_JVMS.6} jdk15
@@ -161,6 +161,15 @@ _ONLY_FOR_PLATFORMS.sun-jdk7= \
 	NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \
 	SunOS-5.11-i386 \
 	SunOS-5.11-x86_64
+_ONLY_FOR_PLATFORMS.oracle-jdk8= \
+	Darwin-9.*-i386 Darwin-9.*-x86_64 \
+	Darwin-[1-9][0-9].*-i386 Darwin-[1-9][0-9].*-x86_64 \
+	DragonFly-*-i386 \
+	FreeBSD-6.*-i386 \
+	Linux-*-i[3-6]86 \
+	Linux-*-x86_64 \
+	NetBSD-[6-9]*-i386 NetBSD-[6-9]*-x86_64 \
+	SunOS-5.11-x86_64

 # Set ONLY_FOR_PLATFORM based on accepted JVMs
 .for _jvm_ in ${PKG_JVMS_ACCEPTED}
@@ -181,6 +190,7 @@ _JAVA_PKGBASE.openjdk7=		openjdk7
 _JAVA_PKGBASE.openjdk8=		openjdk8
 _JAVA_PKGBASE.sun-jdk6=		sun-jre6
 _JAVA_PKGBASE.sun-jdk7=		sun-jre7
+_JAVA_PKGBASE.oracle-jdk8=	oracle-jre8

 # The following is copied from the respective JVM Makefiles.
 _JAVA_NAME.kaffe=		kaffe
@@ -188,6 +198,7 @@ _JAVA_NAME.openjdk7=		openjdk7
 _JAVA_NAME.openjdk8=		openjdk8
 _JAVA_NAME.sun-jdk6=		sun6
 _JAVA_NAME.sun-jdk7=		sun7
+_JAVA_NAME.oracle-jdk8=		oracle8

 # Mark the acceptable JVMs and check which JVM packages are installed.
 .for _jvm_ in ${_PKG_JVMS_ACCEPTED}
@@ -242,12 +253,15 @@ BUILDLINK_API_DEPENDS.sun-jdk6?=	sun-jdk6-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jre6?=	sun-jre6-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jdk7?=	sun-jdk7-[0-9]*
 BUILDLINK_API_DEPENDS.sun-jre7?=	sun-jre7-[0-9]*
+BUILDLINK_API_DEPENDS.oracle-jdk8?=	oracle-jdk8-[0-9]*
+BUILDLINK_API_DEPENDS.oracle-jre8?=	oracle-jre8-[0-9]*

 _JRE.kaffe=		kaffe
 _JRE.openjdk7=		openjdk7
 _JRE.openjdk8=		openjdk8
 _JRE.sun-jdk6=		sun-jre6
 _JRE.sun-jdk7=		sun-jre7
+_JRE.oracle-jdk8=	oracle-jre8

 _JAVA_BASE_CLASSES=	classes.zip

@@ -273,6 +287,11 @@ _JDK_PKGSRCDIR=		../../lang/sun-jdk7
 _JRE_PKGSRCDIR=		../../lang/sun-jre7
 _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-7
 UNLIMIT_RESOURCES+=	datasize
+.elif ${_PKG_JVM} == "oracle-jdk8"
+_JDK_PKGSRCDIR=		../../lang/oracle-jdk8
+_JRE_PKGSRCDIR=		../../lang/oracle-jre8
+_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/oracle-8
+UNLIMIT_RESOURCES+=	datasize
 .endif

 .if defined(_JAVA_HOME_DEFAULT)
--- a/mk/license.mk
+++ b/mk/license.mk
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.66 2015/03/22 03:43:11 tnn Exp $
+# $NetBSD: license.mk,v 1.71 2015/05/08 10:37:32 wiz Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -113,6 +113,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
 	cpl-1.0 \
 	epl-v1.0 \
 	eupl-v1.1 \
+	gfsl \
 	gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
 	gnu-gpl-v1 \
 	gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
@@ -120,7 +121,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
 	ibm-public-license-1.0 \
 	ipafont \
 	isc \
-	lppl-1.3c \
+	lppl-1.2 lppl-1.3c \
 	lucent \
 	miros \
 	mit \
@@ -139,6 +140,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
 	sgi-free-software-b-v2.0 \
 	sleepycat-public \
 	unlicense \
+	w3c \
 	x11 \
 	zlib \
 	zpl
--- a/mk/mysql.buildlink3.mk
+++ b/mk/mysql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.19 2015/01/01 07:51:47 dholland Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.20 2015/04/16 20:24:15 ryoon Exp $
 #
 # This file is included by packages that require some version of the
 # MySQL database client.
@@ -8,7 +8,7 @@
 # MYSQL_VERSION_DEFAULT
 #	The preferred MySQL version.
 #
-#	Possible: 56 55 51
+#	Possible: 56 55 51 MARIADB55
 #	Default: 55
 #
 # === Package-settable variables ===
@@ -31,7 +31,7 @@ _SYS_VARS.mysql=	MYSQL_PKGSRCDIR
 .include "../../mk/bsd.prefs.mk"

 MYSQL_VERSION_DEFAULT?=		55
-MYSQL_VERSIONS_ACCEPTED?=	56 55 51
+MYSQL_VERSIONS_ACCEPTED?=	56 55 51 MARIADB55

 # transform the list into individual variables
 .for mv in ${MYSQL_VERSIONS_ACCEPTED}
@@ -58,6 +58,9 @@ _MYSQL_VERSION_INSTALLED=	51
 .    if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h)
 _MYSQL_VERSION_56_INSTALLED=	yes
 _MYSQL_VERSION_INSTALLED=	56
+.    elif exists(${LOCALBASE}/share/mariadb)
+_MYSQL_VERSION_MARIADB55_INSTALLED=	yes
+_MYSQL_VERSION_INSTALLED=	MARIADB55
 .    else
 _MYSQL_VERSION_55_INSTALLED=	yes
 _MYSQL_VERSION_INSTALLED=	55
@@ -109,6 +112,8 @@ _MYSQL_VERSION=	${_MYSQL_VERSION_FIRSTACCEPTED}
 #
 .if ${_MYSQL_VERSION} == "56"
 MYSQL_PKGSRCDIR=	../../databases/mysql56-client
+.elif ${_MYSQL_VERSION} == "MARIADB55"
+MYSQL_PKGSRCDIR=	../../databases/mariadb55-client
 .elif ${_MYSQL_VERSION} == "55"
 MYSQL_PKGSRCDIR=	../../databases/mysql55-client
 .elif ${_MYSQL_VERSION} == "51"
--- a/mk/ocaml.mk
+++ b/mk/ocaml.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ocaml.mk,v 1.3 2014/10/27 11:58:36 jaapb Exp $
+# $NetBSD: ocaml.mk,v 1.4 2015/04/20 02:36:05 hiramatsu Exp $
 #
 # This Makefile fragment handles the common variables used by OCaml packages.
 #
@@ -85,6 +85,10 @@ OCAML_SITELIBDIR=	lib/ocaml/site-lib
 MAKE_ENV+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
 PLIST_SUBST+=	OCAML_SITELIB="${OCAML_SITELIBDIR}"

+PRINT_PLIST_AWK+=	{ gsub(/${OCAML_SITELIBDIR:S|/|\\/|g}/, \
+			"$${OCAML_SITELIB}"); \
+			print; next; }
+
 .if ${OCAML_USE_FINDLIB} == "yes"
 .include "../../devel/ocaml-findlib/buildlink3.mk"
 INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}
--- a/mk/pkgformat/pkg/package.mk
+++ b/mk/pkgformat/pkg/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.9 2015/02/16 10:50:33 jperkin Exp $
+# $NetBSD: package.mk,v 1.10 2015/04/21 17:01:56 joerg Exp $

 .if defined(PKG_SUFX)
 WARNINGS+=		"PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -72,7 +72,7 @@ _PKG_ARGS_PACKAGE+=	-u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
 ${STAGE_PKGFILE}: ${_CONTENTS_TARGETS}
 	${RUN} ${MKDIR} ${.TARGET:H}
 	@${STEP_MSG} "Creating binary package ${.TARGET}"
-	${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},};	\
+	${RUN} ${_ULIMIT_CMD} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},};	\
 	if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then		\
 		${MV} -f "$$tmpname" ${.TARGET};			\
 	else								\
--- a/mk/platform/Bitrig.mk
+++ b/mk/platform/Bitrig.mk
@@ -0,0 +1,75 @@
+# $NetBSD: Bitrig.mk,v 1.1 2015/06/04 15:48:45 sevan Exp $
+#
+# Variable definitions for the Bitrig operating system.
+
+ECHO_N?=	${ECHO} -n
+LDD?=		/usr/bin/ldd
+LDD_ENV?=	LD_TRACE_LOADED_OBJECTS_FMT1='\t-l%o => %p\n' \
+		LD_TRACE_LOADED_OBJECTS_FMT2=
+IMAKE_MAKE?=	${MAKE}		# program which gets invoked by imake
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+SU?=		/usr/bin/su
+TYPE?=		type				# Shell builtin
+
+USERADD?=	/usr/sbin/useradd
+GROUPADD?=	/usr/sbin/groupadd
+
+CPP_PRECOMP_FLAGS?=	# unset
+DEF_UMASK?=		0022
+EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
+MOTIF_TYPE_DEFAULT?=	motif	# default 2.0 compatible libs type
+NOLOGIN?=		/sbin/nologin
+PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
+ROOT_CMD?=		${SU} - root -c
+ROOT_USER?=		root
+ROOT_GROUP?=	wheel
+ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
+ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
+ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+
+X11_TYPE?=		native
+
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
+.if exists(/usr/include/netinet6)
+_OPSYS_HAS_INET6=	yes	# IPv6 is standard
+.else
+_OPSYS_HAS_INET6=	no	# IPv6 is not standard
+.endif
+_OPSYS_HAS_JAVA=	no	# Java is not standard
+_OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
+_OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
+_OPSYS_PERL_REQD=		# no base version of perl required
+_OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
+_OPSYS_SHLIB_TYPE=	ELF	# shared lib type
+_PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
+_PATCH_BACKUP_ARG?=	-V simple -z 	# switch to patch(1) for backup suffix
+_USE_RPATH=		yes	# add rpath to LDFLAGS
+
+# flags passed to the linker to extract all symbols from static archives.
+# this is GNU ld.
+_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
+_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
+
+_STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
+_STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
+
+.if (${MACHINE_ARCH} == "amd64") || (${MACHINE_ARCH} == "arm")
+DEFAULT_SERIAL_DEVICE?=	/dev/tty00
+SERIAL_DEVICES?=	/dev/tty00 \
+			/dev/tty01
+.else
+DEFAULT_SERIAL_DEVICE?=	/dev/null
+SERIAL_DEVICES?=	/dev/null
+.endif
+
+PKG_HAVE_KQUEUE=	# defined
+
+_OPSYS_CAN_CHECK_SHLIBS=	no
+
+# 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
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.66 2015/01/03 21:30:52 gdt Exp $
+# $NetBSD: Darwin.mk,v 1.67 2015/06/26 13:51:57 adam Exp $
 #
 # Variable definitions for the Darwin operating system.

@@ -20,6 +20,7 @@
 # Mountain Lion	10.8.x	12.x.y	4.5 (llvm gcc 4.2.1)
 # Mavericks	10.9.x	13.x.y	6 (llvm clang 6.0)
 # Yosemite	10.10.x	14.x.y	6 (llvm clang 6.0)
+# El Capitan	10.11.x	15.x.y	7 (llvm clang 7.0)

 # Tiger (and earlier) use Xfree 4.4.0 (and earlier)
 .if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
@@ -79,9 +80,14 @@ _OPSYS_EMULDIR.darwin=	# empty
 #
 # From Xcode 5 onwards system headers are no longer installed by default
 # into /usr/include, so we need to query their location.
+# Use current system version SDK (avoid newer SDKs).
 #
 .if exists(/usr/bin/xcrun)
-OSX_SDK_PATH!=	/usr/bin/xcrun --show-sdk-path 2>/dev/null || echo /nonexistent
+OSX_VERS!=	sw_vers -productVersion
+.  if ${OSX_VERS:R:R} != ${OSX_VERS:R}
+OSX_VERS:=${OSX_VERS:R}
+.  endif
+OSX_SDK_PATH!=	/usr/bin/xcrun --sdk macosx${OSX_VERS} --show-sdk-path 2>/dev/null || echo /nonexistent
 .endif

 _OPSYS_SYSTEM_RPATH?=		/usr/lib
@@ -152,7 +158,7 @@ CONFIGURE_ENV+=		ac_cv_func_poll=no
 .endif

 # Use "/bin/ksh" for buildlink3 wrapper script to improve build performance.
-.if (!empty(OS_VERSION:M9.*) || !empty(OS_VERSION:M1[0-2].*)) && \
+.if (!empty(OS_VERSION:M9.*) || !empty(OS_VERSION:M1[0-9].*)) && \
    exists(/bin/ksh)
 WRAPPER_BIN_SH?=	/bin/ksh
 .endif
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.45 2014/07/25 23:40:01 ryoon Exp $
+# $NetBSD: DragonFly.mk,v 1.46 2015/04/21 17:01:56 joerg Exp $
 #
 # Variable definitions for the DragonFly operating system.

@@ -23,6 +23,7 @@ ROOT_GROUP?=		wheel
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+ULIMIT_CMD_cputime?=	ulimit -t `ulimit -H -t`

 _OPSYS_EMULDIR.linux=	/compat/linux

--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.30 2013/04/28 12:53:56 obache Exp $
+# $NetBSD: FreeBSD.mk,v 1.31 2015/04/21 17:01:56 joerg Exp $
 #
 # Variable definitions for the FreeBSD operating system.

@@ -28,6 +28,7 @@ ROOT_GROUP?=	wheel
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+ULIMIT_CMD_cputime?=	ulimit -t `ulimit -H -t`

 _OPSYS_EMULDIR.freebsd=	# empty
 _OPSYS_EMULDIR.linux=	/compat/linux
--- a/mk/platform/GNUkFreeBSD.mk
+++ b/mk/platform/GNUkFreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: GNUkFreeBSD.mk,v 1.2 2014/02/19 17:20:23 jperkin Exp $
+# $NetBSD: GNUkFreeBSD.mk,v 1.3 2015/04/21 17:01:56 joerg Exp $
 #
 # Variable definitions for the Debian GNU/kFreeBSD operating system.

@@ -28,6 +28,7 @@ SERIAL_DEVICES?=	/dev/null
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+ULIMIT_CMD_cputime?=	ulimit -t `ulimit -H -t`
 USERADD?=		/usr/sbin/useradd

 .if !empty(MACHINE_ARCH:Mx86_64)
--- a/mk/platform/HPUX.mk
+++ b/mk/platform/HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.23 2013/09/04 15:14:45 jperkin Exp $
+# $NetBSD: HPUX.mk,v 1.25 2015/04/19 12:02:15 tnn Exp $
 #
 # Variable definitions for the HP-UX operating system.

@@ -16,7 +16,7 @@ CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
 MOTIF_TYPE_DEFAULT?=	motif	# default 2.0 compatible libs type
-NOLOGIN?=		/etc/nologin
+NOLOGIN?=		/usr/bin/false
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		${SU} - root -c
 ROOT_USER?=		root
@@ -26,7 +26,7 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`

-# Fix broken system headers by using pkgtools/posix_headers
+# Fix broken system headers by using pkgtools/compat_headers
 FIX_SYSTEM_HEADERS?=	yes

 _OPSYS_EMULDIR.hpux=	# empty
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.60 2014/03/07 15:03:15 jperkin Exp $
+# $NetBSD: Linux.mk,v 1.62 2015/05/08 20:28:30 sevan Exp $
 #
 # Variable definitions for the Linux operating system.

@@ -42,6 +42,7 @@ SERIAL_DEVICES?=	/dev/null
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+ULIMIT_CMD_cputime?=	ulimit -t `ulimit -H -t`
 USERADD?=		/usr/sbin/useradd

 _OPSYS_EMULDIR.linux=	# empty
@@ -111,6 +112,11 @@ ABI?=		64
 LIBABISUFFIX?=	64
 .endif

+.if ${MACHINE_ARCH} == "powerpc64le"
+ABI?=		64
+LIBABISUFFIX?=	64
+.endif
+
 # When building 32-bit packages on x86_64 GNU ld isn't smart enough to
 # figure out the target architecture based on the objects so we need to
 # explicitly set it.
--- a/mk/platform/MirBSD.mk
+++ b/mk/platform/MirBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: MirBSD.mk,v 1.10 2014/03/19 16:44:08 bsiegert Exp $
+# $NetBSD: MirBSD.mk,v 1.11 2015/04/21 17:01:56 joerg Exp $
 #
 # Variable definitions for the MirOS BSD operating system.

@@ -26,6 +26,7 @@ ROOT_GROUP?=		wheel
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+ULIMIT_CMD_cputime?=	ulimit -t `ulimit -H -t`

 X11_TYPE?=		modular

--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.40 2014/09/02 16:13:27 gdt Exp $
+# $NetBSD: NetBSD.mk,v 1.42 2015/05/26 10:08:37 joerg Exp $
 #
 # Variable definitions for the NetBSD operating system.

@@ -13,14 +13,8 @@ PS?=		/bin/ps
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin

-.if exists(/usr/sbin/user)
 USERADD?=	/usr/sbin/useradd
 GROUPADD?=	/usr/sbin/groupadd
-.else
-USERADD?=	${LOCALBASE}/sbin/useradd
-GROUPADD?=	${LOCALBASE}/sbin/groupadd
-_USER_DEPENDS=	user>=20000313:../../sysutils/user
-.endif

 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
@@ -40,6 +34,7 @@ ROOT_GROUP?=	wheel
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+ULIMIT_CMD_cputime?=	ulimit -t `ulimit -H -t`

 # Native X11 is only supported on NetBSD-5 and later.
 # On NetBSD-5, native X11 has enough issues that we default
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.34 2013/04/28 12:53:56 obache Exp $
+# $NetBSD: OSF1.mk,v 1.35 2015/04/18 22:56:19 tnn Exp $
 #
 # Variable definitions for the OSF1 operating system.

@@ -26,7 +26,7 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`

-# Fix broken system headers by using pkgtools/posix_headers
+# Fix broken system headers by using pkgtools/compat_headers
 FIX_SYSTEM_HEADERS?=    yes

 _OPSYS_EMULDIR.osf1=	# empty
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.37 2013/04/28 12:53:56 obache Exp $
+# $NetBSD: OpenBSD.mk,v 1.39 2015/05/21 17:15:48 sevan Exp $
 #
 # Variable definitions for the OpenBSD operating system.

@@ -9,8 +9,6 @@ LDD_ENV?=	LD_TRACE_LOADED_OBJECTS_FMT1='\t-l%o => %p\n' \
 IMAKE_MAKE?=	${MAKE}		# program which gets invoked by imake
 PKGLOCALEDIR?=	share
 PS?=		/bin/ps
-# XXX: default from defaults/mk.conf.  Verify/correct for this platform
-# and remove this comment.
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin

@@ -35,6 +33,7 @@ ROOT_GROUP?=	wheel
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+ULIMIT_CMD_cputime?=	ulimit -t `ulimit -H -t`

 X11_TYPE?=		native

--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.63 2015/03/19 19:15:23 tron Exp $
+# $NetBSD: SunOS.mk,v 1.65 2015/04/17 08:22:30 jperkin Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.

@@ -47,8 +47,8 @@ INIT_SYSTEM?=		smf
 KRB5_DEFAULT?=		mit-krb5

 # Builtin defaults which make sense for this platform.
+_OPSYS_PREFER.getopt?=		native
 _OPSYS_PREFER.libexecinfo?=	native
-_OPSYS_PREFER.mit-krb5?=	native
 _OPSYS_PREFER.openssl?=		pkgsrc
 _OPSYS_PREFER.solaris-pam?=	native

--- a/mk/plist/common-dirs.mtree
+++ b/mk/plist/common-dirs.mtree
--- a/mk/plist/print-plist.mk
+++ b/mk/plist/print-plist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: print-plist.mk,v 1.26 2014/01/24 12:42:52 obache Exp $
+# $NetBSD: print-plist.mk,v 1.27 2015/06/07 03:39:08 joerg Exp $

 ###
 ### Automatic PLIST generation
@@ -53,37 +53,6 @@ _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^.*\/fonts\.scale/)
 _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^.*\/fonts\.cache-1/)
 .endif

-# Common (system) directories not to generate @dirrm statements for
-# Reads _MTREE_FILE and generate awk statements that will
-# sort out which directories NOT to include into the PLIST @dirrm list
-_COMMON_MTREE_FILE=	${PKGSRCDIR}/mk/plist/common-dirs.mtree
-
-.if make(print-PLIST)
-_PRINT_PLIST_COMMON_DIRS!=	${AWK} 'BEGIN {				\
-			i=0;						\
-			stack[i]="${PREFIX}" ;				\
-			cwd="";						\
-		}							\
-		! ( /^\// || /^\#/ || /^$$/ ) {				\
-			if ( $$1 == ".." ){				\
-				i=i-1;					\
-				cwd = stack[i];				\
-			} else if ( $$1 == "." ){			\
-			} else {					\
-				stack[i] = cwd ;			\
-				if ( i == 0 ){				\
-					cwd = $$1 ;			\
-				} else {				\
-					cwd = cwd "\\/" $$1 ;		\
-				}					\
-				print "/^" cwd "$$$$/ { next; }";	\
-				i=i+1 ;					\
-			}						\
-		}							\
-		END { print "{ print $$$$0; }"; }			\
-	' <${_COMMON_MTREE_FILE}
-.endif
-
 # scan $PREFIX for any files/dirs modified since the package was extracted
 # will emit "@exec mkdir"-statements for empty directories
 # XXX will fail for data files that were copied using tar (e.g. emacs)!
@@ -179,8 +148,7 @@ print-PLIST:
 				{ sub("^${PKGINFODIR}/", "info/"); }	\
 				{ sub("^${PKGMANDIR}/", "man/"); }	\
 				/^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \
-				/^${PKGINFODIR:S|/|\\/|g}$$/ { next; }	\
-				${_PRINT_PLIST_COMMON_DIRS}'` ;		\
+				/^${PKGINFODIR:S|/|\\/|g}$$/ { next; }'` ;	\
 	do								\
 		if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then	\
 			${ECHO} @pkgdir $$i | ${AWK} '			\
--- a/mk/scripts/mkreadme
+++ b/mk/scripts/mkreadme
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.26 2011/04/22 09:03:53 spz Exp $
+# $NetBSD: mkreadme,v 1.27 2015/06/13 12:09:32 spz Exp $
 #
 # Script for README.html generation
 #
@@ -519,11 +519,14 @@ if [ "x$prune" = "xyes" ]; then
    echo "Pruning unused README.html files"
    echo " "
    cd ${PKGSRCDIR}
-    for d in `ls -d */*` ; do
-	if [ -d $d -a ! -f ${d}/Makefile -a -f ${d}/README.html ]; then
-	    echo "Pruning ${d}/README.html which is no longer used"
-	    rm -f ${d}/README.html
-	fi
+    # cats=`${BMAKE} show-subdir-var VARNAME=SUBDIR` # already set above
+    for c in ${cats} ; do
+	for d in `ls -d ${c}/*` ; do
+	    if [ -d $d -a ! -f ${d}/Makefile -a -f ${d}/README.html ]; then
+		echo "Pruning ${d}/README.html which is no longer used"
+		rm -f ${d}/README.html
+	    fi
+	done
    done
 fi

--- a/mk/tools/tools.Bitrig.mk
+++ b/mk/tools/tools.Bitrig.mk
@@ -0,0 +1,88 @@
+# $NetBSD: tools.Bitrig.mk,v 1.1 2015/06/04 15:48:45 sevan Exp $
+#
+# System-supplied tools for the Bitrig operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.csh?=		/bin/csh
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+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/flex
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+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
+TOOLS_PLATFORM.install?=	/usr/bin/install
+TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.ksh?=		/bin/ksh
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
+TOOLS_PLATFORM.makeinfo?=	/usr/bin/makeinfo
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mktemp?=		/usr/bin/mktemp
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+.if exists(/usr/bin/nroff)
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
+.endif
+TOOLS_PLATFORM.openssl?=	/usr/sbin/openssl
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pax?=		/bin/pax
+TOOLS_PLATFORM.printf?=		/usr/bin/printf
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.readelf?=	/usr/bin/readelf
+TOOLS_PLATFORM.readlink?=	/usr/bin/readlink
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sdiff?=		/usr/bin/sdiff
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sleep?=		/bin/sleep
+.if exists(/usr/bin/soelim)
+TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
+.endif
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tar?=		/bin/tar
+.if exists(/usr/bin/tbl)
+TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+.endif
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+TOOLS_PLATFORM.test?=		test			# shell builtin
+TOOLS_PLATFORM.touch?=		/usr/bin/touch
+TOOLS_PLATFORM.tr?=		/usr/bin/tr
+TOOLS_PLATFORM.true?=		true			# shell builtin
+TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs -r
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.35 2014/03/06 07:34:20 uebayasi Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.36 2015/04/05 00:22:44 rodent Exp $
 #
 # System-supplied tools for the OpenBSD operating system.

@@ -11,6 +11,8 @@ TOOLS_PLATFORM.cat?=		/bin/cat
 TOOLS_PLATFORM.chgrp?=		/bin/chgrp
 .elif exists(/usr/bin/chgrp)
 TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+.elif exists(/usr/sbin/chgrp)
+TOOLS_PLATFORM.chgrp?=		/usr/sbin/chgrp
 .endif
 TOOLS_PLATFORM.chmod?=		/bin/chmod
 .if exists(/sbin/chown)
@@ -65,7 +67,11 @@ TOOLS_PLATFORM.nice?=		/usr/bin/nice
 .if exists(/usr/bin/nroff)
 TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 .endif
+.if exists(/usr/bin/openssl)
 TOOLS_PLATFORM.openssl?=	/usr/bin/openssl
+.elif exists(/usr/sbin/openssl)
+TOOLS_PLATFORM.openssl?=	/usr/sbin/openssl
+.endif
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pax?=		/bin/pax
 TOOLS_PLATFORM.printf?=		/usr/bin/printf
@@ -89,7 +95,9 @@ TOOLS_PLATFORM.tar?=		/bin/tar
 .elif exists(/usr/bin/tar)
 TOOLS_PLATFORM.tar?=		/usr/bin/tar
 .endif
+.if exists(/usr/bin/tbl)
 TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+.endif
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
 TOOLS_PLATFORM.touch?=		/usr/bin/touch
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.47 2015/02/01 08:48:56 obache Exp $
+# $NetBSD: tools.SunOS.mk,v 1.48 2015/06/19 15:22:44 jperkin Exp $
 #
 # System-supplied tools for the Solaris operating system.
 #
@@ -164,9 +164,6 @@ TOOLS_PLATFORM.openssl?=	/usr/bin/openssl
 #TOOLS_PLATFORM.perl?=		/usr/bin/perl
 #TOOLS_PLATFORM.pod2man?=	/usr/perl5/bin/pod2man
 #.endif
-.if ${OS_VERSION} == "5.11" && exists(/usr/bin/pkg-config)
-TOOLS_PLATFORM.pkg-config?=	/usr/bin/pkg-config
-.endif
 TOOLS_PLATFORM.printf?=		/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 .if exists(/usr/gnu/bin/readelf)
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.91 2014/11/25 18:27:49 joerg Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.93 2015/04/27 19:59:07 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,15 +49,6 @@

 .include "../../mk/wrapper/wrapper-defs.mk"

-# pkgsrc bmake does not (yet) correctly handle ${VAR} > 0 because
-# ${VAR} is treated as a string, so we must use a string comparison
-# operator.
-.if ${PKG_DEBUG_LEVEL} != "0" || defined(PKG_VERBOSE)
-ECHO_WRAPPER_MSG?=	${ECHO}
-.else
-ECHO_WRAPPER_MSG?=	${TRUE}
-.endif
-
 .PHONY: generate-wrappers

 .include "../../mk/buildlink3/bsd.buildlink3.mk"
@@ -65,9 +56,7 @@ ECHO_WRAPPER_MSG?=	${TRUE}
 # Prepend ${WRAPPER_BINDIR} to the PATH so that the wrappers are found
 # first when searching for executables.
 #
-.if ${USE_CWRAPPERS:tl} == "no"
 PREPEND_PATH+=		${WRAPPER_BINDIR}
-.endif

 ###
 ### BEGIN: after the barrier
@@ -451,8 +440,8 @@ ${_WRAP_COOKIE.${_wrappee_}}:						\
 		${_WRAP_TRANSFORM.${_wrappee_}}
 	${RUN} 								\
 	wrapper="${WRAPPER_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
-	if [ -x "$$wrapper" ]; then ${ECHO_WRAPPER_MSG} "=> $$wrapper already exists. Skipping"; exit 0; fi; \
-	${ECHO_WRAPPER_MSG} "=> Creating ${_wrappee_} wrapper: $$wrapper"; \
+	if [ -x "$$wrapper" ]; then ${ECHO_BUILDLINK_MSG} "=> $$wrapper already exists. Skipping"; exit 0; fi; \
+	${ECHO_BUILDLINK_MSG} "=> Creating ${_wrappee_} wrapper: $$wrapper"; \
        gen_wrapper=yes;						\
 	wrappee="${PKG_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
 	case $$wrappee in						\
@@ -476,7 +465,7 @@ ${_WRAP_COOKIE.${_wrappee_}}:						\
 		IFS="$$save_IFS";					\
 		if ${TEST} ! -x "$$wrappee"; then			\
 			gen_wrapper=no;					\
-			${ECHO_WRAPPER_MSG} "Warning: unable to generate ${_wrappee_} wrapper script: \`$$wrappee'"; \
+			${ECHO_BUILDLINK_MSG} "Warning: unable to generate ${_wrappee_} wrapper script: \`$$wrappee'"; \
 		fi;							\
 		;;							\
 	esac;								\
@@ -500,7 +489,7 @@ ${_alias_}: ${_WRAP_COOKIE.${_wrappee_}}
 	${RUN} 								\
 	wrapper="${WRAPPER_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \
 	if [ ! -x ${.TARGET} -a -x $$wrapper ]; then			\
-		${ECHO_WRAPPER_MSG} "=> Linking ${_wrappee_} wrapper: ${.TARGET}"; \
+		${ECHO_BUILDLINK_MSG} "=> Linking ${_wrappee_} wrapper: ${.TARGET}"; \
 		${LN} -f${WRAPPER_USE_SYMLINK:Ds} $$wrapper ${.TARGET};	\
 	fi
 .    endif
--- a/mk/wrapper/buildcmd
+++ b/mk/wrapper/buildcmd
@@ -1,4 +1,4 @@
-# $NetBSD: buildcmd,v 1.6 2012/04/13 06:36:08 wiz Exp $
+# $NetBSD: buildcmd,v 1.9 2015/04/26 07:59:58 tnn Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -67,7 +67,7 @@ case $arg in
 	;;
 ######################################################################
 # Treat the '--as-needed' and '--no-as-needed' arguments to ld as if
-# thay are libraries so that they still surround the given library.
+# they are libraries so that they still surround the given library.
 # WARNING: this may not work if the wrapper reorders libraries.
 ######################################################################
 -l*|--as-needed|--no-as-needed)
--- a/mk/wrapper/wrapper-defs.mk
+++ b/mk/wrapper/wrapper-defs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: wrapper-defs.mk,v 1.3 2009/05/06 10:28:01 tron Exp $
+# $NetBSD: wrapper-defs.mk,v 1.5 2015/04/29 14:23:23 jperkin Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -37,11 +37,16 @@
 .if !defined(WRAPPER_DEFS_MK)
 WRAPPER_DEFS_MK=	defined

+.if ${_USE_CWRAPPERS} == "yes"
+WRAPPER_DIR=		${WRKDIR}/.cwrapper
+WRAPPER_BINDIR=		${WRAPPER_DIR}/bin
+.else
 WRAPPER_DIR=		${WRKDIR}/.wrapper
 WRAPPER_BINDIR=		${WRAPPER_DIR}/bin
 WRAPPER_TMPDIR=		${WRAPPER_DIR}/tmp
 WRAPPER_SRCDIR=		${.CURDIR}/../../mk/wrapper
 WRAPPER_BIN_SH?=	${SH}
 WRAPPER_SHELL?=		${WRAPPER_BIN_SH}
+.endif

 .endif	# WRAPPER_DEFS_MK