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/pkgtools/Makefile
+++ b/pkgtools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.107 2014/09/17 12:41:50 joerg Exp $
+# $NetBSD: Makefile,v 1.108 2015/04/25 22:08:40 brook Exp $
 #

 COMMENT=	Tools for use in the packages collection

+SUBDIR+=	R2pkg
 SUBDIR+=	autoswc
 SUBDIR+=	binpatch
 SUBDIR+=	bootstrap-extras
--- a/pkgtools/R2pkg/DESCR
+++ b/pkgtools/R2pkg/DESCR
@@ -0,0 +1,3 @@
+The R2pkg program, which is modeled after url2pkg, creates a new
+pkgsrc package for the corresponding R package.  It is intended to
+help pkgsrc developers create new R packages quickly and easily.
--- a/pkgtools/R2pkg/Makefile
+++ b/pkgtools/R2pkg/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2015/04/25 22:06:34 brook Exp $
+#
+
+VERS=		0.2
+PKGNAME=	R2pkg-${VERS}
+CATEGORIES=	pkgtools
+
+MAINTAINER=	brook@NetBSD.org
+HOMEPAGE=	# none
+COMMENT=	Tool to automate initial steps in building an R package
+LICENSE=	modified-bsd
+
+WRKSRC=			${WRKDIR}
+NO_BUILD=		yes
+USE_LANGUAGES=		# none
+AUTO_MKDIRS=		yes
+
+SUBST_CLASSES+=		version
+SUBST_STAGE.version=	pre-configure
+SUBST_MESSAGE.version=	Substituting version in R2pkg.sh.
+SUBST_FILES.version=	R2pkg.sh
+SUBST_VARS.version=	VERS
+
+SUBST_CLASSES+=		tools
+SUBST_STAGE.tools=	pre-configure
+SUBST_MESSAGE.tools=	Substituting tool locations.
+SUBST_FILES.tools=	R2pkg.sh
+SUBST_VARS.tools=	MAKE
+
+INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man8
+
+do-extract:
+	${CP} ${FILESDIR}/R2pkg.sh ${WRKSRC}
+	${CP} ${FILESDIR}/R2pkg.8 ${WRKSRC}
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/R2pkg.sh ${DESTDIR}${PREFIX}/sbin/R2pkg
+	${INSTALL_MAN} ${WRKSRC}/R2pkg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/R2pkg.8
+
+.include "../../math/R/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/pkgtools/R2pkg/PLIST
+++ b/pkgtools/R2pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/25 22:06:34 brook Exp $
+man/man8/R2pkg.8
+sbin/R2pkg
--- a/pkgtools/R2pkg/files/R2pkg.8
+++ b/pkgtools/R2pkg/files/R2pkg.8
@@ -0,0 +1,149 @@
+.\"	$NetBSD: R2pkg.8,v 1.1 2015/04/25 22:06:34 brook Exp $
+.\"
+.\" Copyright (c) 2014,2015
+.\"	Brook Milligan.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the author nor the names of any contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"
+.Dd April 25, 2015
+.Dt R2pkg 8
+.Os
+.Sh NAME
+.Nm R2pkg
+.Nd create a pkgsrc package for an R package
+.Sh SYNOPSIS
+.Nm
+.Op Fl DVehqv
+.Op Fl E Ar editor
+.Op Ar package
+.Sh DESCRIPTION
+.Nm
+takes the name of an R
+.Ar package
+that should be turned into a
+.Xr pkgsrc 7
+package in the current directory.  The generated package includes a
+.Pa Makefile
+and a mostly complete set of files to get the package going.  However, the files should be reviewed and perhaps adjusted manually after 
+.Nm
+has finished its job.  To help with this, the original versions of files created by
+.Nm
+are preserved for reference.
+.Pp
+.Nm
+is intended to help the process of creating a package but is not
+intended to fly on autopilot.
+.Pp
+The
+.Pa Makefile
+contains all of the variables required for an R package, with information being taken from the package's
+.Pa DESCRIPTION
+file on CRAN, which is automatically fetched by
+.Nm .
+Likewise, the
+.Pa DESCR
+file is populated with information from the same file.  After
+.Pa Makefile 
+and
+.Pa DESCR
+are completed,
+.Nm
+fetches the package and computes its checksum via the
+.Ic makesum
+target.  Then the package is extracted via the
+.Ic extract
+target.
+.Pp
+If the user does not supply the
+.Ar package
+on the command line, then
+.Nm
+will prompt for it.
+.Pp
+The following options are available:
+.Bl -tag -width indent
+.It Fl D
+Write the package's description into
+.Pa DESCRIPTION .
+This may be useful for verifying the information obtained from CRAN.  However, this file must be removed as it is not part of a
+.Xr pkgsrc 7
+package.
+.It Fl E Ar editor
+Use
+.Ar editor 
+instead of the user's default editor.
+.It Fl V
+Print the version.
+.It Fl e
+Do not edit Makefile and DESCR.
+.It Fl h
+Produce a short help message.
+.It Fl q
+Do not produce status messages along the way.
+.It Fl v
+Generate verbose output.  This may be repeated to increase the verbosity.
+.El
+.Sh ENVIRONMENT
+The following environment variables affect the execution of
+.Nm :
+.Bl -tag -width BLOCKSIZE
+.It Ev PKGEDITOR, EDITOR
+Editor used for editing
+.Pa Makefile
+and
+.Pa DESCR .
+.It Ev CRAN_URL
+The URL to the CRAN mirror for downloading the package's DESCRIPTION
+file.  By default,
+.Pa ftp://cran.r-project.org .
+.El
+.Sh EXAMPLES
+Use the following commands to create a
+.Xr pkgsrc 7
+package for the R package
+.Ar foo :
+.Dl cd pkgsrc/math
+.Dl mkdir R-foo
+.Dl cd R-foo
+.Dl R2pkg foo
+Remember to test the resulting package and remove any extra files created by
+.Nm .
+.Sh BUGS
+.Nm
+does not create a finished package; instead, it facilitates the task.
+However, the resulting files must be reviewed and possibly edited by
+hand.  Although dependencies are included in the generated
+.Pa Makefile ,
+they are only comments; no attempt is made to find corresponding
+packages within 
+.Xr pkgsrc 7 .
+As a consequence, the category of dependencies is also not determined.
+.Sh SEE ALSO
+.Xr pkgsrc 7
+.Sh AUTHORS
+.Nm
+was written by
+.An Brook Milligan Aq Mt brook@NetBSD.org .
--- a/pkgtools/R2pkg/files/R2pkg.sh
+++ b/pkgtools/R2pkg/files/R2pkg.sh
@@ -0,0 +1,301 @@
+#!/bin/sh
+# R2pkg
+#
+# Copyright (c) 2014,2015
+#	Brook Milligan.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the author nor the names of any contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#
+# Create an R package in the current directory
+#
+NAME="R2pkg"
+VERS="@VERS@"
+
+USAGE="${NAME} [-DVehqv] [-E editor] [package] -- create an R package for pkgsrc"
+
+: ${CRAN_URL:=ftp://cran.r-project.org}
+: ${PKGEDITOR:=${EDITOR:=vi}}
+
+# Substituted by pkgsrc at pre-configure time.
+MAKE=@MAKE@
+ECHO=echo
+EDIT=1
+QUIET=0
+VERBOSE=0
+
+while getopts DE:Vehqv f
+do
+    case $f in
+	D) DESCRIPTION=yes;;
+	E) PKGEDITOR=${OPTARG};;
+	V) echo "${NAME} v${VERS}"; exit 0;;
+	e) EDIT=0;;
+	h) echo ${USAGE}; exit 0;;
+	q) ECHO=":"; QUIET=1;;
+	v) VERBOSE=$((${VERBOSE}+1));;
+        \?) echo ${USAGE}; exit 1;;
+    esac
+done
+shift `expr ${OPTIND} - 1`
+
+if [ ${#} -eq 0 ]; then
+    read -p "package: " RPKG TAIL
+    if [ "X${TAIL}" != "X" ]; then
+	echo "Error: multiple package names given."
+	echo ${USAGE}
+	exit 1
+    fi
+elif [ ${#} -eq 1 ]; then
+    RPKG=${1}
+else
+    echo ${USAGE}
+    exit 1
+fi
+
+if [ ${VERBOSE} -eq 0 ]; then
+    STDOUT=">/dev/null 2>&1"
+    STDOUT2=">/dev/null 2>&1"
+elif [ ${VERBOSE} -eq 1 ]; then
+    STDOUT=""
+    STDOUT2=">/dev/null 2>&1"
+else
+    STDOUT=""
+    STDOUT2=""
+fi
+
+CRAN_PACKAGES=pub/R/web/packages
+RPKG_DESCRIPTION_URL=${CRAN_URL}/${CRAN_PACKAGES}/${RPKG}/DESCRIPTION
+
+check_for_R ()
+{
+    R_CMD="R --no-save ${STDOUT2}"
+    echo "q()" | eval ${R_CMD}
+    if [ ${?} -ne 0 ]; then
+	echo "ERROR: math/R package is not installed."
+	exit 1
+    fi
+}
+
+preserve_original_files ()
+{
+    [ -f DESCR ]    && mv DESCR DESCR.orig
+    [ -f Makefile ] && mv Makefile Makefile.orig
+    [ -f distinfo ] && mv distinfo distinfo.orig
+}
+
+make_package ()
+{
+    R_CMD="R --no-save ${STDOUT2}"
+    [ "X${DESCRIPTION}" != "X" ] && DESCRIPTION_CMD="copy.description(connection)"
+    cat << EOF | eval ${R_CMD}
+one.line <- function(s) gsub(' *\n *',' ',s)
+pkg.vers <- function(s) gsub('_','.',s)
+field <- function(key,value) paste(key,'=\t',value,sep='')
+
+licenses <- list()
+licenses[['ACM']]           <- 'acm-license'
+licenses[['APACHE']]        <- 'apache-2.0'
+licenses[['ARTISTIC']]      <- 'artistic-2.0'
+licenses[['BSD-2']]         <- '2-clause-bsd'
+licenses[['GPL-2']]         <- 'gnu-gpl-v2'
+licenses[['GPL-3']]         <- 'gnu-gpl-v3'
+licenses[['GPL (>= 2)']]    <- 'gnu-gpl-v2'
+licenses[['GPL-2 | GPL-3']] <- 'gnu-gpl-v2 OR gnu-gpl-v3'
+licenses[['LGPL-2']]        <- 'gnu-lgpl-v2'
+licenses[['LGPL-2.1']]      <- 'gnu-lgpl-v2.1'
+licenses[['LGPL (>= 2)']]   <- 'gnu-lgpl-v2'
+licenses[['LUCENT']]        <- 'lucent'
+licenses[['MIT']]           <- 'mit'
+licenses[['POSTGRESQL']]    <- 'postgresql-license'
+
+paste2 <- function(s1,s2)
+{
+  if (is.na(s1) && is.na(s2)) return ('')
+  if (is.na(s1) && !is.na(s2)) return (s2)
+  if (!is.na(s1) && is.na(s2)) return (s1)
+  if (!is.na(s1) && !is.na(s2)) return (paste(s1,s2))
+}
+
+todo.license <- function(s)
+{
+  if (is.null(licenses[[s]]))
+    todo <- '# TODO: LICENSE'
+  else
+    todo <- 'LICENSE'
+  todo
+}
+
+pkgsrc.license <- function(s)
+{
+  license <- licenses[[s]]
+  if (is.null(license))
+    license <- s
+  license
+}
+
+package <- function(s) field('R_PKGNAME',one.line(s))
+version <- function(s) field('R_PKGVER',one.line(s))
+comment <- function(s) field('COMMENT',one.line(s))
+license <- function(s) field(todo.license(s),pkgsrc.license(s))
+
+categories <- function() paste('CATEGORIES=',paste(basename(dirname(getwd())),'R'),sep='	')
+description <- function(s) strwrap(s,width=71)
+
+depends <- function(s1,s2)
+{
+  s <- paste2(s1,s2)
+  imports <- na.omit(strsplit(one.line(s),', *')[[1]])
+  DEPENDS <- ''
+  if (length(imports) > 0)
+    {
+      for (i in 1:length(imports))
+        {
+          dependency <- strsplit(imports[i],' *\\\\( *')[[1]]
+          depends <- dependency[1]
+          depends.vers <- ifelse(length(dependency) == 2, dependency[2], '>=???')
+          depends.vers <- gsub(' ','',depends.vers)
+          depends.vers <- pkg.vers(gsub('\\\\)','',depends.vers))
+          depends.line <- paste('# DEPENDS+=\tR-',depends,depends.vers,':../../CATEGORY/R-',depends,sep='')
+          DEPENDS <- paste(DEPENDS,depends.line,sep='\n')
+        }
+      DEPENDS <- paste(DEPENDS,'',sep='\n')
+    }
+  DEPENDS
+}
+
+copy.description <- function(connection)
+{
+  description <- readLines(connection)
+  writeLines(description,con='DESCRIPTION')
+}
+
+connection <- url('${RPKG_DESCRIPTION_URL}')
+${DESCRIPTION_CMD}
+metadata <- read.dcf(connection, fields=c('Package','Version','Title','Description','License','Imports','Depends'))
+
+CVS          <- '# \$NetBSD\$'
+CATEGORIES   <- categories()
+MASTER.SITES <- 'MASTER_SITES=	\${MASTER_SITE_R_CRAN:=contrib/}'
+MAINTAINER   <- 'MAINTAINER=	pkgsrc-users@NetBSD.org'
+HOMEPAGE     <- 'HOMEPAGE=	\${R_HOMEPAGE_BASE}/${RPKG}/'
+COMMENT      <- comment(metadata[3])
+LICENSE      <- license(metadata[5])
+R_PKGNAME    <- package(metadata[1])
+R_PKGVER     <- version(metadata[2])
+DEPENDS      <- depends(metadata[6],metadata[7])
+INCLUDE.R    <- '.include "../../math/R/Makefile.extension"'
+INCLUDE.PKG  <- '.include "../../mk/bsd.pkg.mk"'
+
+DESCR        <- description(metadata[4])
+
+Makefile <- paste(CVS,
+                  '',
+                  CATEGORIES,
+                  MASTER.SITES,
+                  '',
+                  MAINTAINER,
+                  HOMEPAGE,
+                  COMMENT,
+                  LICENSE,
+                  '',
+                  R_PKGNAME,
+                  R_PKGVER,
+                  DEPENDS,
+                  INCLUDE.R,
+                  INCLUDE.PKG,
+                  sep='\n')
+
+write(Makefile,'Makefile')
+write(DESCR,'DESCR')
+EOF
+    if [ ${?} -ne 0 ]; then
+	echo "ERROR: parsing metadata failed."
+	exit 1
+    fi
+}
+
+edit_Makefile ()
+{
+    [ ${EDIT} -eq 0 ] || ${PKGEDITOR} Makefile
+}
+
+edit_DESCR ()
+{
+    [ ${EDIT} -eq 0 ] || ${PKGEDITOR} DESCR
+}
+
+create_distinfo ()
+{
+    ${ECHO} "Fetching package ... "
+    MAKE_CMD="${MAKE} makesum ${STDOUT}"
+    eval ${MAKE_CMD}
+}
+
+extract ()
+{
+    ${ECHO} "Extracting package ... "
+    MAKE_CMD="${MAKE} extract ${STDOUT}"
+    eval ${MAKE_CMD}
+}
+
+cleanup ()
+{
+    if [ -f DESCR.orig ] && cmp -s DESCR.orig DESCR; then
+	mv DESCR.orig DESCR
+    fi
+    if [ -f Makefile.orig ] && cmp -s Makefile.orig Makefile; then
+	mv Makefile.orig Makefile
+    fi
+    if [ -f distinfo.orig ] && cmp -s distinfo.orig distinfo; then
+	mv distinfo.orig distinfo
+    fi
+}
+
+messages ()
+{
+    if [ ${QUIET} -eq 0 ]; then
+	cat << EOF
+Please do not forget the following:
+- check DESCR and edit as necessary.
+- check Makefile:
+  o verify the COMMENT.
+  o verify the LICENSE.
+  o verify the DEPENDS, especially the categories.
+EOF
+	[ "X${DESCRIPTION}" != "X" ] && echo "- remove DESCRIPTION."
+    fi
+}
+
+${ECHO} "Creating R package: ${RPKG} ... "
+check_for_R
+preserve_original_files
+make_package
+edit_Makefile
+edit_DESCR
+create_distinfo
+extract
+cleanup
+messages
--- a/pkgtools/bootstrap-mk-files/Makefile
+++ b/pkgtools/bootstrap-mk-files/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2014/11/22 16:32:13 bsiegert Exp $
+# $NetBSD: Makefile,v 1.46 2015/06/11 09:20:55 joerg Exp $

-PKGNAME=	bootstrap-mk-files-20141122
+PKGNAME=	bootstrap-mk-files-20150611
 CATEGORIES=	pkgtools

 CONFLICTS+=	mk-files-[0-9]*
--- a/pkgtools/bootstrap-mk-files/files/bsd.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/bsd.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#	$NetBSD: bsd.sys.mk,v 1.3 2015/06/04 17:11:33 ryoon Exp $
 #
 # Overrides used for NetBSD source tree builds.

--- a/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.lib.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.lib.mk
@@ -0,0 +1,496 @@
+#	$NetBSD: Bitrig.bsd.lib.mk,v 1.1 2015/06/04 15:48:45 sevan Exp $
+#	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
+
+.if !target(__initialized__)
+__initialized__:
+.if exists(${.CURDIR}/../Makefile.inc)
+.include "${.CURDIR}/../Makefile.inc"
+.endif
+.include <bsd.own.mk>
+.include <bsd.obj.mk>
+.include <bsd.depall.mk>
+.MAIN:		all
+.endif
+
+.PHONY:		checkver cleanlib libinstall
+realinstall:	checkver libinstall
+clean cleandir: cleanlib
+
+.if exists(${SHLIB_VERSION_FILE})
+SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
+SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor
+SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ; echo $$teeny
+
+# Check for higher installed library versions.
+.if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
+	exists(${BSDSRCDIR}/lib/checkver)
+checkver:
+	@(cd ${.CURDIR} && \
+		sh ${BSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
+		    -d ${DESTDIR}${LIBDIR} ${LIB})
+.endif
+.endif
+
+.if !target(checkver)
+checkver:
+.endif
+
+print-shlib-major:
+.if defined(SHLIB_MAJOR)
+	@echo ${SHLIB_MAJOR}
+.else
+	@false
+.endif
+
+print-shlib-minor:
+.if defined(SHLIB_MINOR)
+	@echo ${SHLIB_MINOR}
+.else
+	@false
+.endif
+
+print-shlib-teeny:
+.if defined(SHLIB_TEENY)
+	@echo ${SHLIB_TEENY}
+.else
+	@false
+.endif
+
+.if defined(SHLIB_MAJOR) && !empty(SHLIB_MAJOR)
+.if defined(SHLIB_MINOR) && !empty(SHLIB_MINOR)
+.if defined(SHLIB_TEENY) && !empty(SHLIB_TEENY)
+SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
+.else
+SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
+.endif
+.else
+SHLIB_FULLVERSION=${SHLIB_MAJOR}
+.endif
+.endif
+
+# add additional suffixes not exported.
+# .po is used for profiling object files.
+# .so is used for PIC object files.
+.SUFFIXES: .out .a .ln .so .po .o .s .S .c .cc .C .m .F .f .r .y .l .cl .p .h
+.SUFFIXES: .sh .m4 .m
+
+
+# Set PICFLAGS to cc flags for producing position-independent code,
+# if not already set.  Includes -DPIC, if required.
+
+# Data-driven table using make variables to control how shared libraries
+# are built for different platforms and object formats.
+# OBJECT_FMT:		currently either "ELF" or "a.out", from <bsd.own.mk>
+# SHLIB_MAJOR, SHLIB_MINOR, SHLIB_TEENY: Major, minor, and teeny version
+#			numbers of shared library
+# SHLIB_SOVERSION:	version number to be compiled into a shared library
+#			via -soname. Usualy ${SHLIB_MAJOR} on ELF.
+#			NetBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
+#			[.${SHLIB_TEENY}]]
+# SHLIB_SHFLAGS:	Flags to tell ${LD} to emit shared library.
+#			with ELF, also set shared-lib version for ld.so.
+# SHLIB_LDSTARTFILE:	support .o file, call C++ file-level constructors
+# SHLIB_LDENDFILE:	support .o file, call C++ file-level destructors
+# FPICFLAGS:		flags for ${FC} to compile .[fF] files to .so objects.
+# CPPPICFLAGS:		flags for ${CPP} to preprocess .[sS] files for ${AS}
+# CPICFLAGS:		flags for ${CC} to compile .[cC] files to pic objects.
+# CSHLIBFLAGS:		flags for ${CC} to compile .[cC] files to .so objects.
+#			(usually includes ${CPICFLAGS})
+# CAPICFLAGS:		flags for ${CC} to compiling .[Ss] files
+#		 	(usually just ${CPPPICFLAGS} ${CPICFLAGS})
+# APICFLAGS:		flags for ${AS} to assemble .[sS] to .so objects.
+
+# Platform-independent flags for Bitrig a.out shared libraries
+SHLIB_LDSTARTFILE=
+SHLIB_LDENDFILE=
+SHLIB_SOVERSION=${SHLIB_FULLVERSION}
+SHLIB_SHFLAGS=
+FPICFLAGS ?= -fPIC
+CPICFLAGS?= -fPIC -DPIC
+CPPPICFLAGS?= -DPIC 
+CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
+APICFLAGS?= -k
+
+MKPICLIB?= yes
+
+# Platform-independent linker flags for ELF shared libraries
+.if ${OBJECT_FMT} == "ELF"
+SHLIB_SOVERSION=	${SHLIB_MAJOR}
+SHLIB_SHFLAGS=		-Wl,-soname,lib${LIB}.so.${SHLIB_SOVERSION}
+SHLIB_LDSTARTFILE?=	${DESTDIR}/usr/lib/crtbeginS.o
+SHLIB_LDENDFILE?=	${DESTDIR}/usr/lib/crtendS.o
+.endif
+
+CFLAGS+=	${COPTS}
+FFLAGS+=	${FOPTS}
+
+.c.o:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.c} ${.IMPSRC}
+.else
+	@echo ${COMPILE.c:Q} ${.IMPSRC}
+	@${COMPILE.c} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.c.po:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.c} -pg ${.IMPSRC} -o ${.TARGET}
+.else
+	@echo ${COMPILE.c:Q} -pg ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.c} -pg ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.c.so:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+.else
+	@echo ${COMPILE.c:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.c} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.c.ln:
+	${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
+
+.cc.o .C.o:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.cc} ${.IMPSRC}
+.else
+	@echo ${COMPILE.cc:Q} ${.IMPSRC}
+	@${COMPILE.cc} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.cc.po .C.po:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.cc} -pg ${.IMPSRC} -o ${.TARGET}
+.else
+	@echo ${COMPILE.cc:Q} -pg ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.cc} -pg ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.cc.so .C.so:
+.if defined(COPTS) && !empty(COPTS:M*-g*)
+	${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+.else
+	@echo ${COMPILE.cc:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.cc} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.f.o:
+.if defined(FOPTS) && !empty(FOPTS:M*-g*)
+	${COMPILE.f} ${.IMPSRC}
+.else
+	@echo ${COMPILE.f:Q} ${.IMPSRC}
+	@${COMPILE.f} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.f.po:
+.if defined(FOPTS) && !empty(FOPTS:M*-g*)
+	${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}
+.else
+	@echo ${COMPILE.f:Q} -pg ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.f.so:
+.if defined(FOPTS) && !empty(FOPTS:M*-g*)
+	${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+.else
+	@echo ${COMPILE.f:Q} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.f.ln:
+	${ECHO} Skipping lint for Fortran libraries.
+
+.m.o:
+.if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
+	${COMPILE.m} ${.IMPSRC}
+.else
+	@echo ${COMPILE.m:Q} ${.IMPSRC}
+	@${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.m.po:
+.if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
+	${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}
+.else
+	@echo ${COMPILE.m:Q} -pg ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.m.so:
+.if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
+	${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+.else
+	@echo ${COMPILE.m:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.m} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
+.S.o .s.o:
+	@echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC}
+	@${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+
+.S.po .s.po:
+	@echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+
+.S.so .s.so:
+	@echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
+	@${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
+	@${LD} -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+
+.if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+	|| ${MKLINKLIB} != "no"
+_LIBS=lib${LIB}.a
+.else
+_LIBS=
+.endif
+
+OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}
+
+.if ${MKPROFILE} != "no"
+_LIBS+=lib${LIB}_p.a
+POBJS+=${OBJS:.o=.po}
+.endif
+
+.if ${MKPIC} != "no"
+.if ${MKPICLIB} == "no"
+SOLIB=lib${LIB}.a
+.else
+SOLIB=lib${LIB}_pic.a
+_LIBS+=${SOLIB}
+SOBJS+=${OBJS:.o=.so}
+.endif
+.if defined(SHLIB_FULLVERSION)
+_LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
+.endif
+.endif
+
+LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
+.if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS)
+_LIBS+=llib-l${LIB}.ln
+.endif
+
+.if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
+	|| ${MKLINKLIB} != "no"
+ALLOBJS=${OBJS} ${POBJS} ${SOBJS}
+.else
+ALLOBJS=${POBJS} ${SOBJS} 
+.endif
+.if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS)
+ALLOBJS+=${LOBJS}
+.endif
+.NOPATH: ${ALLOBJS} ${_LIBS}
+
+realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}
+
+__archivebuild: .USE
+	@rm -f ${.TARGET}
+	${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
+	${RANLIB} ${.TARGET}
+
+__archiveinstall: .USE
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${LIBOWN} \
+	    -g ${LIBGRP} -m 600 ${.ALLSRC} ${.TARGET}
+	${RANLIB} -t ${.TARGET}
+	chmod ${LIBMODE} ${.TARGET}
+
+DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
+CLEANFILES+=	${DPSRCS}
+.if defined(YHEADER)
+CLEANFILES+=	${SRCS:M*.y:.y=.h}
+.endif
+
+lib${LIB}.a:: ${OBJS} __archivebuild
+	@echo building standard ${LIB} library
+
+lib${LIB}_p.a:: ${POBJS} __archivebuild
+	@echo building profiled ${LIB} library
+
+lib${LIB}_pic.a:: ${SOBJS} __archivebuild
+	@echo building shared object ${LIB} library
+
+lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
+    ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
+	@echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
+	@rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
+.if defined(DESTDIR)
+	$(CC) -nostdlib -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
+	    ${SHLIB_LDSTARTFILE} \
+	    -Wl,--whole-archive,${SOLIB} \
+	    -Wl,--no-whole-archive,${LDADD} \
+	    -L${DESTDIR}${LIBDIR} ${RPATH_FLAG}${LIBDIR} \
+	    ${SHLIB_LDENDFILE}
+.else
+	$(CC) -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
+	    ${SHLIB_LDSTARTFILE} \
+	    -Wl,--whole-archive,${SOLIB} -Wl,--no-whole-archive,${LDADD} \
+	    ${SHLIB_LDENDFILE}
+.endif
+.if ${OBJECT_FMT} == "ELF"
+.if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
+    "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
+	ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp
+	mv -f lib${LIB}.so.${SHLIB_MAJOR}.tmp lib${LIB}.so.${SHLIB_MAJOR}
+.endif
+	ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp
+	mv -f lib${LIB}.so.tmp lib${LIB}.so
+.endif
+
+.if !empty(LOBJS)
+LLIBS?=		-lc
+llib-l${LIB}.ln: ${LOBJS}
+	@echo building llib-l${LIB}.ln
+	@rm -f llib-l${LIB}.ln
+	@${LINT} -C${LIB} ${.ALLSRC} ${LLIBS}
+.endif
+
+cleanlib:
+	rm -f a.out [Ee]rrs mklog core *.core ${CLEANFILES}
+	rm -f lib${LIB}.a ${OBJS}
+	rm -f lib${LIB}_p.a ${POBJS}
+	rm -f lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${SOBJS}
+	rm -f llib-l${LIB}.ln ${LOBJS}
+
+.if defined(SRCS)
+afterdepend: .depend
+	@(TMP=/tmp/_depend$$$$; \
+	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.so \1.ln:/' \
+	      < .depend > $$TMP; \
+	    mv $$TMP .depend)
+.endif
+
+.if !target(libinstall)
+# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
+libinstall::
+
+.if ${MKLINKLIB} != "no"
+libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.a
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.a
+.if !defined(UPDATE)
+.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.a
+.endif
+
+.if !defined(BUILD) && !make(all) && !make(lib${LIB}.a)
+${DESTDIR}${LIBDIR}/lib${LIB}.a: .MADE
+.endif
+${DESTDIR}${LIBDIR}/lib${LIB}.a: lib${LIB}.a __archiveinstall
+.endif
+
+.if ${MKPROFILE} != "no"
+libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
+.if !defined(UPDATE)
+.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
+.endif
+
+.if !defined(BUILD) && !make(all) && !make(lib${LIB}_p.a)
+${DESTDIR}${LIBDIR}/lib${LIB}_p.a: .MADE
+.endif
+${DESTDIR}${LIBDIR}/lib${LIB}_p.a: lib${LIB}_p.a __archiveinstall
+.endif
+
+.if ${MKPIC} != "no" && ${MKPICINSTALL} != "no"
+libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
+.if !defined(UPDATE)
+.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
+.endif
+
+.if !defined(BUILD) && !make(all) && !make(lib${LIB}_pic.a)
+${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: .MADE
+.endif
+.if ${MKPICLIB} == "no"
+${DESTDIR}${LIBDIR}/lib${LIB}_pic.a:
+	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
+	ln -s lib${LIB}.a ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
+.else
+${DESTDIR}${LIBDIR}/lib${LIB}_pic.a: lib${LIB}_pic.a __archiveinstall
+.endif
+.endif
+
+.if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
+libinstall:: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
+.PRECIOUS: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
+.if !defined(UPDATE)
+.PHONY: ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
+.endif
+
+.if !defined(BUILD) && !make(all) && !make(lib${LIB}.so.${SHLIB_FULLVERSION})
+${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: .MADE
+.endif
+${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_FULLVERSION}
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${LIBOWN} \
+	    -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} ${.TARGET}
+.if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)
+	/sbin/ldconfig -m ${LIBDIR}
+.endif
+.if ${OBJECT_FMT} == "ELF"
+	ln -sf lib${LIB}.so.${SHLIB_FULLVERSION}\
+	    ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.tmp
+	mv -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.tmp\
+	    ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
+.if ${MKLINKLIB} != "no"
+	ln -sf lib${LIB}.so.${SHLIB_FULLVERSION}\
+	    ${DESTDIR}${LIBDIR}/lib${LIB}.so.tmp
+	mv -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.tmp\
+	    ${DESTDIR}${LIBDIR}/lib${LIB}.so
+.endif
+.endif
+.endif
+
+.if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS)
+libinstall:: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
+.PRECIOUS: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
+.if !defined(UPDATE)
+.PHONY: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
+.endif
+
+.if !defined(BUILD) && !make(all) && !make(llib-l${LIB}.ln)
+${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .MADE
+.endif
+${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} -o ${LIBOWN} \
+	    -g ${LIBGRP} -m ${LIBMODE} ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
+.endif
+.endif
+
+.include <bsd.man.mk>
+.include <bsd.nls.mk>
+.include <bsd.files.mk>
+.include <bsd.inc.mk>
+.include <bsd.links.mk>
+.include <bsd.dep.mk>
+.include <bsd.sys.mk>
+
+# Make sure all of the standard targets are defined, even if they do nothing.
+lint regress:
--- a/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.man.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.man.mk
@@ -0,0 +1,181 @@
+#	$NetBSD: Bitrig.bsd.man.mk,v 1.1 2015/06/04 15:48:45 sevan Exp $
+#	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93
+
+.if !target(__initialized__)
+__initialized__:
+.if exists(${.CURDIR}/../Makefile.inc)
+.include "${.CURDIR}/../Makefile.inc"
+.endif
+.include <bsd.own.mk>
+.include <bsd.obj.mk>
+.include <bsd.depall.mk>
+.MAIN:		all
+.endif
+
+.PHONY:		catinstall maninstall catpages manpages catlinks manlinks cleanman html installhtml cleanhtml
+.if ${MKMAN} != "no"
+realinstall:	${MANINSTALL}
+.endif
+cleandir: cleanman
+
+HTMLDIR?=	${DESTDIR}/usr/share/man
+
+MANTARGET?=	cat
+MANDOC?=	mandoc -Tascii
+
+
+.SUFFIXES: .1 .2 .3 .3p .4 .5 .6 .7 .8 .9 \
+	   .cat1 .cat2 .cat3 .cat4 .cat5 .cat6 .cat7 .cat8 .cat9 \
+	   .html1 .html2 .html3 .html4 .html5 .html6 .html7 .html8 .html9
+
+.9.cat9 .8.cat8 .7.cat7 .6.cat6 .5.cat5 .4.cat4 3p.cat3p .3.cat3 .2.cat2 .1.cat1:
+	@echo "${MANDOC} ${.IMPSRC} > ${.TARGET}"
+	@${MANDOC} ${.IMPSRC} > ${.TARGET} || \
+	 (rm -f ${.TARGET}; false)
+
+.9.html9 .8.html8 .7.html7 .6.html6 .5.html5 .4.html4 .3p.html3p .3.html3 .2.html2 .1.html1:
+	@echo "${MANDOC} -Thtml ${.IMPSRC} > ${.TARGET}"
+	@${MANDOC} -Thtml ${.IMPSRC} > ${.TARGET} || \
+	 (rm -f ${.TARGET}; false)
+
+.if defined(MAN) && !empty(MAN)
+MANPAGES=	${MAN}
+CATPAGES=	${MANPAGES:C/(.*).([1-9]p?)/\1.cat\2/}
+.NOPATH:	${CATPAGES}
+.if !defined(NOHTML)
+HTMLPAGES=	${MANPAGES:C/(.*).([1-9]p?)/\1.html\2/}
+.endif
+.endif
+
+MINSTALL=	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
+		    -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+
+.if defined(MANZ)
+# chown and chmod are done afterward automatically
+MCOMPRESS=	gzip -cf
+MCOMPRESSSUFFIX= .gz
+.endif
+
+catinstall: catlinks
+maninstall: manlinks
+
+__installpage: .USE
+.if defined(MCOMPRESS) && !empty(MCOMPRESS)
+	@rm -f ${.TARGET}
+	${MCOMPRESS} ${.ALLSRC} > ${.TARGET}
+	@chown ${MANOWN}:${MANGRP} ${.TARGET}
+	@chmod ${MANMODE} ${.TARGET}
+.else
+	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
+	    (echo "${MINSTALL} ${.ALLSRC} ${.TARGET}" && \
+	     ${MINSTALL} ${.ALLSRC} ${.TARGET})
+.endif
+
+
+# Rules for cat'ed man page installation
+.if defined(CATPAGES) && !empty(CATPAGES) && ${MKCATPAGES} != "no"
+catpages:: ${CATPAGES:@P@${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}@}
+.PRECIOUS: ${CATPAGES:@P@${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}@}
+.if !defined(UPDATE)
+.PHONY: ${CATPAGES:@P@${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}@}
+.endif
+
+.   for P in ${CATPAGES:O:u}
+.	if !defined(BUILD) && !make(all) && !make(${P})
+${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}: .MADE
+.	endif
+${DESTDIR}${MANDIR}/${P:T:E}${MANSUBDIR}/${P:T:R}.0${MCOMPRESSSUFFIX}: ${P} __installpage
+.   endfor
+.else
+catpages::
+.endif
+
+# Rules for source page installation
+.if defined(MANPAGES) && !empty(MANPAGES)
+manpages:: ${MANPAGES:@P@${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}@}
+.PRECIOUS: ${MANPAGES:@P@${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}@}
+.if !defined(UPDATE)
+.PHONY: ${MANPAGES:@P@${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}@}
+.endif
+
+.   for P in ${MANPAGES:O:u}
+${DESTDIR}${MANDIR}/man${P:T:E}${MANSUBDIR}/${P}${MCOMPRESSSUFFIX}: ${P} __installpage
+.   endfor
+.else
+manpages::
+.endif
+
+.if ${MKCATPAGES} != "no"
+catlinks: catpages
+.if defined(MLINKS) && !empty(MLINKS)
+	@set ${MLINKS}; \
+	while test $$# -ge 2; do \
+		name=$$1; \
+		shift; \
+		dir=${DESTDIR}${MANDIR}/cat$${name##*.}; \
+		l=$${dir}${MANSUBDIR}/$${name%.*}.0${MCOMPRESSSUFFIX}; \
+		name=$$1; \
+		shift; \
+		dir=${DESTDIR}${MANDIR}/cat$${name##*.}; \
+		t=$${dir}${MANSUBDIR}/$${name%.*}.0${MCOMPRESSSUFFIX}; \
+		if test $$l -nt $$t -o ! -f $$t; then \
+			echo $$t -\> $$l; \
+			ln -f $$l $$t; \
+		fi; \
+	done
+.endif
+.else
+catlinks:
+.endif
+
+manlinks: manpages
+.if defined(MLINKS) && !empty(MLINKS)
+	@set ${MLINKS}; \
+	while test $$# -ge 2; do \
+		name=$$1; \
+		shift; \
+		dir=${DESTDIR}${MANDIR}/man$${name##*.}; \
+		l=$${dir}${MANSUBDIR}/$${name}${MCOMPRESSSUFFIX}; \
+		name=$$1; \
+		shift; \
+		dir=${DESTDIR}${MANDIR}/man$${name##*.}; \
+		t=$${dir}${MANSUBDIR}/$${name}${MCOMPRESSSUFFIX}; \
+		if test $$l -nt $$t -o ! -f $$t; then \
+			echo $$t -\> $$l; \
+			ln -f $$l $$t; \
+		fi; \
+	done
+.endif
+
+# PS rules
+ps: ${PSPAGES}
+
+.if defined(HTMLPAGES) && !empty(HTMLPAGES)
+.for P in ${HTMLPAGES:O:u} 
+${HTMLDIR}/${P:T:E}/${P:T:R}.html: ${P}
+	${MINSTALL} ${.ALLSRC} ${.TARGET}
+.endfor
+.endif
+installhtml: ${HTMLPAGES:@P@${HTMLDIR}/${P:T:E}/${P:T:R}.html@}
+
+cleanhtml:
+.if defined(HTMLPAGES) && !empty(HTMLPAGES)
+	rm -f ${HTMLPAGES}
+.endif
+
+
+.if defined(CATPAGES)
+.if ${MKCATPAGES} != "no" && ${MKMAN} != "no"
+realall: ${CATPAGES}
+.else
+realall:
+.endif
+
+cleanman:
+	rm -f ${CATPAGES}
+.else
+cleanman:
+.endif
+
+# Make sure all of the standard targets are defined, even if they do nothing.
+clean depend includes lint regress tags:
--- a/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.own.mk.in
+++ b/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.own.mk.in
@@ -0,0 +1,254 @@
+#	$NetBSD: Bitrig.bsd.own.mk.in,v 1.1 2015/06/04 15:48:45 sevan Exp $
+
+.if !defined(_BSD_OWN_MK_)
+_BSD_OWN_MK_=1
+
+# XXX On systems with a Berkeley-style make, perhaps we ought to check
+# XXX for and source a file other than /etc/mk.conf
+
+.if defined(MAKECONF) && exists(${MAKECONF})
+.include "${MAKECONF}"
+.elif exists(@SYSCONFDIR@/mk.conf)
+.include "@SYSCONFDIR@/mk.conf"
+.elif exists(/etc/mk.conf)
+.include "/etc/mk.conf"
+.endif
+
+# Defining `SKEY' causes support for S/key authentication to be compiled in.
+SKEY=		yes
+
+# where the system object and source trees are kept; can be configurable
+# by the user in case they want them in ~/foosrc and ~/fooobj, for example
+BSDSRCDIR?=	/usr/src
+BSDOBJDIR?=	/usr/obj
+
+BINGRP?=	wheel
+BINOWN?=	root
+BINMODE?=	555
+NONBINMODE?=	444
+
+# Define MANZ to have the man pages compressed (gzip)
+#MANZ=		1
+
+MANDIR?=	/usr/share/man
+MANGRP?=	wheel
+MANOWN?=	root
+MANMODE?=	${NONBINMODE}
+MANINSTALL?=	maninstall catinstall
+
+INFODIR?=	/usr/share/info
+INFOGRP?=	wheel
+INFOOWN?=	root
+INFOMODE?=	${NONBINMODE}
+
+LIBDIR?=	/usr/lib
+LINTLIBDIR?=	/usr/libdata/lint
+LIBGRP?=	${BINGRP}
+LIBOWN?=	${BINOWN}
+LIBMODE?=	${NONBINMODE}
+
+DOCDIR?=	/usr/share/doc
+HTMLDOCDIR?=	/usr/share/doc/html
+DOCGRP?=	wheel
+DOCOWN?=	root
+DOCMODE?=	${NONBINMODE}
+
+NLSDIR?=	/usr/share/nls
+NLSGRP?=	wheel
+NLSOWN?=	root
+NLSMODE?=	${NONBINMODE}
+
+KMODDIR?=	/usr/lkm
+KMODGRP?=	wheel
+KMODOWN?=	root
+KMODMODE?=	${NONBINMODE}
+
+LOCALEDIR?=	/usr/share/locale
+LOCALEGRP?=	wheel
+LOCALEOWN?=	root
+LOCALEMODE?=	${NONBINMODE}
+
+COPY?=		-c
+.if defined(UPDATE)
+PRESERVE?=	-p
+.else
+PRESERVE?=
+.endif
+.if defined(UNPRIVILEGED)
+INSTPRIV?=	-U
+.endif
+STRIPFLAG?=	-s
+
+# Define SYS_INCLUDE to indicate whether you want symbolic links to the system
+# source (``symlinks''), or a separate copy (``copies''); (latter useful
+# in environments where it's not possible to keep /sys publicly readable)
+#SYS_INCLUDE= 	symlinks
+
+# Data-driven table using make variables to control how 
+# toolchain-dependent targets and shared libraries are built
+# for different platforms and object formats.
+# OBJECT_FMT:		currently either "ELF" or "a.out".
+# SHLIB_TYPE:		"ELF" or "a.out" or "" to force static libraries.
+#
+.if ${MACHINE_ARCH} == "x86_64"
+OBJECT_FMT?=ELF
+.else
+OBJECT_FMT?=a.out
+.endif
+
+# Location of the file that contains the major and minor numbers of the
+# version of a shared library.  If this file exists a shared library
+# will be built by <bsd.lib.mk>.
+SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_version
+
+# GNU sources and packages sometimes see architecture names differently.
+# This table maps an architecture name to its GNU counterpart.
+# Use as so:  ${GNU_ARCH.${TARGET_ARCH}} or ${MACHINE_GNU_ARCH}
+.ifndef MACHINE_GNU_ARCH
+MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}}
+.endif
+
+# CPU model, derived from MACHINE_ARCH
+MACHINE_CPU=	${MACHINE_ARCH:C/mipse[bl]/mips/:S/arm26/arm/:S/arm32/arm/:C/sh3e[bl]/sh3/:S/m68000/m68k/}
+
+TARGETS+=	all clean cleandir depend dependall includes \
+		install lint obj regress tags html installhtml cleanhtml
+.PHONY:		all clean cleandir depend dependall distclean includes \
+		install lint obj regress tags beforedepend afterdepend \
+		beforeinstall afterinstall realinstall realdepend realall \
+		html installhtml cheanhtml
+
+# set NEED_OWN_INSTALL_TARGET, if it's not already set, to yes
+# this is used by bsd.pkg.mk to stop "install" being defined
+NEED_OWN_INSTALL_TARGET?=	yes
+
+.if ${NEED_OWN_INSTALL_TARGET} == "yes"
+.if !target(install)
+install:	.NOTMAIN beforeinstall subdir-install realinstall afterinstall
+beforeinstall:	.NOTMAIN
+subdir-install:	.NOTMAIN beforeinstall
+realinstall:	.NOTMAIN beforeinstall
+afterinstall:	.NOTMAIN subdir-install realinstall
+.endif
+all:		.NOTMAIN realall subdir-all
+subdir-all:	.NOTMAIN
+realall:	.NOTMAIN
+depend:		.NOTMAIN realdepend subdir-depend
+subdir-depend:	.NOTMAIN
+realdepend:	.NOTMAIN
+distclean:	.NOTMAIN cleandir
+.endif
+
+PRINTOBJDIR=	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -B -s -f-
+
+# Define MKxxx variables (which are either yes or no) for users
+# to set in $sysconfdir/mk.conf and override on the make commandline.
+# These should be tested with `== "no"' or `!= "no"'.
+# The NOxxx variables should only be used by Makefiles.
+#
+
+MKCATPAGES?=yes
+
+.if defined(NODOC)
+MKDOC=no
+#.elif !defined(MKDOC)
+#MKDOC=yes
+.else
+MKDOC?=yes
+.endif
+
+MKINFO?=yes
+
+.if defined(NOLINKLIB)
+MKLINKLIB=no
+.else
+MKLINKLIB?=yes
+.endif
+.if ${MKLINKLIB} == "no"
+MKPICINSTALL=no
+MKPROFILE=no
+.endif
+
+.if defined(NOLINT)
+MKLINT=no
+.else
+MKLINT?=yes
+.endif
+
+.if defined(NOMAN)
+MKMAN=no
+.else
+MKMAN?=yes
+.endif
+.if ${MKMAN} == "no"
+MKCATPAGES=no
+.endif
+
+.if defined(NONLS)
+MKNLS=no
+.else
+MKNLS?=yes
+.endif
+
+#
+# MKOBJDIRS controls whether object dirs are created during "make build".
+# MKOBJ controls whether the "make obj" rule does anything.
+#
+.if defined(NOOBJ)
+MKOBJ=no
+MKOBJDIRS=no
+.else
+MKOBJ?=yes
+MKOBJDIRS?=no
+.endif
+
+.if defined(NOPIC)
+MKPIC=no
+.else
+MKPIC?=yes
+.endif
+
+.if defined(NOPICINSTALL)
+MKPICINSTALL=no
+.else
+MKPICINSTALL?=yes
+.endif
+
+.if defined(NOPROFILE)
+MKPROFILE=no
+.else
+MKPROFILE?=yes
+.endif
+
+.if defined(NOSHARE)
+MKSHARE=no
+.else
+MKSHARE?=yes
+.endif
+.if ${MKSHARE} == "no"
+MKCATPAGES=no
+MKDOC=no
+MKINFO=no
+MKMAN=no
+MKNLS=no
+.endif
+
+.if defined(NOCRYPTO)
+MKCRYPTO=no
+.else
+MKCRYPTO?=yes
+.endif
+
+MKCRYPTO_IDEA?=no
+
+MKCRYPTO_RC5?=no
+
+.if defined(NOKERBEROS) || (${MKCRYPTO} == "no")
+MKKERBEROS=no
+.else
+MKKERBEROS?=yes
+.endif
+
+MKSOFTFLOAT?=no
+
+.endif		# _BSD_OWN_MK_
--- a/pkgtools/bootstrap-mk-files/files/mods/Bitrig.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Bitrig.sys.mk
@@ -0,0 +1,191 @@
+#	$NetBSD: Bitrig.sys.mk,v 1.1 2015/06/04 15:48:45 sevan Exp $
+#	@(#)sys.mk	8.2 (Berkeley) 3/21/94
+
+unix?=		We run Bitrig.
+
+.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
+.SUFFIXES: .sh .m4
+
+.LIBS:		.a
+
+AR?=		ar
+ARFLAGS?=	rl
+RANLIB?=	ranlib
+
+AS?=		as
+AFLAGS?=
+COMPILE.s?=	${CC} ${AFLAGS} -c
+LINK.s?=	${CC} ${AFLAGS} ${LDFLAGS}
+COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
+LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+CC?=		cc
+DBG?=	-O
+CFLAGS?=	${DBG}
+COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
+LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+CXX?=		c++
+CXXFLAGS?=	${CFLAGS}
+COMPILE.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
+LINK.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+OBJC?=		${CC}
+OBJCFLAGS?=	${CFLAGS}
+COMPILE.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
+LINK.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+CPP?=		cpp
+CPPFLAGS?=	
+
+FC?=		f77
+FFLAGS?=	-O
+RFLAGS?=
+COMPILE.f?=	${FC} ${FFLAGS} -c
+LINK.f?=	${FC} ${FFLAGS} ${LDFLAGS}
+COMPILE.F?=	${FC} ${FFLAGS} ${CPPFLAGS} -c
+LINK.F?=	${FC} ${FFLAGS} ${CPPFLAGS} ${LDFLAGS}
+COMPILE.r?=	${FC} ${FFLAGS} ${RFLAGS} -c
+LINK.r?=	${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS}
+
+INSTALL?=	install
+
+LEX?=		lex
+LFLAGS?=
+LEX.l?=		${LEX} ${LFLAGS}
+
+LD?=		ld
+LDFLAGS?=
+
+LINT?=		lint
+LINTFLAGS?=	-chapbxzF
+
+LORDER?=	lorder
+
+MAKE?=		make
+
+NM?=		nm
+
+PC?=		pc
+PFLAGS?=
+COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
+LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+SHELL?=		sh
+
+SIZE?=		size
+
+TSORT?= 	tsort -q
+
+YACC?=		yacc
+YFLAGS?=
+YACC.y?=	${YACC} ${YFLAGS}
+
+# C
+.c:
+	${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.c.o:
+	${COMPILE.c} ${.IMPSRC}
+.c.a:
+	${COMPILE.c} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+.c.ln:
+	${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
+
+# C++
+.cc .cpp .cxx .C:
+	${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.cc.o .cpp.o .cxx.o .C.o:
+	${COMPILE.cc} ${.IMPSRC}
+.cc.a .cpp.a .cxx.a .C.a:
+	${COMPILE.cc} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+# Fortran/Ratfor
+.f:
+	${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.f.o:
+	${COMPILE.f} ${.IMPSRC}
+.f.a:
+	${COMPILE.f} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+.F:
+	${LINK.F} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.F.o:
+	${COMPILE.F} ${.IMPSRC}
+.F.a:
+	${COMPILE.F} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+.r:
+	${LINK.r} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.r.o:
+	${COMPILE.r} ${.IMPSRC}
+.r.a:
+	${COMPILE.r} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+# Pascal
+.p:
+	${LINK.p} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.p.o:
+	${COMPILE.p} ${.IMPSRC}
+.p.a:
+	${COMPILE.p} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+# Assembly
+.s:
+	${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.s.o:
+	${COMPILE.s} ${.IMPSRC}
+.s.a:
+	${COMPILE.s} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+.S:
+	${LINK.S} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
+.S.o:
+	${COMPILE.S} ${.IMPSRC}
+.S.a:
+	${COMPILE.S} ${.IMPSRC}
+	${AR} ${ARFLAGS} $@ $*.o
+	rm -f $*.o
+
+# Lex
+.l:
+	${LEX.l} ${.IMPSRC}
+	${LINK.c} -o ${.TARGET} lex.yy.c ${LDLIBS} -ll
+	rm -f lex.yy.c
+.l.c:
+	${LEX.l} ${.IMPSRC}
+	mv lex.yy.c ${.TARGET}
+.l.o:
+	${LEX.l} ${.IMPSRC}
+	${COMPILE.c} -o ${.TARGET} lex.yy.c 
+	rm -f lex.yy.c
+
+# Yacc
+.y:
+	${YACC.y} ${.IMPSRC}
+	${LINK.c} -o ${.TARGET} y.tab.c ${LDLIBS}
+	rm -f y.tab.c
+.y.c:
+	${YACC.y} ${.IMPSRC}
+	mv y.tab.c ${.TARGET}
+.y.o:
+	${YACC.y} ${.IMPSRC}
+	${COMPILE.c} -o ${.TARGET} y.tab.c
+	rm -f y.tab.c
+
+# Shell
+.sh:
+	rm -f ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
--- a/pkgtools/bootstrap-mk-files/files/mods/FreeMiNT.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/FreeMiNT.sys.mk
@@ -1,16 +1,10 @@
-#	$NetBSD: FreeMiNT.sys.mk,v 1.1 2013/09/08 16:27:23 ryoon Exp $
+#	$NetBSD: FreeMiNT.sys.mk,v 1.3 2015/06/11 09:20:56 joerg Exp $
 #	NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94

 unix?=		We run FreeMiNT.
 OS!=		uname -s

-# At least Ubuntu 8.1 sets __attribute__((warn_unused_result)) on fwrite()
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509
-.if !defined(NOGCCERROR)
-CFLAGS+= -Wno-error
-.endif
-
 .SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
 .SUFFIXES: .sh .m4
  
--- a/pkgtools/bootstrap-mk-files/files/mods/GNUkFreeBSD.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/GNUkFreeBSD.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: GNUkFreeBSD.sys.mk,v 1.1 2013/07/26 09:38:15 ryoon Exp $
+#	$NetBSD: GNUkFreeBSD.sys.mk,v 1.3 2015/06/11 09:20:56 joerg Exp $
 #	NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94

@@ -84,12 +84,6 @@ YACC?=		yacc
 YFLAGS?=
 YACC.y?=	${YACC} ${YFLAGS}

-# At least Ubuntu 8.1 sets __attribute__((warn_unused_result)) on fwrite()
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509
-.if !defined(NOGCCERROR)
-CFLAGS+= -Wno-error
-.endif
-
 # C
 .c:
 	${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
--- a/pkgtools/bootstrap-mk-files/files/mods/Haiku.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Haiku.sys.mk
@@ -1,16 +1,10 @@
-#	$NetBSD: Haiku.sys.mk,v 1.1 2010/02/06 10:50:40 obache Exp $
+#	$NetBSD: Haiku.sys.mk,v 1.3 2015/06/11 09:20:56 joerg Exp $
 #	NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94

 unix?=		We run Haiku.
 OS!=		uname -s

-# At least Ubuntu 8.1 sets __attribute__((warn_unused_result)) on fwrite()
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509
-.if !defined(NOGCCERROR)
-CFLAGS+= -Wno-error
-.endif
-
 .SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
 .SUFFIXES: .sh .m4
  
--- a/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: Linux.sys.mk,v 1.3 2011/10/31 23:41:21 sbd Exp $
+#	$NetBSD: Linux.sys.mk,v 1.5 2015/06/11 09:20:56 joerg Exp $
 #	NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94

@@ -84,12 +84,6 @@ YACC?=		yacc
 YFLAGS?=
 YACC.y?=	${YACC} ${YFLAGS}

-# At least Ubuntu 8.1 sets __attribute__((warn_unused_result)) on fwrite()
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509
-.if !defined(NOGCCERROR)
-CFLAGS+= -Wno-error
-.endif
-
 # C
 .c:
 	${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
--- a/pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk
@@ -1,14 +1,9 @@
-#	$NetBSD: Minix.sys.mk,v 1.1 2011/11/06 21:01:30 tcort Exp $
+#	$NetBSD: Minix.sys.mk,v 1.3 2015/06/11 09:20:56 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94

 unix?=		We run Unix.
 OS?=		Minix

-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509
-.if !defined(NOGCCERROR)
-CFLAGS+= -Wno-error
-.endif
-
 .SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
 .SUFFIXES: .sh .m4
  
--- a/pkgtools/bootstrap-mk-files/files/mods/SunOS.bsd.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/SunOS.bsd.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: SunOS.bsd.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#	$NetBSD: SunOS.bsd.sys.mk,v 1.3 2015/06/04 17:11:33 ryoon Exp $
 #
 # Overrides used for NetBSD source tree builds.

--- a/pkgtools/cwrappers/Makefile
+++ b/pkgtools/cwrappers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/03/18 15:05:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2015/04/29 14:23:58 jperkin Exp $

 PKGNAME=		cwrappers-20150318
 CATEGORIES=		pkgtools sysutils
@@ -15,20 +15,17 @@ INSTALLATION_DIRS=	libexec/cwrappers

 .include "../../mk/bsd.prefs.mk"

-USE_CWRAPPERS:=		no
 CHECK_PERMS=		no

 .if ${OPSYS} != "NetBSD" || !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*)
 MAKE_ENV+=	NEED_MI_VECTOR_HASH=1
 .endif
-.if !empty(MACHINE_PLATFORM:MDarwin-9.*) || !empty(MACHINE_PLATFORM:MDarwin-10.*)
-MAKE_ENV+=	NEED_GETLINE=1
-.endif

 CFLAGS.FreeBSD+=	-D_WITH_GETLINE
 CFLAGS.Linux+=	-D_GNU_SOURCE=1

 do-extract:
 	${CP} -R ${FILESDIR}/bin ${WRKSRC}
+	${TOUCH} ${WRKSRC}/transform-gcc.c

 .include "../../mk/bsd.pkg.mk"
--- a/pkgtools/cwrappers/files/bin/Makefile
+++ b/pkgtools/cwrappers/files/bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/09/18 19:31:47 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/19 13:30:35 tnn Exp $
 #
 PROGS=	as-wrapper cc-wrapper c++-wrapper cpp-wrapper f77-wrapper \
 	imake-wrapper ld-wrapper libtool-wrapper shlibtool-wrapper
@@ -11,10 +11,6 @@ LIB_SRCS=	alloc.c cleanup-cc.c common.c reorder-cc.c
 LIB_SRCS+=	mi_vector_hash.c
 CPPFLAGS+=	-DNEED_MI_VECTOR_HASH
 .endif
-.ifdef NEED_GETLINE
-LIB_SRCS+=	getline.c
-CPPFLAGS+=	-DNEED_GETLINE
-.endif

 LDADD+=		-lnbcompat

--- a/pkgtools/cwrappers/files/bin/alloc.c
+++ b/pkgtools/cwrappers/files/bin/alloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: alloc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: alloc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -31,7 +31,8 @@
 * SUCH DAMAGE.
 */

-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/pkgtools/cwrappers/files/bin/base-wrapper.c
+++ b/pkgtools/cwrappers/files/bin/base-wrapper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: base-wrapper.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: base-wrapper.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -31,8 +31,9 @@
 * SUCH DAMAGE.
 */

+#include <nbcompat.h>
 #include <sys/wait.h>
-#include <err.h>
+#include <nbcompat/err.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/pkgtools/cwrappers/files/bin/cleanup-cc.c
+++ b/pkgtools/cwrappers/files/bin/cleanup-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cleanup-cc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: cleanup-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -30,7 +30,8 @@
 */


-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
--- a/pkgtools/cwrappers/files/bin/common.c
+++ b/pkgtools/cwrappers/files/bin/common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.3 2014/11/29 22:19:55 joerg Exp $ */
+/* $NetBSD: common.c,v 1.4 2015/04/19 13:30:35 tnn Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -32,6 +32,7 @@
 #include <nbcompat.h>
 #include <sys/wait.h>
 #include <nbcompat/err.h>
+#include <nbcompat/stdio.h>
 #include <nbcompat/stdlib.h>
 #include <string.h>
 #include <unistd.h>
--- a/pkgtools/cwrappers/files/bin/common.h
+++ b/pkgtools/cwrappers/files/bin/common.h
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.3 2015/02/13 22:18:38 jperkin Exp $ */
+/* $NetBSD: common.h,v 1.4 2015/04/19 13:30:35 tnn Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -104,8 +104,5 @@ void	fixup_libtool(struct arglist *);
 #ifdef NEED_MI_VECTOR_HASH
 void	mi_vector_hash(const void *, size_t, uint32_t, uint32_t[3]);
 #endif
-#ifdef NEED_GETLINE
-ssize_t	getline(char **, size_t *, FILE *);
-#endif

 #endif
--- a/pkgtools/cwrappers/files/bin/fixup-libtool.c
+++ b/pkgtools/cwrappers/files/bin/fixup-libtool.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fixup-libtool.c,v 1.5 2015/03/18 15:05:36 jperkin Exp $ */
+/* $NetBSD: fixup-libtool.c,v 1.7 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -29,10 +29,11 @@
 * SUCH DAMAGE.
 */

+#include <nbcompat.h>
+#include <nbcompat/stdio.h>
 #include <sys/stat.h>
-#include <err.h>
+#include <nbcompat/err.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
--- a/pkgtools/cwrappers/files/bin/generic-transform-cc.c
+++ b/pkgtools/cwrappers/files/bin/generic-transform-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: generic-transform-cc.c,v 1.2 2015/03/15 19:16:45 joerg Exp $ */
+/* $NetBSD: generic-transform-cc.c,v 1.3 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -33,7 +33,8 @@
 #include <sys/stat.h>
 #endif

-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
--- a/pkgtools/cwrappers/files/bin/getline.c
+++ b/pkgtools/cwrappers/files/bin/getline.c
@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "common.h"
-
-ssize_t
-getline(char **lineptr, size_t *len, FILE *fp)
-{
-	char *iter, *eos;
-	int ch;
-
-	if (*len == 1) {
-		free(*lineptr);
-		*len = 0;
-	}
-	if (*len == 0) {
-		*lineptr = malloc(128);
-		if (*lineptr == NULL)
-			return -1;
-		*len = 128;		
-	}
-
-	iter = *lineptr;
-	for (;;) {
-		eos = *lineptr + *len - 1;
-
-		while (iter < eos) {
-			ch = getc_unlocked(fp);
-			if (ch == -1)
-				break;
-			*iter++ = ch;
-			if (ch == '\n') {
-				*iter = '\0';
-				return iter - *lineptr;
-			}
-		}
-		if (iter == *lineptr)
-			return -1;
-		if (iter < eos) {
-			*iter = '\0';
-			return iter - *lineptr;
-		}
-
-		iter = realloc(*lineptr, *len * 2);
-		if (iter == NULL)
-			return -1;
-		*lineptr = iter;
-		iter += *len - 1;
-		*len *= 2;
-	}
-}
--- a/pkgtools/cwrappers/files/bin/normalise-cc.c
+++ b/pkgtools/cwrappers/files/bin/normalise-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: normalise-cc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: normalise-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -30,7 +30,8 @@
 */


-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
--- a/pkgtools/cwrappers/files/bin/normalise-ld.c
+++ b/pkgtools/cwrappers/files/bin/normalise-ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: normalise-ld.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: normalise-ld.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -29,8 +29,8 @@
 * SUCH DAMAGE.
 */

-
-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
--- a/pkgtools/cwrappers/files/bin/reorder-cc.c
+++ b/pkgtools/cwrappers/files/bin/reorder-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: reorder-cc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: reorder-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -29,7 +29,8 @@
 * SUCH DAMAGE.
 */

-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <stdlib.h>
 #include <string.h>
 #include "common.h"
--- a/pkgtools/cwrappers/files/bin/transform-cc.c
+++ b/pkgtools/cwrappers/files/bin/transform-cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: transform-cc.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */
+/* $NetBSD: transform-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -29,7 +29,8 @@
 * SUCH DAMAGE.
 */

-#include <err.h>
+#include <nbcompat.h>
+#include <nbcompat/err.h>
 #include <string.h>
 #include "common.h"

--- a/pkgtools/cwrappers/files/doc/unimplemented.txt
+++ b/pkgtools/cwrappers/files/doc/unimplemented.txt
@@ -40,3 +40,12 @@ Libtool:

 - Drop -L, -l, -Wl,* if not in link mode
  -> see first point
+
+rpath aggregation:
+
+- OSF1 and HP-UX ld(1) do not support multiple -rpath or +b. Any such instances
+  need to be transformed to a colon-separated list. Example:
+
+  -Wl,-rpath -Wl,/dir1 -Wl,-rpath -Wl,/dir2 --> -Wl,+b -Wl,/dir1:/dir2
+
+  See cmd-sink-{hpux,osf1}-{ld,cc} in classic wrappers for more information.
--- a/pkgtools/gnome-packagekit/Makefile
+++ b/pkgtools/gnome-packagekit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2014/10/07 16:47:34 adam Exp $
+# $NetBSD: Makefile,v 1.50 2015/06/12 10:50:55 wiz Exp $

 DISTNAME=	gnome-packagekit-0.4.0
-PKGREVISION=	36
+PKGREVISION=	39
 CATEGORIES=	pkgtools gnome
 MASTER_SITES=	http://www.packagekit.org/releases/

--- a/pkgtools/libkver/PLIST
+++ b/pkgtools/libkver/PLIST
@@ -1,14 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2013/01/04 06:00:48 apb Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/06/17 08:20:21 sborrill Exp $
 lib/libkver.a
 lib/libkver.so
 lib/libkver.so.1
 lib/libkver.so.1.0
 sbin/kver
-man/cat8/kver.0
-man/man8/kver.8
 man/cat3/kver.0
 man/cat8/kver.0
 man/man3/kver.3
 man/man8/kver.8
-sbin/kver
 ${PLIST.sysctl}sbin/sysctl
--- a/pkgtools/libnbcompat/Makefile
+++ b/pkgtools/libnbcompat/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.81 2014/07/25 13:26:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.84 2015/06/08 00:44:46 joerg Exp $
 #
 # NOTE: If you update this package, it is *mandatory* that you update
 # 	pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
 #	list of tested and supported platforms.
 #

-PKGNAME=		libnbcompat-20140725
+PKGNAME=		libnbcompat-20150615
 CATEGORIES=		pkgtools devel

 MAINTAINER=		joerg@NetBSD.org
--- a/pkgtools/libnbcompat/files/Makefile.in
+++ b/pkgtools/libnbcompat/files/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.36 2009/06/05 19:58:04 joerg Exp $
+# $NetBSD: Makefile.in,v 1.39 2015/05/02 12:52:59 joerg Exp $
 #

 srcdir=		@srcdir@
@@ -71,7 +71,8 @@ WITH_DB=	@WITH_DB@
 LINK=		$(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
 COMPILE=	$(CC) $(CPPFLAGS) $(CFLAGS)

-all: nbcompat/nbconfig.h $(LIB)
+all: $(LIB)
+all $(OBJS): nbcompat/nbconfig.h

 .c.o:
 	$(COMPILE) $(DEFS) -c $<
--- a/pkgtools/libnbcompat/files/README
+++ b/pkgtools/libnbcompat/files/README
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.20 2014/07/25 13:26:24 jperkin Exp $
+$NetBSD: README,v 1.22 2015/04/19 12:24:21 tnn Exp $

 0 Introduction
 ==============
@@ -61,6 +61,7 @@ on the following operating systems:
 	IRIX-6.5/mipseb			<jschauma@NetBSD.org>
 	Linux/i386			<schwarz@NetBSD.org>
 	RHEL4 Linux 2.6/i386		<jschauma@NetBSD.org>
+	Tru64 UNIX 5.1B-2/alpha		<rodent@NetBSD.org>

 libnbcompat-20070507 has been tested to build and install correctly
 on the following operating systems:
@@ -90,12 +91,26 @@ on the following operating systems:
 	OpenBSD/amd64 5.3		<ryoon@NetBSD.org>
 	DragonFly/amd64 3.4.1		<ryoon@NetBSD.org>
 	Debian GNU/Linux/amd64 7.1	<ryoon@NetBSD.org>
+	CentOS Linux/amd64 6.5		<rodent@NetBSD.org>
+	OpenBSD/sparc64 5.5		<rodent@NetBSD.org>

 libnbcompat-20140725 has been tested to build and install correctly
 on the following operating systems:

 	Ubuntu GNU/Linux/amd64 12.04	<jperkin@joyent.com>
+	CentOS Linux/amd64 6.5		<rodent@NetBSD.org>
+	CentOS Linux/amd64 6.6		<rodent@NetBSD.org>
+	CentOS Linux/amd64 7.0		<rodent@NetBSD.org>
+	OpenBSD/sparc64 5.5		<rodent@NetBSD.org>
+	OpenBSD/sparc64 5.6		<rodent@NetBSD.org>
+	FreeBSD/amd64 10.1		<rodent@NetBSD.org>

+libnbcompat-20150419 has been tested to build and install correctly
+on the following operating systems:
+
+	NetBSD/i386 5.2.3		<tnn@NetBSD.org>
+	HP-UX/hppa 11.11		<tnn@NetBSD.org>
+	
 3 Usage
 =======

--- a/pkgtools/libnbcompat/files/configure
+++ b/pkgtools/libnbcompat/files/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libnbcompat 20120702.
+# Generated by GNU Autoconf 2.69 for libnbcompat 20150419.
 #
 # Report bugs to <joerg@NetBSD.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libnbcompat'
 PACKAGE_TARNAME='libnbcompat'
-PACKAGE_VERSION='20120702'
-PACKAGE_STRING='libnbcompat 20120702'
+PACKAGE_VERSION='20150419'
+PACKAGE_STRING='libnbcompat 20150419'
 PACKAGE_BUGREPORT='joerg@NetBSD.org'
 PACKAGE_URL=''

@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures libnbcompat 20120702 to adapt to many kinds of systems.
+\`configure' configures libnbcompat 20150419 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1317,7 +1317,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of libnbcompat 20120702:";;
+     short | recursive ) echo "Configuration of libnbcompat 20150419:";;
   esac
  cat <<\_ACEOF

@@ -1404,7 +1404,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-libnbcompat configure 20120702
+libnbcompat configure 20150419
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2243,7 +2243,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by libnbcompat $as_me 20120702, which was
+It was created by libnbcompat $as_me 20150419, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -5533,73 +5533,6 @@ _ACEOF


 # Checks for library functions.
-for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" malloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
 ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
  ac_have_decl=1
@@ -5916,29 +5849,11 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h

 fi

-for ac_func in vprintf
-do :
-  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VPRINTF 1
-_ACEOF

-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
-
-$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-
-fi
-
-fi
-done
-
-
-
-ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "#include <stdio.h>
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_snprintf(char *, size_t, const char *, ...)" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "snprintf(char *, size_t, const char *, ...)" "$as_ac_Symbol" "#include <stdio.h>
 "
-if test "x$ac_cv_have_decl_snprintf" = xyes; then :
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
  ac_have_decl=1
 else
  ac_have_decl=0
@@ -5947,29 +5862,31 @@ fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_SNPRINTF $ac_have_decl
 _ACEOF
-ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "#include <stdio.h>
+if test $ac_have_decl = 1; then :
+
+else
+  case " $LIBOBJS " in
+  *" snprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ ;;
+esac
+
+fi
+
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_asprintf(char **, const char *, ...)" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "asprintf(char **, const char *, ...)" "$as_ac_Symbol" "#define _GNU_SOURCE
+             #include <stdio.h>
 "
-if test "x$ac_cv_have_decl_vasprintf" = xyes; then :
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
  ac_have_decl=1
 else
  ac_have_decl=0
 fi

 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_VASPRINTF $ac_have_decl
+#define HAVE_DECL_ASPRINTF $ac_have_decl
 _ACEOF
-
-
-case $host_os in
-darwin*)
-	# NetBSD PR 38488: warnx(3) escapes certain characters like \n
-	ac_cv_func_warn=no
-	;;
-esac
-
-ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
-if test "x$ac_cv_func_asprintf" = xyes; then :
-  $as_echo "#define HAVE_ASPRINTF 1" >>confdefs.h
+if test $ac_have_decl = 1; then :

 else
  case " $LIBOBJS " in
@@ -5980,6 +5897,61 @@ esac

 fi

+as_ac_Symbol=`$as_echo "ac_cv_have_decl_strdup(const char *)" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "strdup(const char *)" "$as_ac_Symbol" "#include <string.h>
+"
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRDUP $ac_have_decl
+_ACEOF
+if test $ac_have_decl = 1; then :
+
+else
+  case " $LIBOBJS " in
+  *" strdup.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
+ ;;
+esac
+
+fi
+
+
+case $host_os in
+darwin*)
+	# NetBSD PR 38488: warnx(3) escapes certain characters like \n
+	ac_cv_func_warn=no
+	;;
+esac
+
+as_ac_Symbol=`$as_echo "ac_cv_have_decl_isblank(int)" | $as_tr_sh`
+ac_fn_c_check_decl "$LINENO" "isblank(int)" "$as_ac_Symbol" "#include <ctype.h>
+"
+if eval test \"x\$"$as_ac_Symbol"\" = x"yes"; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISBLANK $ac_have_decl
+_ACEOF
+if test $ac_have_decl = 1; then :
+
+else
+  case " $LIBOBJS " in
+  *" isblank.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS isblank.$ac_objext"
+ ;;
+esac
+
+fi
+
+
 ac_fn_c_check_func "$LINENO" "err" "ac_cv_func_err"
 if test "x$ac_cv_func_err" = xyes; then :
  $as_echo "#define HAVE_ERR 1" >>confdefs.h
@@ -6032,6 +6004,19 @@ esac

 fi

+ac_fn_c_check_func "$LINENO" "getdelim" "ac_cv_func_getdelim"
+if test "x$ac_cv_func_getdelim" = xyes; then :
+  $as_echo "#define HAVE_GETDELIM 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" getdelim.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getdelim.$ac_objext"
+ ;;
+esac
+
+fi
+
 ac_fn_c_check_func "$LINENO" "getenv" "ac_cv_func_getenv"
 if test "x$ac_cv_func_getenv" = xyes; then :
  $as_echo "#define HAVE_GETENV 1" >>confdefs.h
@@ -6045,14 +6030,14 @@ esac

 fi

-ac_fn_c_check_func "$LINENO" "isblank" "ac_cv_func_isblank"
-if test "x$ac_cv_func_isblank" = xyes; then :
-  $as_echo "#define HAVE_ISBLANK 1" >>confdefs.h
+ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
+if test "x$ac_cv_func_getline" = xyes; then :
+  $as_echo "#define HAVE_GETLINE 1" >>confdefs.h

 else
  case " $LIBOBJS " in
-  *" isblank.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS isblank.$ac_objext"
+  *" getline.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getline.$ac_objext"
 ;;
 esac

@@ -6201,19 +6186,6 @@ esac

 fi

-ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
-if test "x$ac_cv_func_snprintf" = xyes; then :
-  $as_echo "#define HAVE_SNPRINTF 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" snprintf.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
- ;;
-esac
-
-fi
-
 ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
 if test "x$ac_cv_func_statvfs" = xyes; then :
  $as_echo "#define HAVE_STATVFS 1" >>confdefs.h
@@ -6227,19 +6199,6 @@ esac

 fi

-ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
-if test "x$ac_cv_func_strdup" = xyes; then :
-  $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strdup.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
- ;;
-esac
-
-fi
-
 ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
 if test "x$ac_cv_func_strerror" = xyes; then :
  $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
@@ -6618,13 +6577,12 @@ esac

 fi

-for ac_func in bcopy bzero memset memcpy setlocale
+for ac_func in setlocale
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
+if test "x$ac_cv_func_setlocale" = xyes; then :
  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SETLOCALE 1
 _ACEOF

 fi
@@ -6848,7 +6806,7 @@ esac

 fi

-for ac_func in getpassphrase getpgrp memmove select
+for ac_func in getpassphrase getpgrp select
 do :
  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -7697,7 +7655,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libnbcompat $as_me 20120702, which was
+This file was extended by libnbcompat $as_me 20150419, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -7759,7 +7717,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libnbcompat config.status 20120702
+libnbcompat config.status 20150419
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- a/pkgtools/libnbcompat/files/configure.ac
+++ b/pkgtools/libnbcompat/files/configure.ac
@@ -1,8 +1,8 @@
-dnl $NetBSD: configure.ac,v 1.83 2014/07/25 13:26:24 jperkin Exp $
+dnl $NetBSD: configure.ac,v 1.85 2015/06/08 00:44:46 joerg Exp $

 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([libnbcompat], [20120702], [joerg@NetBSD.org])
+AC_INIT([libnbcompat], [20150419], [joerg@NetBSD.org])
 AC_CONFIG_HEADER(nbcompat/config.h)
 AC_ARG_PROGRAM

@@ -283,12 +283,17 @@ AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(off_t, 0)

 # Checks for library functions.
-AC_FUNC_MALLOC
 AC_FUNC_STRERROR_R
 AC_FUNC_VFORK
-AC_FUNC_VPRINTF

-AC_CHECK_DECLS([snprintf, vasprintf], [], [], [#include <stdio.h>])
+AC_CHECK_DECLS([snprintf(char *, size_t, const char *, ...)],
+            [], [AC_LIBOBJ(snprintf)], [#include <stdio.h>])
+AC_CHECK_DECLS([asprintf(char **, const char *, ...)],
+            [], [AC_LIBOBJ(asprintf)],
+            [#define _GNU_SOURCE
+             #include <stdio.h>])
+AC_CHECK_DECLS([strdup(const char *)],
+            [], [AC_LIBOBJ(strdup)], [#include <string.h>])

 case $host_os in
 darwin*)
@@ -297,10 +302,13 @@ darwin*)
 	;;
 esac

-AC_REPLACE_FUNCS([asprintf err fgetln fnmatch fparseln getenv isblank \
-	lchflags lchmod lchown lutimes mkdtemp mkstemp setenv setgroupent \
-	setpassent setprogname shquote snprintf statvfs strdup strerror \
-	strlcat strlcpy strmode strsep strtoll unsetenv usleep utimes warn
+AC_CHECK_DECLS([isblank(int)], [], [AC_LIBOBJ(isblank)], [#include <ctype.h>])
+
+AC_REPLACE_FUNCS([err fgetln fnmatch fparseln getdelim getenv \
+	getline lchflags lchmod lchown lutimes mkdtemp mkstemp setenv \
+	setgroupent setpassent setprogname shquote statvfs \
+	strerror strlcat strlcpy strmode strsep strtoll unsetenv usleep \
+	utimes warn
 ])

 AC_SEARCH_LIBS(socket, [socket network])
@@ -348,7 +356,7 @@ if test $need_gettemp = yes; then
 	AC_LIBOBJ(gettemp)
 fi

-AC_CHECK_FUNCS([bcopy bzero memset memcpy setlocale])
+AC_CHECK_FUNCS([setlocale])

 need_setmode=no
 AC_CHECK_FUNCS([getmode setmode], [:], [need_setmode=yes])
@@ -420,7 +428,7 @@ if test $pkg_use_nbcompat_poll = yes; then
 	AC_LIBOBJ(poll)
 fi

-AC_CHECK_FUNCS([getpassphrase getpgrp memmove select])
+AC_CHECK_FUNCS([getpassphrase getpgrp select])

 AC_CHECK_FUNC(getpgrp, [AC_FUNC_GETPGRP])

--- a/pkgtools/libnbcompat/files/getdelim.c
+++ b/pkgtools/libnbcompat/files/getdelim.c
@@ -0,0 +1,82 @@
+/*	$NetBSD: getdelim.c,v 1.1 2015/04/19 12:22:14 tnn Exp $	*/
+/*	$NetBSD-src: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <nbcompat.h>
+#include <nbcompat/stdio.h>
+#include <nbcompat/stdlib.h>
+
+#if !HAVE_GETDELIM
+
+ssize_t
+getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
+{
+	char *ptr, *eptr;
+
+
+	if (*buf == NULL || *bufsiz == 0) {
+		*bufsiz = BUFSIZ;
+		if ((*buf = malloc(*bufsiz)) == NULL)
+			return -1;
+	}
+
+	for (ptr = *buf, eptr = *buf + *bufsiz;;) {
+		int c = fgetc(fp);
+		if (c == -1) {
+			if (feof(fp)) {
+				ssize_t diff = (ssize_t)(ptr - *buf);
+				if (diff != 0) {
+					*ptr = '\0';
+					return diff;
+				}
+			}
+			return -1;
+		}
+		*ptr++ = c;
+		if (c == delimiter) {
+			*ptr = '\0';
+			return ptr - *buf;
+		}
+		if (ptr + 2 >= eptr) {
+			char *nbuf;
+			size_t nbufsiz = *bufsiz * 2;
+			ssize_t d = ptr - *buf;
+			if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
+				return -1;
+			*buf = nbuf;
+			*bufsiz = nbufsiz;
+			eptr = nbuf + nbufsiz;
+			ptr = nbuf + d;
+		}
+	}
+}
+
+#endif
--- a/pkgtools/libnbcompat/files/getline.c
+++ b/pkgtools/libnbcompat/files/getline.c
@@ -0,0 +1,44 @@
+/*	$NetBSD: getline.c,v 1.1 2015/04/19 12:22:14 tnn Exp $	*/
+/*	$NetBSD-src: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <nbcompat.h>
+#include <nbcompat/stdio.h>
+
+#if !HAVE_GETLINE
+
+ssize_t
+getline(char **buf, size_t *bufsiz, FILE *fp)
+{
+	return getdelim(buf, bufsiz, '\n', fp);
+}
+
+#endif
--- a/pkgtools/libnbcompat/files/malloc.c
+++ b/pkgtools/libnbcompat/files/malloc.c
@@ -1,15 +0,0 @@
-/*	$NetBSD: malloc.c,v 1.1.1.1 2003/03/31 05:02:54 grant Exp $	*/
-
-#if ! HAVE_MALLOC
-#undef malloc
-
-#include <sys/types.h>
-
-void *malloc();
-
-void *rpl_malloc (size_t n)
-{
-        if (n == 0) n = 1;
-        return malloc(n);
-}
-#endif
--- a/pkgtools/libnbcompat/files/md5c.c
+++ b/pkgtools/libnbcompat/files/md5c.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md5c.c,v 1.7 2008/10/06 12:36:20 joerg Exp $	*/
+/*	$NetBSD: md5c.c,v 1.8 2015/06/08 00:44:46 joerg Exp $	*/

 /*
 * This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
@@ -51,15 +51,7 @@

 #if !HAVE_MD5_H

-#if defined(HAVE_MEMSET)
 #define ZEROIZE(d, l)		memset((d), 0, (l)) 
-#else 
-# if defined(HAVE_BZERO)
-#define ZEROIZE(d, l)		bzero((d), (l))
-# else
-#error You need either memset or bzero 
-# endif 
-#endif

 typedef unsigned char *POINTER;
 typedef uint16_t UINT2;
--- a/pkgtools/libnbcompat/files/nbcompat/config.h.in
+++ b/pkgtools/libnbcompat/files/nbcompat/config.h.in
@@ -15,21 +15,19 @@
 /* Define to 1 if you have the <alloca.h> header file. */
 #undef HAVE_ALLOCA_H

-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H

-/* Define to 1 if you have the `bcopy' function. */
-#undef HAVE_BCOPY
-
-/* Define to 1 if you have the `bzero' function. */
-#undef HAVE_BZERO
+/* Define to 1 if you have the <bsd/libutil.h> header file. */
+#undef HAVE_BSD_LIBUTIL_H

 /* Define to 1 if you have the <ctype.h> header file. */
 #undef HAVE_CTYPE_H

+/* Define to 1 if you have the declaration of `asprintf(char **, const char *,
+   ...)', and to 0 if you don't. */
+#undef HAVE_DECL_ASPRINTF
+
 /* Define to 1 if you have the declaration of `endgrent', and to 0 if you
   don't. */
 #undef HAVE_DECL_ENDGRENT
@@ -38,6 +36,10 @@
   don't. */
 #undef HAVE_DECL_ENDPWENT

+/* Define to 1 if you have the declaration of `isblank(int)', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ISBLANK
+
 /* Define to 1 if you have the declaration of `optarg', and to 0 if you don't.
   */
 #undef HAVE_DECL_OPTARG
@@ -54,18 +56,18 @@
   don't. */
 #undef HAVE_DECL_SETPASSENT

-/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
-   don't. */
+/* Define to 1 if you have the declaration of `snprintf(char *, size_t, const
+   char *, ...)', and to 0 if you don't. */
 #undef HAVE_DECL_SNPRINTF

+/* Define to 1 if you have the declaration of `strdup(const char *)', and to 0
+   if you don't. */
+#undef HAVE_DECL_STRDUP
+
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
   don't. */
 #undef HAVE_DECL_STRERROR_R

-/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
-   don't. */
-#undef HAVE_DECL_VASPRINTF
-
 /* Define to 1 if you have the <dirent.h> header file. */
 #undef HAVE_DIRENT_H

@@ -75,9 +77,6 @@
 /* Define to 1 if `dd_fd' is a member of `DIR'. */
 #undef HAVE_DIR_DD_FD

-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
 /* Define to 1 if you have the <endian.h> header file. */
 #undef HAVE_ENDIAN_H

@@ -120,9 +119,15 @@
 /* Define to 1 if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO

+/* Define to 1 if you have the `getdelim' function. */
+#undef HAVE_GETDELIM
+
 /* Define to 1 if you have the `getenv' function. */
 #undef HAVE_GETENV

+/* Define to 1 if you have the `getline' function. */
+#undef HAVE_GETLINE
+
 /* Define to 1 if you have the `getmode' function. */
 #undef HAVE_GETMODE

@@ -153,9 +158,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H

-/* Define to 1 if you have the `isblank' function. */
-#undef HAVE_ISBLANK
-
 /* Define to 1 if you have the `issetugid' function. */
 #undef HAVE_ISSETUGID

@@ -174,9 +176,6 @@
 /* Define to 1 if you have the `util' library (-lutil). */
 #undef HAVE_LIBUTIL

-/* Define to 1 if you have the <bsd/libutil.h> header file. */
-#undef HAVE_BSD_LIBUTIL_H
-
 /* Define to 1 if you have the <libutil.h> header file. */
 #undef HAVE_LIBUTIL_H

@@ -195,25 +194,12 @@
 /* Define to 1 if you have the <machine/endian.h> header file. */
 #undef HAVE_MACHINE_ENDIAN_H

-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#undef HAVE_MALLOC
-
 /* Define to 1 if you have the <md5.h> header file. */
 #undef HAVE_MD5_H

-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H

-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
 /* Define to 1 if you have the `mkdtemp' function. */
 #undef HAVE_MKDTEMP

@@ -317,9 +303,6 @@
 /* Define to 1 if you have the <signal.h> header file. */
 #undef HAVE_SIGNAL_H

-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
 /* Define to 1 if the system has the type `socklen_t'. */
 #undef HAVE_SOCKLEN_T

@@ -344,9 +327,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H

-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR

@@ -431,12 +411,12 @@
 /* Define to 1 if you have the <sys/file.h> header file. */
 #undef HAVE_SYS_FILE_H

-/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
-
 /* Define to 1 if you have the <sys/mkdev.h> header file. */
 #undef HAVE_SYS_MKDEV_H

+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
 /* Define to 1 if you have the <sys/mount.h> header file. */
 #undef HAVE_SYS_MOUNT_H

@@ -533,9 +513,6 @@
 /* Define to 1 if you have the <vis.h> header file. */
 #undef HAVE_VIS_H

-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
 /* Define to 1 if you have the `warn' function. */
 #undef HAVE_WARN

@@ -630,9 +607,6 @@
   a type exists and the standard includes do not define it. */
 #undef int8_t

-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t

--- a/pkgtools/libnbcompat/files/nbcompat/ctype.h
+++ b/pkgtools/libnbcompat/files/nbcompat/ctype.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ctype.h,v 1.2 2008/04/29 05:46:08 martin Exp $	*/
+/*	$NetBSD: ctype.h,v 1.3 2015/06/08 00:44:46 joerg Exp $	*/

 /*-
 * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 * Declare macros and functions that may be missing in <ctype.h>.
 */

-#if !HAVE_ISBLANK
+#if !HAVE_DECL_ISBLANK
 int	isblank(int);
 #endif

--- a/pkgtools/libnbcompat/files/nbcompat/stdio.h
+++ b/pkgtools/libnbcompat/files/nbcompat/stdio.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.5 2014/06/07 19:17:42 cheusov Exp $	*/
+/*	$NetBSD: stdio.h,v 1.7 2015/06/08 00:44:46 joerg Exp $	*/

 /*-
 * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -56,12 +56,20 @@ int	pclose(FILE *);
 char	*fgetln(FILE *, size_t *);
 #endif

+#if !HAVE_GETDELIM
+ssize_t	getdelim(char **, size_t *, int, FILE *);
+#endif
+
+#if !HAVE_GETLINE
+ssize_t	getline(char **, size_t *, FILE *);
+#endif
+
 #if !HAVE_DECL_SNPRINTF
 int	snprintf(char *, size_t, const char *, ...);
 int	vsnprintf(char *, size_t, const char *, va_list);
 #endif

-#if !HAVE_DECL_VASPRINTF
+#if !HAVE_DECL_ASPRINTF
 int	asprintf(char **, const char *, ...);
 int	vasprintf(char **, const char *, va_list);
 #endif
--- a/pkgtools/libnbcompat/files/nbcompat/stdlib.h
+++ b/pkgtools/libnbcompat/files/nbcompat/stdlib.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdlib.h,v 1.4 2008/10/06 12:36:20 joerg Exp $	*/
+/*	$NetBSD: stdlib.h,v 1.5 2015/04/14 09:23:48 jperkin Exp $	*/

 /*-
 * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -44,6 +44,10 @@
 * <alloca.h>.
 */

+#if !HAVE_SETENV
+int	setenv(const char *, const char *, int);
+#endif
+
 #if !HAVE_MKSTEMP
 int	mkstemp(char *);
 #endif
--- a/pkgtools/libnbcompat/files/nbcompat/string.h
+++ b/pkgtools/libnbcompat/files/nbcompat/string.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: string.h,v 1.2 2008/04/29 05:46:08 martin Exp $	*/
+/*	$NetBSD: string.h,v 1.3 2015/06/08 00:44:46 joerg Exp $	*/

 /*-
 * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -40,11 +40,7 @@
 * Declare functions and macros that may be missing in <string.h>.
 */

-#if !HAVE_MEMMOVE
-# define memmove(a,b,c)	bcopy((b),(a),(c))
-#endif
-
-#if !HAVE_STRDUP
+#if !HAVE_DECL_STRDUP
 char	*strdup(const char *);
 #endif

--- a/pkgtools/libnbcompat/files/rmd160.c
+++ b/pkgtools/libnbcompat/files/rmd160.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmd160.c,v 1.8 2008/10/06 12:36:20 joerg Exp $	*/
+/*	$NetBSD: rmd160.c,v 1.9 2015/06/08 00:44:46 joerg Exp $	*/

 /********************************************************************\
 *
@@ -25,7 +25,7 @@
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rmd160.c,v 1.8 2008/10/06 12:36:20 joerg Exp $");
+__RCSID("$NetBSD: rmd160.c,v 1.9 2015/06/08 00:44:46 joerg Exp $");
 #endif	/* not lint */

 /* header files */
@@ -53,15 +53,7 @@ __weak_alias(RMD160Final,_RMD160Final)
 #endif
 #endif

-#if defined(HAVE_MEMSET)
 #define ZEROIZE(d, l)		memset((d), 0, (l)) 
-#else 
-# if defined(HAVE_BZERO)
-#define ZEROIZE(d, l)		bzero((d), (l))
-# else
-#error You need either memset or bzero 
-# endif 
-#endif

 /********************************************************************/

--- a/pkgtools/libnbcompat/inplace.mk
+++ b/pkgtools/libnbcompat/inplace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: inplace.mk,v 1.11 2014/09/03 10:03:31 jperkin Exp $
+# $NetBSD: inplace.mk,v 1.12 2015/04/21 00:26:48 joerg Exp $
 #
 # This file should not be included directly. Use USE_FEATURES instead.
 #
@@ -28,8 +28,12 @@ post-extract: libnbcompat-extract
 .PHONY: libnbcompat-extract
 libnbcompat-extract:
 	${RUN} ${CP} -R ${LIBNBCOMPAT_FILESDIR} ${LIBNBCOMPAT_SRCDIR}
+	${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${LIBNBCOMPAT_SRCDIR}/config.guess
+	${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${LIBNBCOMPAT_SRCDIR}/config.sub
 .if !empty(LIBNBCOMPAT_USE_PIC:M[Yy][Ee][Ss])
 	${RUN} ${CP} -R ${LIBNBCOMPAT_FILESDIR} ${LIBNBCOMPAT_PICDIR}
+	${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${LIBNBCOMPAT_PICDIR}/config.guess
+	${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${LIBNBCOMPAT_PICDIR}/config.sub
 .endif

 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
--- a/pkgtools/lintpkgsrc/Makefile
+++ b/pkgtools/lintpkgsrc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2015/01/10 20:12:24 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/06/12 10:50:55 wiz Exp $

 PKGNAME=	lintpkgsrc-4.88
+PKGREVISION=	1
 CATEGORIES=	pkgtools

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/mksandbox/Makefile
+++ b/pkgtools/mksandbox/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2014/03/03 03:30:53 obache Exp $
+# $NetBSD: Makefile,v 1.9 2015/04/14 08:55:07 jperkin Exp $

-PKGNAME=	mksandbox-1.3
+PKGNAME=	mksandbox-1.4
 CATEGORIES=	pkgtools

 MAINTAINER=	agc@NetBSD.org
@@ -10,6 +10,7 @@ LICENSE=	2-clause-bsd

 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
+NO_CHECKSUM=	yes
 USE_LANGUAGES=	# none
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8

--- a/pkgtools/mksandbox/files/mksandbox
+++ b/pkgtools/mksandbox/files/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh

-# $NetBSD: mksandbox,v 1.6 2013/07/24 22:16:26 jperkin Exp $
+# $NetBSD: mksandbox,v 1.7 2015/04/14 08:55:07 jperkin Exp $

 # Copyright (c) 2002,2012 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
@@ -247,7 +247,7 @@ r3() {
 fses="\\
 EOS

-if [ ! -z "$kernel" ]; then
+if [ -n "$kernel" -a -f "$kernel" ]; then
 	echo "Copying the kernel"
 	$cpprog $kernel $sandbox
 fi
--- a/pkgtools/p5-pkgsrc-Dewey/Makefile
+++ b/pkgtools/p5-pkgsrc-Dewey/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2014/10/09 14:06:49 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2015/06/18 06:29:18 dholland Exp $

 PKGNAME=	p5-pkgsrc-Dewey-1.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	pkgtools perl5

 MAINTAINER=	wiz@NetBSD.org
@@ -13,6 +13,8 @@ CPPFLAGS+=	-DHAVE_CTYPE_H -DHAVE_STDLIB_H -DHAVE_STRING_H
 CPPFLAGS.NetBSD+=	-DHAVE_ERR_H

 USE_LANGUAGES=		c
+USE_FEATURES+=		err
+MAKE_ENV+=		LIBS=${LIBS:Q}

 PERL5_PACKLIST=		auto/pkgsrc/Dewey/.packlist

--- a/pkgtools/p5-pkgsrc-Dewey/files/Makefile.PL
+++ b/pkgtools/p5-pkgsrc-Dewey/files/Makefile.PL
@@ -5,4 +5,5 @@ WriteMakefile(
    VERSION_FROM      => 'Dewey.pm', # finds $VERSION
    INC               => '-I.',
    OBJECT            => '$(O_FILES)', # link all the C files too
+    LIBS              => "$ENV{LDFLAGS} $ENV{LIBS}", # for -lnbcompat
 );
--- a/pkgtools/packagekit/Makefile
+++ b/pkgtools/packagekit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2015/01/17 04:47:17 obache Exp $
+# $NetBSD: Makefile,v 1.47 2015/04/25 14:24:45 tnn Exp $

 DISTNAME=	PackageKit-0.4.0
-PKGREVISION=	33
+PKGREVISION=	35
 PKGNAME=	${DISTNAME:S/PackageKit/packagekit/}
 CATEGORIES=	pkgtools
 MASTER_SITES=	http://www.freedesktop.org/software/PackageKit/releases/
--- a/pkgtools/packagekit/buildlink3.mk
+++ b/pkgtools/packagekit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2014/10/07 16:47:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2015/04/06 08:17:16 adam Exp $

 BUILDLINK_TREE+=	packagekit

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	packagekit
 PACKAGEKIT_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.packagekit+=	packagekit>=0.4.0
-BUILDLINK_ABI_DEPENDS.packagekit+=	packagekit>=0.4.0nb33
+BUILDLINK_ABI_DEPENDS.packagekit+=	packagekit>=0.4.0nb34
 BUILDLINK_PKGSRCDIR.packagekit?=	../../pkgtools/packagekit

 .include "../../databases/sqlite3/buildlink3.mk"
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2014/11/24 01:08:02 asau Exp $
+# $NetBSD: Makefile,v 1.70 2015/06/07 22:49:04 joerg Exp $

-PKGNAME=	pbulk-0.53
+PKGNAME=	pbulk-0.54
 COMMENT=	Modular bulk build framework

 .include "../../pkgtools/pbulk/Makefile.common"
--- a/pkgtools/pbulk/files/pbulk/scripts/build-client-start
+++ b/pkgtools/pbulk/files/pbulk/scripts/build-client-start
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: build-client-start,v 1.2 2008/09/16 18:21:30 joerg Exp $
+# $NetBSD: build-client-start,v 1.3 2015/06/07 22:49:04 joerg Exp $

 . @PBULK_CONFIG@

@@ -12,5 +12,13 @@ if [ "${config_version}" != "@PBULK_CONFIG_VERSION@" ]; then
 fi

 for client in ${build_clients}; do
-	ssh $client "${pbuild} -c ${master_port_build} -b ${pbuild_script}" &
+	case ${client} in 
+	*:*)
+		port="-p ${client##*:}"
+		client=${client%%:*}
+		;;
+	*)
+		;;
+	esac
+	ssh $port $client "${pbuild} -c ${master_port_build} -b ${pbuild_script}" &
 done
--- a/pkgtools/pbulk/files/pbulk/scripts/scan-client-start
+++ b/pkgtools/pbulk/files/pbulk/scripts/scan-client-start
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: scan-client-start,v 1.3 2012/11/23 12:13:35 joerg Exp $
+# $NetBSD: scan-client-start,v 1.4 2015/06/07 22:49:04 joerg Exp $

 . @PBULK_CONFIG@

@@ -18,5 +18,13 @@ else
 fi

 for client in ${scan_clients}; do
-	ssh $client "${pscan_prepare} && ${pscan} -c ${master_port_scan} -M ${make} ${extra_pscan_args} ${pkgsrc}" &
+	case ${client} in 
+	*:*)
+		port="-p ${client##*:}"
+		client=${client%%:*}
+		;;
+	*)
+		;;
+	esac
+	ssh $port $client "${pscan_prepare} && ${pscan} -c ${master_port_scan} -M ${make} ${extra_pscan_args} ${pkgsrc}" &
 done
--- a/pkgtools/pkg_distinst/Makefile
+++ b/pkgtools/pkg_distinst/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/05/29 23:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/12 10:50:56 wiz Exp $

 PKGNAME=	pkg_distinst-0.02
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	pkgtools

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2014/05/29 23:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2015/06/12 10:50:56 wiz Exp $
 #

 PKGNAME=		pkg_filecheck-0.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		pkgtools devel

 MAINTAINER=		pkgsrc-users@NetBSD.org
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2015/01/22 09:19:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.208 2015/04/21 00:28:19 joerg Exp $

 # Notes to package maintainers:
 #
@@ -151,8 +151,10 @@ LIBARCHIVE_LIBS=	${SED} -n -e 's/^Libs.private://p' \
    ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo
 LIBS+=		${LIBARCHIVE_LIBS:sh}

-CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.sub
+CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.guess \
+			${WRKSRC}/config.guess
+CONFIG_SUB_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.sub \
+			${WRKSRC}/config.sub

 .  if ${OPSYS} == "Cygwin"
 CPPFLAGS+=	-DLIBARCHIVE_STATIC
@@ -207,7 +209,8 @@ pre-configure:
 		${LIBARCHIVE_CONFIGURE_ARGS}
 	cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
 .endif
-	cd ${WRKDIR}/libfetch && ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV}	\
+	cd ${WRKDIR}/libfetch && ${TOUCH} fetch.cat3 &&			\
+		${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV}			\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS}	\
 			-f ${MAKE_FILE} depend all

--- a/pkgtools/pkg_install/files/add/main.c
+++ b/pkgtools/pkg_install/files/add/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.28 2014/12/30 15:13:20 wiz Exp $	*/
+/*	$NetBSD: main.c,v 1.29 2015/05/08 16:29:37 agc Exp $	*/

 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.28 2014/12/30 15:13:20 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.29 2015/05/08 16:29:37 agc Exp $");

 /*
 *
@@ -62,9 +62,9 @@ int	ReplaceSame = 0;
 static void
 usage(void)
 {
-	(void) fprintf(stderr, "%s\n%s\n%s\n%s\n",
+	(void) fprintf(stderr, "%s\n%s\n%s\n",
 	    "usage: pkg_add [-AfhInRuVv] [-C config] [-P destdir] [-K pkg_dbdir]",
-	    "               [-m machine] [-p prefix] [-s verification-type]\n",
+	    "               [-m machine] [-p prefix] [-s verification-type]",
 	    "               [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ...");
 	exit(1);
 }
--- a/pkgtools/pkg_install/files/lib/license.c
+++ b/pkgtools/pkg_install/files/lib/license.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: license.c,v 1.38 2014/05/15 09:59:09 wiz Exp $	*/
+/*	$NetBSD: license.c,v 1.41 2015/05/08 10:37:32 wiz Exp $	*/

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -57,6 +57,7 @@ const char *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 "
@@ -64,7 +65,7 @@ const char *default_acceptable_licenses =
    "ibm-public-license-1.0 "
    "ipafont "
    "isc "
-    "lppl-1.3c "
+    "lppl-1.2 lppl-1.3c "
    "lucent "
    "miros "
    "mit "
@@ -82,6 +83,7 @@ const char *default_acceptable_licenses =
    "sgi-free-software-b-v2.0 "
    "sleepycat-public "
    "unlicense "
+    "w3c "
    "x11 "
    "zlib "
    "zpl";
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.167 2014/12/30 15:13:21 wiz Exp $	*/
+/*	$NetBSD: version.h,v 1.168 2015/05/08 16:29:37 agc Exp $	*/

 /*
 * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_

-#define PKGTOOLS_VERSION 20141227
+#define PKGTOOLS_VERSION 20150508

 #endif /* _INST_LIB_VERSION_H_ */
--- a/pkgtools/pkg_notify/Makefile
+++ b/pkgtools/pkg_notify/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2014/10/09 14:06:49 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/06/12 10:50:56 wiz Exp $

 PKGNAME=	pkg_notify-0.4.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	pkgtools

 MAINTAINER=	imil@gcu.info
--- a/pkgtools/pkg_p5up2date/Makefile
+++ b/pkgtools/pkg_p5up2date/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2014/10/09 14:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/06/12 10:50:56 wiz Exp $

 PKGNAME=	pkg_p5up2date-0.06
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	pkgtools

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
@@ -1,6 +1,6 @@
 #!/bin/sh

-# $NetBSD: pkg_rolling-replace.sh,v 1.34 2015/02/12 08:22:16 abs Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.35 2015/04/14 11:40:31 wiz Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -453,7 +453,7 @@ while [ -n "$REPLACE_TODO" ]; do
    # Set PKGNAME_REQD to give underlying make processes a chance to
    # set options derived from the package name.  For example,
    # the appropriate version of Python can be derived from the
-    # package name (so, when building py26-foo, use python-2.6,
+    # package name (so, when building py34-foo, use python-3.4,
    # not python-2.7).
    MAKE_SET_VARS="PKGNAME_REQD=${pkg}-*"

--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2014/05/29 23:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/12 10:50:56 wiz Exp $
 #

 PKGNAME=	pkgdep-1.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	pkgtools

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/pkgdepgraph/Makefile
+++ b/pkgtools/pkgdepgraph/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2014/05/29 23:37:15 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2015/06/12 10:50:56 wiz Exp $
 #

 PKGNAME=	pkgdepgraph-2.8
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	pkgtools devel

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2015/02/03 22:50:27 abs Exp $
+# $NetBSD: Makefile,v 1.87 2015/06/12 10:50:56 wiz Exp $

 PKGNAME=	pkgdiff-1.6
+PKGREVISION=	1
 CATEGORIES=	pkgtools devel

 MAINTAINER=	wiz@NetBSD.org
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2015/03/08 17:57:42 imil Exp $
+# $NetBSD: Makefile,v 1.53 2015/04/06 08:17:36 adam Exp $

 GHCOMMIT=		2e1630265953c9c01836a4b62acfa8397579346a
 DISTNAME=		${GHCOMMIT}
 PKGNAME=		pkgin-0.8.0
+PKGREVISION=		1
 CATEGORIES=		pkgtools
 MASTER_SITES=		https://github.com/NetBSDfr/pkgin/archive/

--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.460 2015/03/11 19:09:38 rillig Exp $
+# $NetBSD: Makefile,v 1.463 2015/06/14 18:18:34 wiz Exp $

-PKGNAME=	pkglint-4.153
+PKGNAME=	pkglint-4.155
 CATEGORIES=	pkgtools

 OWNER=		wiz@NetBSD.org
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.262 2015/03/11 19:05:58 rillig Exp $
+# $NetBSD: makevars.map,v 1.264 2015/05/03 15:20:24 bsiegert Exp $
 #

 # This file contains the guessed type of some variables, according to
@@ -151,6 +151,7 @@ BINGRP			UserGroupName [$system]
 BINMODE			FileMode [$system]
 BINOWN			UserGroupName [$system]
 BOOTSTRAP_DEPENDS	InternalList of DependencyWithPath [c:a,m:a,o:a,*.mk:a]
+BOOTSTRAP_PKG		YesNo [$package]
 BROKEN			Message []
 BROKEN_GETTEXT_DETECTION	YesNo [$package]
 BROKEN_EXCEPT_ON_PLATFORM	List of PlatformTriple [$package_list]
@@ -657,7 +658,7 @@ PTHREAD_OPTS		List of { native optional require } [m:as,c:a,b:a]
 PTHREAD_TYPE		Identifier [$system]
 # ^^ or "native" or "none".
 PY_PATCHPLIST		Yes [$package]
-PYPKGPREFIX		{ py26 py27 py33 } [*:pu, pyversion.mk:s, *:]
+PYPKGPREFIX		{ py27 py33 py34 } [*:pu, pyversion.mk:s, *:]
 PYTHON_FOR_BUILD_ONLY	Yes [$package]
 REPLACE_PYTHON	List of Pathmask [$package_list]
 PYTHON_VERSIONS_ACCEPTED List of Version [$package]
@@ -739,6 +740,7 @@ USE_BUILTIN.*		YesNo_Indirectly [builtin.mk:s]
 USE_CMAKE		Yes [$package]
 USE_CROSSBASE		Yes [m:s]
 USE_FEATURES		List of Identifier [$package]
+USE_GCC_RUNTIME		YesNo [$package]
 USE_GNU_CONFIGURE_HOST	YesNo [$package]
 USE_GNU_ICONV		Yes [m:s,c:s,o:s]
 USE_IMAKE		Yes [m:s]
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.877 2015/03/11 19:05:58 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.878 2015/06/14 18:18:34 wiz Exp $
 #

 # pkglint - static analyzer and checker for pkgsrc packages
@@ -2116,7 +2116,7 @@ sub parse_mk_cond($$) {
 sub parse_licenses($) {
 	my ($licenses) = @_;

-	$licenses =~ s,\${PERL5_LICENSE},gnu-gpl-v2 OR artistic,g;
+	$licenses =~ s,\$\{PERL5_LICENSE},gnu-gpl-v2 OR artistic,g;
 	$licenses =~ s,[()]|AND|OR,,g; # XXX: treats OR like AND
 	my @licenses = split(/\s+/, $licenses);
 	return \@licenses;
@@ -3578,7 +3578,7 @@ sub checkline_mk_shelltext($$) {
 "\${PREFIX}.");
 		}

-		if (($state == SCST_INSTALL_DIR || $state == SCST_INSTALL_DIR2) && $shellword !~ regex_mk_shellvaruse && $shellword =~ m"^(?:\${DESTDIR\})?\$\{PREFIX(?:|:Q)\}/(.*)") {
+		if (($state == SCST_INSTALL_DIR || $state == SCST_INSTALL_DIR2) && $shellword !~ regex_mk_shellvaruse && $shellword =~ m"^(?:\$\{DESTDIR\})?\$\{PREFIX(?:|:Q)\}/(.*)") {
 			my ($dirname) = ($1);

 			$line->log_note("You can use AUTO_MKDIRS=yes or INSTALLATION_DIRS+= ${dirname} instead of this command.");
@@ -7011,7 +7011,7 @@ sub checkfile_PLIST($) {
 				$opt_debug_unchecked and $line->log_debug("Unchecked pathname \"${text}\".");
 			}

-			if ($text =~ /\${PKGLOCALEDIR}/ && defined($pkgctx_vardef) && !exists($pkgctx_vardef->{"USE_PKGLOCALEDIR"})) {
+			if ($text =~ /\$\{PKGLOCALEDIR}/ && defined($pkgctx_vardef) && !exists($pkgctx_vardef->{"USE_PKGLOCALEDIR"})) {
 				$line->log_warning("PLIST contains \${PKGLOCALEDIR}, but USE_PKGLOCALEDIR was not found.");
 			}

--- a/pkgtools/pkgse/Makefile
+++ b/pkgtools/pkgse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2014/10/09 14:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/06/12 10:50:56 wiz Exp $
 #

 DISTNAME=	pkgse-0.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	pkgtools
 MASTER_SITES=	http://imil.net/NetBSD/
 EXTRACT_SUFX=	.tgz
--- a/pkgtools/pkgsrc-todo/Makefile
+++ b/pkgtools/pkgsrc-todo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2014/11/20 09:33:29 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/12 10:50:56 wiz Exp $

 PKGNAME=	pkgsrc-todo-1.3
+PKGREVISION=	1
 CATEGORIES=	pkgtools

 MAINTAINER=	wiz@NetBSD.org
--- a/pkgtools/pkgsurvey/Makefile
+++ b/pkgtools/pkgsurvey/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2014/03/03 03:30:55 obache Exp $
+# $NetBSD: Makefile,v 1.14 2015/05/10 19:47:03 joerg Exp $
 #

-PKGNAME=	pkgsurvey-0.0
+PKGNAME=	pkgsurvey-1.0
 CATEGORIES=	pkgtools

 MAINTAINER=	agc@pkgsrc.org
--- a/pkgtools/pkgsurvey/files/pkgsurvey.sh
+++ b/pkgtools/pkgsurvey/files/pkgsurvey.sh
@@ -1,5 +1,12 @@
 #! /bin/sh

-${PKG_INFO} | sort | mail -s "`hostname` `${UNAME} -s`-`${UNAME} -p`-`${UNAME} -r`" agc-pkgsurvey@pkgsrc.org
+${PKG_INFO} -e '*' | while read pkg; do
+	path=`${PKG_INFO} -Q PKGPATH "$pkg"`
+	automatic=`${PKG_INFO} -Q automatic "$pkg"`
+	if [ -z "$automatic" ]; then
+		automatic=no
+	fi
+	echo "$path $pkg $automatic"
+done | sort | mail -s "`hostname` `${UNAME} -s`-`${UNAME} -p`-`${UNAME} -r`" pkgsurvey1.0@pkgsrc.org

 exit 0
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2014/05/29 23:37:15 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2015/06/12 10:50:56 wiz Exp $

 PKGNAME=	port2pkg-1.15
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	pkgtools

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/rc.subr/Makefile
+++ b/pkgtools/rc.subr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2014/06/04 14:16:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.29 2015/05/10 19:20:09 bsiegert Exp $
 #

-PKGNAME=		rc.subr-20140604
+PKGNAME=		rc.subr-20150510
 CATEGORIES=		pkgtools

 MAINTAINER=		sbd@NetBSD.org
--- a/pkgtools/rc.subr/files/rc.subr
+++ b/pkgtools/rc.subr/files/rc.subr
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.11 2014/06/04 14:16:00 ryoon Exp $
+# $NetBSD: rc.subr,v 1.12 2015/05/10 19:20:09 bsiegert Exp $
 #
 # Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -67,6 +67,9 @@ _RCARG_su="-m"
 _osname=$(uname -s)
 _osrelease=$(uname -r)
 case $_osname in
+	Darwin)
+		_RCCMD_echo="/bin/echo"
+		;;
 	SunOS)
 		_RCCMD_chown="/bin/chown"
 #		_RCCMD_ci="/usr/bin/ci"			# not in Solaris 9
--- a/pkgtools/revbump/Makefile
+++ b/pkgtools/revbump/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2015/02/09 00:58:44 snj Exp $
+# $NetBSD: Makefile,v 1.34 2015/06/12 10:50:56 wiz Exp $

 PKGNAME=		revbump-2.11
+PKGREVISION=		1
 CATEGORIES=		pkgtools

 MAINTAINER=		wiz@NetBSD.org
--- a/pkgtools/revbump/files/replace-commonbump
+++ b/pkgtools/revbump/files/replace-commonbump
@@ -128,7 +128,7 @@ sub GenerateHash ($$) {
 		    $included =~ s/\${[^}]+}/$value/;
 		    if ($value eq '') {
 			print STDERR 
-$FILE, ': ', __LINE__, ' Value ${', $varname, '} is emtpy at ', $shortdir, "\n";
+$FILE, ': ', __LINE__, ' Value ${', $varname, '} is empty at ', $shortdir, "\n";
 		    }
 		}
 		print STDERR __LINE__ , ' ', $shortname, ' -> ', $included,': ',$_ ,"\n" if $debug;
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2014/10/09 14:06:50 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.79 2015/06/17 11:59:58 wiz Exp $

-PKGNAME=	url2pkg-2.20
+PKGNAME=	url2pkg-2.23
 CATEGORIES=	pkgtools

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/url2pkg/files/url2pkg.pl
+++ b/pkgtools/url2pkg/files/url2pkg.pl
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: url2pkg.pl,v 1.26 2014/08/01 15:44:13 schmonz Exp $
+# $NetBSD: url2pkg.pl,v 1.29 2015/06/17 11:59:58 wiz Exp $
 #

 # Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -120,6 +120,7 @@ my ($distname, $abs_wrkdir, $abs_wrksrc);
 my (@wrksrc_files, @wrksrc_dirs);
 my (@depends, @build_depends, @includes, @build_vars, @extra_vars, @todo);
 my ($pkgname);
+my ($dist_subdir);

 #
 # And now to the real magic_* subroutines.
@@ -246,6 +247,7 @@ sub generate_initial_package($) {
 	my ($url) = @_;
 	my ($found, $master_site);
 	my ($master_sites, $distfile, $homepage, $dist_sufx, $category);
+	my ($gh_project, $gh_tag, $gh_release);

 	$found = false;
 	open(SITES, "<", "../../mk/fetch/sites.mk") or die;
@@ -301,6 +303,41 @@ sub generate_initial_package($) {
 		}
 	}

+	if (!$found) {
+		if ($url =~ qr"^https?://github\.com/") {
+			if ($url =~ qr"^https?://github\.com/(.*)/(.*)/archive/(.*)(\.tar\.gz|\.zip)$") {
+				$master_sites = "\${MASTER_SITE_GITHUB:=$1/}";
+				$homepage = "\${MASTER_SITE_GITHUB:=$1/$2/}";
+				$gh_project = $2;
+				$gh_tag = $3;
+				if (index($gh_tag, $gh_project) == -1 ) {
+					$pkgname = '${GITHUB_PROJECT}-${DISTNAME}';
+					$dist_subdir = '${GITHUB_PROJECT}';
+				}
+				$distfile = "$3$4";
+				$found = true;
+			} elsif ($url =~ qr"^https?://github\.com/(.*)/(.*)/releases/download/(.*)/(.*)(\.tar\.gz|\.zip)$") {
+				$master_sites = "\${MASTER_SITE_GITHUB:=$1/}";
+				$homepage = "\${MASTER_SITE_GITHUB:=$1/$2/}";
+				if (index($4, $2) == -1) {
+					$gh_project = $2;
+					$dist_subdir = '${GITHUB_PROJECT}';
+				}
+				if ($3 eq $4) {
+					$gh_release = '${DISTNAME}';
+				} else {
+					$gh_release = $3;
+				}
+				$distfile = "$4$5";
+				$found = true;
+			} else {
+				die("$0: ERROR: Invalid GitHub URL: ${url}\n");
+			}
+		} else {
+			$gh_project = ""; $gh_release = ""; $dist_subdir = "";
+		}
+	}
+
 	if (!$found) {
 		if ($url =~ qr"^(.*/)(.*)$") {
 			($master_sites, $distfile) = ($1, $2);
@@ -328,11 +365,20 @@ sub generate_initial_package($) {
 	print MF ("# \$Net" . "BSD\$\n");
 	print MF ("\n");
 	print_section(*MF, [
+		(($gh_project ne "")
+		? ["GITHUB_PROJECT", $gh_project]
+		: ()),
 		["DISTNAME", $distname],
 		["CATEGORIES", $category],
 		["MASTER_SITES", $master_sites],
+		(($gh_release ne "")
+		? ["GITHUB_RELEASE", $gh_release]
+		: ()),
 		(($dist_sufx ne ".tar.gz" && $dist_sufx ne ".gem")
 		? ["EXTRACT_SUFX", $dist_sufx]
+		: ()),
+		(($dist_subdir ne "")
+		? ["DIST_SUBDIR", $dist_subdir]
 		: ())
 	]);
 	print_section(*MF, [
@@ -377,6 +423,7 @@ sub adjust_package_from_extracted_distfiles()
 		given ($f) {
 			next when qr"^\.";
 			next when 'pax_global_header';
+			next when 'package.xml';
 			next when qr".*\.gemspec";
 			default { push(@files, $f) }
 		}
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.162 2015/03/12 14:46:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.163 2015/05/05 07:51:43 wiz Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in buildlink3.mk to the correct version,
 #	usually the most recent.

-PKGNAME=	x11-links-0.93
+PKGNAME=	x11-links-0.94
 CATEGORIES=	pkgtools x11

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.61 2015/03/12 14:46:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.62 2015/05/05 07:51:43 wiz Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@ BUILDLINK_TREE+=	x11-links
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.93
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.94
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build

--- a/pkgtools/x11-links/files/xorg.libxcb
+++ b/pkgtools/x11-links/files/xorg.libxcb
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libxcb,v 1.12 2015/03/12 14:46:09 ryoon Exp $
+# $NetBSD: xorg.libxcb,v 1.13 2015/05/05 07:51:43 wiz Exp $
 #
 include/xcb/bigreq.h
 include/xcb/composite.h
@@ -221,6 +221,8 @@ lib/libxcb-xkb.a
 lib/libxcb-xkb.so
 lib/libxcb-xkb.so.0
 lib/libxcb-xkb.so.0.1
+lib/libxcb-xkb.so.1
+lib/libxcb-xkb.so.1.0
 lib/libxcb-xprint.0.0.0.dylib
 lib/libxcb-xprint.0.dylib
 lib/libxcb-xprint.dylib