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.
  #
  
  set name=pkg.fmri \
      value=pkg:/system/library/security/gss/diffie-hellman@$(PKGVERS)
  set name=pkg.description \
*** 31,55 ****
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Security
  set name=variant.arch value=$(ARCH)
  dir path=usr group=sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
! dir path=usr/lib/$(ARCH64)/gss
  dir path=usr/lib/gss
! file path=usr/lib/$(ARCH64)/gss/dh1024-0.so.1
! file path=usr/lib/$(ARCH64)/gss/dh640-0.so.1
! file path=usr/lib/$(ARCH64)/gss/mech_dh.so.1
  file path=usr/lib/gss/dh1024-0.so.1
  file path=usr/lib/gss/dh640-0.so.1
  file path=usr/lib/gss/mech_dh.so.1
  legacy pkg=SUNWgssdh \
      desc="GSS-API mechanism libraries for NIS+ extended Diffie-Hellman" \
      name="GSS Diffie-Hellman"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=usr/lib/$(ARCH64)/gss/dh1024-0.so target=dh1024-0.so.1
! link path=usr/lib/$(ARCH64)/gss/dh640-0.so target=dh640-0.so.1
! link path=usr/lib/$(ARCH64)/gss/mech_dh.so target=mech_dh.so.1
  link path=usr/lib/gss/dh1024-0.so target=dh1024-0.so.1
  link path=usr/lib/gss/dh640-0.so target=dh640-0.so.1
  link path=usr/lib/gss/mech_dh.so target=mech_dh.so.1
--- 32,56 ----
  set name=info.classification \
      value=org.opensolaris.category.2008:System/Security
  set name=variant.arch value=$(ARCH)
  dir path=usr group=sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
! $(BUILD64)dir path=usr/lib/$(ARCH64)/gss
  dir path=usr/lib/gss
! $(BUILD64)file path=usr/lib/$(ARCH64)/gss/dh1024-0.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/gss/dh640-0.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/gss/mech_dh.so.1
  file path=usr/lib/gss/dh1024-0.so.1
  file path=usr/lib/gss/dh640-0.so.1
  file path=usr/lib/gss/mech_dh.so.1
  legacy pkg=SUNWgssdh \
      desc="GSS-API mechanism libraries for NIS+ extended Diffie-Hellman" \
      name="GSS Diffie-Hellman"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=usr/lib/$(ARCH64)/gss/dh1024-0.so target=dh1024-0.so.1
! $(BUILD64)link path=usr/lib/$(ARCH64)/gss/dh640-0.so target=dh640-0.so.1
! $(BUILD64)link path=usr/lib/$(ARCH64)/gss/mech_dh.so target=mech_dh.so.1
  link path=usr/lib/gss/dh1024-0.so target=dh1024-0.so.1
  link path=usr/lib/gss/dh640-0.so target=dh640-0.so.1
  link path=usr/lib/gss/mech_dh.so target=mech_dh.so.1