1681 support for BUILD64=# no longer works

*** 20,29 ****
--- 20,30 ----
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+ # Copyright 2014 Andrew Stormont.
  #
  
  set name=pkg.fmri value=pkg:/system/library/security/libsasl@$(PKGVERS)
  set name=pkg.description \
      value="Simple Authentication and Security Layer (SASL) v2 shared library and plugins"
*** 32,58 ****
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Libraries
  set name=variant.arch value=$(ARCH)
  dir path=usr group=sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/sasl
! dir path=usr/lib/sasl/$(ARCH64)
  dir path=usr/share/man
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man3proc
  dir path=usr/share/man/man3project
  dir path=usr/share/man/man3resolv
  dir path=usr/share/man/man3rpc
  dir path=usr/share/man/man3sasl
  dir path=usr/share/man/man4
! file path=usr/lib/$(ARCH64)/libsasl.so.1
  file path=usr/lib/libsasl.so.1
! file path=usr/lib/sasl/$(ARCH64)/crammd5.so.1
! file path=usr/lib/sasl/$(ARCH64)/digestmd5.so.1
! file path=usr/lib/sasl/$(ARCH64)/login.so.1
! file path=usr/lib/sasl/$(ARCH64)/plain.so.1
  file path=usr/lib/sasl/crammd5.so.1
  file path=usr/lib/sasl/digestmd5.so.1
  file path=usr/lib/sasl/login.so.1
  file path=usr/lib/sasl/plain.so.1
  file path=usr/share/man/man3lib/libsasl.3lib
--- 33,59 ----
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Libraries
  set name=variant.arch value=$(ARCH)
  dir path=usr group=sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/sasl
! $(BUILD64)dir path=usr/lib/sasl/$(ARCH64)
  dir path=usr/share/man
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man3proc
  dir path=usr/share/man/man3project
  dir path=usr/share/man/man3resolv
  dir path=usr/share/man/man3rpc
  dir path=usr/share/man/man3sasl
  dir path=usr/share/man/man4
! $(BUILD64)file path=usr/lib/$(ARCH64)/libsasl.so.1
  file path=usr/lib/libsasl.so.1
! $(BUILD64)file path=usr/lib/sasl/$(ARCH64)/crammd5.so.1
! $(BUILD64)file path=usr/lib/sasl/$(ARCH64)/digestmd5.so.1
! $(BUILD64)file path=usr/lib/sasl/$(ARCH64)/login.so.1
! $(BUILD64)file path=usr/lib/sasl/$(ARCH64)/plain.so.1
  file path=usr/lib/sasl/crammd5.so.1
  file path=usr/lib/sasl/digestmd5.so.1
  file path=usr/lib/sasl/login.so.1
  file path=usr/lib/sasl/plain.so.1
  file path=usr/share/man/man3lib/libsasl.3lib
*** 126,136 ****
      desc="Simple Authentication and Security Layer (SASL) v2 shared library and plugins" \
      name="Simple Authentication and Security Layer (SASL) v2 shared library and plugins"
  license cr_Sun license=cr_Sun
  license usr/src/lib/libsasl/THIRDPARTYLICENSE \
      license=usr/src/lib/libsasl/THIRDPARTYLICENSE
! link path=usr/lib/$(ARCH64)/libsasl.so target=libsasl.so.1
  link path=usr/lib/libsasl.so target=libsasl.so.1
  link path=usr/share/man/man3proc/ps_kill.3proc target=ps_pstop.3proc
  link path=usr/share/man/man3proc/ps_lcontinue.3proc target=ps_pstop.3proc
  link path=usr/share/man/man3proc/ps_lgetfpregs.3proc target=ps_lgetregs.3proc
  link path=usr/share/man/man3proc/ps_lgetxregs.3proc target=ps_lgetregs.3proc
--- 127,137 ----
      desc="Simple Authentication and Security Layer (SASL) v2 shared library and plugins" \
      name="Simple Authentication and Security Layer (SASL) v2 shared library and plugins"
  license cr_Sun license=cr_Sun
  license usr/src/lib/libsasl/THIRDPARTYLICENSE \
      license=usr/src/lib/libsasl/THIRDPARTYLICENSE
! $(BUILD64)link path=usr/lib/$(ARCH64)/libsasl.so target=libsasl.so.1
  link path=usr/lib/libsasl.so target=libsasl.so.1
  link path=usr/share/man/man3proc/ps_kill.3proc target=ps_pstop.3proc
  link path=usr/share/man/man3proc/ps_lcontinue.3proc target=ps_pstop.3proc
  link path=usr/share/man/man3proc/ps_lgetfpregs.3proc target=ps_lgetregs.3proc
  link path=usr/share/man/man3proc/ps_lgetxregs.3proc target=ps_lgetregs.3proc