Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.59 2015/05/04 19:23:19 joerg Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.60 2015/07/04 16:18:38 joerg Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -47,18 +47,11 @@ PLIST_SUBST+=		IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q}
 .endif

 .if defined(USE_IMAKE)
-USE_X11BASE?=		implied
 MAKE_FLAGS+=		CC=${CC:Q} CXX=${CXX:Q}
 .endif

-.if defined(USE_X11BASE) && ${X11_TYPE} != "modular"
-.  include "x11.buildlink3.mk"
-.endif
-
 .if defined(INSTALLATION_PREFIX)
 PREFIX=			${INSTALLATION_PREFIX}
-.elif defined(USE_X11BASE)
-PREFIX=			${X11PREFIX}
 .elif defined(USE_CROSSBASE)
 PREFIX=			${CROSSBASE}
 .else
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.365 2015/06/04 15:48:46 sevan Exp $
+# $NetBSD: bsd.prefs.mk,v 1.369 2015/09/08 12:07:55 jperkin Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -322,8 +322,10 @@ LOWER_OPSYS_VERSUFFIX=	2.${OS_VERSION:C/5.//}
 _UNAME_V!=		${UNAME} -v
 .  if !empty(_UNAME_V:Mjoyent_*)
 OS_VARIANT=		SmartOS
+LOWER_VARIANT_VERSION=	${_UNAME_V:C/joyent_//}
 .  elif !empty(_UNAME_V:Momnios-*)
 OS_VARIANT=		OmniOS
+LOWER_VARIANT_VERSION!= 	/usr/bin/awk '{ if (!seen) { print $$3; seen=1 } }' /etc/release
 .  endif

 .elif ${OPSYS} == "SCO_SV"
@@ -387,28 +389,6 @@ 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
@@ -422,6 +402,8 @@ OBJECT_FMT=	ELF
 .elif ${OPSYS} == "MirBSD"
 OBJECT_FMT=	ELF
 MKPROFILE=	no
+.elif ${OPSYS} == "Linux"
+OBJECT_FMT=	ELF
 .elif ${OPSYS} == "AIX"
 OBJECT_FMT=	XCOFF
 .elif ${OPSYS} == "OSF1"
@@ -659,8 +641,6 @@ CROSSBASE?=	${LOCALBASE}/cross
 X11BASE=		${LOCALBASE}
 .endif

-X11PREFIX=		${LOCALBASE}
-
 # Default directory for font encodings
 .if ${X11_TYPE} == "modular"
 X11_ENCODINGSDIR?=	${X11BASE}/share/fonts/X11/encodings
--- a/mk/build/bsd.build-vars.mk
+++ b/mk/build/bsd.build-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build-vars.mk,v 1.8 2012/12/06 11:36:31 jperkin Exp $
+# $NetBSD: bsd.build-vars.mk,v 1.9 2015/07/04 16:18:38 joerg Exp $
 #
 # Package-settable variables:
 #
@@ -37,7 +37,6 @@ MAKE_ENV+=	LOCALBASE=${LOCALBASE:Q}
 MAKE_ENV+=	NO_WHOLE_ARCHIVE_FLAG=${NO_WHOLE_ARCHIVE_FLAG:Q}
 MAKE_ENV+=	WHOLE_ARCHIVE_FLAG=${WHOLE_ARCHIVE_FLAG:Q}
 MAKE_ENV+=	X11BASE=${X11BASE:Q}
-MAKE_ENV+=	X11PREFIX=${X11PREFIX:Q}
 MAKE_ENV+=	PKGMANDIR=${PKGMANDIR:Q}
 MAKE_ENV+=	PKGINFODIR=${PKGINFODIR:Q}
 MAKE_ENV+=	PKGGNUDIR=${PKGGNUDIR:Q}
--- a/mk/check/bsd.check-vars.mk
+++ b/mk/check/bsd.check-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.check-vars.mk,v 1.7 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: bsd.check-vars.mk,v 1.8 2015/08/17 17:35:23 jperkin Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -8,14 +8,10 @@
 CHECK_FILES_SUPPORTED?=		yes
 CHECK_SHLIBS_SUPPORTED?=	yes

-.if ${_OPSYS_CAN_CHECK_SHLIBS} == "yes"
-USE_CHECK_SHLIBS_ELF?=		yes
+.if ${_OPSYS_CAN_CHECK_SHLIBS:tl} == "yes"
+_USE_CHECK_SHLIBS_NATIVE=	yes
 .else
-USE_CHECK_SHLIBS_ELF?=		no
+_USE_CHECK_SHLIBS_NATIVE=	no
 .endif

 USE_TOOLS+=	awk cat cmp diff echo find grep rm sed test touch true
-
-.if !empty(USE_CHECK_SHLIBS_ELF:M[yY][eE][sS])
-USE_TOOLS+=	readelf
-.endif
--- a/mk/check/check-shlibs-elf.awk
+++ b/mk/check/check-shlibs-elf.awk
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs-elf.awk,v 1.10 2014/10/03 19:12:16 jperkin Exp $
+# $NetBSD: check-shlibs-elf.awk,v 1.11 2015/08/10 15:11:47 jperkin Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -101,7 +101,7 @@ function check_pkg(DSO, pkg, found) {
 	close(depends_file)
 }

-function checkshlib(DSO, needed, rpath, found, dso_rath, got_rpath, nrpath) {
+function checkshlib(DSO, needed, rpath, found, dso_rpath, got_rpath, nrpath) {
 	cmd = readelf " -Wd " shquote(DSO) " 2> /dev/null"
 	while ((cmd | getline) > 0) {
 		if ($2 == "(RPATH)" || $2 == "(RUNPATH)") {
--- a/mk/check/check-shlibs-macho.awk
+++ b/mk/check/check-shlibs-macho.awk
@@ -0,0 +1,117 @@
+# $NetBSD: check-shlibs-macho.awk,v 1.1 2015/08/17 17:35:23 jperkin Exp $
+
+#
+# Read a list of potential Mach-O binaries from stdin.
+# For each, check the list of required DSOs and ensure that each of them can
+# be found correctly, and check that any pkgsrc-installed DSOs belong to a
+# full dependency.
+#
+
+function shquote(IN,	out) {
+	out = IN;
+	gsub("\\\\", "\\\\", out);
+	gsub("\\\n", "\\n", out);
+	gsub("\\\t", "\\t", out);
+	gsub(" ", "\\ ", out);
+	gsub("'", "\\'", out);
+	gsub("`", "\\`", out);
+	gsub("\"", "\\\"", out);
+	gsub(";", "\\;", out);
+	gsub("&", "\\&", out);
+	gsub("<", "\\<", out);
+	gsub(">", "\\>", out);
+	gsub("\\(", "\\(", out);
+	gsub("\\)", "\\)", out);
+	gsub("\\|", "\\|", out);
+	gsub("\\*", "\\*", out);
+	gsub("\\?", "\\?", out);
+	gsub("\\{", "\\{", out);
+	gsub("\\}", "\\}", out);
+	gsub("\\[", "\\[", out);
+	gsub("\\]", "\\]", out);
+	gsub("\\$", "\\$", out);
+	gsub("!", "\\!", out);
+	gsub("#", "\\#", out);
+	gsub("\\^", "\\^", out);
+	gsub("~", "\\~", out);
+	return out;
+}
+
+function check_pkg(DSO, 	pkg, found) {
+	if (destdir == "")
+		return 0
+	if (DSO in pkgcache) {
+		pkg = pkgcache[DSO]
+	} else {
+		cmd = pkg_info_cmd " -Fe " shquote(DSO) " 2>/dev/null"
+		if ((cmd | getline pkg) < 0) {
+			close(cmd)
+			return 0
+		}
+		close(cmd)
+		pkgcache[DSO] = pkg
+	}
+	if (pkg == "")
+		return 0
+	found=0
+	while ((getline < depends_file) > 0) {
+		if ($3 == pkg) {
+			found=1
+			if ($1 != "full")
+				continue
+			close(depends_file)
+			return 0
+		}
+	}
+	if (found)
+		print DSO ": " pkg " is not a runtime dependency"
+	close(depends_file)
+}
+
+function checkshlib(DSO,	needed, found) {
+	cmd = "otool -XL " shquote(DSO) " 2>/dev/null"
+	while ((cmd | getline) > 0) {
+		needed[$1] = ""
+	}
+	close(cmd)
+	ndirs = split(cross_destdir ":" destdir, check_dirs, ":")
+	for (lib in needed) {
+		#
+		# Ensure we don't have any WRKDIR references.
+		#
+		if (lib == wrkdir ||
+		    substr(lib, 1, length(wrkdir) + 1) == wrkdir "/") {
+			print DSO ": path relative to WRKDIR: " lib
+			break
+		}
+		#
+		# Check destination dirs for library existence.  If found in a
+		# system path (cross_destdir is somewhat confusing but if set
+		# it points to the populated cross destdir, otherwise we are
+		# checking '/') then check_pkg() ensures it is a runtime dep.
+		#
+		for (i = 1; i <= ndirs; i++) {
+			libfile = check_dirs[i] lib
+			if (!(libfile in libcache))
+				libcache[libfile] = system("test -f " \
+							   shquote(libfile))
+			if (libcache[libfile] == 0) {
+				check_pkg(lib)
+				found = 1
+				break
+			}
+		}
+		if (found == 0)
+			print DSO ": missing library: " lib
+	}
+}
+
+BEGIN {
+	cross_destdir = ENVIRON["CROSS_DESTDIR"]
+	destdir = ENVIRON["DESTDIR"]
+	wrkdir = ENVIRON["WRKDIR"]
+	pkg_info_cmd = ENVIRON["PKG_INFO_CMD"]
+	depends_file = ENVIRON["DEPENDS_FILE"]
+}
+
+{ checkshlib($0); }
--- a/mk/check/check-shlibs.mk
+++ b/mk/check/check-shlibs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs.mk,v 1.24 2014/10/12 23:39:17 joerg Exp $
+# $NetBSD: check-shlibs.mk,v 1.26 2015/08/17 17:35:23 jperkin Exp $
 #
 # This file verifies that all libraries used by the package can be found
 # at run-time.
@@ -38,7 +38,7 @@ CHECK_SHLIBS_SUPPORTED?=	yes
 CHECK_SHLIBS_SKIP?=		# none

 # All binaries and shared libraries.
-_CHECK_SHLIBS_ERE=	(bin/|sbin/|libexec/|\.so$$|lib/lib.*\.so|lib/lib.*\.dylib|lib/lib.*\.sl)
+_CHECK_SHLIBS_ERE=	(bin/|sbin/|libexec/|\.(dylib|sl|so)$$|lib/lib.*\.(dylib|sl|so))

 _CHECK_SHLIBS_FILELIST_CMD?=	${SED} -e '/^@/d' ${PLIST} |		\
 	(while read file; do						\
@@ -50,17 +50,23 @@ _CHECK_SHLIBS_FILELIST_CMD?=	${SED} -e '/^@/d' ${PLIST} |		\
 privileged-install-hook: _check-shlibs
 .endif

-.if !empty(USE_CHECK_SHLIBS_ELF:M[yY][eE][sS])
-CHECK_SHLIBS_ELF=	${PKGSRCDIR}/mk/check/check-shlibs-elf.awk
-CHECK_SHLIBS_ELF_ENV=	PLATFORM_RPATH=${_OPSYS_SYSTEM_RPATH:Q}
-CHECK_SHLIBS_ELF_ENV+=	READELF=${TOOLS_PATH.readelf:Q}
-CHECK_SHLIBS_ELF_ENV+=	CROSS_DESTDIR=${_CROSS_DESTDIR:Q}
-CHECK_SHLIBS_ELF_ENV+=	PKG_INFO_CMD=${PKG_INFO:Q}
-CHECK_SHLIBS_ELF_ENV+=	DEPENDS_FILE=${_RRDEPENDS_FILE:Q}
-.  if ${_USE_DESTDIR} != "no"
-CHECK_SHLIBS_ELF_ENV+=	DESTDIR=${DESTDIR:Q}
+.if ${_USE_CHECK_SHLIBS_NATIVE} == "yes"
+CHECK_SHLIBS_NATIVE_ENV=
+.  if ${OBJECT_FMT} == "ELF"
+USE_TOOLS+=			readelf
+CHECK_SHLIBS_NATIVE=		${PKGSRCDIR}/mk/check/check-shlibs-elf.awk
+CHECK_SHLIBS_NATIVE_ENV+=	PLATFORM_RPATH=${_OPSYS_SYSTEM_RPATH:Q}
+CHECK_SHLIBS_NATIVE_ENV+=	READELF=${TOOLS_PATH.readelf:Q}
+.  elif ${OBJECT_FMT} == "Mach-O"
+CHECK_SHLIBS_NATIVE=		${PKGSRCDIR}/mk/check/check-shlibs-macho.awk
 .  endif
-CHECK_SHLIBS_ELF_ENV+=	WRKDIR=${WRKDIR:Q}
+CHECK_SHLIBS_NATIVE_ENV+=	CROSS_DESTDIR=${_CROSS_DESTDIR:Q}
+CHECK_SHLIBS_NATIVE_ENV+=	PKG_INFO_CMD=${PKG_INFO:Q}
+CHECK_SHLIBS_NATIVE_ENV+=	DEPENDS_FILE=${_RRDEPENDS_FILE:Q}
+.  if ${_USE_DESTDIR} != "no"
+CHECK_SHLIBS_NATIVE_ENV+=	DESTDIR=${DESTDIR:Q}
+.  endif
+CHECK_SHLIBS_NATIVE_ENV+=	WRKDIR=${WRKDIR:Q}

 _check-shlibs: error-check .PHONY
 	@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
@@ -76,7 +82,7 @@ _check-shlibs: error-check .PHONY
 		esac;							\
 		${ECHO} $$file;						\
 	done |								\
-	${PKGSRC_SETENV} ${CHECK_SHLIBS_ELF_ENV} ${AWK} -f ${CHECK_SHLIBS_ELF} > ${ERROR_DIR}/${.TARGET}
+	${PKGSRC_SETENV} ${CHECK_SHLIBS_NATIVE_ENV} ${AWK} -f ${CHECK_SHLIBS_NATIVE} > ${ERROR_DIR}/${.TARGET}

 .else
 .  if ${_USE_DESTDIR} != "no"
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.161 2015/04/27 10:33:49 tnn Exp $
+# $NetBSD: gcc.mk,v 1.163 2015/07/26 22:13:17 khorben Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -67,7 +67,7 @@ _DEF_VARS.gcc=	\
 	PKG_CC PKG_CPP PKG_CXX PKG_FC \
 	PKG_ADA PKG_GMK PKG_GLK PKG_GDB PKG_CHP PKG_GLK PKG_GNT PKG_PRP \
 	_CC _COMPILER_RPATH_FLAG _COMPILER_STRIP_VARS \
-	_GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CC \
+	_GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CC _GCC_CFLAGS \
 	_GCC_CPP _GCC_CXX _GCC_DEPENDENCY _GCC_DEPENDS \
 	_GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \
 	_GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \
@@ -105,7 +105,7 @@ GCC_REQD+=	20120614

 # _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc
 # without the PKGREVISIONs.
-_GCC_DIST_NAME:=	gcc49
+_GCC_DIST_NAME:=	gcc5
 .include "../../lang/${_GCC_DIST_NAME}/version.mk"
 _GCC_DIST_VERSION:=	${${_GCC_DIST_NAME:tu}_DIST_VERSION}

@@ -138,6 +138,9 @@ _GCC48_PATTERNS= 4.8 4.8.*
 # _GCC49_PATTERNS matches N s.t. 4.9 <= N < 4.10.
 _GCC49_PATTERNS= 4.9 4.9.*

+# _GCC5_PATTERNS matches N s.t. 5.0 <= N < 6.
+_GCC5_PATTERNS= 5.*
+
 # _GCC_AUX_PATTERNS matches 8-digit date YYYYMMDD*
 _GCC_AUX_PATTERNS= 20[1-2][0-9][0-1][0-9][0-3][0-9]*

@@ -278,6 +281,12 @@ _NEED_GCC49?=	no
 _NEED_GCC49=	yes
 .  endif
 .endfor
+_NEED_GCC5?=	no
+.for _pattern_ in ${_GCC5_PATTERNS}
+.  if !empty(_GCC_REQD:M${_pattern_})
+_NEED_GCC5=	yes
+.  endif
+.endfor
 _NEED_GCC_AUX?=	no
 .for _pattern_ in ${_GCC_AUX_PATTERNS}
 .  if !empty(_GCC_REQD:M${_pattern_})
@@ -289,8 +298,9 @@ _NEED_NEWER_GCC=NO
    !empty(_NEED_GCC34:M[nN][oO]) && !empty(_NEED_GCC44:M[nN][oO]) && \
    !empty(_NEED_GCC45:M[nN][oO]) && !empty(_NEED_GCC46:M[nN][oO]) && \
    !empty(_NEED_GCC47:M[nN][oO]) && !empty(_NEED_GCC48:M[nN][oO]) && \
-    !empty(_NEED_GCC49:M[nN][oO]) && !empty(_NEED_GCC_AUX:M[nN][oO])
-_NEED_GCC49=	yes
+    !empty(_NEED_GCC49:M[nN][oO]) && !empty(_NEED_GCC5:M[nN][oO]) && \
+    !empty(_NEED_GCC_AUX:M[nN][oO])
+_NEED_GCC5=	yes
 .endif

 # Assume by default that GCC will only provide a C compiler.
@@ -313,6 +323,8 @@ LANGUAGES.gcc=	c c++ fortran fortran77 go java objc obj-c++
 LANGUAGES.gcc=	c c++ fortran fortran77 go java objc obj-c++
 .elif !empty(_NEED_GCC49:M[yY][eE][sS])
 LANGUAGES.gcc=	c c++ fortran fortran77 go java objc obj-c++
+.elif !empty(_NEED_GCC5:M[yY][eE][sS])
+LANGUAGES.gcc=	c c++ fortran fortran77 go java objc obj-c++
 .elif !empty(_NEED_GCC_AUX:M[yY][eE][sS])
 LANGUAGES.gcc=	c c++ fortran fortran77 objc ada
 .endif
@@ -336,6 +348,8 @@ CWRAPPERS_APPEND.cc+=	-std=gnu99
 CFLAGS+=	-Wno-import
 .endif

+CFLAGS+=	${_GCC_CFLAGS}
+
 .if !empty(_NEED_GCC2:M[yY][eE][sS])
 #
 # We require gcc-2.x in the lang/gcc2 directory.
@@ -505,6 +519,27 @@ _GCC_DEPENDENCY=	gcc49>=${_GCC_REQD}:../../lang/gcc49
 _USE_GCC_SHLIB?=	yes
 .    endif
 .  endif
+.elif !empty(_NEED_GCC5:M[yY][eE][sS])
+#
+# We require gcc-5.x in the lang/gcc5-* directory.
+#
+_GCC_PKGBASE=		gcc5
+.  if !empty(PKGPATH:Mlang/gcc5)
+_IGNORE_GCC=		yes
+MAKEFLAGS+=		_IGNORE_GCC=yes
+.  endif
+.  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
+_GCC_PKGSRCDIR=		../../lang/gcc5
+_GCC_DEPENDENCY=	gcc5>=${_GCC_REQD}:../../lang/gcc5
+.    if !empty(_LANGUAGES.gcc:Mc++) || \
+        !empty(_LANGUAGES.gcc:Mfortran) || \
+        !empty(_LANGUAGES.gcc:Mfortran77) || \
+        !empty(_LANGUAGES.gcc:Mgo) || \
+        !empty(_LANGUAGES.gcc:Mobjc) || \
+        !empty(_LANGUAGES.gcc:Mobj-c++)
+_USE_GCC_SHLIB?=	yes
+.    endif
+.  endif
 .elif !empty(_NEED_GCC_AUX:M[yY][eE][sS])
 #
 # We require Ada-capable compiler in the lang/gcc-aux directory.
@@ -839,6 +874,8 @@ PREPEND_PATH+=	${_GCC_DIR}/bin
 .      include "../../lang/gcc48-libs/buildlink3.mk"
 .    elif !empty(CC_VERSION:Mgcc-4.9*)
 .      include "../../lang/gcc49-libs/buildlink3.mk"
+.    elif !empty(CC_VERSION:Mgcc-5.*)
+.      include "../../lang/gcc5-libs/buildlink3.mk"
 .    else
 PKG_FAIL_REASON=	"No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}"
 .    endif
--- a/mk/compiler/gfortran.mk
+++ b/mk/compiler/gfortran.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.5 2015/01/27 04:53:46 dbj Exp $
+# $NetBSD: gfortran.mk,v 1.7 2015/09/11 15:23:21 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -90,6 +90,7 @@ PREPEND_PATH+=	${_GFORTRAN_DIR}/bin
 .  endif

 # Add the dependency on gfortran.
+BUILDLINK_DEPMETHOD.gcc48=	full
 .  include "../../lang/gcc48/buildlink3.mk"

 .  if defined(GFORTRAN_DIR) && !empty(GFORTRAN_DIR)
--- a/mk/curses.builtin.mk
+++ b/mk/curses.builtin.mk
@@ -1,4 +1,4 @@
-# $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

@@ -126,8 +126,7 @@ USE_BUILTIN.curses=	no
 # 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]*-*			\
-			NetBSD-1.4.*-* NetBSD-1.4[A-X]-*
+_INCOMPAT_CURSES?=
 .for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
 .  if !empty(MACHINE_PLATFORM:M${_pattern_})
 USE_BUILTIN.curses=	no
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.256 2015/04/19 09:21:33 tnn Exp $
+# $NetBSD: mk.conf,v 1.260 2015/09/05 21:25:30 sevan Exp $
 #

 # This file provides default values for variables that may be overridden
@@ -215,16 +215,32 @@ PKGSRC_RUN_TEST?=	no
 # Possible: yes, no
 # Default: no

-.if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
+PKGSRC_USE_FORT?= no
+# Turns on substitute wrappers for commonly used functions that do not bounds
+# checking regularly, but could in some cases (with GCC for instance).
+# Possible: yes, no
+# Default: no
+
+.if ${PKGSRC_USE_FORT:Uno} != "no"
+PKGSRC_USE_SSP?= yes
+.else
+PKGSRC_USE_SSP?= no
+.endif
+# Set this to YES to enable stack-smashing protection (on supported platforms).
+# Possible: yes, no
+# Default: no, except if PKGSRC_USE_FORT is set to "yes".
+
+# 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:MOpenBSD-*-*) && \
-     exists(/usr/X11R6/lib/X11/config/xorgversion.def))
-PREFER_PKGSRC?=
 .elif !empty(MACHINE_PLATFORM:MLinux-*-*) && \
      (!defined(X11_TYPE) || ${X11_TYPE} == "native")
 PREFER_PKGSRC?=
@@ -302,7 +318,7 @@ VARBASE?=	/var
 # Where Motif-2.0-compatible headers and libraries are installed
 # on the system.
 # Possible: any path
-# Default: ${X11PREFIX} or where motif, openmotif or lesstif is installed
+# Default: ${X11BASE} or where motif, openmotif or lesstif is installed

 PKGINFODIR?=	info
 #	The subdirectory of PREFIX that holds the GNU info files and the
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -143,6 +143,7 @@ dvdread			Enable reproduction of DVDs.
 dvi			Enable device independent file format (mostly TeX) support.
 eaccelerator-disassembler	Include disassembler.
 eaccelerator-doc-comment-inclusion	Retain doc-comments in internal php structures.
+eai			Enable EAI (Email Address Internationalization) support.
 eb			Enable EB dictionary library support.
 ecl			Use Embeddable Common Lisp.
 ecore			Enable ecore library support.
@@ -422,14 +423,11 @@ libvpx			Enable libvpx support.
 libwildmidi		Enable MIDI support using libwildmidi.
 libwww-aliases		Install aliases for p5-libwww (e.g. HEAD, GET etc.).
 libxml2			Use the libxml2 library for XML support.
-liferea-gtkhtml		Use libgtkhtml2 to render HTML.
-liferea-mozilla		Use xulrunner to render HTML.
 lilypond		Enable LilyPond music typesetter support.
 links			Use and enable support for the links browser.
-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.
+llvm			Enable run time generation with Low Level Virtual Machine.
 lmdb			Enable lmdb support.
 lprng-priv-ports	Connections must be made from privileged ports.
 lprng-suid		Install LPRng executables setuid root.
@@ -450,11 +448,8 @@ maintainer-zts		Enable the Zend Thread Safety option for PHP.
 manual			Include manual.			
 marble			Enable marble (virtual globe) support.
 mc-charset		Enable charset selection and conversion.
-mc-edit			Enable internal editor.
-mc-samba		Enable smb virtual file system.
-mc-subshell		Enable support for subshell.
-mc-vfs			Support for VFS (virtual file system).
 mecab			Use MeCab as the Japanese Morphological Analzer.
+memcached		Enable memcached support.
 mex			Enable matlab mex support (Linux and Solaris only).
 migemo			Enable migemo (Japanese text search tool/library) support.
 mikmod			Enable MikMod sound library.
@@ -474,7 +469,6 @@ modplug			Use for decoding mod-like music formats.
 motif			Enable motif support.
 motoya			Add motoya fonts.
 mozilla			Use mozilla as gecko rendering engine.
-mozilla-enigmail	Enable the Enigmail OpenPGP extension.
 mozilla-jemalloc	Enable building with Mozilla'a jemalloc.
 mozilla-jit		Enable nanojit javascript acceleration.
 mozilla-lightning	Enable the lightning calendar extension.
@@ -662,6 +656,7 @@ spamassassin-test-prefork	Enable spamd prefork test (kills processes containing
 spandsp			Enable spandsp support.
 speex			Enable speex support.
 spf			Enable Sender Policy Framework support.
+sphinx			Enable Sphinx full-text search.
 sqlite			Enable SQLite support.
 sqlite3			Enable SQLite3 support.
 squid-arp-acl		Enable use of ARP ACL lists (ether address).
--- a/mk/emulator/emulator-vars.mk
+++ b/mk/emulator/emulator-vars.mk
@@ -1,4 +1,4 @@
-# $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.
@@ -86,11 +86,7 @@ _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
--- a/mk/fetch/bsd.fetch-vars.mk
+++ b/mk/fetch/bsd.fetch-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.fetch-vars.mk,v 1.19 2015/03/09 15:50:18 tnn Exp $
+# $NetBSD: bsd.fetch-vars.mk,v 1.22 2015/09/13 15:03:57 joerg Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -13,6 +13,16 @@
 #	the distribution files are looked up, additionally to DISTDIR.
 #	No files will ever be created in these directories.
 #
+#    POST_FETCH_HOOK is a program to execute after fetch successfully
+#	obtained a file.  It is called with the relative path of the distfile
+#	in ${DISTDIR} and the full URL it was obtained from.
+#
+#    IGNORE_INTERACTIVE_FETCH can be set to yes to skip the normal
+#	interactive check logic and tries any provided MASTER_SITE
+#	or MASTER_SITE_OVERRIDE.
+#
+#	The normal backup sites are explicitly disabled in this case.
+#
 # The following variables may be set in a package Makefile:
 #
 #    DIST_SUBDIR is the subdirectory of ${DISTDIR} in which the original
--- a/mk/fetch/bsd.fetch.mk
+++ b/mk/fetch/bsd.fetch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.fetch.mk,v 1.8 2015/03/07 14:17:52 tnn Exp $
+# $NetBSD: bsd.fetch.mk,v 1.10 2015/07/06 05:03:33 rodent Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "fetch" step.
@@ -39,4 +39,4 @@
 .include "fetch-list.mk"
 .include "distclean.mk"
 .include "github.mk"
-
+.include "pypi.mk"
--- a/mk/fetch/fetch
+++ b/mk/fetch/fetch
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $NetBSD: fetch,v 1.15 2013/02/16 07:32:28 obache Exp $
+# $NetBSD: fetch,v 1.18 2015/09/19 11:45:56 dsainty Exp $
 #
-# Copyright (c) 2006 The NetBSD Foundation, Inc.
+# Copyright (c) 2006, 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -43,7 +43,7 @@
 #	fetch -- fetch files via URLs
 #
 # SYNOPSIS
-#	fetch [-c] [-d dir] [-f distinfo] [-r] [-v] file site ...
+#	fetch [-c] [-d dir] [-f distinfo] [-p hook] [-r] [-v] file [site ...]
 #
 # DESCRIPTION
 #	fetch will attempt to fetch the file from the list of specified
@@ -67,6 +67,11 @@
 #		for the file.  The file format should match what is
 #		needed by the pkgsrc/mk/checksum/checksum script.
 #
+#	-p hook
+#		After a successful fetch, run hook.  The first argument is
+#		the relative path of the distfile and the second argument
+#		the full URL the file was obtained from.
+#
 #	-r	Resume a previous fetch for the file.  In this case,
 #		the file is first saved to a ".pkgsrc.resume" file,
 #		and is later renamed to the final file name if the
@@ -118,13 +123,14 @@
 self="${0##*/}"

 usage() {
-	${ECHO} 1>&2 "usage: $self [-c] [-d dir] [-f distinfo] [-r] [-v] file site ..."
+	${ECHO} 1>&2 "usage: $self [-c] [-d dir] [-f distinfo] [-p hook] [-r] [-v] file [site ...]"
 }

 # Process optional arguments
 checksum=
 distinfo=
 fetchdir=.			# A relative directory or "."
+post_fetch=
 resume=
 verbose=
 while ${TEST} $# -gt 0; do
@@ -132,6 +138,7 @@ while ${TEST} $# -gt 0; do
 	-c)	checksum=yes; shift ;;
 	-d)	fetchdir="$2"; shift 2 ;;
 	-f)	distinfo="$2"; shift 2 ;;
+	-p)	post_fetch="$2"; shift 2 ;;
 	-r)	resume=yes; shift ;;
 	-v)	verbose=yes; shift ;;
 	--)	shift; break ;;
@@ -159,7 +166,7 @@ if ${TEST} -n "$resume"; then
 fi

 # Process required arguments
-if ${TEST} $# -lt 2; then
+if ${TEST} $# -lt 1; then
 	usage
 	exit 1
 fi
@@ -301,6 +308,9 @@ while ${TEST} $# -gt 0; do
 		fi
 	fi
 done
+if ${TEST} -f $path && ${TEST} -n "$post_fetch"; then
+	"$post_fetch" $path "$url"
+fi
 if ${TEST} -f $path; then
 	exit 0
 else
--- a/mk/fetch/fetch.mk
+++ b/mk/fetch/fetch.mk
@@ -1,6 +1,8 @@
-# $NetBSD: fetch.mk,v 1.64 2014/10/07 07:27:18 tron Exp $
+# $NetBSD: fetch.mk,v 1.67 2015/09/14 08:27:13 joerg Exp $

+.if empty(INTERACTIVE_STAGE:Mfetch) && empty(FETCH_MESSAGE:U)
 _MASTER_SITE_BACKUP=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
+.endif
 _MASTER_SITE_OVERRIDE=	${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}

 # Where to put distfiles that don't have any other master site
@@ -115,7 +117,10 @@ post-fetch:
 ${DISTDIR}/${_file_}:
 	@${DO_NADA}
 .  else
