238319: Sun packages changes.

17 files changed, 55 insertions, 45 deletions

diff --git a/security/nss/pkg/solaris/Makefile b/security/nss/pkg/solaris/Makefile
index 6b45179d4..d00cce538 100644
--- a/security/nss/pkg/solaris/Makefile
+++ b/security/nss/pkg/solaris/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
@@ -14,37 +14,27 @@ CORE_DEPTH = ../../..
 
 HEADER_DIR = public/nss
 
-ifeq ($(USE_64), 1)
-DIRS = \
-	SUNWtlsx \
-	SUNWtlsux
-else
 DIRS = \
 	SUNWtls \
 	SUNWtlsu \
 	SUNWtlsd
-endif
 
 PROTO = \
 	$(ROOT) \
 	$(ROOT)/usr \
 	$(ROOT)/usr/lib \
 	$(ROOT)/usr/lib/mps \
+	$(ROOT)/usr/lib/mps/sparcv9 \
 	$(ROOT)/usr/include \
 	$(ROOT)/usr/include/mps \
 	$(ROOT)/usr/sfw \
-	$(ROOT)/usr/sfw/bin
-
-
-ifdef USE_64
-PROTO += $(ROOT)/usr/lib/mps/sparcv9 \
-	$(ROOT)/usr/include/mps/sparcv9 \
+	$(ROOT)/usr/sfw/bin \
 	$(ROOT)/usr/sfw/bin/sparcv9
 
-endif
-
 include Makefile.com
 
+DIST64 = $(shell echo $(DIST) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
+
 awk_pkginfo: bld_awk_pkginfo
 	./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION)
 
@@ -59,18 +49,20 @@ clean clobber::
 $(ROOT) $(ROOT)/%:
 	mkdir -p $@
 
