CVS commit: pkgsrc/pkgtools/pkg_install

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Oct 20 08:18:12 UTC 2015

Modified Files:
        pkgsrc/pkgtools/pkg_install: Makefile
        pkgsrc/pkgtools/pkg_install/files/add: Makefile.in perform.c

Log Message:
OpenBSD and derivatives define MACHINE_ARCH in sys/param.h to "amd64" which
overrides our attempt to set it to "x86_64" and ensure consistency across
platforms.  Work around this by setting it using PKGSRC_MACHINE_ARCH.

Confirmed to fix the issue and not break a variety of other platforms by
Sevan, and approved under duress by Joerg.


To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 pkgsrc/pkgtools/pkg_install/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/pkgtools/pkg_install/files/add/Makefile.in
cvs rdiff -u -r1.106 -r1.107 pkgsrc/pkgtools/pkg_install/files/add/perform.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.