Import of pkgsrc-2014Q1

2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.197 2013/06/05 18:20:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.203 2014/03/14 22:09:04 ryoon Exp $

 # Notes to package maintainers:
 #
@@ -6,11 +6,9 @@
 # PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
 # change in the pkg_* tools that pkgsrc relies on for proper operation.

-DISTNAME=		pkg_install-${VERSION}
+PKGNAME=		pkg_install-${VERSION}
 PKGREVISION=		1
 CATEGORIES=		pkgtools
-MASTER_SITES=		# empty
-DISTFILES=		# empty

 MAINTAINER=		agc@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/
@@ -55,11 +53,23 @@ USE_NATIVE_GCC=		yes

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

+.if ${OS_VARIANT} == "SCOOSR5"
+# SCO OpenServer 5.0.7/3.2's strings.h defines strcasecmp with
+# "unsigned size_t". We cannot use -Werror for net/libfetch.
+MAKE_FLAGS+=	NOGCCERROR=yes
+.endif
+
 .if defined(_PKGSRC_BARRIER) && empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 PKG_ADD_CMD=		${WRKSRC}/add/pkg_add
 PKG_CREATE_CMD=		${WRKSRC}/create/pkg_create
 PKG_DELETE_CMD=		${WRKSRC}/delete/pkg_delete
+#
+#  Special case for dependency checking in 'non-bootstrap' builds:
+#  don't redefine 'pkg_info' if it already exists.
+#
+.  if defined(PKG_INFO_CMD) && !exists(${PKG_INFO_CMD})
 PKG_INFO_CMD=		${WRKSRC}/info/pkg_info
+.  endif
 .endif

 CPPFLAGS+=		-D_LARGEFILE_SOURCE -D_LARGE_FILES
@@ -69,6 +79,7 @@ CPPFLAGS+=		-DDEF_UMASK=${DEF_UMASK}

 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
 MAKE_ENV+=		OPSYS=${OPSYS:Q}
+MAKE_ENV+=		CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
 MAKE_ENV+=		MANINSTALL=${MANINSTALL:Q}

 PKG_DBDIR?=		/var/db/pkg
--- a/pkgtools/pkg_install/files/Makefile.in
+++ b/pkgtools/pkg_install/files/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.9 2009/02/02 12:35:00 joerg Exp $
+# $NetBSD: Makefile.in,v 1.10 2013/09/11 14:39:21 wiz Exp $

 BOOTSTRAP=	@bootstrap@

@@ -21,5 +21,5 @@ install clean:
 distclean: clean
 	rm -f config.log config.status configure.lineno
 	rm -f Makefile */Makefile
-	rm -f lib/config.h
-	rm -f bmp/bmp.sh
+	rm -f lib/config.h lib/pkg_install.conf.5 lib/pkg_install.conf.cat
+	rm -f bpm/bpm.sh
--- a/pkgtools/pkg_install/files/add/Makefile.in
+++ b/pkgtools/pkg_install/files/add/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.27 2012/10/21 09:08:56 joerg Exp $
+# $NetBSD: Makefile.in,v 1.28 2013/09/12 11:03:10 jperkin Exp $

 srcdir=		@srcdir@

@@ -50,5 +50,9 @@ install:
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1
+.  else
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
+.  endif
 .endif
