From c963f3acd1a349b462137c1115607491cc7515f5 Mon Sep 17 00:00:00 2001 From: cvs2hg Date: Fri, 7 Mar 2003 16:46:50 +0000 Subject: fixup commit for tag 'NSS_334_20030307' --- security/nss/pkg/solaris/Makefile | 56 ------------ security/nss/pkg/solaris/Makefile.com | 34 ------- security/nss/pkg/solaris/Makefile.targ | 31 ------- security/nss/pkg/solaris/SUNWtls/Makefile | 16 ---- security/nss/pkg/solaris/SUNWtls/pkgdepend | 28 ------ security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl | 34 ------- security/nss/pkg/solaris/SUNWtls/prototype_com | 32 ------- security/nss/pkg/solaris/SUNWtls/prototype_i386 | 30 ------- security/nss/pkg/solaris/SUNWtls/prototype_sparc | 32 ------- security/nss/pkg/solaris/SUNWtlsx/Makefile | 16 ---- security/nss/pkg/solaris/SUNWtlsx/pkgdepend | 32 ------- security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl | 35 -------- security/nss/pkg/solaris/SUNWtlsx/prototype_com | 28 ------ security/nss/pkg/solaris/SUNWtlsx/prototype_sparc | 37 -------- security/nss/pkg/solaris/bld_awk_pkginfo.ksh | 105 ---------------------- security/nss/pkg/solaris/common_files/copyright | 28 ------ 16 files changed, 574 deletions(-) delete mode 100644 security/nss/pkg/solaris/Makefile delete mode 100644 security/nss/pkg/solaris/Makefile.com delete mode 100644 security/nss/pkg/solaris/Makefile.targ delete mode 100644 security/nss/pkg/solaris/SUNWtls/Makefile delete mode 100644 security/nss/pkg/solaris/SUNWtls/pkgdepend delete mode 100644 security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl delete mode 100644 security/nss/pkg/solaris/SUNWtls/prototype_com delete mode 100644 security/nss/pkg/solaris/SUNWtls/prototype_i386 delete mode 100644 security/nss/pkg/solaris/SUNWtls/prototype_sparc delete mode 100644 security/nss/pkg/solaris/SUNWtlsx/Makefile delete mode 100644 security/nss/pkg/solaris/SUNWtlsx/pkgdepend delete mode 100644 security/nss/pkg/solaris/SUNWtlsx/pkginfo.tmpl delete mode 100644 security/nss/pkg/solaris/SUNWtlsx/prototype_com delete mode 100644 security/nss/pkg/solaris/SUNWtlsx/prototype_sparc delete mode 100644 security/nss/pkg/solaris/bld_awk_pkginfo.ksh delete mode 100644 security/nss/pkg/solaris/common_files/copyright diff --git a/security/nss/pkg/solaris/Makefile b/security/nss/pkg/solaris/Makefile deleted file mode 100644 index 2d2ff6ff4..000000000 --- a/security/nss/pkg/solaris/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "$Id$" -# - -CORE_DEPTH = ../../.. - -%: %.ksh - $(RM) $@ - cp $< $@ - chmod +x $@ - - -ifeq ($(USE_64), 1) -DIRS = \ - SUNWtlsx -else -DIRS = \ - SUNWtls -endif - -PROTO = \ - $(ROOT) \ - $(ROOT)/usr \ - $(ROOT)/usr/lib \ - $(ROOT)/usr/lib/mps - -ifdef USE_64 -PROTO += $(ROOT)/usr/lib/mps/sparcv9 -endif - -include Makefile.com - -awk_pkginfo: bld_awk_pkginfo - ./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION) - -all:: awk_pkginfo $(PROTO) -publish: awk_pkginfo $(PROTO) - +$(LOOP_OVER_DIRS) - -clean clobber:: - $(RM) awk_pkginfo bld_awk_pkginfo - $(RM) -r $(ROOT) - -$(ROOT) $(ROOT)/%: - mkdir -p $@ - -ifdef USE_64 -$(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib - $(LN) -sf ../../../../$(DIST)/lib $@ -else -$(ROOT)/usr/lib/mps: $(ROOT)/usr/lib - $(LN) -sf ../../../$(DIST)/lib $@ -endif diff --git a/security/nss/pkg/solaris/Makefile.com b/security/nss/pkg/solaris/Makefile.com deleted file mode 100644 index ac4790230..000000000 --- a/security/nss/pkg/solaris/Makefile.com +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "$Id$" -# - -MACH = $(shell mach) - -PUBLISH_ROOT = $(DIST) -ifeq ($(CORE_DEPTH),../../..) -ROOT = ROOT -else -ROOT = $(subst ../../../,,$(CORE_DEPTH))/ROOT -endif - -PKGARCHIVE = $(PUBLISH_ROOT)/pkgarchive -DATAFILES = copyright -FILES = $(DATAFILES) pkginfo prototype - - -PACKAGE = $(shell basename `pwd`) - -PRODUCT_VERSION = "3.3.4" -PRODUCT_NAME = NSS_3_3_4_RTM - -LN = /usr/bin/ln - -CLOBBERFILES = $(FILES) - -include $(CORE_DEPTH)/coreconf/config.mk -include $(CORE_DEPTH)/coreconf/rules.mk - -# vim: ft=make diff --git a/security/nss/pkg/solaris/Makefile.targ b/security/nss/pkg/solaris/Makefile.targ deleted file mode 100644 index 5390dcb67..000000000 --- a/security/nss/pkg/solaris/Makefile.targ +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "$Id$" -# - -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 - -pkg: $(PKGARCHIVE) prototype - pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE) - -$(PKGARCHIVE): - [ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE) - -$(DATAFILES):: %: ../common_files/% - $(RM) $@; cp ../common_files/$@ $@ - -$(MACHDATAFILES): %: ../common_files/%_$(MACH) - $(RM) $@; cp ../common_files/$@_$(MACH) $@ - -clobber clean:: - -$(RM) $(CLOBBERFILES) $(CLEANFILES) - -.PHONY: pkg diff --git a/security/nss/pkg/solaris/SUNWtls/Makefile b/security/nss/pkg/solaris/SUNWtls/Makefile deleted file mode 100644 index 5058a1f68..000000000 --- a/security/nss/pkg/solaris/SUNWtls/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/SUNWtls/pkgdepend b/security/nss/pkg/solaris/SUNWtls/pkgdepend deleted file mode 100644 index 966ba0556..000000000 --- a/security/nss/pkg/solaris/SUNWtls/pkgdepend +++ /dev/null @@ -1,28 +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 -# see pkginfo(4), PKG parameter -# see pkginfo(4), NAME parameter -# see pkginfo(4), VERSION parameter -# see pkginfo(4), ARCH parameter -# -# () -# () -# ... -# -# ... - -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 SUNWpr Netscape Portable Runtime diff --git a/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl b/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl deleted file mode 100644 index e0a697529..000000000 --- a/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl +++ /dev/null @@ -1,34 +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="SUNWtls" -NAME="Network Security Services" -ARCH="ISA" -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" -VENDOR="Sun Microsystems, Inc." -HOTLINE="Please contact your local service provider" -EMAIL="" -CLASSES="none" -BASEDIR=/ -SUNW_PKGVERS="1.0" -#VSTOCK="" -#ISTATES="" -#RSTATES='' -#ULIMIT="" -#ORDER="" -#PSTAMP="" -#INTONLY="" diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_com b/security/nss/pkg/solaris/SUNWtls/prototype_com deleted file mode 100644 index c5a9d9b39..000000000 --- a/security/nss/pkg/solaris/SUNWtls/prototype_com +++ /dev/null @@ -1,32 +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 # where to find pkg objects -#!include # include another 'prototype' file -#!default # default used if not specified on entry -#!= # puts parameter in pkg environment - -# packaging files -i copyright -i pkginfo -i depend=pkgdepend -# -# source locations relative to the prototype file -# -# SUNWtls -# -d none usr 755 root sys -d none usr/lib 755 root bin -d none usr/lib/mps 755 root bin -f none usr/lib/mps/libnss3.so 755 root bin -f none usr/lib/mps/libsmime3.so 755 root bin -f none usr/lib/mps/libssl3.so 755 root bin -f none usr/lib/mps/libnssckbi.so 755 root bin diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_i386 b/security/nss/pkg/solaris/SUNWtls/prototype_i386 deleted file mode 100644 index d2718ee05..000000000 --- a/security/nss/pkg/solaris/SUNWtls/prototype_i386 +++ /dev/null @@ -1,30 +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 # where to find pkg objects -#!include # include another 'prototype' file -#!default # default used if not specified on entry -#!= # puts parameter in pkg environment - -# -# Include ISA independent files (prototype_com) -# -!include prototype_com -# -# -# -# List files which are i386 specific here -# -# source locations relative to the prototype file -# -# -# SUNWtls -# diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_sparc b/security/nss/pkg/solaris/SUNWtls/prototype_sparc deleted file mode 100644 index dae7ef7d7..000000000 --- a/security/nss/pkg/solaris/SUNWtls/prototype_sparc +++ /dev/null @@ -1,32 +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 # where to find pkg objects -#!include # include another 'prototype' file -#!default # default used if not specified on entry -#!= # 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 -# -# -# SUNWtls -# -f none usr/lib/mps/libfreebl_hybrid_3.so 755 root bin -f none usr/lib/mps/libfreebl_pure32_3.so 755 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 38c887be5..000000000 --- a/security/nss/pkg/solaris/SUNWtlsx/pkgdepend +++ /dev/null @@ -1,32 +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 -# see pkginfo(4), PKG parameter -# see pkginfo(4), NAME parameter -# see pkginfo(4), VERSION parameter -# see pkginfo(4), ARCH parameter -# -# () -# () -# ... -# -# ... - -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="" -#ISTATES="" -#RSTATES='' -#ULIMIT="" -#ORDER="" -#PSTAMP="" -#INTONLY="" 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 # where to find pkg objects -#!include # include another 'prototype' file -#!default # default used if not specified on entry -#!= # 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 ba9bf925c..000000000 --- a/security/nss/pkg/solaris/SUNWtlsx/prototype_sparc +++ /dev/null @@ -1,37 +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 # where to find pkg objects -#!include # include another 'prototype' file -#!default # default used if not specified on entry -#!= # 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 - diff --git a/security/nss/pkg/solaris/bld_awk_pkginfo.ksh b/security/nss/pkg/solaris/bld_awk_pkginfo.ksh deleted file mode 100644 index 6f2723b4c..000000000 --- a/security/nss/pkg/solaris/bld_awk_pkginfo.ksh +++ /dev/null @@ -1,105 +0,0 @@ -#!/usr/bin/ksh -p -# -#ident "$Id$" -# -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# Simple script which builds the awk_pkginfo awk script. This awk script -# is used to convert the pkginfo.tmpl files into pkginfo files -# for the build. -# - -usage() -{ - cat <<-EOF -usage: bld_awk_pkginfo -p -m -o [-v ] -EOF -} - -# -# Awk strings -# -# two VERSION patterns: one for Dewey decimal, one for Dewey plus ,REV=n -# the first has one '=' the second has two or more '=' -# -VERSION1="VERSION=[^=]*$" -VERSION2="VERSION=[^=]*=.*$" -PRODVERS="^SUNW_PRODVERS=" -ARCH='ARCH=\"ISA\"' - -# -# parse command line -# -mach="" -prodver="" -awk_script="" -version="NSSVERS" - -while getopts o:p:m:v: c -do - case $c in - o) - awk_script=$OPTARG - ;; - m) - mach=$OPTARG - ;; - p) - prodver=$OPTARG - ;; - v) - version=$OPTARG - ;; - \?) - usage - exit 1 - ;; - esac -done - -if [[ ( -z $prodver ) || ( -z $mach ) || ( -z $awk_script ) ]] -then - usage - exit 1 -fi - -if [[ -f $awk_script ]] -then - rm -f $awk_script -fi - -# -# Build REV= field based on date -# -rev=$(date "+%Y.%m.%d.%H.%M") - -# -# Build awk script which will process all the -# pkginfo.tmpl files. -# -# the first VERSION pattern is replaced with a leading quotation mark -# -rm -f $awk_script -cat << EOF > $awk_script -/$VERSION1/ { - sub(/\=[^=]*$/,"=\"$rev\"") - print - next - } -/$VERSION2/ { - sub(/\=[^=]*$/,"=$rev\"") - sub(/NSSVERS/,"$version") - print - next - } -/$PRODVERS/ { - printf "SUNW_PRODVERS=\"%s\"\n", "$prodver" - next - } -/$ARCH/ { - printf "ARCH=\"%s\"\n", "$mach" - next - } -{ print } -EOF diff --git a/security/nss/pkg/solaris/common_files/copyright b/security/nss/pkg/solaris/common_files/copyright deleted file mode 100644 index 4ef1ca7c2..000000000 --- a/security/nss/pkg/solaris/common_files/copyright +++ /dev/null @@ -1,28 +0,0 @@ -The contents of this package are subject to the Mozilla Public License -Version 1.1 (the "License"); you may not use this package except in -compliance with the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" -basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -License for the specific language governing rights and limitations -under the License. - -The Original Code is the Netscape security libraries. - -The Initial Developer of the Original Code is Netscape Communications -Corporation. Portions created by Netscape are Copyright (C) 1994-2000 -Netscape Communications Corporation. All Rights Reserved. - -Contributor(s): - -Alternatively, the contents of this package may be used under the terms -of the GNU General Public License Version 2 or later (the "GPL"), in -which case the provisions of the GPL are applicable instead of those -above. If you wish to allow use of your version of this package only -under the terms of the GPL and not to allow others to use your version -of this package under the MPL, indicate your decision by deleting the -provisions above and replace them with the notice and other provisions -required by the GPL. If you do not delete the provisions above, a -recipient may use your version of this package under either the MPL or -the GPL. -- cgit v1.2.1