238319: Sun packages changes.

18 files changed, 147 insertions, 200 deletions

diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk
index a8eed088f..5b3b51d0b 100644
--- a/security/coreconf/OS2.mk
+++ b/security/coreconf/OS2.mk
@@ -54,7 +54,8 @@ LIB_PREFIX  = $(NULL)
 
 # Override suffix in suffix.mk
 LIB_SUFFIX  = lib
-DLL_SUFFIX  = dll
+# the DLL_SUFFIX must be uppercase for FIPS mode to work. bugzilla 240784
+DLL_SUFFIX  = DLL
 PROG_SUFFIX = .exe
 
 
diff --git a/security/coreconf/SunOS5.10_i86pc.mk b/security/coreconf/SunOS5.10_i86pc.mk
index 9205e6448..39bd787d1 100755
--- a/security/coreconf/SunOS5.10_i86pc.mk
+++ b/security/coreconf/SunOS5.10_i86pc.mk
@@ -37,9 +37,12 @@ SOL_CFLAGS	= -D_SVID_GETTOD
 
 include $(CORE_DEPTH)/coreconf/SunOS5.mk
 
-CPU_ARCH		= x86
-ARCHFLAG		=
-OS_DEFINES		+= -Di386
+ifeq ($(USE_64),1)
+    CPU_ARCH		= x86_64
+else
+    CPU_ARCH		= x86
+    OS_DEFINES		+= -Di386
+endif
 
 ifeq ($(OS_RELEASE),5.10_i86pc)
 	OS_DEFINES += -DSOLARIS2_10
diff --git a/security/coreconf/SunOS5.mk b/security/coreconf/SunOS5.mk
index ec7d94eda..15ac35363 100644
--- a/security/coreconf/SunOS5.mk
+++ b/security/coreconf/SunOS5.mk
@@ -53,22 +53,28 @@ endif
 
 ifeq ($(USE_64), 1)
   ifdef NS_USE_GCC
-      ARCHFLAG= UNKNOWN 
+      ARCHFLAG=-m64
   else
-      ARCHFLAG=-xarch=v9
+      ifeq ($(OS_TEST),i86pc)
+        ARCHFLAG=-xarch=amd64
+      else
+        ARCHFLAG=-xarch=v9
+      endif
   endif
 else
-  ifdef NS_USE_GCC
-    ifdef USE_HYBRID
-      ARCHFLAG=-mcpu=v9 -Wa,-xarch=v8plus
+  ifneq ($(OS_TEST),i86pc)
+    ifdef NS_USE_GCC
+      ifdef USE_HYBRID
+        ARCHFLAG=-mcpu=v9 -Wa,-xarch=v8plus
+      else
+        ARCHFLAG=-mcpu=v8
+      endif
     else
-      ARCHFLAG=-mcpu=v8
-    endif
-  else
-    ifdef USE_HYBRID
-      ARCHFLAG=-xarch=v8plus
-    else
-      ARCHFLAG=-xarch=v8
+      ifdef USE_HYBRID
+        ARCHFLAG=-xarch=v8plus
+      else
+        ARCHFLAG=-xarch=v8
+      endif
     endif
   endif
 endif
@@ -104,6 +110,9 @@ ifdef NS_USE_GCC
 		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
 	endif
 	OS_CFLAGS += $(ARCHFLAG)
+	ifdef BUILD_OPT
+	    OPTIMIZER = -O2
+	endif
 else
 	CC         = cc
 	CCC        = CC
@@ -157,10 +166,17 @@ PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
 # -G: produce a shared object
 # -z defs: no unresolved symbols allowed
 ifdef NS_USE_GCC
+ifeq ($(USE_64), 1)
+	DSO_LDOPTS += -m64
+endif
 	DSO_LDOPTS += -shared -h $(notdir $@)
 else
 ifeq ($(USE_64), 1)
-	DSO_LDOPTS += -xarch=v9
+	ifeq ($(OS_TEST),i86pc)
+	    DSO_LDOPTS +=-xarch=amd64
+	else
+	    DSO_LDOPTS +=-xarch=v9
+	endif
 endif
 	DSO_LDOPTS += -G -h $(notdir $@)
 endif
diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile
index 365cf882e..55d8f3b49 100644
--- a/security/nss/lib/freebl/Makefile
+++ b/security/nss/lib/freebl/Makefile
@@ -233,10 +233,12 @@ ECL_HDRS += ecp_fp.h
 endif # NSS_ENABLE_ECC
 else
 # Solaris x86
+ifneq ($(USE_64),1)
     DEFINES += -D_X86_
     DEFINES += -DMP_USE_UINT_DIGIT
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D
     ASFILES  = mpi_i86pc.s
+endif
 ifdef NS_USE_GCC
     LD = gcc
     AS = gcc
diff --git a/security/nss/pkg/linux/Makefile b/security/nss/pkg/linux/Makefile
index 52fb7001c..3678e56aa 100644
--- a/security/nss/pkg/linux/Makefile
+++ b/security/nss/pkg/linux/Makefile
@@ -8,7 +8,7 @@
 CORE_DEPTH = ../../..
 
 NAME        = sun-nss
-RELEASE     = 4
+RELEASE     = 5
 VERSION     = `grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h \
 		| sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'`
 PWD         = `pwd`
diff --git a/security/nss/pkg/solaris/Makefile b/security/nss/pkg/solaris/Makefile
index 3819fa4a8..71d121a9f 100644
--- a/security/nss/pkg/solaris/Makefile
+++ b/security/nss/pkg/solaris/Makefile
@@ -32,7 +32,22 @@ ifeq ($(MACH), sparc)
 	$(ROOT)/usr/sfw/bin/sparcv9
 endif
 