-ifdef USE_64
-$(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib/mps
-	$(LN) -sf ../../../../$(DIST)/lib $@
-$(ROOT)/usr/sfw/bin/sparcv9: $(ROOT)/usr/sfw/bin
-	$(LN) -sf ../../../../$(DIST)/bin $@
-$(ROOT)/usr/include/mps/sparcv9: $(ROOT)/usr/include
-	$(LN) -sf ../../../../$(SOURCE_PREFIX)/$(HEADER_DIR) $@
-else
 $(ROOT)/usr/lib/mps: $(ROOT)/usr/lib
-	$(LN) -sf ../../../$(DIST)/lib $@
+	mkdir -p $@
+	$(CP) -r $(DIST)/lib/*.so $@
+	$(CP) -r $(DIST)/lib/*.chk $@
 $(ROOT)/usr/sfw/bin: $(ROOT)/usr/sfw
-	$(LN) -sf ../../../$(DIST)/bin $@
+	mkdir -p $@
+	-$(CP) -r $(DIST)/bin/* $@
 $(ROOT)/usr/include/mps: $(ROOT)/usr/include
-	$(LN) -sf ../../../$(SOURCE_PREFIX)/$(HEADER_DIR) $@
-endif
+	mkdir -p $@
+	$(CP) -r $(SOURCE_PREFIX)/$(HEADER_DIR)/*.h $@
+$(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib/mps
+	mkdir -p $@
+	$(CP) -r $(DIST64)/lib/*.so $@
+	$(CP) -r $(DIST64)/lib/*.chk $@
+$(ROOT)/usr/sfw/bin/sparcv9: $(ROOT)/usr/sfw/bin
+	mkdir -p $@
+	$(CP) -r $(DIST64)/bin/* $@
diff --git a/security/nss/pkg/solaris/Makefile-devl.com b/security/nss/pkg/solaris/Makefile-devl.com
index 8e1c52ad4..372d6e557 100755
--- a/security/nss/pkg/solaris/Makefile-devl.com
+++ b/security/nss/pkg/solaris/Makefile-devl.com
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/Makefile-devl.targ b/security/nss/pkg/solaris/Makefile-devl.targ
index bbf9411bb..84283d89b 100755
--- a/security/nss/pkg/solaris/Makefile-devl.targ
+++ b/security/nss/pkg/solaris/Makefile-devl.targ
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/Makefile-tlsu.com b/security/nss/pkg/solaris/Makefile-tlsu.com
index 8e1c52ad4..372d6e557 100755
--- a/security/nss/pkg/solaris/Makefile-tlsu.com
+++ b/security/nss/pkg/solaris/Makefile-tlsu.com
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/Makefile-tlsu.targ b/security/nss/pkg/solaris/Makefile-tlsu.targ
index bbf9411bb..2c5db9911 100755
--- a/security/nss/pkg/solaris/Makefile-tlsu.targ
+++ b/security/nss/pkg/solaris/Makefile-tlsu.targ
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
@@ -8,8 +8,8 @@
 pkginfo: pkginfo.tmpl ../awk_pkginfo
 	$(RM) $@; nawk -f ../awk_pkginfo $@.tmpl > $@
 
-pkg: $(PKGARCHIVE) prototype
-	pkgmk -f prototype -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
+pkg: $(PKGARCHIVE) prototype_$(MACH)
+	pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
 
 $(PKGARCHIVE):
 	[ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)
diff --git a/security/nss/pkg/solaris/Makefile.com b/security/nss/pkg/solaris/Makefile.com
index b7f6f80ef..9e4d4fc04 100644
--- a/security/nss/pkg/solaris/Makefile.com
+++ b/security/nss/pkg/solaris/Makefile.com
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
@@ -24,6 +24,7 @@ PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.
 	| sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//')
 
 LN = /usr/bin/ln
+CP = /usr/bin/cp
 
 CLOBBERFILES = $(FILES)
 
diff --git a/security/nss/pkg/solaris/Makefile.targ b/security/nss/pkg/solaris/Makefile.targ
index 13ac0fd96..bc36eb6c4 100644
--- a/security/nss/pkg/solaris/Makefile.targ
+++ b/security/nss/pkg/solaris/Makefile.targ
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/SUNWtls/Makefile b/security/nss/pkg/solaris/SUNWtls/Makefile
index 5058a1f68..a299d6321 100644
--- a/security/nss/pkg/solaris/SUNWtls/Makefile
+++ b/security/nss/pkg/solaris/SUNWtls/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/SUNWtls/pkgdepend b/security/nss/pkg/solaris/SUNWtls/pkgdepend
index 966ba0556..51b7ba8b3 100644
--- a/security/nss/pkg/solaris/SUNWtls/pkgdepend
+++ b/security/nss/pkg/solaris/SUNWtls/pkgdepend
@@ -1,4 +1,4 @@
-# Copyright 2002 Microsystems, Inc.  All Rights Reserved.
+# Copyright 2004 Microsystems, Inc.  All Rights Reserved.
 # Use is subject to license terms.
 #
 #	$Id$
diff --git a/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl b/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl
index e0a697529..fd2235b9d 100644
--- a/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl
+++ b/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_com b/security/nss/pkg/solaris/SUNWtls/prototype_com
index db1aeb907..3e2df6253 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_com
+++ b/security/nss/pkg/solaris/SUNWtls/prototype_com
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_i386 b/security/nss/pkg/solaris/SUNWtls/prototype_i386
index d2718ee05..8c6d62844 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_i386
+++ b/security/nss/pkg/solaris/SUNWtls/prototype_i386
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_sparc b/security/nss/pkg/solaris/SUNWtls/prototype_sparc
index e7821ae42..649082e5e 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_sparc
+++ b/security/nss/pkg/solaris/SUNWtls/prototype_sparc
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
@@ -36,3 +36,20 @@ s none usr/lib/mps/secv1/libfreebl_hybrid_3.chk=../libfreebl_hybrid_3.chk
 s none usr/lib/mps/secv1/libfreebl_hybrid_3.so=../libfreebl_hybrid_3.so
 s none usr/lib/mps/secv1/libfreebl_pure32_3.chk=../libfreebl_pure32_3.chk
 s none usr/lib/mps/secv1/libfreebl_pure32_3.so=../libfreebl_pure32_3.so
+s none usr/lib/mps/64=sparcv9
+s none usr/lib/mps/secv1/64=sparcv9
+d none usr/lib/mps/sparcv9 755 root bin
+d none usr/lib/mps/secv1/sparcv9 755 root bin
+f none usr/lib/mps/sparcv9/libnss3.so 755 root bin
+f none usr/lib/mps/sparcv9/libsmime3.so 755 root bin
+f none usr/lib/mps/sparcv9/libssl3.so 755 root bin
+f none usr/lib/mps/sparcv9/libnssckbi.so 755 root bin
+f none usr/lib/mps/sparcv9/libsoftokn3.chk 755 root bin
+f none usr/lib/mps/sparcv9/libsoftokn3.so 755 root bin
+s none usr/lib/mps/secv1/sparcv9/libnss3.so=../../libnss3.so
+s none usr/lib/mps/secv1/sparcv9/libsmime3.so=../../libsmime3.so
+s none usr/lib/mps/secv1/sparcv9/libssl3.so=../../libssl3.so
+s none usr/lib/mps/secv1/sparcv9/libnssckbi.so=../../libnssckbi.so
+s none usr/lib/mps/secv1/sparcv9/libsoftokn3.chk=../../libsoftokn3.chk
+s none usr/lib/mps/secv1/sparcv9/libsoftokn3.so=../../libsoftokn3.so
+
diff --git a/security/nss/pkg/solaris/SUNWtlsu/Makefile b/security/nss/pkg/solaris/SUNWtlsu/Makefile
index a8aefbac1..bc2795e27 100755
--- a/security/nss/pkg/solaris/SUNWtlsu/Makefile
+++ b/security/nss/pkg/solaris/SUNWtlsu/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/SUNWtlsu/pkgdepend b/security/nss/pkg/solaris/SUNWtlsu/pkgdepend
index 8b348ba47..ae7d398c1 100755
--- a/security/nss/pkg/solaris/SUNWtlsu/pkgdepend
+++ b/security/nss/pkg/solaris/SUNWtlsu/pkgdepend
@@ -1,4 +1,4 @@
-# Copyright 2002 Microsystems, Inc.  All Rights Reserved.
+# Copyright 2004 Microsystems, Inc.  All Rights Reserved.
 # Use is subject to license terms.
 #
 #	$Id$
diff --git a/security/nss/pkg/solaris/SUNWtlsu/pkginfo.tmpl b/security/nss/pkg/solaris/SUNWtlsu/pkginfo.tmpl
index e5648316d..19b7e8766 100755
--- a/security/nss/pkg/solaris/SUNWtlsu/pkginfo.tmpl
+++ b/security/nss/pkg/solaris/SUNWtlsu/pkginfo.tmpl
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
diff --git a/security/nss/pkg/solaris/SUNWtlsu/prototype b/security/nss/pkg/solaris/SUNWtlsu/prototype
index c27d2c03d..48f8387dd 100755
--- a/security/nss/pkg/solaris/SUNWtlsu/prototype
+++ b/security/nss/pkg/solaris/SUNWtlsu/prototype
@@ -1,5 +1,5 @@
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"