pkg/50708: pkgtools/bootstrap-mk-files FreeBSD amd64 OBJECT_FMT problem

[davshao%gmail.com@localhost]

>Number:         50708
>Category:       pkg
>Synopsis:       pkgtools/bootstrap-mk-files FreeBSD amd64 OBJECT_FMT problem
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 26 08:35:00 +0000 2016
>Originator:     David Shao
>Release:        current pkgsrc cvs
>Organization:
>Environment:
FreeBSD xxxxx.f 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r294705+e33a579(svn_head): Mon Jan 25 00:49:22 PST 2016    xxxxx@xxxxx.f:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
On both FreeBSD 11.0-CURRENT amd64 and FreeBSD 10.2-RELEASE amd64, detection of the current object format seems to have broken down.  On FreeBSD, uname -a on my machines returns amd64 not x86_64.

Perhaps unwisely, I have been religiously updated pkgtools/pkg_install and others on Friday, January 22, even before

Module Name:    pkgsrc
Date:           Sun Jan 24 16:14:45 UTC 2016

Modified Files:
        pkgsrc/bootstrap: bootstrap
        pkgsrc/devel/bmake: Makefile
        pkgsrc/devel/bmake/files: main.c make-bootstrap.sh.in

and found days later today that executing a simple bmake fetch results in an error such as:

/usr/pkgsrc/multimedia/libva # bmake fetch
ERROR: [depends.mk] Installed package digest-20121220 has an
ERROR:     object format ``ELF'' which differs from ``a.out''.  Please
ERROR:     update the digest-20121220 package to a.out.
*** Error code 1

I found a workaround changing /usr/pkg/share/mk/bsd.own.mk as follows:

--- bsd.own.mk.orig     2016-01-26 00:14:44.595417000 -0800
+++ bsd.own.mk  2016-01-25 23:56:49.000000000 -0800
@@ -115,6 +115,7 @@
     ${MACHINE_ARCH} == "sparc" || \
     ${MACHINE_ARCH} == "sparc64" || \
     ${MACHINE_ARCH} == "x86_64" || \
+    ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "m68000" || \
     ${MACHINE_ARCH} == "arm" || \

A similar patch can be made to pkgtools/bootstrap-mk-files/files/mods/bsd.own.mk.in

As the same behavior is occurring with a backed up version of pkg from January 22, it doesn't seem the January 24 changes can be blamed.
>How-To-Repeat:

>Fix:
For this particular machine running FreeBSD 11.0-CURRENT amd64, apply the following diff to /usr/pkgsrc/pkgtools/bootstrap-mk-files and bmake replace the bootstrap-mk-files package:

--- files/mods/bsd.own.mk.in.orig       2015-03-06 22:42:44.000000000 -0800
+++ files/mods/bsd.own.mk.in    2016-01-25 23:56:32.864580000 -0800
@@ -115,6 +115,7 @@
     ${MACHINE_ARCH} == "sparc" || \
     ${MACHINE_ARCH} == "sparc64" || \
     ${MACHINE_ARCH} == "x86_64" || \
+    ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "m68000" || \
     ${MACHINE_ARCH} == "arm" || \