-${DISTDIR}/${_file_}: fetch-check-interactive do-fetch-file error-check
+.    if empty(IGNORE_INTERACTIVE_FETCH:Uno:M[yY][eE][sS])
+${DISTDIR}/${_file_}: fetch-check-interactive
+.    endif
+${DISTDIR}/${_file_}: do-fetch-file error-check
 .  endif
 .endfor

@@ -263,6 +268,9 @@ _FETCH_ARGS+=	-r
 .if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
 _FETCH_ARGS+=	-d ${DIST_SUBDIR}
 .endif
+.if defined(POST_FETCH_HOOK) && !empty(POST_FETCH_HOOK)
+_FETCH_ARGS+=	-p ${POST_FETCH_HOOK:Q}
+.endif

 .PHONY: do-fetch-file
 do-fetch-file: .USE
--- a/mk/fetch/pypi.mk
+++ b/mk/fetch/pypi.mk
@@ -0,0 +1,41 @@
+# $NetBSD: pypi.mk,v 1.2 2015/07/06 05:03:33 rodent Exp $
+#
+# pypi.python.org master site handling
+#
+# To use, set in the pkgsrc Makefile:
+#
+# DISTNAME=	pyfoo-1.0.0
+# MASTER_SITES=	${MASTER_SITE_PYPI}
+#
+# Then, PKGNAME and HOMEPAGE will be set automatically (can be overridden).
+#
+# Keywords: pypi python
+
+.if defined(MASTER_SITES) && !empty(MASTER_SITES:C,^https:\/\/pypi.python.org\/packages\/source\/$,match,:Mmatch)
+_USE_PYPI=		YES
+.endif
+
+.if defined(_USE_PYPI) && !defined(DISTNAME)
+PKG_FAIL_REASON+=	"DISTNAME must be set when MASTER_SITES = MASTER_SITE_PYPI."
+.endif
+
+.if defined(_USE_PYPI) && !empty(_USE_PYPI:MYES)
+_PYPI_DEFAULT_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+
+# For: https://pypi.python.org/packages/source/p/pyfoo/
+_PYPI_PACKAGE_PATH=		${DISTNAME:S/-${PKGVERSION_NOREV}//1}
+
+# For: https://pypi.python.org/packages/source/p/
+_PYPI_PATH_INDEX=		${_PYPI_PACKAGE_PATH:C/^([[:alnum:]]{1}).*$/\1/1}
+
+SITES.${_PYPI_DEFAULT_DISTFILES}=	${MASTER_SITES:=${_PYPI_PATH_INDEX}/${_PYPI_PACKAGE_PATH}/}
+
+# Lets us override PKGNAME in the pkgsrc Makefile if necessary.
+# No need to sacrifice convenience otherwise.
+.if defined(PKGNAME) && ${PKGNAME} == ${DISTNAME}
+PKGNAME=			${PYPKGPREFIX}-${DISTNAME}
+.endif
+
+# Makes: https://pypi.python.org/pypi/pyfoo/1.0.0 and saves an HTTP redirect.
+HOMEPAGE?=			https://pypi.python.org/pypi/${_PYPI_PACKAGE_PATH}
+.endif
--- a/mk/fetch/sites.mk
+++ b/mk/fetch/sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.128 2015/05/16 20:02:21 tsutsui Exp $
+# $NetBSD: sites.mk,v 1.134 2015/08/11 23:41:41 ryoon Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -27,6 +27,11 @@ MASTER_SITE_GITHUB+=    \
 MASTER_SITE_GNUSTEP+=   \
 	ftp://ftp.gnustep.org/pub/gnustep/

+MASTER_SITE_OSDN+=	\
+	http://jaist.dl.sourceforge.jp/ \
+	http://iij.dl.sourceforge.jp/ \
+	http://osdn.dl.osdn.jp/
+
 MASTER_SITE_PERL_CPAN+= \
 	ftp://cpan.pair.com/modules/by-module/ \
 	ftp://ftp.funet.fi/pub/languages/perl/CPAN/modules/by-module/ \
@@ -70,7 +75,8 @@ MASTER_SITE_GNOME+=     \
 	http://ftp.tuwien.ac.at/hci/gnome.org/ \
 	ftp://ftp.cse.buffalo.edu/pub/Gnome/ \
 	ftp://ftp.kddlabs.co.jp/pub/GNOME/ \
-	ftp://ftp.dit.upm.es/linux/gnome/
+	ftp://ftp.dit.upm.es/linux/gnome/ \
+	https://download.gnome.org/

 MASTER_SITE_KDE+=	\
 	http://download.kde.org/stable/ \
@@ -89,12 +95,6 @@ MASTER_SITE_KDE+=	\
 MASTER_SITE_SOURCEFORGE+=	\
 	http://downloads.sourceforge.net/sourceforge/

-MASTER_SITE_SOURCEFORGE_JP+=	\
-	http://jaist.dl.sourceforge.jp/ \
-	http://iij.dl.sourceforge.jp/ \
-	http://osdn.dl.sourceforge.jp/
-
-
 MASTER_SITE_SUSE+=	\
 	ftp://rpmfind.net/linux/opensuse/update/${SUSE_VERSION}/${MACHINE_ARCH}/ \
 	ftp://fr.rpmfind.net/linux/opensuse/update/${SUSE_VERSION}/${MACHINE_ARCH}/ \
@@ -103,8 +103,7 @@ MASTER_SITE_SUSE+=	\
 MASTER_SITE_MOZILLA_ALL+=   \
 	http://download-origin.cdn.mozilla.net/pub/mozilla.org/ \
 	http://dm-download02.mozilla.org/pub/mozilla.org/ \
-	http://ftp.mozilla.org/pub/mozilla.org/ \
-	ftp://ftp.mozilla.org/pub/mozilla.org/
+	http://ftp.mozilla.org/pub/mozilla.org/

 # see http://www.mozilla.org/mirrors.html
 MASTER_SITE_MOZILLA+=	\
@@ -119,8 +118,7 @@ MASTER_SITE_MOZILLA+=	\
 MASTER_SITE_MOZILLA_ESR+=	\
 	http://download-origin.cdn.mozilla.net/pub/mozilla.org/ \
 	http://dm-download02.mozilla.org/pub/mozilla.org/ \
-	http://ftp.mozilla.org/pub/mozilla.org/ \
-	ftp://ftp.mozilla.org/pub/mozilla.org/
+	http://ftp.mozilla.org/pub/mozilla.org/

 MASTER_SITE_XEMACS+=    \
 	http://ftp.xemacs.org/pub/xemacs/ \
@@ -318,7 +316,10 @@ MASTER_SITE_OPENBSD+= \
 	ftp://ftp.jaist.ac.jp/pub/OpenBSD/

 MASTER_SITE_RUBYGEMS+= \
-	http://rubygems.org/downloads/ \
+	http://rubygems.org/downloads/
+
+MASTER_SITE_PYPI+= \
+	https://pypi.python.org/packages/source/

 MASTER_SITE_HASKELL_HACKAGE+=	\
 	http://hackage.haskell.org/package/
--- a/mk/help/directories.help
+++ b/mk/help/directories.help
@@ -1,4 +1,4 @@
-# $NetBSD: directories.help,v 1.2 2014/12/30 15:13:19 wiz Exp $
+# $NetBSD: directories.help,v 1.4 2015/07/04 16:18:38 joerg Exp $
 #
 # This file contains some short documentation on the directories that
 # are used within pkgsrc.
@@ -6,15 +6,14 @@
 # PREFIX
 #	This is the directory where the package should install its
 #	files. The actual value depends on the variables
-#	USE_X11BASE and USE_CROSSBASE.
+#	INSTALLATION_PREFIX and USE_CROSSBASE.
 #
 #	Tags: read-only, system-defined, non-overridable, etc.
 #
 #	See also:
 #		CROSSBASE,
 #		INSTALLATION_PREFIX,
-#		LOCALBASE,
-#		X11PREFIX.
+#		LOCALBASE.
 #

 # LOCALBASE
--- a/mk/install/replace.mk
+++ b/mk/install/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.16 2014/12/06 23:28:18 agc Exp $
+# $NetBSD: replace.mk,v 1.17 2015/09/07 19:23:47 gdt Exp $
 #
 # Public targets:
 #
@@ -48,7 +48,6 @@ replace: barrier

 replace-message: .PHONY
 	@${PHASE_MSG} "Replacing for ${PKGNAME}"
-	@${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."

 .if ${_USE_DESTDIR} == "no"
 su-replace: .PHONY _pkgformat-replace
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.102 2015/06/02 20:37:01 ryoon Exp $
+# $NetBSD: java-vm.mk,v 1.103 2015/08/12 01:06:45 ryoon Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -96,7 +96,7 @@ _PKG_JVM_DEFAULT=	${PKG_JVM_DEFAULT}
 .if !defined(_PKG_JVM_DEFAULT)
 .  if   !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-i386) || \
        !empty(MACHINE_PLATFORM:MNetBSD-[56789].*-x86_64)
-_PKG_JVM_DEFAULT?=	openjdk7
+_PKG_JVM_DEFAULT?=	openjdk8
 .  elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \
 	!empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf)
 _PKG_JVM_DEFAULT?=	openjdk8
