1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/service-file-system-nfs.mf
          +++ new/usr/src/pkg/manifests/service-file-system-nfs.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   24  # Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
       25 +# Copyright 2014 Andrew Stormont.
  25   26  #
  26   27  
  27   28  set name=pkg.fmri value=pkg:/service/file-system/nfs@$(PKGVERS)
  28   29  set name=pkg.description value="Network File System (NFS) server support"
  29   30  set name=pkg.summary value="Network File System (NFS) server support"
  30   31  set name=info.classification \
  31   32      value="org.opensolaris.category.2008:System/File System"
  32   33  set name=variant.arch value=$(ARCH)
  33   34  dir path=etc group=sys
  34   35  dir path=etc/default group=sys

  35   36  dir path=etc/init.d group=sys
  36   37  dir path=etc/nfs group=sys
  37   38  dir path=kernel group=sys
  38   39  dir path=kernel/misc group=sys
  39   40  dir path=kernel/misc/$(ARCH64) group=sys

  40   41  dir path=lib
  41   42  dir path=lib/svc
  42   43  dir path=lib/svc/manifest group=sys
  43   44  dir path=lib/svc/manifest/network group=sys
  44   45  dir path=lib/svc/manifest/network/nfs group=sys
  45   46  dir path=lib/svc/method
  46   47  dir path=usr group=sys
  47   48  dir path=usr/lib
  48   49  dir path=usr/lib/fs group=sys
  49   50  dir path=usr/lib/fs/nfs group=sys
  50      -dir path=usr/lib/fs/nfs/$(ARCH64) group=sys
       51 +$(BUILD64)dir path=usr/lib/fs/nfs/$(ARCH64) group=sys
  51   52  dir path=usr/lib/nfs group=sys
  52   53  dir path=usr/lib/reparse group=bin
  53      -dir path=usr/lib/reparse/$(ARCH64) group=sys
       54 +$(BUILD64)dir path=usr/lib/reparse/$(ARCH64) group=sys
  54   55  dir path=usr/sbin
  55   56  dir path=usr/share/man
  56   57  dir path=usr/share/man/man1m
  57   58  dir path=usr/share/man/man5
  58   59  file path=etc/default/nfslogd group=sys \
  59   60      original_name=SUNWnfss:etc/default/nfslogd preserve=true
  60   61  file path=etc/init.d/nfs.server group=sys mode=0744 \
  61   62      original_name=SUNWnfss:etc/init.d/nfs.server preserve=true
  62   63  file path=etc/nfs/nfslog.conf group=sys \
  63   64      original_name=SUNWnfss:etc/nfs/nfslog.conf preserve=true
  64   65  file path=kernel/misc/$(ARCH64)/nfssrv group=sys mode=0755
  65   66  $(i386_ONLY)file path=kernel/misc/nfssrv group=sys mode=0755
  66   67  file path=lib/svc/manifest/network/nfs/nfslogd.xml group=sys mode=0444
  67   68  file path=lib/svc/manifest/network/nfs/rquota.xml group=sys mode=0444
  68   69  file path=lib/svc/manifest/network/nfs/server.xml group=sys mode=0444
  69   70  file path=lib/svc/method/nfs-server mode=0555
  70      -file path=usr/lib/fs/nfs/$(ARCH64)/libshare_nfs.so.1
       71 +$(BUILD64)file path=usr/lib/fs/nfs/$(ARCH64)/libshare_nfs.so.1
  71   72  file path=usr/lib/fs/nfs/libshare_nfs.so.1
  72   73  file path=usr/lib/nfs/mountd mode=0555
  73   74  file path=usr/lib/nfs/nfsd mode=0555
  74   75  file path=usr/lib/nfs/nfslogd mode=0555
  75   76  file path=usr/lib/nfs/rquotad mode=0555
  76      -file path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so.1
       77 +$(BUILD64)file path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so.1
  77   78  file path=usr/lib/reparse/libnfs_basic.so.1
  78   79  file path=usr/sbin/exportfs mode=0555
  79   80  file path=usr/sbin/nfsref mode=0555
  80   81  file path=usr/share/man/man1m/mountd.1m
  81   82  file path=usr/share/man/man1m/nfsd.1m
  82   83  file path=usr/share/man/man1m/nfslogd.1m
  83   84  file path=usr/share/man/man1m/rquotad.1m
  84   85  file path=usr/share/man/man4/nfslog.conf.4
  85   86  file path=usr/share/man/man4/rmtab.4
  86   87  file path=usr/share/man/man5/nfssec.5
  87   88  legacy pkg=SUNWnfsskr \
  88   89      desc="Network File System (NFS) server kernel support (Root)" \
  89   90      name="Network File System (NFS) server kernel support (Root)"
  90   91  legacy pkg=SUNWnfssr desc="Network File System (NFS) server support (Root)" \
  91   92      name="Network File System (NFS) server support (Root)"
  92   93  legacy pkg=SUNWnfssu desc="Network File System (NFS) server support (Usr)" \
  93   94      name="Network File System (NFS) server support (Usr)"
  94   95  license cr_Sun license=cr_Sun
  95   96  license lic_CDDL license=lic_CDDL
  96      -link path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so target=./libnfs_basic.so.1
       97 +$(BUILD64)link path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so \
       98 +    target=./libnfs_basic.so.1
  97   99  link path=usr/lib/reparse/libnfs_basic.so target=./libnfs_basic.so.1
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX