1681 support for BUILD64=# no longer works

*** 19,28 ****
--- 19,29 ----
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2014 Andrew Stormont.
  #
  
  #
  # The default for payload-bearing actions in this package is to appear in the
  # global zone only.  See the include file for greater detail, as well as
*** 44,65 ****
  dir path=kernel/misc/$(ARCH64) group=sys
  dir path=usr group=sys
  dir path=usr/lib
  dir path=usr/lib/mdb group=sys
  dir path=usr/lib/mdb/kvm group=sys
! dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
  dir path=usr/share/man
  dir path=usr/share/man/man7d
  driver name=iser perms="* 0600 root sys"
  file path=kernel/drv/$(ARCH64)/iser group=sys
  $(i386_ONLY)file path=kernel/drv/iser group=sys
  file path=kernel/drv/iser.conf group=sys
  file path=kernel/kmdb/$(ARCH64)/idm group=sys mode=0555
  $(i386_ONLY)file path=kernel/kmdb/idm group=sys mode=0555
  file path=kernel/misc/$(ARCH64)/idm group=sys mode=0755
  $(i386_ONLY)file path=kernel/misc/idm group=sys mode=0755
! file path=usr/lib/mdb/kvm/$(ARCH64)/idm.so group=sys mode=0555
  $(i386_ONLY)file path=usr/lib/mdb/kvm/idm.so group=sys mode=0555
  file path=usr/share/man/man7d/iser.7d
  legacy pkg=SUNWiscsidmr desc="Sun iSCSI Data Mover (Root)" \
      name="Sun iSCSI Data Mover (Root)"
  legacy pkg=SUNWiscsidmu desc="Sun iSCSI Data Mover (Usr)" \
--- 45,66 ----
  dir path=kernel/misc/$(ARCH64) group=sys
  dir path=usr group=sys
  dir path=usr/lib
  dir path=usr/lib/mdb group=sys
  dir path=usr/lib/mdb/kvm group=sys
! $(BUILD64)dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
  dir path=usr/share/man
  dir path=usr/share/man/man7d
  driver name=iser perms="* 0600 root sys"
  file path=kernel/drv/$(ARCH64)/iser group=sys
  $(i386_ONLY)file path=kernel/drv/iser group=sys
  file path=kernel/drv/iser.conf group=sys
  file path=kernel/kmdb/$(ARCH64)/idm group=sys mode=0555
  $(i386_ONLY)file path=kernel/kmdb/idm group=sys mode=0555
  file path=kernel/misc/$(ARCH64)/idm group=sys mode=0755
  $(i386_ONLY)file path=kernel/misc/idm group=sys mode=0755
! $(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/idm.so group=sys mode=0555
  $(i386_ONLY)file path=usr/lib/mdb/kvm/idm.so group=sys mode=0555
  file path=usr/share/man/man7d/iser.7d
  legacy pkg=SUNWiscsidmr desc="Sun iSCSI Data Mover (Root)" \
      name="Sun iSCSI Data Mover (Root)"
  legacy pkg=SUNWiscsidmu desc="Sun iSCSI Data Mover (Usr)" \