1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/service-storage-ndmp.mf
          +++ new/usr/src/pkg/manifests/service-storage-ndmp.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each

  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2014 Andrew Stormont.
  24   25  #
  25   26  
  26   27  #
  27   28  # The default for payload-bearing actions in this package is to appear in the
  28   29  # global zone only.  See the include file for greater detail, as well as
  29   30  # information about overriding the defaults.
  30   31  #
  31   32  <include global_zone_only_component>
  32   33  set name=pkg.fmri value=pkg:/service/storage/ndmp@$(PKGVERS)
  33   34  set name=pkg.description \

  34   35      value="Network Data Management Protocol Service (user components)"
  35   36  set name=pkg.summary value="Network Data Management Protocol Service (User)"
  36   37  set name=info.classification \

  37   38      value=org.opensolaris.category.2008:System/Services
  38   39  set name=variant.arch value=$(ARCH)
  39   40  dir path=lib
  40   41  dir path=lib/svc
  41   42  dir path=lib/svc/manifest group=sys
  42   43  dir path=lib/svc/manifest/system group=sys
  43   44  dir path=lib/svc/method
  44   45  dir path=usr group=sys
  45   46  dir path=usr/include
  46   47  dir path=usr/lib
  47      -dir path=usr/lib/$(ARCH64)
       48 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  48   49  dir path=usr/lib/ndmp
  49   50  dir path=usr/sbin
  50   51  dir path=usr/share/man
  51   52  dir path=usr/share/man/man1m
  52   53  dir path=usr/share/man/man4
  53   54  file path=lib/svc/manifest/system/ndmp.xml group=sys mode=0444
  54   55  file path=lib/svc/method/svc-ndmp mode=0555
  55   56  file path=usr/include/libndmp.h
  56      -file path=usr/lib/$(ARCH64)/libndmp.so.1
  57      -file path=usr/lib/$(ARCH64)/llib-lndmp.ln
       57 +$(BUILD64)file path=usr/lib/$(ARCH64)/libndmp.so.1
       58 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lndmp.ln
  58   59  file path=usr/lib/libndmp.so.1
  59   60  file path=usr/lib/llib-lndmp
  60   61  file path=usr/lib/llib-lndmp.ln
  61   62  file path=usr/lib/ndmp/ndmpd mode=0555
  62   63  file path=usr/sbin/ndmpadm mode=0555
  63   64  file path=usr/sbin/ndmpstat mode=0555
  64   65  file path=usr/share/man/man1m/ndmpadm.1m
  65   66  file path=usr/share/man/man1m/ndmpd.1m
  66   67  file path=usr/share/man/man1m/ndmpstat.1m
  67   68  file path=usr/share/man/man4/ndmp.4
  68   69  legacy pkg=SUNWndmpr \
  69   70      desc="Network Data Management Protocol Service (root components)" \
  70   71      name="Network Data Management Protocol Service (Root)"
  71   72  legacy pkg=SUNWndmpu \
  72   73      desc="Network Data Management Protocol Service (user components)" \
  73   74      name="Network Data Management Protocol Service (User)"
  74   75  license cr_Sun license=cr_Sun
  75   76  license lic_OSBL license=lic_OSBL
  76   77  license lic_OSBL_preamble license=lic_OSBL_preamble
  77   78  license usr/src/cmd/ndmpd/LICENSE license=usr/src/cmd/ndmpd/LICENSE
  78      -link path=usr/lib/$(ARCH64)/libndmp.so target=libndmp.so.1
       79 +$(BUILD64)link path=usr/lib/$(ARCH64)/libndmp.so target=libndmp.so.1
  79   80  link path=usr/lib/libndmp.so target=libndmp.so.1
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX