diff options
| author | kirk.erickson%sun.com <devnull@localhost> | 2002-08-23 00:46:35 +0000 |
|---|---|---|
| committer | kirk.erickson%sun.com <devnull@localhost> | 2002-08-23 00:46:35 +0000 |
| commit | 1208dc647f3908e6d0c622134752dfb2b23f47a2 (patch) | |
| tree | 073e88f872c6ab95420a09518c47b7bd0e992936 | |
| parent | 14ba063b91c3a4f149427036aa9e562718315023 (diff) | |
| download | nss-hg-1208dc647f3908e6d0c622134752dfb2b23f47a2.tar.gz | |
wtc's patch
1. I moved the 'solarispkg' makefile target from
coreconf/rules.mk to nss/Makefile because this
target is specific to NSS. (coreconf is used by
other products too.)
2. The 'VERSION' in pkginfo.tmpl should say '3.3.2'
instead of '4.1.2'.
3. I deleted the commented-out libultrasparc4.so
from prototype_sparc. (That is an NSPR file.)
| -rw-r--r-- | security/coreconf/rules.mk | 6 | ||||
| -rw-r--r-- | security/nss/Makefile | 6 | ||||
| -rw-r--r-- | security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl | 2 | ||||
| -rw-r--r-- | security/nss/pkg/solaris/SUNWtls/prototype_sparc | 1 |
4 files changed, 7 insertions, 8 deletions
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index e19c1b900..7126d8fc4 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -916,12 +916,6 @@ else depend:: endif -ifeq ($(OS_ARCH),SunOS) -solarispkg: - @echo Making Solaris packages. - cd pkg/solaris && $(MAKE) publish -endif - ################################################################################ # Special gmake rules. ################################################################################ diff --git a/security/nss/Makefile b/security/nss/Makefile index 8c2d74331..a886eadac 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -109,3 +109,9 @@ endif endif nss_RelEng_bld: build_coreconf import all + +ifeq ($(OS_ARCH),SunOS) +solarispkg: + @echo Making Solaris packages. + $(MAKE) -C pkg/solaris publish +endif diff --git a/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl b/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl index 145689540..67bc783fa 100644 --- a/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl +++ b/security/nss/pkg/solaris/SUNWtls/pkginfo.tmpl @@ -12,7 +12,7 @@ PKG="SUNWtls" NAME="Network Security Services" ARCH="ISA" -VERSION="4.1.2,REV=0.0.0" +VERSION="3.3.2,REV=0.0.0" SUNW_PRODNAME="Network Security Services" SUNW_PRODVERS="RELEASE/VERSION" SUNW_PKGTYPE="usr" diff --git a/security/nss/pkg/solaris/SUNWtls/prototype_sparc b/security/nss/pkg/solaris/SUNWtls/prototype_sparc index b8f03ed6c..e751f6b5f 100644 --- a/security/nss/pkg/solaris/SUNWtls/prototype_sparc +++ b/security/nss/pkg/solaris/SUNWtls/prototype_sparc @@ -28,4 +28,3 @@ # # SUNWtls # -#f none usr/lib/mps/libultrasparc4.so 755 root bin |