-DIST64 = $(shell echo $(DIST) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
+ifeq ($(USE_64), 1)
+ifeq ($(MACH), sparc)
+# Sparc
+	PROTO += $(ROOT)/usr/lib/mps/sparcv9 \
+	$(ROOT)/usr/sfw/bin/sparcv9
+else
+# AMD64
+	PROTO += $(ROOT)/usr/lib/mps/amd64 \
+	$(ROOT)/usr/sfw/bin/amd64
+endif
+	DIST64 = $(DIST)
+	DIST32 = $(shell echo $(DIST) | sed -e "s|_64_OPT|_OPT|g" -e "s|_64_DBG|_DBG|g")
+else
+	DIST32 = $(DIST)
+	DIST64 = $(shell echo $(DIST) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
+endif
 
 awk_pkginfo: bld_awk_pkginfo
 	./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION)
@@ -50,11 +65,11 @@ $(ROOT):
 
 $(ROOT)/usr/lib/mps:
 	mkdir -p $@
-	$(CP) -r $(DIST)/lib/*.so $@
-	$(CP) -r $(DIST)/lib/*.chk $@
+	$(CP) -r $(DIST32)/lib/*.so $@
+	$(CP) -r $(DIST32)/lib/*.chk $@
 $(ROOT)/usr/sfw/bin:
 	mkdir -p $@
-	-$(CP) -r $(DIST)/bin/* $@
+	-$(CP) -r $(DIST32)/bin/* $@
 $(ROOT)/usr/include/mps:
 	mkdir -p $@
 	$(CP) -r $(SOURCE_PREFIX)/$(HEADER_DIR)/*.h $@
@@ -65,3 +80,10 @@ $(ROOT)/usr/lib/mps/sparcv9:
 $(ROOT)/usr/sfw/bin/sparcv9:
 	mkdir -p $@
 	$(CP) -r $(DIST64)/bin/* $@
+$(ROOT)/usr/lib/mps/amd64:
+	mkdir -p $@
+	$(CP) -r $(DIST64)/lib/*.so $@
+	$(CP) -r $(DIST64)/lib/*.chk $@
+$(ROOT)/usr/sfw/bin/amd64:
+	mkdir -p $@
+	$(CP) -r $(DIST64)/bin/* $@
diff --git a/security/nss/pkg/solaris/Makefile-tlsu.targ b/security/nss/pkg/solaris/Makefile-tlsu.targ
index 2c5db9911..8f4ecb6b6 100755
--- a/security/nss/pkg/solaris/Makefile-tlsu.targ
+++ b/security/nss/pkg/solaris/Makefile-tlsu.targ
@@ -5,11 +5,19 @@
 #ident	"$Id$"
 #
 
+include ../proto64.mk
+
 pkginfo: pkginfo.tmpl ../awk_pkginfo
 	$(RM) $@; nawk -f ../awk_pkginfo $@.tmpl > $@
 
-pkg: $(PKGARCHIVE) prototype_$(MACH)
-	pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
+prototype:  prototype_com prototype_$(MACH)
+	cat prototype_$(MACH) |  sed -e \
+'/^!include[    ][  ]*prototype_com/ r ./prototype_com' \
+-e 's/^!include[    ][  ]*prototype_com//g' \
+ | sed $(sed_proto64) >prototype
+
+pkg: $(PKGARCHIVE) prototype
+	pkgmk -f prototype -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
 
 $(PKGARCHIVE):
 	[ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)
diff --git a/security/nss/pkg/solaris/Makefile.targ b/security/nss/pkg/solaris/Makefile.targ
index bc36eb6c4..8f4ecb6b6 100644
--- a/security/nss/pkg/solaris/Makefile.targ
+++ b/security/nss/pkg/solaris/Makefile.targ
@@ -5,16 +5,19 @@
 #ident	"$Id$"
 #
 
+include ../proto64.mk
+
 pkginfo: pkginfo.tmpl ../awk_pkginfo
 	$(RM) $@; nawk -f ../awk_pkginfo $@.tmpl > $@
 
 prototype:  prototype_com prototype_$(MACH)
 	cat prototype_$(MACH) |  sed -e \
 '/^!include[    ][  ]*prototype_com/ r ./prototype_com' \
--e 's/^!include[    ][  ]*prototype_com//g' >prototype
+-e 's/^!include[    ][  ]*prototype_com//g' \
+ | sed $(sed_proto64) >prototype
 
 pkg: $(PKGARCHIVE) prototype
-	pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
+	pkgmk -f prototype -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
 
 $(PKGARCHIVE):
 	[ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)
diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_i386 b/security/nss/pkg/solaris/SUNWtls/prototype_i386
index 8c6d62844..458434fcb 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_i386
+++ b/security/nss/pkg/solaris/SUNWtls/prototype_i386
@@ -28,3 +28,19 @@
 #
 # SUNWtls
 #
+#64#s none usr/lib/mps/64=amd64
+#64#s none usr/lib/mps/secv1/64=amd64
+#64#d none usr/lib/mps/amd64 755 root bin
+#64#d none usr/lib/mps/secv1/amd64 755 root bin
+#64#f none usr/lib/mps/amd64/libnss3.so 755 root bin
+#64#f none usr/lib/mps/amd64/libsmime3.so 755 root bin
+#64#f none usr/lib/mps/amd64/libssl3.so 755 root bin
+#64#f none usr/lib/mps/amd64/libnssckbi.so 755 root bin
+#64#f none usr/lib/mps/amd64/libsoftokn3.chk 755 root bin
+#64#f none usr/lib/mps/amd64/libsoftokn3.so 755 root bin
+#64#s none usr/lib/mps/secv1/amd64/libnss3.so=../../amd64/libnss3.so
+#64#s none usr/lib/mps/secv1/amd64/libsmime3.so=../../amd64/libsmime3.so
+#64#s none usr/lib/mps/secv1/amd64/libssl3.so=../../amd64/libssl3.so
+#64#s none usr/lib/mps/secv1/amd64/libnssckbi.so=../../amd64/libnssckbi.so
+#64#s none usr/lib/mps/secv1/amd64/libsoftokn3.chk=../../amd64/libsoftokn3.chk
+#64#s none usr/lib/mps/secv1/amd64/libsoftokn3.so=../../amd64/libsoftokn3.so
diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_sparc b/security/nss/pkg/solaris/SUNWtls/prototype_sparc
index 0aeb466f0..f82f6b5e2 100644
--- a/security/nss/pkg/solaris/SUNWtls/prototype_sparc
+++ b/security/nss/pkg/solaris/SUNWtls/prototype_sparc
@@ -36,20 +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=../../sparcv9/libnss3.so
-s none usr/lib/mps/secv1/sparcv9/libsmime3.so=../../sparcv9/libsmime3.so
-s none usr/lib/mps/secv1/sparcv9/libssl3.so=../../sparcv9/libssl3.so
-s none usr/lib/mps/secv1/sparcv9/libnssckbi.so=../../sparcv9/libnssckbi.so
-s none usr/lib/mps/secv1/sparcv9/libsoftokn3.chk=../../sparcv9/libsoftokn3.chk
-s none usr/lib/mps/secv1/sparcv9/libsoftokn3.so=../../sparcv9/libsoftokn3.so
+#64#s none usr/lib/mps/64=sparcv9
+#64#s none usr/lib/mps/secv1/64=sparcv9
+#64#d none usr/lib/mps/sparcv9 755 root bin
+#64#d none usr/lib/mps/secv1/sparcv9 755 root bin
+#64#f none usr/lib/mps/sparcv9/libnss3.so 755 root bin
+#64#f none usr/lib/mps/sparcv9/libsmime3.so 755 root bin
+#64#f none usr/lib/mps/sparcv9/libssl3.so 755 root bin
+#64#f none usr/lib/mps/sparcv9/libnssckbi.so 755 root bin
+#64#f none usr/lib/mps/sparcv9/libsoftokn3.chk 755 root bin
+#64#f none usr/lib/mps/sparcv9/libsoftokn3.so 755 root bin
+#64#s none usr/lib/mps/secv1/sparcv9/libnss3.so=../../sparcv9/libnss3.so
+#64#s none usr/lib/mps/secv1/sparcv9/libsmime3.so=../../sparcv9/libsmime3.so
+#64#s none usr/lib/mps/secv1/sparcv9/libssl3.so=../../sparcv9/libssl3.so
+#64#s none usr/lib/mps/secv1/sparcv9/libnssckbi.so=../../sparcv9/libnssckbi.so
+#64#s none usr/lib/mps/secv1/sparcv9/libsoftokn3.chk=../../sparcv9/libsoftokn3.chk
+#64#s none usr/lib/mps/secv1/sparcv9/libsoftokn3.so=../../sparcv9/libsoftokn3.so
 
diff --git a/security/nss/pkg/solaris/SUNWtlsu/prototype_i386 b/security/nss/pkg/solaris/SUNWtlsu/prototype_i386
index 7fc238abd..8c02db360 100644
--- a/security/nss/pkg/solaris/SUNWtlsu/prototype_i386
+++ b/security/nss/pkg/solaris/SUNWtlsu/prototype_i386
@@ -28,4 +28,14 @@
 #
 # SUNWtlsu
 #
+#64#s none usr/sfw/bin/64=amd64
+#64#d none usr/sfw/bin/amd64 0755 root bin
+#64#f none usr/sfw/bin/amd64/certutil 0755 root bin
+#64#f none usr/sfw/bin/amd64/crlutil 0755 root bin
+#64#f none usr/sfw/bin/amd64/cmsutil 0755 root bin
+#64#f none usr/sfw/bin/amd64/modutil 0755 root bin
+#64#f none usr/sfw/bin/amd64/pk12util 0755 root bin
+#64#f none usr/sfw/bin/amd64/signtool 0755 root bin
+#64#f none usr/sfw/bin/amd64/signver 0755 root bin
+#64#f none usr/sfw/bin/amd64/ssltap 0755 root bin
 
diff --git a/security/nss/pkg/solaris/SUNWtlsu/prototype_sparc b/security/nss/pkg/solaris/SUNWtlsu/prototype_sparc
index 21aaabe32..02cd02c39 100644
--- a/security/nss/pkg/solaris/SUNWtlsu/prototype_sparc
+++ b/security/nss/pkg/solaris/SUNWtlsu/prototype_sparc
@@ -28,14 +28,14 @@
 #
 # SUNWtlsu
 #
-s none usr/sfw/bin/64=sparcv9
-d none usr/sfw/bin/sparcv9 0755 root bin
-f none usr/sfw/bin/sparcv9/certutil 0755 root bin
-f none usr/sfw/bin/sparcv9/crlutil 0755 root bin
-f none usr/sfw/bin/sparcv9/cmsutil 0755 root bin
-f none usr/sfw/bin/sparcv9/modutil 0755 root bin
-f none usr/sfw/bin/sparcv9/pk12util 0755 root bin
-f none usr/sfw/bin/sparcv9/signtool 0755 root bin
-f none usr/sfw/bin/sparcv9/signver 0755 root bin
-f none usr/sfw/bin/sparcv9/ssltap 0755 root bin
+#64#s none usr/sfw/bin/64=sparcv9
+#64#d none usr/sfw/bin/sparcv9 0755 root bin
+#64#f none usr/sfw/bin/sparcv9/certutil 0755 root bin
+#64#f none usr/sfw/bin/sparcv9/crlutil 0755 root bin
+#64#f none usr/sfw/bin/sparcv9/cmsutil 0755 root bin
+#64#f none usr/sfw/bin/sparcv9/modutil 0755 root bin
+#64#f none usr/sfw/bin/sparcv9/pk12util 0755 root bin
+#64#f none usr/sfw/bin/sparcv9/signtool 0755 root bin
+#64#f none usr/sfw/bin/sparcv9/signver 0755 root bin
+#64#f none usr/sfw/bin/sparcv9/ssltap 0755 root bin
 
diff --git a/security/nss/pkg/solaris/SUNWtlsx/Makefile b/security/nss/pkg/solaris/SUNWtlsx/Makefile
deleted file mode 100644
index 5058a1f68..000000000
--- a/security/nss/pkg/solaris/SUNWtlsx/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-
-CORE_DEPTH = ../../../..
-include ../Makefile.com
-
-DATAFILES +=
-
-all:: $(FILES)
-publish:: all pkg
-
-include ../Makefile.targ
diff --git a/security/nss/pkg/solaris/SUNWtlsx/pkgdepend b/security/nss/pkg/solaris/SUNWtlsx/pkgdepend
deleted file mode 100644
index b5c7d7fa8..000000000
--- a/security/nss/pkg/solaris/SUNWtlsx/pkgdepend
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2002 Microsystems, Inc.  All Rights Reserved.
-# Use is subject to license terms.
-#
-#	$Id$
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
-P SUNWcarx  Core Architecture, (Root) (64-bit)
-P SUNWcsxu  Core Solaris (Usr) (64-bit)
-P SUNWcslx  Core Solaris Libraries (64-bit)
-P SUNWprx	Netscape Portable Runtime
diff --git a/security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl b/security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl
deleted file mode 100644
index 6129c2452..000000000
--- a/security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWtlsx"
-NAME="Network Security Services (64-bit)"
-ARCH="ISA"
-SUNW_ISA="sparcv9"
-VERSION="NSSVERS,REV=0.0.0"
-SUNW_PRODNAME="Network Security Services"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Network Security Services (64-bit)"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
diff --git a/security/nss/pkg/solaris/SUNWtlsx/prototype_com b/security/nss/pkg/solaris/SUNWtlsx/prototype_com
deleted file mode 100644
index 0dffc99e1..000000000
--- a/security/nss/pkg/solaris/SUNWtlsx/prototype_com
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i copyright
-i pkginfo
-i depend=pkgdepend
-#
-# source locations relative to the prototype file
-#
-# SUNWtlsx
-#
-d none usr 755 root sys
-d none usr/lib 755 root bin
-d none usr/lib/mps 755 root bin
diff --git a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc b/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
deleted file mode 100644
index 1f15d804b..000000000
--- a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"$Id$"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWtlsx
-#
-s none usr/lib/mps/64=sparcv9
-d none usr/lib/mps/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
diff --git a/security/nss/pkg/solaris/proto64.mk b/security/nss/pkg/solaris/proto64.mk
new file mode 100644
index 000000000..48e3bebc3
--- /dev/null
+++ b/security/nss/pkg/solaris/proto64.mk
@@ -0,0 +1,14 @@
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident  "$Id$"
+#
+
+ifeq ($(USE_64), 1)
+  # Remove 64 tag
+  sed_proto64='s/\#64\#//g'
+else
+  # Strip 64 lines
+  sed_proto64='/\#64\#/d'
+endif