238319: Sun packages changes.

6 files changed, 6 insertions, 198 deletions

diff --git a/security/nss/pkg/solaris/Makefile b/security/nss/pkg/solaris/Makefile
index 7ad9adf3d..231aa0516 100644
--- a/security/nss/pkg/solaris/Makefile
+++ b/security/nss/pkg/solaris/Makefile
@@ -17,8 +17,7 @@ HEADER_DIR = public/nss
 ifeq ($(USE_64), 1)
 DIRS = \
 	SUNWtlsx \
-	SUNWtlsux \
-	SUNWtlsdx
+	SUNWtlsux
 else
 DIRS = \
 	SUNWtls \
diff --git a/security/nss/pkg/solaris/SUNWtlsd/prototype b/security/nss/pkg/solaris/SUNWtlsd/prototype
index 3d3930157..16233267e 100755
--- a/security/nss/pkg/solaris/SUNWtlsd/prototype
+++ b/security/nss/pkg/solaris/SUNWtlsd/prototype
@@ -60,6 +60,7 @@ f none usr/include/mps/nssb64t.h 0644 root bin
 f none usr/include/mps/nssbase.h 0644 root bin
 f none usr/include/mps/nssbaset.h 0644 root bin
 f none usr/include/mps/nssckepv.h 0644 root bin
+f none usr/include/mps/nssckbi.h 0644 root bin
 f none usr/include/mps/nssckft.h 0644 root bin
 f none usr/include/mps/nssckfw.h 0644 root bin
 f none usr/include/mps/nssckfwc.h 0644 root bin
@@ -69,6 +70,7 @@ f none usr/include/mps/nssckmdt.h 0644 root bin
 #f none usr/include/mps/nssckp.h 0644 root bin
 f none usr/include/mps/nssckt.h 0644 root bin
 #f none usr/include/mps/nsscku.h 0644 root bin
+f none usr/include/mps/nssilckt.h 0644 root bin
 f none usr/include/mps/nssilock.h 0644 root bin
 f none usr/include/mps/nsslocks.h 0644 root bin
 f none usr/include/mps/nssrwlk.h 0644 root bin
@@ -86,6 +88,7 @@ f none usr/include/mps/pkcs11f.h 0644 root bin
 f none usr/include/mps/pkcs11p.h 0644 root bin
 f none usr/include/mps/pkcs11t.h 0644 root bin
 f none usr/include/mps/pkcs11u.h 0644 root bin
+f none usr/include/mps/pkcs11n.h 0644 root bin
 f none usr/include/mps/pkcs12.h 0644 root bin
 f none usr/include/mps/pkcs12t.h 0644 root bin
 f none usr/include/mps/pkcs7t.h 0644 root bin
@@ -112,10 +115,12 @@ f none usr/include/mps/secpkcs7.h 0644 root bin
 f none usr/include/mps/secport.h 0644 root bin
 #f none usr/include/mps/secrng.h 0644 root bin
 #f none usr/include/mps/secrngt.h 0644 root bin
+f none usr/include/mps/shsign.h 0644 root bin
 f none usr/include/mps/smime.h 0644 root bin
 f none usr/include/mps/ssl.h 0644 root bin
 f none usr/include/mps/sslerr.h 0644 root bin
 f none usr/include/mps/sslproto.h 0644 root bin
+f none usr/include/mps/sslt.h 0644 root bin
 f none usr/include/mps/swfort.h 0644 root bin
 f none usr/include/mps/swfortt.h 0644 root bin
 f none usr/include/mps/watcomfx.h 0644 root bin