--- a/pkgtools/pkg_install/files/add/perform.c
+++ b/pkgtools/pkg_install/files/add/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.103 2013/01/31 10:25:30 wiz Exp $	*/
+/*	$NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -6,7 +6,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.103 2013/01/31 10:25:30 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin Exp $");

 /*-
 * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
@@ -413,9 +413,6 @@ check_already_installed(struct pkg_task *pkg)
 		return 1;
 	}

-	if (Force)
-		return 1;
-
 	/* We can only arrive here for explicitly requested packages. */
 	if (!Automatic && is_automatic_installed(pkg->pkgname)) {
 		if (Fake ||
@@ -1559,6 +1556,7 @@ nuke_pkg:

 nuke_pkgdb:
 	if (!Fake) {
+		(void) remove_files(pkg->install_logdir, "+*");
 		if (recursive_remove(pkg->install_logdir, 1))
 			warn("Couldn't remove %s", pkg->install_logdir);
 		free(pkg->install_logdir_real);
--- a/pkgtools/pkg_install/files/admin/Makefile.in
+++ b/pkgtools/pkg_install/files/admin/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.25 2012/10/21 09:08:56 joerg Exp $
+# $NetBSD: Makefile.in,v 1.26 2013/09/12 11:03:10 jperkin Exp $

 srcdir=		@srcdir@

@@ -65,9 +65,15 @@ install:
 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat8dir)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1
+	$(INSTALL) -m 444 audit-packages.cat ${DESTDIR}$(cat8dir)/audit-packages.8
+	$(INSTALL) -m 444 download-vulnerability-list.cat ${DESTDIR}$(cat8dir)/download-vulnerability-list.8
+.  else
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
 	$(INSTALL) -m 444 audit-packages.cat ${DESTDIR}$(cat8dir)/audit-packages.0
 	$(INSTALL) -m 444 download-vulnerability-list.cat ${DESTDIR}$(cat8dir)/download-vulnerability-list.0
+.  endif
 .endif

 audit-packages: audit-packages.sh.in
--- a/pkgtools/pkg_install/files/admin/main.c
+++ b/pkgtools/pkg_install/files/admin/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.61 2010/04/20 00:39:13 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.62 2013/08/03 11:45:14 obache 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.61 2010/04/20 00:39:13 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.62 2013/08/03 11:45:14 obache Exp $");

 /*-
 * Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
@@ -248,7 +248,7 @@ rebuild(void)
 	iterate_pkg_db(add_pkg, &count);

 	printf("\n");
-	printf("Stored %" PRIzu " file%s and %zu explicit director%s"
+	printf("Stored %" PRIzu " file%s and %" PRIzu " explicit director%s"
 	    " from %"PRIzu " package%s in %s.\n",
 	    count.files, count.files == 1 ? "" : "s",
 	    count.directories, count.directories == 1 ? "y" : "ies",
--- a/pkgtools/pkg_install/files/bpm/bpm.1
+++ b/pkgtools/pkg_install/files/bpm/bpm.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: bpm.1,v 1.7 2012/02/21 18:32:14 wiz Exp $ */
+.\" $NetBSD: bpm.1,v 1.8 2013/07/20 21:50:53 wiz Exp $ */
 .\"
 .\" Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -111,4 +111,4 @@ are valid for
 The
 .Nm
 utility was written by
-.An Alistair Crooks Aq agc@NetBSD.org .
+.An Alistair Crooks Aq Mt agc@NetBSD.org .
--- a/pkgtools/pkg_install/files/configure
+++ b/pkgtools/pkg_install/files/configure
@@ -5034,7 +5034,7 @@ _ACEOF


 case $host in
-*-*-hpux*)
+*-*-bsdi*|*-*-hpux*|*-*-osf*)
 	$as_echo "#define MISSING_SIZE_T_SUPPORT 1" >>confdefs.h


