1681 support for BUILD64=# no longer works

*** 20,29 ****
--- 20,30 ----
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright (c) 2012 by Delphix. All rights reserved.
+ # Copyright 2014 Andrew Stormont.
  #
  
  set name=pkg.fmri value=pkg:/system/file-system/zfs/tests@$(PKGVERS)
  set name=pkg.description value="ZFS test commands"
  set name=pkg.summary value="ZFS unbundled utilities"
*** 34,67 ****
  dir path=kernel/drv group=sys
  dir path=kernel/drv/$(ARCH64) group=sys
  dir path=usr group=sys
  dir path=usr/bin
  $(i386_ONLY)dir path=usr/bin/$(ARCH32)
! dir path=usr/bin/$(ARCH64)
  dir path=usr/include
  dir path=usr/include/sys
  dir path=usr/include/sys/fs
  dir path=usr/lib
  dir path=usr/lib/devfsadm group=sys
  dir path=usr/lib/devfsadm/linkmod group=sys
  dir path=usr/sbin
  $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
! dir path=usr/sbin/$(ARCH64)
  driver name=zut perms="* 0666 root sys"
  file path=kernel/drv/$(ARCH64)/zut group=sys
  $(i386_ONLY)file path=kernel/drv/zut group=sys
  file path=kernel/drv/zut.conf group=sys
  $(i386_ONLY)file path=usr/bin/$(ARCH32)/zlook mode=0555
  $(i386_ONLY)file path=usr/bin/$(ARCH32)/ztest mode=0555
! file path=usr/bin/$(ARCH64)/zlook mode=0555
! file path=usr/bin/$(ARCH64)/ztest mode=0555
  file path=usr/include/sys/fs/zut.h
  file path=usr/lib/devfsadm/linkmod/SUNW_zut_link.so group=sys
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zhack mode=0555
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zinject mode=0555
! file path=usr/sbin/$(ARCH64)/zhack mode=0555
! file path=usr/sbin/$(ARCH64)/zinject mode=0555
  hardlink path=usr/bin/zlook target=../../usr/lib/isaexec
  hardlink path=usr/bin/ztest target=../../usr/lib/isaexec
  hardlink path=usr/sbin/zhack target=../../usr/lib/isaexec
  hardlink path=usr/sbin/zinject target=../../usr/lib/isaexec
  legacy pkg=SUNWonzfs desc="ZFS test commands" name="ZFS unbundled utilities"
--- 35,68 ----
  dir path=kernel/drv group=sys
  dir path=kernel/drv/$(ARCH64) group=sys
  dir path=usr group=sys
  dir path=usr/bin
  $(i386_ONLY)dir path=usr/bin/$(ARCH32)
! $(BUILD64)dir path=usr/bin/$(ARCH64)
  dir path=usr/include
  dir path=usr/include/sys
  dir path=usr/include/sys/fs
  dir path=usr/lib
  dir path=usr/lib/devfsadm group=sys
  dir path=usr/lib/devfsadm/linkmod group=sys
  dir path=usr/sbin
  $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
! $(BUILD64)dir path=usr/sbin/$(ARCH64)
  driver name=zut perms="* 0666 root sys"
  file path=kernel/drv/$(ARCH64)/zut group=sys
  $(i386_ONLY)file path=kernel/drv/zut group=sys
  file path=kernel/drv/zut.conf group=sys
  $(i386_ONLY)file path=usr/bin/$(ARCH32)/zlook mode=0555
  $(i386_ONLY)file path=usr/bin/$(ARCH32)/ztest mode=0555
! $(BUILD64)file path=usr/bin/$(ARCH64)/zlook mode=0555
! $(BUILD64)file path=usr/bin/$(ARCH64)/ztest mode=0555
  file path=usr/include/sys/fs/zut.h
  file path=usr/lib/devfsadm/linkmod/SUNW_zut_link.so group=sys
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zhack mode=0555
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zinject mode=0555
! $(BUILD64)file path=usr/sbin/$(ARCH64)/zhack mode=0555
! $(BUILD64)file path=usr/sbin/$(ARCH64)/zinject mode=0555
  hardlink path=usr/bin/zlook target=../../usr/lib/isaexec
  hardlink path=usr/bin/ztest target=../../usr/lib/isaexec
  hardlink path=usr/sbin/zhack target=../../usr/lib/isaexec
  hardlink path=usr/sbin/zinject target=../../usr/lib/isaexec
  legacy pkg=SUNWonzfs desc="ZFS test commands" name="ZFS unbundled utilities"