--- a/mk/license.mk
+++ b/mk/license.mk
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.71 2015/05/08 10:37:32 wiz Exp $
+# $NetBSD: license.mk,v 1.74 2015/09/13 11:22:22 leot Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -121,7 +121,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
 	ibm-public-license-1.0 \
 	ipafont \
 	isc \
-	lppl-1.2 lppl-1.3c \
+	lppl-1.0 lppl-1.2 lppl-1.3c \
 	lucent \
 	miros \
 	mit \
@@ -143,11 +143,16 @@ DEFAULT_ACCEPTABLE_LICENSES= \
 	w3c \
 	x11 \
 	zlib \
-	zpl
+	zpl-2.0 \
+	zpl-2.1

 # not approved by OSI, derived from BSD
 DEFAULT_ACCEPTABLE_LICENSES+=	info-zip

+# not approved by OSI, in line with Free Software principles but with rename
+# restrictions and typefaces can not be sold by itself.
+DEFAULT_ACCEPTABLE_LICENSES+=	vera-ttf-license
+
 ##### Variant spellings

 .if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES)
--- a/mk/pkgformat/pkg/metadata.mk
+++ b/mk/pkgformat/pkg/metadata.mk
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.11 2015/02/16 10:17:47 jperkin Exp $
+# $NetBSD: metadata.mk,v 1.12 2015/07/04 16:18:38 joerg Exp $

 ######################################################################
 ### The targets below are all PRIVATE.