--- a/pkgtools/pkg_install/files/configure.ac
+++ b/pkgtools/pkg_install/files/configure.ac
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.37 2013/02/10 12:46:56 obache Exp $
+dnl $NetBSD: configure.ac,v 1.38 2013/08/03 11:45:14 obache Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 AC_INIT([pkg_install], [20090911], [joerg@NetBSD.org])
@@ -133,7 +133,7 @@ AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(size_t, [#include <stdlib.h>])

 case $host in
-*-*-hpux*)
+*-*-bsdi*|*-*-hpux*|*-*-osf*)
 	AC_DEFINE(MISSING_SIZE_T_SUPPORT)
 	AH_TEMPLATE([MISSING_SIZE_T_SUPPORT], [
 	Define to 1 if the `z' modifider for printf is missing.
--- a/pkgtools/pkg_install/files/create/Makefile.in
+++ b/pkgtools/pkg_install/files/create/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.23 2012/10/21 09:08:56 joerg Exp $
+# $NetBSD: Makefile.in,v 1.24 2013/09/12 11:03:10 jperkin Exp $

 srcdir=		@srcdir@

@@ -56,5 +56,9 @@ install:
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1
+.  else
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
+.  endif
 .endif
--- a/pkgtools/pkg_install/files/delete/Makefile.in
+++ b/pkgtools/pkg_install/files/delete/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.20 2012/10/21 09:08:56 joerg Exp $
+# $NetBSD: Makefile.in,v 1.21 2013/09/12 11:03:10 jperkin Exp $

 srcdir=		@srcdir@

@@ -50,5 +50,9 @@ install:
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1
+.  else
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
+.  endif
 .endif
--- a/pkgtools/pkg_install/files/info/Makefile.in
+++ b/pkgtools/pkg_install/files/info/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.26 2012/10/21 09:08:57 joerg Exp $
+# $NetBSD: Makefile.in,v 1.27 2013/09/12 11:03:10 jperkin Exp $

 srcdir=		@srcdir@

@@ -54,5 +54,9 @@ install:
 	$(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1
 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1
+.  else
 	$(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0
+.  endif
 .endif
--- a/pkgtools/pkg_install/files/lib/Makefile.in
+++ b/pkgtools/pkg_install/files/lib/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.33 2012/05/15 16:43:54 christos Exp $
+# $NetBSD: Makefile.in,v 1.34 2013/09/12 11:03:10 jperkin Exp $

 srcdir=		@srcdir@

@@ -65,7 +65,13 @@ install:
 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat5dir)
 	$(INSTALL) -m 755 -d ${DESTDIR}$(cat7dir)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	$(INSTALL) -m 444 pkg_summary.cat ${DESTDIR}$(cat5dir)/pkg_summary.5
+	$(INSTALL) -m 444 pkg_install.conf.cat ${DESTDIR}$(cat5dir)/pkg_install.conf.5
+	$(INSTALL) -m 444 pkgsrc.cat ${DESTDIR}$(cat7dir)/pkgsrc.7
+.  else
 	$(INSTALL) -m 444 pkg_summary.cat ${DESTDIR}$(cat5dir)/pkg_summary.0
 	$(INSTALL) -m 444 pkg_install.conf.cat ${DESTDIR}$(cat5dir)/pkg_install.conf.0
 	$(INSTALL) -m 444 pkgsrc.cat ${DESTDIR}$(cat7dir)/pkgsrc.0
+.  endif
 .endif
--- 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.33 2013/05/05 21:09:59 rodent Exp $	*/
+/*	$NetBSD: license.c,v 1.36 2014/03/19 21:45:12 wiz Exp $	*/

 /*-
 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -51,9 +51,11 @@ const char *default_acceptable_licenses =
    "artistic artistic-2.0 "
    "boost-license "
    "cc-by-sa-v3.0 "
+    "cc0-1.0-universal "
    "cddl-1.0 "
    "cpl-1.0 "
    "epl-v1.0 "
+    "eupl-v1.1 "
    "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 "
--- a/pkgtools/pkg_install/files/lib/pkg_signature.c
+++ b/pkgtools/pkg_install/files/lib/pkg_signature.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pkg_signature.c,v 1.10 2010/02/20 04:40:03 joerg Exp $	*/
+/*	$NetBSD: pkg_signature.c,v 1.11 2013/09/11 14:10:05 khorben Exp $	*/

 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pkg_signature.c,v 1.10 2010/02/20 04:40:03 joerg Exp $");
+__RCSID("$NetBSD: pkg_signature.c,v 1.11 2013/09/11 14:10:05 khorben Exp $");

 /*-
 * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -325,10 +325,7 @@ pkg_verify_signature(const char *archive_name, struct archive **archive,

 	*pkgname = NULL;

-	state = xmalloc(sizeof(*state));
-	state->sign_blocks = NULL;
-	state->sign_buf = NULL;
-	state->archive = NULL;
+	state = xcalloc(sizeof(*state), 1);

 	r = read_file_from_archive(archive_name, *archive, entry, HASH_FNAME,
 	    &hash_file, &hash_len);
--- a/pkgtools/pkg_install/files/lib/var.c
+++ b/pkgtools/pkg_install/files/lib/var.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.9 2013/05/17 07:27:29 martin Exp $	*/
+/*	$NetBSD: var.c,v 1.10 2013/09/12 07:28:28 wiz Exp $	*/

 /*-
 * Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: var.c,v 1.9 2013/05/17 07:27:29 martin Exp $");
+__RCSID("$NetBSD: var.c,v 1.10 2013/09/12 07:28:28 wiz Exp $");

 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -60,7 +60,7 @@ static const char *var_cmp(const char *, size_t, const char *, size_t);
 static void var_print(FILE *, const char *, const char *);

 /*
- * Copy the specified varibales from the file fname to stdout.
+ * Copy the specified variables from the file fname to stdout.
 */
 int
 var_copy_list(const char *buf, const char **variables)
@@ -74,8 +74,8 @@ var_copy_list(const char *buf, const char **variables)
 			next = eol + 1;
 			len = eol - buf;
 		} else {
-			next = eol;
 			len = strlen(buf);
+			next = buf + len;
 		}

 		for (i=0; variables[i]; i++) {
--- 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.165 2013/01/31 10:25:30 wiz Exp $	*/
+/*	$NetBSD: version.h,v 1.166 2013/09/02 10:28:44 jperkin 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 20130131
+#define PKGTOOLS_VERSION 20130902

 #endif /* _INST_LIB_VERSION_H_ */
--- a/pkgtools/pkg_install/files/view/Makefile.in
+++ b/pkgtools/pkg_install/files/view/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.6 2008/03/10 12:14:32 wiz Exp $
+# $NetBSD: Makefile.in,v 1.7 2013/09/12 11:03:10 jperkin Exp $

 prefix=		@prefix@
 exec_prefix=	@exec_prefix@
@@ -30,6 +30,14 @@ install:
 	@for script in $(SCRIPTS); do \
 		echo "$(INSTALL) -m 444 $$script.1 ${DESTDIR}$(man1dir)/$$script.1"; \
 		$(INSTALL) -m 444 $$script.1 ${DESTDIR}$(man1dir)/$$script.1; \
-		echo "$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0"; \
-		$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0; \
+		case "$(CATMAN_SECTION_SUFFIX)" in \
+		[Yy][Ee][Ss]) \
+			echo "$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.1"; \
+			$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.1; \
+			;; \
+		*) \
+			echo "$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0"; \
+			$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0; \
+			;; \
+		esac; \
 	done
--- a/pkgtools/pkg_install/files/view/linkfarm.1
+++ b/pkgtools/pkg_install/files/view/linkfarm.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: linkfarm.1,v 1.6 2009/02/08 23:11:56 wiz Exp $
+.\"	$NetBSD: linkfarm.1,v 1.7 2013/07/20 21:50:53 wiz Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -145,4 +145,4 @@ directory, and it defaults to "info/dir *[~#] *.OLD *.orig *,v".
 The
 .Nm
 utility was written by
-.An Alistair G. Crooks Aq agc@NetBSD.org .
+.An Alistair G. Crooks Aq Mt agc@NetBSD.org .
--- a/pkgtools/pkg_install/files/view/pkg_view.1
+++ b/pkgtools/pkg_install/files/view/pkg_view.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkg_view.1,v 1.13 2010/01/22 13:30:42 joerg Exp $
+.\"	$NetBSD: pkg_view.1,v 1.14 2013/07/20 21:50:53 wiz Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -273,4 +273,4 @@ directory.
 The
 .Nm
 utility was written by
-.An Alistair G. Crooks Aq agc@NetBSD.org .
+.An Alistair G. Crooks Aq Mt agc@NetBSD.org .