 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.211 2015/09/07 09:06:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.212 2015/10/20 08:18:12 jperkin Exp $
 # Notes to package maintainers:
+#
 # Updating this package does not automatically necessitate bumping
 # 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.
 PKGNAME=		pkg_install-${VERSION}
 CATEGORIES=		pkgtools
 MAINTAINER=		agc@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/
 COMMENT=		Package management and administration tools for pkgsrc
 @@ -66,27 +66,27 @@ PKG_DELETE_CMD=		${WRKSRC}/delete/pkg_de
 #  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
 CPPFLAGS+=		-D_FILE_OFFSET_BITS=64
 CPPFLAGS+=		-DDEF_UMASK=${DEF_UMASK}
-MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+=		PKGSRC_MACHINE_ARCH=${MACHINE_ARCH}
 MAKE_ENV+=		OPSYS=${OPSYS}
 MAKE_ENV+=		CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
 MAKE_ENV+=		MANINSTALL=${MANINSTALL:Q}
 PKG_DBDIR?=		/var/db/pkg
 EGDIR=			${PREFIX}/share/examples/pkg_install
 PLIST_SUBST+=		PKG_DBDIR=${PKG_DBDIR}
 DEINSTALL_SRC=		# empty
 INSTALL_SRC=		${PKGDIR}/INSTALL
 FILES_SUBST+=		PKG_DBDIR=${PKG_DBDIR}			\
 			PKG_TOOLS_BIN=${PKG_TOOLS_BIN:Q}	\

 @@ -1,30 +1,30 @@
-# $NetBSD: Makefile.in,v 1.31 2015/09/07 09:06:04 jperkin Exp $
+# $NetBSD: Makefile.in,v 1.32 2015/10/20 08:18:12 jperkin Exp $
 srcdir=		@srcdir@
 prefix=		@prefix@
 exec_prefix=	@exec_prefix@
 sbindir=	@sbindir@
 mandir=		@mandir@
 datarootdir=	@datarootdir@
 man1dir=	$(mandir)/man1
 cat1dir=	$(mandir)/cat1
 CC=		@CC@
 CCLD=		$(CC)
 CPPFLAGS=	@CPPFLAGS@ -I. -I$(srcdir) -I../lib
-DEFS=		@DEFS@ -DOPSYS_NAME=\"$(OPSYS)\" -DMACHINE_ARCH=\"$(MACHINE_ARCH)\" -DBINDIR=\"$(sbindir)\"
+DEFS=		@DEFS@ -DOPSYS_NAME=\"$(OPSYS)\" -DPKGSRC_MACHINE_ARCH=\"$(PKGSRC_MACHINE_ARCH)\" -DBINDIR=\"$(sbindir)\"
 CFLAGS=		@CFLAGS@
 LDFLAGS=	@LDFLAGS@ -L../lib
 SSL_SUPPORT=	@ssl_support@
 LIBS=		-linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch
 .if !empty(SSL_SUPPORT)
 LIBS+=		-lssl -lcrypto
 .endif
 LIBS+=		@LIBS@
 INSTALL=	@INSTALL@

 @@ -1,22 +1,22 @@
-/*	$NetBSD: perform.c,v 1.106 2014/12/30 15:13:20 wiz Exp $	*/
+/*	$NetBSD: perform.c,v 1.107 2015/10/20 08:18:12 jperkin Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.106 2014/12/30 15:13:20 wiz Exp $");
+__RCSID("$NetBSD: perform.c,v 1.107 2015/10/20 08:18:12 jperkin Exp $");
 /*-
  * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
  * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org>
  * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org>
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
  * Copyright (c) 2010 Thomas Klausner <wiz@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
 @@ -897,27 +897,27 @@ check_platform(struct pkg_task *pkg)
 			warnx("uname() failed, continuing.");
 			return 0;
 		} else {
 			warnx("uname() failed, aborting.");
 			return -1;
+		}
+	}
 	normalise_platform(&host_uname);
 	if (OverrideMachine != NULL)
 		effective_arch = OverrideMachine;
 	else
-		effective_arch = MACHINE_ARCH;
+		effective_arch = PKGSRC_MACHINE_ARCH;
 	/* If either the OS or arch are different, bomb */
 	if (strcmp(OPSYS_NAME, pkg->buildinfo[BI_OPSYS]) ||
 	    strcmp(effective_arch, pkg->buildinfo[BI_MACHINE_ARCH]) != 0)
 		fatal = 1;
 	else
 		fatal = 0;
 	if (fatal ||
 	    compatible_platform(OPSYS_NAME, host_uname.release,
 				pkg->buildinfo[BI_OS_VERSION]) != 1) {
 		warnx("Warning: package `%s' was built for a platform:",
 		    pkg->pkgname);