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:/service/file-system/nfs@$(PKGVERS)
  set name=pkg.description value="Network File System (NFS) server support"
  set name=pkg.summary value="Network File System (NFS) server support"
*** 45,58 ****
  dir path=lib/svc/method
  dir path=usr group=sys
  dir path=usr/lib
  dir path=usr/lib/fs group=sys
  dir path=usr/lib/fs/nfs group=sys
! dir path=usr/lib/fs/nfs/$(ARCH64) group=sys
  dir path=usr/lib/nfs group=sys
  dir path=usr/lib/reparse group=bin
! dir path=usr/lib/reparse/$(ARCH64) group=sys
  dir path=usr/sbin
  dir path=usr/share/man
  dir path=usr/share/man/man1m
  dir path=usr/share/man/man5
  file path=etc/default/nfslogd group=sys \
--- 46,59 ----
  dir path=lib/svc/method
  dir path=usr group=sys
  dir path=usr/lib
  dir path=usr/lib/fs group=sys
  dir path=usr/lib/fs/nfs group=sys
! $(BUILD64)dir path=usr/lib/fs/nfs/$(ARCH64) group=sys
  dir path=usr/lib/nfs group=sys
  dir path=usr/lib/reparse group=bin
! $(BUILD64)dir path=usr/lib/reparse/$(ARCH64) group=sys
  dir path=usr/sbin
  dir path=usr/share/man
  dir path=usr/share/man/man1m
  dir path=usr/share/man/man5
  file path=etc/default/nfslogd group=sys \
*** 65,81 ****
  $(i386_ONLY)file path=kernel/misc/nfssrv group=sys mode=0755
  file path=lib/svc/manifest/network/nfs/nfslogd.xml group=sys mode=0444
  file path=lib/svc/manifest/network/nfs/rquota.xml group=sys mode=0444
  file path=lib/svc/manifest/network/nfs/server.xml group=sys mode=0444
  file path=lib/svc/method/nfs-server mode=0555
! file path=usr/lib/fs/nfs/$(ARCH64)/libshare_nfs.so.1
  file path=usr/lib/fs/nfs/libshare_nfs.so.1
  file path=usr/lib/nfs/mountd mode=0555
  file path=usr/lib/nfs/nfsd mode=0555
  file path=usr/lib/nfs/nfslogd mode=0555
  file path=usr/lib/nfs/rquotad mode=0555
! file path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so.1
  file path=usr/lib/reparse/libnfs_basic.so.1
  file path=usr/sbin/exportfs mode=0555
  file path=usr/sbin/nfsref mode=0555
  file path=usr/share/man/man1m/mountd.1m
  file path=usr/share/man/man1m/nfsd.1m
--- 66,82 ----
  $(i386_ONLY)file path=kernel/misc/nfssrv group=sys mode=0755
  file path=lib/svc/manifest/network/nfs/nfslogd.xml group=sys mode=0444
  file path=lib/svc/manifest/network/nfs/rquota.xml group=sys mode=0444
  file path=lib/svc/manifest/network/nfs/server.xml group=sys mode=0444
  file path=lib/svc/method/nfs-server mode=0555
! $(BUILD64)file path=usr/lib/fs/nfs/$(ARCH64)/libshare_nfs.so.1
  file path=usr/lib/fs/nfs/libshare_nfs.so.1
  file path=usr/lib/nfs/mountd mode=0555
  file path=usr/lib/nfs/nfsd mode=0555
  file path=usr/lib/nfs/nfslogd mode=0555
  file path=usr/lib/nfs/rquotad mode=0555
! $(BUILD64)file path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so.1
  file path=usr/lib/reparse/libnfs_basic.so.1
  file path=usr/sbin/exportfs mode=0555
  file path=usr/sbin/nfsref mode=0555
  file path=usr/share/man/man1m/mountd.1m
  file path=usr/share/man/man1m/nfsd.1m
*** 91,97 ****
      name="Network File System (NFS) server support (Root)"
  legacy pkg=SUNWnfssu desc="Network File System (NFS) server support (Usr)" \
      name="Network File System (NFS) server support (Usr)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so target=./libnfs_basic.so.1
  link path=usr/lib/reparse/libnfs_basic.so target=./libnfs_basic.so.1
--- 92,99 ----
      name="Network File System (NFS) server support (Root)"
  legacy pkg=SUNWnfssu desc="Network File System (NFS) server support (Usr)" \
      name="Network File System (NFS) server support (Usr)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so \
!     target=./libnfs_basic.so.1
  link path=usr/lib/reparse/libnfs_basic.so target=./libnfs_basic.so.1