@@ -236,7 +236,6 @@ MESSAGE_SUBST+=	PKGNAME=${PKGNAME}					\
 		EMULDIR=${EMULDIR}					\
 		EMULSUBDIR=${EMULSUBDIR}				\
 		LOCALBASE=${LOCALBASE}					\
-		X11PREFIX=${X11PREFIX}					\
 		X11BASE=${X11BASE}					\
 		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}			\
 		ROOT_GROUP=${REAL_ROOT_GROUP}				\
--- a/mk/pkgformat/pkg/package.mk
+++ b/mk/pkgformat/pkg/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.10 2015/04/21 17:01:56 joerg Exp $
+# $NetBSD: package.mk,v 1.11 2015/09/07 11:02:28 jperkin Exp $

 .if defined(PKG_SUFX)
 WARNINGS+=		"PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -137,8 +137,8 @@ package-links: delete-package-links
 ### the non-primary categories to which the package belongs.
 ###
 delete-package-links:
-	${RUN} ${FIND} ${PACKAGES} -type l -name ${PKGFILE:T} -print	\
-	| ${XARGS} ${RM} -f
+	${RUN} ${FIND} ${PACKAGES}/*/${PKGFILE:T} -type l -print	\
+		2>/dev/null | ${XARGS} ${RM} -f

 ######################################################################
 ### tarup (PUBLIC)
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.62 2015/02/24 09:46:09 wiz Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.63 2015/08/10 05:41:10 dholland Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -1163,12 +1163,13 @@ install-rcd-scripts:	# do nothing

 .for _script_ in ${_INSTALL_RCD_SCRIPTS}
 RCD_SCRIPT_SRC.${_script_}?=	${FILESDIR}/${_script_}.sh
-RCD_SCRIPT_WRK.${_script_}?=	${WRKDIR}/${_script_}
+RCD_SCRIPT_WRK.${_script_}?=	${WRKDIR}/.rc.d/${_script_}

 .  if !empty(RCD_SCRIPT_SRC.${_script_})
 generate-rcd-scripts: ${RCD_SCRIPT_WRK.${_script_}}
 ${RCD_SCRIPT_WRK.${_script_}}: ${RCD_SCRIPT_SRC.${_script_}}
 	@${STEP_MSG} "Creating ${.TARGET}"
+	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} > ${.TARGET}
 	${RUN}${CHMOD} +x ${.TARGET}

--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.67 2015/06/26 13:51:57 adam Exp $
+# $NetBSD: Darwin.mk,v 1.71 2015/09/07 11:48:35 jperkin Exp $
 #
 # Variable definitions for the Darwin operating system.

@@ -128,6 +128,9 @@ USE_BUILTIN.dl=		no	# Darwin-[56].* uses devel/dlcompat
 # Builtin defaults which make sense for this platform.
 _OPSYS_PREFER.linux-pam?=	native
 _OPSYS_PREFER.mit-krb5?=	native
+.if ${OS_VERSION:R} >= 11
+_OPSYS_PREFER.openssl?=		pkgsrc	# builtin deprecated from 10.7 onwards
+.endif

 # flags passed to the linker to extract all symbols from static archives.
 # this is GNU ld.
@@ -139,10 +142,14 @@ _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
 .endif

-_OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
+_OPSYS_CAN_CHECK_SHLIBS=	yes # check shared libraries using otool(1)

+# OSX strip(1) tries to remove relocatable symbols and fails on certain
+# objects, resulting in non-zero exit status.  We can't modify strip arguments
+# (e.g. adding "-u -r" which would fix the issue) when using install -s so for
+# now stripping is disabled in that mode.
 _STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip
-_STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
+_STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U}	# install(1) option to strip

 # 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.
@@ -158,7 +165,8 @@ 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-9].*)) && \
+.if (!empty(OS_VERSION:M9.*) || !empty(OS_VERSION:M1[0-2].*) || \
+     !empty(OS_VERSION:M1[4-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.46 2015/04/21 17:01:56 joerg Exp $
+# $NetBSD: DragonFly.mk,v 1.47 2015/09/10 19:49:58 jperkin Exp $
 #
 # Variable definitions for the DragonFly operating system.

@@ -28,7 +28,7 @@ ULIMIT_CMD_cputime?=	ulimit -t `ulimit -H -t`
 _OPSYS_EMULDIR.linux=	/compat/linux

 _OPSYS_SYSTEM_RPATH?=		/lib:/usr/lib:/usr/lib/gcc41:/usr/lib/gcc34:/usr/lib/gcc47
-_OPSYS_LIB_DIRS?=		/lib:/usr/lib
+_OPSYS_LIB_DIRS?=		/lib /usr/lib
 _OPSYS_INCLUDE_DIRS?=		/usr/include

 .if exists(/usr/include/netinet6)
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.62 2015/05/08 20:28:30 sevan Exp $
+# $NetBSD: Linux.mk,v 1.63 2015/07/18 15:08:43 wiedi Exp $
 #
 # Variable definitions for the Linux operating system.

@@ -59,9 +59,14 @@ _OPSYS_SYSTEM_RPATH=	/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/i386-linux
 _OPSYS_LIB_DIRS?=	/lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/i386-linux-gnu /usr/lib/i386-linux-gnu
 .endif
 .if !empty(MACHINE_ARCH:Marm*)
+.if exists(/etc/ld.so.conf.d/arm-linux-gnueabihf.conf)
+_OPSYS_SYSTEM_RPATH=	/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/arm-linux-gnueabihf:/usr/lib/arm-linux-gnueabihf
+_OPSYS_LIB_DIRS?=	/lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/arm-linux-gnueabihf /usr/lib/arm-linux-gnueabihf
+.else
 _OPSYS_SYSTEM_RPATH=	/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/arm-linux-gnueabi:/usr/lib/arm-linux-gnueabi
 _OPSYS_LIB_DIRS?=	/lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/arm-linux-gnueabi /usr/lib/arm-linux-gnueabi
 .endif
+.endif
 .else
 _OPSYS_SYSTEM_RPATH=	/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
 _OPSYS_LIB_DIRS?=	/lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.42 2015/05/26 10:08:37 joerg Exp $
+# $NetBSD: NetBSD.mk,v 1.45 2015/08/10 21:44:34 khorben Exp $
 #
 # Variable definitions for the NetBSD operating system.

@@ -128,6 +128,21 @@ FFLAGS+=	-mieee
 PKG_HAVE_KQUEUE=	# defined
 .endif

+.if ${PKGSRC_USE_FORT:Uno} != "no"
+# build with fortify
+_GCC_CFLAGS+=	-D_FORTIFY_SOURCE=2
+.endif
+
+.if ${PKGSRC_USE_SSP:Uno} != "no"
+. if (${MACHINE_ARCH} != "alpha") && \
+	(${MACHINE_ARCH} != "hppa") && \
+	(${MACHINE_ARCH} != "ia64") && \
+	(${MACHINE_ARCH} != "mips")
+# build with stack protection (with GCC)
+_GCC_CFLAGS+=	-fstack-protector
+. endif
+.endif
+
 _OPSYS_CAN_CHECK_SHLIBS=	yes # use readelf in check/bsd.check-vars.mk

 # check for maximum command line length and set it in configure's environment,
--- a/mk/platform/QNX.mk
+++ b/mk/platform/QNX.mk
@@ -1,6 +1,5 @@
 # Variable definitions for the QNX operating system.

-CC=		gcc
 ECHO_N?=	${ECHO} -n
 IMAKE_MAKE?=	${MAKE}		# program which gets invoked by imake
 PKGLOCALEDIR?=	share
--- a/mk/plist/plist.mk
+++ b/mk/plist/plist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.48 2014/12/30 15:13:20 wiz Exp $
+# $NetBSD: plist.mk,v 1.49 2015/07/04 16:18:38 joerg Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -162,7 +162,6 @@ PLIST_SUBST+=	OPSYS=${OPSYS:Q}					\
 		LOCALBASE=${LOCALBASE:Q}				\
 		VIEWBASE=${VIEWBASE:Q}					\
 		X11BASE=${X11BASE:Q}					\
-		X11PREFIX=${X11PREFIX:Q}				\
 		CHGRP=${CHGRP:Q}					\
 		CHMOD=${CHMOD:Q}					\
 		CHOWN=${CHOWN:Q}					\
--- a/mk/plist/shlib-dylib.awk
+++ b/mk/plist/shlib-dylib.awk
@@ -1,4 +1,4 @@
-# $NetBSD: shlib-dylib.awk,v 1.3 2006/02/07 18:42:38 jlam Exp $
+# $NetBSD: shlib-dylib.awk,v 1.4 2015/09/07 15:30:25 jperkin Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -91,6 +91,10 @@ function add_dylib(lib) {
 ### dylib names that can be derived from this entry as dylibs.
 ###
 /.*\/lib[^\/]+\.so(\.[0-9]+)+$/ {
+	cmd = TEST " -f " PREFIX "/" $0
+	if (system(cmd) == 0) {
+		entries[++nentries] = $0
+	}
 	lib = $0; sub("\\.so\\.", ".", lib); sub("\\.so$", "", lib)
 	lib = lib ".dylib"
 	add_dylib(lib)
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $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.

@@ -32,9 +32,6 @@ 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
--- a/mk/tools/tools.QNX.mk
+++ b/mk/tools/tools.QNX.mk
@@ -0,0 +1,109 @@
+# $NetBSD: tools.QNX.mk,v 1.1 2015/07/04 07:15:22 ryoon Exp $
+#
+# System-supplied tools for the QNX operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.bison?=		${QNX_HOST}/usr/bin/bison
+TOOLS_PLATFORM.bison-yacc?=	${QNX_HOST}/usr/bin/bison -y
+TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
+TOOLS_PLATFORM.bzip2?=		/usr/bin/bzip2
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/bin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cpp?=		${QNX_HOST}/usr/bin/cpp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/usr/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?=		/usr/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?=		${QNX_HOST}/usr/bin/flex
+TOOLS_PLATFORM.ftp?=		/usr/bin/ftp
+TOOLS_PLATFORM.gawk?=		/usr/bin/gawk
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.groff?=		${QNX_HOST}/usr/bin/groff
+TOOLS_PLATFORM.gunzip?=		/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/bin/gzip -dc
+TOOLS_PLATFORM.gzip?=		/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.ksh?=		/bin/ksh
+TOOLS_PLATFORM.lex?=		${QNX_HOST}/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		${QNX_HOST}/usr/bin/m4
+TOOLS_PLATFORM.gmake?=		${QNX_HOST}/usr/bin/make
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		${QNX_HOST}/usr/bin/nroff
+TOOLS_PLATFORM.openssl?=	/usr/bin/openssl
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pax?=		/bin/pax
+TOOLS_PLATFORM.printf?=		/usr/bin/printf
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+TOOLS_PLATFORM.readelf?=	${QNX_HOST}/usr/bin/readelf
+.endif
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sleep?=		/usr/bin/sleep
+TOOLS_PLATFORM.soelim?=		${QNX_HOST}/usr/bin/soelim
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+TOOLS_PLATFORM.strip?=		${QNX_HOST}/usr/bin/strip
+.endif
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+TOOLS_PLATFORM.tbl?=		${QNX_HOST}/usr/bin/tbl
+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.unzip?=		/usr/bin/unzip
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.yacc?=		${QNX_HOST}/usr/bin/bison -y
+
+
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.  for _t_ in ar as ld nm objcopy objdump ranlib readelf strip
+TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?=	\
+	${QNX_HOST}/usr/bin/nto${MACHINE_GNU_PLATFORM}-${_t_}
+TOOLS_CREATE+=	${MACHINE_GNU_PLATFORM}-${_t_}
+.  endfor
+TOOLS_PATH.ar?=			${QNX_HOST}/usr/bin/${MACHINE_GNU_PLATFORM}-ar
+TOOLS_CREATE+=			ar
+TOOLS_PATH.ranlib?=		${QNX_HOST}/usr/bin/${MACHINE_GNU_PLATFORM}-ranlib
+TOOLS_CREATE+=			ranlib
+
+NATIVE_CC:=	${QNX_HOST}/usr/bin/qcc
+CC=		${QNX_HOST}/usr/bin/qcc -V gcc_nto${MACHINE_GNU_PLATFORM}
+
+NATIVE_CXX:=	${QNX_HOST}/usr/bin/QCC
+CXX=		${QNX_HOST}/usr/bin/QCC -V gcc_nto${MACHINE_GNU_PLATFORM}
+
+NATIVE_LD:=	${QNX_HOST}/usr/bin/ld
+LD=		${QNX_HOST}/usr/bin/nto${MACHINE_GNU_PLATFORM}-ld
+
+.endif
+
--- a/mk/x11.version.mk
+++ b/mk/x11.version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.version.mk,v 1.11 2010/09/11 20:46:11 wiz Exp $
+# $NetBSD: x11.version.mk,v 1.12 2015/07/04 16:18:38 joerg Exp $
 #
 # This file must not be included directly.
 # It is included automatically by mk/x11.buildlink3.mk.
@@ -35,7 +35,6 @@

 _VARGROUPS+=	x11
 _USER_VARS.x11=	X11_TYPE X11BASE
-_PKG_VARS.x11=	USE_X11BASE
 _SYS_VARS.x11=	X11_PKGSRCDIR.${X11_TYPE} BUILTIN_X11_TYPE.${X11_TYPE} BUILTIN_X11_VERSION.${X11_TYPE}

 X11_PKGSRCDIR.native=	../../pkgtools/x11-links