diff --git a/security/nss/pkg/solaris/SUNWtlsdx/Makefile b/security/nss/pkg/solaris/SUNWtlsdx/Makefile
deleted file mode 100755
index 3a1bd83b3..000000000
--- a/security/nss/pkg/solaris/SUNWtlsdx/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-devl.com
-
-DATAFILES +=
-
-all:: $(FILES)
-publish:: all pkg
-
-include ../Makefile-devl.targ
diff --git a/security/nss/pkg/solaris/SUNWtlsdx/pkgdepend b/security/nss/pkg/solaris/SUNWtlsdx/pkgdepend
deleted file mode 100755
index 831c2b37c..000000000
--- a/security/nss/pkg/solaris/SUNWtlsdx/pkgdepend
+++ /dev/null
@@ -1,23 +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 SUNWprdx	Netscape Portable Runtime Development (64-bit) 
-P SUNWtlsx	Netscape Security Services (64-bit)
diff --git a/security/nss/pkg/solaris/SUNWtlsdx/pkginfo.tmpl b/security/nss/pkg/solaris/SUNWtlsdx/pkginfo.tmpl
deleted file mode 100755
index cadd53c8c..000000000
--- a/security/nss/pkg/solaris/SUNWtlsdx/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="SUNWtlsdx"
-NAME="Network Security Services Development (64-bit)"
-ARCH="ISA"
-SUNW_ISA="sparcv9"
-VERSION="NSSVERS,REV=0.0.0"
-SUNW_PRODNAME="Network Security Services Development (64-bit)"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Network Security Services Files for Development (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/SUNWtlsdx/prototype b/security/nss/pkg/solaris/SUNWtlsdx/prototype
deleted file mode 100755
index 0cc4c565f..000000000
--- a/security/nss/pkg/solaris/SUNWtlsdx/prototype
+++ /dev/null
@@ -1,122 +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
-#
-# SUNWtlsdx
-#
-d none usr 0755 root sys
-d none usr/include 0755 root bin
-s none usr/include/mps/64=sparcv9
-d none usr/include/mps/sparcv9 0755 root bin
-f none usr/include/mps/sparcv9/base64.h 0644 root bin
-#f none usr/include/mps/sparcv9/blapi.h 0644 root bin
-f none usr/include/mps/sparcv9/blapit.h 0644 root bin
-f none usr/include/mps/sparcv9/cert.h 0644 root bin
-f none usr/include/mps/sparcv9/certdb.h 0644 root bin
-f none usr/include/mps/sparcv9/certt.h 0644 root bin
-f none usr/include/mps/sparcv9/ciferfam.h 0644 root bin
-f none usr/include/mps/sparcv9/cmmf.h 0644 root bin
-f none usr/include/mps/sparcv9/cmmft.h 0644 root bin
-f none usr/include/mps/sparcv9/cms.h 0644 root bin
-f none usr/include/mps/sparcv9/cmsreclist.h 0644 root bin
-f none usr/include/mps/sparcv9/cmst.h 0644 root bin
-f none usr/include/mps/sparcv9/crmf.h 0644 root bin
-f none usr/include/mps/sparcv9/crmft.h 0644 root bin
-f none usr/include/mps/sparcv9/cryptohi.h 0644 root bin
-f none usr/include/mps/sparcv9/cryptoht.h 0644 root bin
-f none usr/include/mps/sparcv9/hasht.h 0644 root bin
-f none usr/include/mps/sparcv9/jar-ds.h 0644 root bin
-f none usr/include/mps/sparcv9/jar.h 0644 root bin
-f none usr/include/mps/sparcv9/jarfile.h 0644 root bin
-f none usr/include/mps/sparcv9/key.h 0644 root bin
-#f none usr/include/mps/sparcv9/keydbt.h 0644 root bin
-f none usr/include/mps/sparcv9/keyhi.h 0644 root bin
-#f none usr/include/mps/sparcv9/keylow.h 0644 root bin
-f none usr/include/mps/sparcv9/keyt.h 0644 root bin
-#f none usr/include/mps/sparcv9/keytboth.h 0644 root bin
-f none usr/include/mps/sparcv9/keythi.h 0644 root bin
-#f none usr/include/mps/sparcv9/keytlow.h 0644 root bin
-f none usr/include/mps/sparcv9/nss.h 0644 root bin
-f none usr/include/mps/sparcv9/nssb64.h 0644 root bin
-f none usr/include/mps/sparcv9/nssb64t.h 0644 root bin
-f none usr/include/mps/sparcv9/nssbase.h 0644 root bin
-f none usr/include/mps/sparcv9/nssbaset.h 0644 root bin
-f none usr/include/mps/sparcv9/nssckepv.h 0644 root bin
-f none usr/include/mps/sparcv9/nssckft.h 0644 root bin
-f none usr/include/mps/sparcv9/nssckfw.h 0644 root bin
-f none usr/include/mps/sparcv9/nssckfwc.h 0644 root bin
-f none usr/include/mps/sparcv9/nssckfwt.h 0644 root bin
-f none usr/include/mps/sparcv9/nssckg.h 0644 root bin
-f none usr/include/mps/sparcv9/nssckmdt.h 0644 root bin
-#f none usr/include/mps/sparcv9/nssckp.h 0644 root bin
-f none usr/include/mps/sparcv9/nssckt.h 0644 root bin
-#f none usr/include/mps/sparcv9/nsscku.h 0644 root bin
-f none usr/include/mps/sparcv9/nssilock.h 0644 root bin
-f none usr/include/mps/sparcv9/nsslocks.h 0644 root bin
-f none usr/include/mps/sparcv9/nssrwlk.h 0644 root bin
-f none usr/include/mps/sparcv9/nssrwlkt.h 0644 root bin
-f none usr/include/mps/sparcv9/ocsp.h 0644 root bin
-f none usr/include/mps/sparcv9/ocspt.h 0644 root bin
-f none usr/include/mps/sparcv9/p12.h 0644 root bin
-f none usr/include/mps/sparcv9/p12plcy.h 0644 root bin
-f none usr/include/mps/sparcv9/p12t.h 0644 root bin
-f none usr/include/mps/sparcv9/pk11func.h 0644 root bin
-f none usr/include/mps/sparcv9/pk11pqg.h 0644 root bin
-f none usr/include/mps/sparcv9/pk11sdr.h 0644 root bin
-f none usr/include/mps/sparcv9/pkcs11.h 0644 root bin
-f none usr/include/mps/sparcv9/pkcs11f.h 0644 root bin
-f none usr/include/mps/sparcv9/pkcs11p.h 0644 root bin
-f none usr/include/mps/sparcv9/pkcs11t.h 0644 root bin
-f none usr/include/mps/sparcv9/pkcs11u.h 0644 root bin
-f none usr/include/mps/sparcv9/pkcs12.h 0644 root bin
-f none usr/include/mps/sparcv9/pkcs12t.h 0644 root bin
-f none usr/include/mps/sparcv9/pkcs7t.h 0644 root bin
-f none usr/include/mps/sparcv9/portreg.h 0644 root bin
-#f none usr/include/mps/sparcv9/pqgutil.h 0644 root bin
-f none usr/include/mps/sparcv9/preenc.h 0644 root bin
-f none usr/include/mps/sparcv9/secasn1.h 0644 root bin
-f none usr/include/mps/sparcv9/secasn1t.h 0644 root bin
-f none usr/include/mps/sparcv9/seccomon.h 0644 root bin
-f none usr/include/mps/sparcv9/secder.h 0644 root bin
-f none usr/include/mps/sparcv9/secdert.h 0644 root bin
-f none usr/include/mps/sparcv9/secdig.h 0644 root bin
-f none usr/include/mps/sparcv9/secdigt.h 0644 root bin
-f none usr/include/mps/sparcv9/secerr.h 0644 root bin
-f none usr/include/mps/sparcv9/sechash.h 0644 root bin
-f none usr/include/mps/sparcv9/secitem.h 0644 root bin
-f none usr/include/mps/sparcv9/secmime.h 0644 root bin
-f none usr/include/mps/sparcv9/secmod.h 0644 root bin
-f none usr/include/mps/sparcv9/secmodt.h 0644 root bin
-f none usr/include/mps/sparcv9/secoid.h 0644 root bin
-f none usr/include/mps/sparcv9/secoidt.h 0644 root bin
-f none usr/include/mps/sparcv9/secpkcs5.h 0644 root bin
-f none usr/include/mps/sparcv9/secpkcs7.h 0644 root bin
-f none usr/include/mps/sparcv9/secport.h 0644 root bin
-#f none usr/include/mps/sparcv9/secrng.h 0644 root bin
-#f none usr/include/mps/sparcv9/secrngt.h 0644 root bin
-f none usr/include/mps/sparcv9/smime.h 0644 root bin
-f none usr/include/mps/sparcv9/ssl.h 0644 root bin
-f none usr/include/mps/sparcv9/sslerr.h 0644 root bin
-f none usr/include/mps/sparcv9/sslproto.h 0644 root bin
-f none usr/include/mps/sparcv9/swfort.h 0644 root bin
-f none usr/include/mps/sparcv9/swfortt.h 0644 root bin
-f none usr/include/mps/sparcv9/watcomfx.h 0644 root bin