Mercurial Mercurial > sustaining > oi_151a > oi-build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump Mozilla NSS and NSPR oi_151a
authorJon Tibble <meths@btinternet.com>
Sun, 27 Jan 2013 18:39:23 +0000
branchoi_151a
changeset 321 f3de87aa29ac
parent 320 16acb9413bb6
child 322 e2cca05522fd
Bump Mozilla NSS and NSPR
.hgignore file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nspr/Makefile file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nspr/library-nspr-header-nspr.p5m file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nspr/library-nspr.p5m file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nspr/patches/arch.patch file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nspr/sample-manifests/nspr-4.8.4 file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nspr/sample-manifests/nspr-4.9.4 file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/Makefile file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/patches/arch.patch file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/patches/coreconf.patch file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/patches/runpath.patch file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/patches/runpath2.patch file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/sample-manifests/nss-3.12.6 file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/sample-manifests/nss-3.14.1 file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/system-library-mozilla-nss-header-nss.p5m file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/system-library-mozilla-nss.p5m file | annotate | diff | comparison | revisions
components/sic_team/mozilla-nss/system-mozilla-nss.p5m file | annotate | diff | comparison | revisions
components/sic_team/sic_team-incorporation/Makefile file | annotate | diff | comparison | revisions
components/sic_team/sic_team-incorporation/sic_team-incorporation.p5m file | annotate | diff | comparison | revisions 
--- a/.hgignore	Sun Jan 27 18:36:45 2013 +0000
+++ b/.hgignore	Sun Jan 27 18:39:23 2013 +0000
@@ -1,7 +1,7 @@
 syntax: glob
 
 components/*/build*
-components/illumos-gcc/richlowe-gcc-f268959*
+components/illumos-gcc/illumos-gcc-*
 components/kvm/joyent-illumos-kvm-b0749fb*
 components/meta-packages/history/build*
 components/mtr/mtr-0.82*
@@ -16,6 +16,9 @@
 components/python/pybonjour/pybonjour-1.1.1*
 components/python/pycurl/pycurl-7.19.0*
 components/qemu-kvm/joyent-illumos-kvm-cmd-bacaa89*
+components/sic_team/*/build*
+components/sic_team/mozilla-nspr/nspr-4.9.4*
+components/sic_team/mozilla-nss/nss-3.14.1*
 i386*
 tools/python/pkglint/__init__.pyc
 tools/python/pkglint/userland.pyc
--- a/components/sic_team/mozilla-nspr/Makefile	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nspr/Makefile	Sun Jan 27 18:39:23 2013 +0000
@@ -10,21 +10,24 @@
 
 #
 # Copyright 2011, Andrzej Szeszo
+# Copyright 2013, Jon Tibble
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		nspr
-COMPONENT_VERSION=	4.8.4
+COMPONENT_VERSION=	4.9.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha1:c4af8c2956674ff0f17b4247516716e92db40cf6
+COMPONENT_ARCHIVE_HASH=	sha256:749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4
 COMPONENT_ARCHIVE_URL=	http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/configure.mk
 include ../../../make-rules/ips.mk
 
+PKGLINT = /bin/true
+
 CONFIGURE_SCRIPT = $(SOURCE_DIR)/mozilla/nsprpub/configure
 
 CONFIGURE_ENV += CC="$(CC)"
@@ -40,9 +43,6 @@
 #CONFIGURE_OPTIONS += --disable-debug
 CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.$(BITS))
 
-PKGMANGLE = true
-PKGLINT = true
-
 build: $(BUILD_32_and_64)
 
 install: $(INSTALL_32_and_64)
--- a/components/sic_team/mozilla-nspr/library-nspr-header-nspr.p5m	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nspr/library-nspr-header-nspr.p5m	Sun Jan 27 18:39:23 2013 +0000
@@ -10,9 +10,10 @@
 
 #
 # Copyright 2011, Andrzej Szeszo
+# Copyright 2013, Jon Tibble
 #
 
-set name=pkg.fmri value=pkg:/library/nspr/[email protected],$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/library/nspr/header-nspr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Netscape Portable Runtime Development"
 set name=variant.opensolaris.zone value=global value=nonglobal
 set name=info.classification value=org.opensolaris.category.2008:Development/System
@@ -48,21 +49,15 @@
 file path=usr/include/mps/md/_irix32.cfg
 file path=usr/include/mps/md/_irix64.cfg
 file path=usr/include/mps/md/_linux.cfg
-file path=usr/include/mps/md/_ncr.cfg
-file path=usr/include/mps/md/_nec.cfg
 file path=usr/include/mps/md/_netbsd.cfg
-file path=usr/include/mps/md/_nextstep.cfg
 file path=usr/include/mps/md/_nto.cfg
 file path=usr/include/mps/md/_openbsd.cfg
 file path=usr/include/mps/md/_os2.cfg
 file path=usr/include/mps/md/_osf1.cfg
 file path=usr/include/mps/md/_qnx.cfg
-file path=usr/include/mps/md/_reliantunix.cfg
 file path=usr/include/mps/md/_riscos.cfg
 file path=usr/include/mps/md/_scoos.cfg
 file path=usr/include/mps/md/_solaris.cfg
-file path=usr/include/mps/md/_sony.cfg
-file path=usr/include/mps/md/_sunos4.cfg
 file path=usr/include/mps/md/_symbian.cfg
 file path=usr/include/mps/md/_unixware.cfg
 file path=usr/include/mps/md/_unixware7.cfg
--- a/components/sic_team/mozilla-nspr/library-nspr.p5m	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nspr/library-nspr.p5m	Sun Jan 27 18:39:23 2013 +0000
@@ -10,9 +10,10 @@
 
 #
 # Copyright 2011, Andrzej Szeszo
+# Copyright 2013, Jon Tibble
 #
 
-set name=pkg.fmri value=pkg:/library/[email protected],$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/library/nspr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="Netscape Portable Runtime Interface"
 set name=org.opensolaris.consolidation value=sic_team
 set name=variant.opensolaris.zone value=global value=nonglobal
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sic_team/mozilla-nspr/patches/arch.patch	Sun Jan 27 18:39:23 2013 +0000
@@ -0,0 +1,28 @@
+diff -ur nspr-4.9.4.orig/mozilla/nsprpub/configure nspr-4.9.4/mozilla/nsprpub/configure
+--- nspr-4.9.4.orig/mozilla/nsprpub/configure	2012-10-24 23:19:07.000000000 +0100
++++ nspr-4.9.4/mozilla/nsprpub/configure	2013-01-26 19:59:52.637586722 +0000
+@@ -5140,8 +5140,8 @@
+             CXX="$CXX -m64"
+         else
+             if test "$OS_TEST" = "i86pc"; then
+-                CC="$CC -xarch=amd64"
+-                CXX="$CXX -xarch=amd64"
++                CC="$CC -m64"
++                CXX="$CXX -m64"
+             else
+                 CC="$CC -xarch=v9"
+                 CXX="$CXX -xarch=v9"
+diff -ur nspr-4.9.4.orig/mozilla/nsprpub/configure.in nspr-4.9.4/mozilla/nsprpub/configure.in
+--- nspr-4.9.4.orig/mozilla/nsprpub/configure.in	2012-10-24 23:19:07.000000000 +0100
++++ nspr-4.9.4/mozilla/nsprpub/configure.in	2013-01-26 20:00:09.680448835 +0000
+@@ -2279,8 +2279,8 @@
+             CXX="$CXX -m64"
+         else
+             if test "$OS_TEST" = "i86pc"; then
+-                CC="$CC -xarch=amd64"
+-                CXX="$CXX -xarch=amd64"
++                CC="$CC -m64"
++                CXX="$CXX -m64"
+             else
+                 CC="$CC -xarch=v9"
+                 CXX="$CXX -xarch=v9"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sic_team/mozilla-nspr/sample-manifests/nspr-4.8.4	Sun Jan 27 18:39:23 2013 +0000
@@ -0,0 +1,153 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="XXX Summary XXX"
+set name=info.classification value="org.opensolaris.category.2008:XXX Classification XXX"
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+
+dir  path=usr
+dir  path=usr/bin
+file path=usr/bin/compile-et.pl
+file path=usr/bin/nspr-config
+file path=usr/bin/prerr.properties
+dir  path=usr/include
+dir  path=usr/include/mps
+dir  path=usr/include/mps/md
+file path=usr/include/mps/md/_aix32.cfg
+file path=usr/include/mps/md/_aix64.cfg
+file path=usr/include/mps/md/_beos.cfg
+file path=usr/include/mps/md/_bsdi.cfg
+file path=usr/include/mps/md/_darwin.cfg
+file path=usr/include/mps/md/_dgux.cfg
+file path=usr/include/mps/md/_freebsd.cfg
+file path=usr/include/mps/md/_hpux32.cfg
+file path=usr/include/mps/md/_hpux64.cfg
+file path=usr/include/mps/md/_irix32.cfg
+file path=usr/include/mps/md/_irix64.cfg
+file path=usr/include/mps/md/_linux.cfg
+file path=usr/include/mps/md/_ncr.cfg
+file path=usr/include/mps/md/_nec.cfg
+file path=usr/include/mps/md/_netbsd.cfg
+file path=usr/include/mps/md/_nextstep.cfg
+file path=usr/include/mps/md/_nto.cfg
+file path=usr/include/mps/md/_openbsd.cfg
+file path=usr/include/mps/md/_os2.cfg
+file path=usr/include/mps/md/_osf1.cfg
+file path=usr/include/mps/md/_qnx.cfg
+file path=usr/include/mps/md/_reliantunix.cfg
+file path=usr/include/mps/md/_riscos.cfg
+file path=usr/include/mps/md/_scoos.cfg
+file path=usr/include/mps/md/_solaris.cfg
+file path=usr/include/mps/md/_sony.cfg
+file path=usr/include/mps/md/_sunos4.cfg
+file path=usr/include/mps/md/_symbian.cfg
+file path=usr/include/mps/md/_unixware.cfg
+file path=usr/include/mps/md/_unixware7.cfg
+file path=usr/include/mps/md/_win95.cfg
+file path=usr/include/mps/md/_winnt.cfg
+file path=usr/include/mps/nspr.h
+dir  path=usr/include/mps/obsolete
+file path=usr/include/mps/obsolete/pralarm.h
+file path=usr/include/mps/obsolete/probslet.h
+file path=usr/include/mps/obsolete/protypes.h
+file path=usr/include/mps/obsolete/prsem.h
+file path=usr/include/mps/plarena.h
+file path=usr/include/mps/plarenas.h
+file path=usr/include/mps/plbase64.h
+file path=usr/include/mps/plerror.h
+file path=usr/include/mps/plgetopt.h
+file path=usr/include/mps/plhash.h
+file path=usr/include/mps/plstr.h
+file path=usr/include/mps/pratom.h
+file path=usr/include/mps/prbit.h
+file path=usr/include/mps/prclist.h
+file path=usr/include/mps/prcmon.h
+file path=usr/include/mps/prcountr.h
+file path=usr/include/mps/prcpucfg.h
+file path=usr/include/mps/prcvar.h
+file path=usr/include/mps/prdtoa.h
+file path=usr/include/mps/prenv.h
+file path=usr/include/mps/prerr.h
+file path=usr/include/mps/prerror.h
+file path=usr/include/mps/prinet.h
+file path=usr/include/mps/prinit.h
+file path=usr/include/mps/prinrval.h
+file path=usr/include/mps/prio.h
+file path=usr/include/mps/pripcsem.h
+dir  path=usr/include/mps/private
+file path=usr/include/mps/private/pprio.h
+file path=usr/include/mps/private/pprthred.h
+file path=usr/include/mps/private/prpriv.h
+file path=usr/include/mps/prlink.h
+file path=usr/include/mps/prlock.h
+file path=usr/include/mps/prlog.h
+file path=usr/include/mps/prlong.h
+file path=usr/include/mps/prmem.h
+file path=usr/include/mps/prmon.h
+file path=usr/include/mps/prmwait.h
+file path=usr/include/mps/prnetdb.h
+file path=usr/include/mps/prolock.h
+file path=usr/include/mps/prpdce.h
+file path=usr/include/mps/prprf.h
+file path=usr/include/mps/prproces.h
+file path=usr/include/mps/prrng.h
+file path=usr/include/mps/prrwlock.h
+file path=usr/include/mps/prshm.h
+file path=usr/include/mps/prshma.h
+file path=usr/include/mps/prsystem.h
+file path=usr/include/mps/prthread.h
+file path=usr/include/mps/prtime.h
+file path=usr/include/mps/prtpool.h
+file path=usr/include/mps/prtrace.h
+file path=usr/include/mps/prtypes.h
+file path=usr/include/mps/prvrsion.h
+file path=usr/include/mps/prwin16.h
+dir  path=usr/lib
+dir  path=usr/lib/mps
+dir  path=usr/lib/mps/$(MACH64)
+file path=usr/lib/mps/$(MACH64)/libnspr4.a
+file path=usr/lib/mps/$(MACH64)/libnspr4.so
+file path=usr/lib/mps/$(MACH64)/libplc4.a
+file path=usr/lib/mps/$(MACH64)/libplc4.so
+file path=usr/lib/mps/$(MACH64)/libplds4.a
+file path=usr/lib/mps/$(MACH64)/libplds4.so
+dir  path=usr/lib/mps/$(MACH64)/pkgconfig
+file path=usr/lib/mps/$(MACH64)/pkgconfig/nspr.pc
+file path=usr/lib/mps/libnspr4.a
+file path=usr/lib/mps/libnspr4.so
+file path=usr/lib/mps/libplc4.a
+file path=usr/lib/mps/libplc4.so
+file path=usr/lib/mps/libplds4.a
+file path=usr/lib/mps/libplds4.so
+dir  path=usr/lib/mps/pkgconfig
+file path=usr/lib/mps/pkgconfig/nspr.pc
+dir  path=usr/lib/pkgconfig
+file path=usr/lib/pkgconfig/nspr.pc
+dir  path=usr/share
+dir  path=usr/share/aclocal
+file path=usr/share/aclocal/nspr.m4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sic_team/mozilla-nspr/sample-manifests/nspr-4.9.4	Sun Jan 27 18:39:23 2013 +0000
@@ -0,0 +1,147 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="XXX Summary XXX"
+set name=info.classification value="org.opensolaris.category.2008:XXX Classification XXX"
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+
+dir  path=usr
+dir  path=usr/bin
+file path=usr/bin/compile-et.pl
+file path=usr/bin/nspr-config
+file path=usr/bin/prerr.properties
+dir  path=usr/include
+dir  path=usr/include/mps
+dir  path=usr/include/mps/md
+file path=usr/include/mps/md/_aix32.cfg
+file path=usr/include/mps/md/_aix64.cfg
+file path=usr/include/mps/md/_beos.cfg
+file path=usr/include/mps/md/_bsdi.cfg
+file path=usr/include/mps/md/_darwin.cfg
+file path=usr/include/mps/md/_dgux.cfg
+file path=usr/include/mps/md/_freebsd.cfg
+file path=usr/include/mps/md/_hpux32.cfg
+file path=usr/include/mps/md/_hpux64.cfg
+file path=usr/include/mps/md/_irix32.cfg
+file path=usr/include/mps/md/_irix64.cfg
+file path=usr/include/mps/md/_linux.cfg
+file path=usr/include/mps/md/_netbsd.cfg
+file path=usr/include/mps/md/_nto.cfg
+file path=usr/include/mps/md/_openbsd.cfg
+file path=usr/include/mps/md/_os2.cfg
+file path=usr/include/mps/md/_osf1.cfg
+file path=usr/include/mps/md/_qnx.cfg
+file path=usr/include/mps/md/_riscos.cfg
+file path=usr/include/mps/md/_scoos.cfg
+file path=usr/include/mps/md/_solaris.cfg
+file path=usr/include/mps/md/_symbian.cfg
+file path=usr/include/mps/md/_unixware.cfg
+file path=usr/include/mps/md/_unixware7.cfg
+file path=usr/include/mps/md/_win95.cfg
+file path=usr/include/mps/md/_winnt.cfg
+file path=usr/include/mps/nspr.h
+dir  path=usr/include/mps/obsolete
+file path=usr/include/mps/obsolete/pralarm.h
+file path=usr/include/mps/obsolete/probslet.h
+file path=usr/include/mps/obsolete/protypes.h
+file path=usr/include/mps/obsolete/prsem.h
+file path=usr/include/mps/plarena.h
+file path=usr/include/mps/plarenas.h
+file path=usr/include/mps/plbase64.h
+file path=usr/include/mps/plerror.h
+file path=usr/include/mps/plgetopt.h
+file path=usr/include/mps/plhash.h
+file path=usr/include/mps/plstr.h
+file path=usr/include/mps/pratom.h
+file path=usr/include/mps/prbit.h
+file path=usr/include/mps/prclist.h
+file path=usr/include/mps/prcmon.h
+file path=usr/include/mps/prcountr.h
+file path=usr/include/mps/prcpucfg.h
+file path=usr/include/mps/prcvar.h
+file path=usr/include/mps/prdtoa.h
+file path=usr/include/mps/prenv.h
+file path=usr/include/mps/prerr.h
+file path=usr/include/mps/prerror.h
+file path=usr/include/mps/prinet.h
+file path=usr/include/mps/prinit.h
+file path=usr/include/mps/prinrval.h
+file path=usr/include/mps/prio.h
+file path=usr/include/mps/pripcsem.h
+dir  path=usr/include/mps/private
+file path=usr/include/mps/private/pprio.h
+file path=usr/include/mps/private/pprthred.h
+file path=usr/include/mps/private/prpriv.h
+file path=usr/include/mps/prlink.h
+file path=usr/include/mps/prlock.h
+file path=usr/include/mps/prlog.h
+file path=usr/include/mps/prlong.h
+file path=usr/include/mps/prmem.h
+file path=usr/include/mps/prmon.h
+file path=usr/include/mps/prmwait.h
+file path=usr/include/mps/prnetdb.h
+file path=usr/include/mps/prolock.h
+file path=usr/include/mps/prpdce.h
+file path=usr/include/mps/prprf.h
+file path=usr/include/mps/prproces.h
+file path=usr/include/mps/prrng.h
+file path=usr/include/mps/prrwlock.h
+file path=usr/include/mps/prshm.h
+file path=usr/include/mps/prshma.h
+file path=usr/include/mps/prsystem.h
+file path=usr/include/mps/prthread.h
+file path=usr/include/mps/prtime.h
+file path=usr/include/mps/prtpool.h
+file path=usr/include/mps/prtrace.h
+file path=usr/include/mps/prtypes.h
+file path=usr/include/mps/prvrsion.h
+file path=usr/include/mps/prwin16.h
+dir  path=usr/lib
+dir  path=usr/lib/mps
+dir  path=usr/lib/mps/$(MACH64)
+file path=usr/lib/mps/$(MACH64)/libnspr4.a
+file path=usr/lib/mps/$(MACH64)/libnspr4.so
+file path=usr/lib/mps/$(MACH64)/libplc4.a
+file path=usr/lib/mps/$(MACH64)/libplc4.so
+file path=usr/lib/mps/$(MACH64)/libplds4.a
+file path=usr/lib/mps/$(MACH64)/libplds4.so
+dir  path=usr/lib/mps/$(MACH64)/pkgconfig
+file path=usr/lib/mps/$(MACH64)/pkgconfig/nspr.pc
+file path=usr/lib/mps/libnspr4.a
+file path=usr/lib/mps/libnspr4.so
+file path=usr/lib/mps/libplc4.a
+file path=usr/lib/mps/libplc4.so
+file path=usr/lib/mps/libplds4.a
+file path=usr/lib/mps/libplds4.so
+dir  path=usr/lib/mps/pkgconfig
+file path=usr/lib/mps/pkgconfig/nspr.pc
+dir  path=usr/lib/pkgconfig
+file path=usr/lib/pkgconfig/nspr.pc
+dir  path=usr/share
+dir  path=usr/share/aclocal
+file path=usr/share/aclocal/nspr.m4
--- a/components/sic_team/mozilla-nss/Makefile	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nss/Makefile	Sun Jan 27 18:39:23 2013 +0000
@@ -10,16 +10,17 @@
 
 #
 # Copyright 2011, Andrzej Szeszo
+# Copyright 2013, Jon Tibble
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		nss
-COMPONENT_VERSION=	3.12.6
+COMPONENT_VERSION=	3.14.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha1:461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46
-COMPONENT_ARCHIVE_URL=	ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH=	sha256:80a5d4872da13d0272636ad04e1beddcf8d4572bcc0d47dbea1d12fb592fb7e5
+COMPONENT_ARCHIVE_URL=	ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_1_RTM/src/$(COMPONENT_ARCHIVE)
 
 # Enable compiler optimizations and disable debugging code
 COMPONENT_BUILD_ENV += BUILD_OPT=1
@@ -42,12 +43,10 @@
 COMPONENT_BUILD_ENV.64 += USE_64=1
 COMPONENT_BUILD_ENV += $(COMPONENT_BUILD_ENV.$(BITS))
 
-
 include ../../../make-rules/prep.mk
 include ../../../make-rules/justmake.mk
 include ../../../make-rules/ips.mk
 
-PKGMANGLE = true
 PKGLINT = true
 
 $(BUILD_DIR)/%/.built:	$(SOURCE_DIR)/.prep
--- a/components/sic_team/mozilla-nss/patches/arch.patch	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nss/patches/arch.patch	Sun Jan 27 18:39:23 2013 +0000
@@ -1,6 +1,6 @@
 --- nss-3.12.6/mozilla/security/coreconf/SunOS5.mk.orig	2012-02-02 14:46:03.520995829 +0000
 +++ nss-3.12.6/mozilla/security/coreconf/SunOS5.mk	2012-02-02 14:46:43.710652404 +0000
-@@ -56,7 +56,7 @@
+@@ -15,7 +15,7 @@
        ARCHFLAG=-m64
    else
        ifeq ($(OS_TEST),i86pc)
@@ -9,7 +9,7 @@
        else
          ARCHFLAG=-xarch=v9
        endif
-@@ -147,7 +147,7 @@
+@@ -106,7 +106,7 @@
  else
  ifeq ($(USE_64), 1)
  	ifeq ($(OS_TEST),i86pc)
--- a/components/sic_team/mozilla-nss/patches/coreconf.patch	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nss/patches/coreconf.patch	Sun Jan 27 18:39:23 2013 +0000
@@ -1,7 +1,7 @@
 diff -ruN nss-3.12.6.orig/mozilla/security/coreconf/rules.mk nss-3.12.6/mozilla/security/coreconf/rules.mk
 --- nss-3.12.6.orig/mozilla/security/coreconf/rules.mk	2009-12-08 01:33:36.000000000 +0000
 +++ nss-3.12.6/mozilla/security/coreconf/rules.mk	2011-04-28 13:59:24.449070011 +0100
-@@ -411,7 +411,7 @@
+@@ -378,7 +378,7 @@
  endif
  
  # The quotes allow absolute paths to contain spaces.
--- a/components/sic_team/mozilla-nss/patches/runpath.patch	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nss/patches/runpath.patch	Sun Jan 27 18:39:23 2013 +0000
@@ -13,7 +13,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure.in nss-3.12.6/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure.in
 --- nss-3.12.6.orig/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure.in	2006-03-02 22:48:55.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/tests/pkcs11/netscape/trivial/configure.in	2012-02-02 13:57:06.895561687 +0000
-@@ -60,7 +60,7 @@
+@@ -28,7 +28,7 @@
  )
  
  NSPR_CFLAGS="-I$NSPR_INCLUDE"
--- a/components/sic_team/mozilla-nss/patches/runpath2.patch	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nss/patches/runpath2.patch	Sun Jan 27 18:39:23 2013 +0000
@@ -1,7 +1,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/cmd/pk11mode/Makefile nss-3.12.6/mozilla/security/nss/cmd/pk11mode/Makefile
 --- nss-3.12.6.orig/mozilla/security/nss/cmd/pk11mode/Makefile	2009-03-31 00:40:52.000000000 +0100
 +++ nss-3.12.6/mozilla/security/nss/cmd/pk11mode/Makefile	2012-02-02 14:38:31.494513429 +0000
-@@ -70,6 +70,7 @@
+@@ -38,6 +38,7 @@
  
  EXTRA_SHARED_LIBS += \
  	-L$(NSPR_LIB_DIR) \
@@ -12,7 +12,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk
 --- nss-3.12.6.orig/mozilla/security/nss/cmd/platlibs.mk	2010-02-04 18:59:10.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk	2012-02-02 14:36:02.417536468 +0000
-@@ -183,6 +183,7 @@
+@@ -127,6 +127,7 @@
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
@@ -20,7 +20,7 @@
  	-lplc4 \
  	-lplds4 \
  	-lnspr4 \
-@@ -235,6 +236,7 @@
+@@ -179,6 +179,7 @@
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
@@ -31,7 +31,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/Makefile nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile
 --- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/Makefile	2009-08-07 20:06:37.000000000 +0100
 +++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile	2012-02-02 14:38:02.243374759 +0000
-@@ -68,6 +68,7 @@
+@@ -36,6 +36,7 @@
  
  EXTRA_SHARED_LIBS += \
  	-L$(NSPR_LIB_DIR) \
@@ -42,7 +42,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/mangle/Makefile nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile
 --- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2008-11-20 15:44:24.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2012-02-02 14:36:31.841732437 +0000
-@@ -68,6 +68,7 @@
+@@ -36,6 +36,7 @@
  
  EXTRA_SHARED_LIBS += \
  	-L$(NSPR_LIB_DIR) \
@@ -53,7 +53,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/builtins/Makefile nss-3.12.6/mozilla/security/nss/lib/ckfw/builtins/Makefile
 --- nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/builtins/Makefile	2009-12-17 22:00:47.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/lib/ckfw/builtins/Makefile	2012-02-02 14:28:57.559752851 +0000
-@@ -66,6 +66,7 @@
+@@ -34,6 +34,7 @@
  
  EXTRA_SHARED_LIBS += \
  	-L$(NSPR_LIB_DIR) \
@@ -64,7 +64,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/capi/Makefile nss-3.12.6/mozilla/security/nss/lib/ckfw/capi/Makefile
 --- nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/capi/Makefile	2009-07-29 21:15:19.000000000 +0100
 +++ nss-3.12.6/mozilla/security/nss/lib/ckfw/capi/Makefile	2012-02-02 14:27:59.590451326 +0000
-@@ -72,6 +72,7 @@
+@@ -40,6 +40,7 @@
  
  EXTRA_LIBS += \
  	-L$(NSPR_LIB_DIR) \
@@ -75,7 +75,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/nssmkey/Makefile nss-3.12.6/mozilla/security/nss/lib/ckfw/nssmkey/Makefile
 --- nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/nssmkey/Makefile	2005-11-23 23:04:08.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/lib/ckfw/nssmkey/Makefile	2012-02-02 14:28:33.862666008 +0000
-@@ -67,6 +67,7 @@
+@@ -35,6 +35,7 @@
  
  EXTRA_LIBS += \
  	-L$(NSPR_LIB_DIR) \
@@ -86,18 +86,18 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/freebl/config.mk nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk
 --- nss-3.12.6.orig/mozilla/security/nss/lib/freebl/config.mk	2009-04-11 22:18:42.000000000 +0100
 +++ nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk	2012-02-02 14:33:24.476440608 +0000
-@@ -111,6 +111,7 @@
+@@ -85,6 +85,7 @@
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
 +	-R$(NSPR_LIB_DIR) \
  	-lnspr4 \
  	$(NULL)
- else
+ endif
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/nss/config.mk nss-3.12.6/mozilla/security/nss/lib/nss/config.mk
 --- nss-3.12.6.orig/mozilla/security/nss/lib/nss/config.mk	2009-12-15 22:22:31.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/lib/nss/config.mk	2012-02-02 14:32:23.596086591 +0000
-@@ -73,6 +73,7 @@
+@@ -41,6 +41,7 @@
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
@@ -108,7 +108,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/smime/config.mk nss-3.12.6/mozilla/security/nss/lib/smime/config.mk
 --- nss-3.12.6.orig/mozilla/security/nss/lib/smime/config.mk	2009-06-11 01:55:47.000000000 +0100
 +++ nss-3.12.6/mozilla/security/nss/lib/smime/config.mk	2012-02-02 14:32:04.860999052 +0000
-@@ -75,6 +75,7 @@
+@@ -43,6 +43,7 @@
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
@@ -119,9 +119,9 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/softoken/config.mk nss-3.12.6/mozilla/security/nss/lib/softoken/config.mk
 --- nss-3.12.6.orig/mozilla/security/nss/lib/softoken/config.mk	2009-06-11 01:55:48.000000000 +0100
 +++ nss-3.12.6/mozilla/security/nss/lib/softoken/config.mk	2012-02-02 14:32:52.701287385 +0000
-@@ -85,6 +85,7 @@
+@@ -52,6 +52,7 @@
+ 	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
- 	-lsqlite3 \
  	-L$(NSPR_LIB_DIR) \
 +	-R$(NSPR_LIB_DIR) \
  	-lplc4 \
@@ -130,7 +130,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.6/mozilla/security/nss/lib/softoken/legacydb/config.mk
 --- nss-3.12.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk	2009-06-11 01:55:49.000000000 +0100
 +++ nss-3.12.6/mozilla/security/nss/lib/softoken/legacydb/config.mk	2012-02-02 14:33:09.164394761 +0000
-@@ -83,6 +83,7 @@
+@@ -50,6 +50,7 @@
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
@@ -141,7 +141,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/ssl/config.mk nss-3.12.6/mozilla/security/nss/lib/ssl/config.mk
 --- nss-3.12.6.orig/mozilla/security/nss/lib/ssl/config.mk	2010-02-04 19:09:08.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/lib/ssl/config.mk	2012-02-02 14:33:35.117601311 +0000
-@@ -88,6 +88,7 @@
+@@ -60,6 +60,7 @@
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
@@ -152,7 +152,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/sysinit/config.mk nss-3.12.6/mozilla/security/nss/lib/sysinit/config.mk
 --- nss-3.12.6.orig/mozilla/security/nss/lib/sysinit/config.mk	2010-02-16 19:38:42.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/lib/sysinit/config.mk	2012-02-02 14:29:31.994941326 +0000
-@@ -78,6 +78,7 @@
+@@ -46,6 +46,7 @@
  	-L$(NSSUTIL_LIB_DIR) \
  	-lnssutil3 \
  	-L$(NSPR_LIB_DIR) \
@@ -163,7 +163,7 @@
 diff -ur nss-3.12.6.orig/mozilla/security/nss/lib/util/config.mk nss-3.12.6/mozilla/security/nss/lib/util/config.mk
 --- nss-3.12.6.orig/mozilla/security/nss/lib/util/config.mk	2009-12-15 22:22:31.000000000 +0000
 +++ nss-3.12.6/mozilla/security/nss/lib/util/config.mk	2012-02-02 14:32:38.525180567 +0000
-@@ -68,6 +68,7 @@
+@@ -36,6 +36,7 @@
  EXTRA_SHARED_LIBS += \
  	-L$(DIST)/lib \
  	-L$(NSPR_LIB_DIR) \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sic_team/mozilla-nss/sample-manifests/nss-3.12.6	Sun Jan 27 18:39:23 2013 +0000
@@ -0,0 +1,173 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="XXX Summary XXX"
+set name=info.classification value="org.opensolaris.category.2008:XXX Classification XXX"
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+
+dir  path=usr
+dir  path=usr/include
+dir  path=usr/include/mps
+file path=usr/include/mps/base64.h
+file path=usr/include/mps/blapit.h
+file path=usr/include/mps/cert.h
+file path=usr/include/mps/certdb.h
+file path=usr/include/mps/certt.h
+file path=usr/include/mps/ciferfam.h
+file path=usr/include/mps/cmmf.h
+file path=usr/include/mps/cmmft.h
+file path=usr/include/mps/cms.h
+file path=usr/include/mps/cmsreclist.h
+file path=usr/include/mps/cmst.h
+file path=usr/include/mps/crmf.h
+file path=usr/include/mps/crmft.h
+file path=usr/include/mps/cryptohi.h
+file path=usr/include/mps/cryptoht.h
+file path=usr/include/mps/ecl-exp.h
+file path=usr/include/mps/hasht.h
+file path=usr/include/mps/jar-ds.h
+file path=usr/include/mps/jar.h
+file path=usr/include/mps/jarfile.h
+file path=usr/include/mps/key.h
+file path=usr/include/mps/keyhi.h
+file path=usr/include/mps/keyt.h
+file path=usr/include/mps/keythi.h
+file path=usr/include/mps/nss.h
+file path=usr/include/mps/nssb64.h
+file path=usr/include/mps/nssb64t.h
+file path=usr/include/mps/nssbase.h
+file path=usr/include/mps/nssbaset.h
+file path=usr/include/mps/nssckbi.h
+file path=usr/include/mps/nssckepv.h
+file path=usr/include/mps/nssckft.h
+file path=usr/include/mps/nssckfw.h
+file path=usr/include/mps/nssckfwc.h
+file path=usr/include/mps/nssckfwt.h
+file path=usr/include/mps/nssckg.h
+file path=usr/include/mps/nssckmdt.h
+file path=usr/include/mps/nssckt.h
+file path=usr/include/mps/nssilckt.h
+file path=usr/include/mps/nssilock.h
+file path=usr/include/mps/nsslocks.h
+file path=usr/include/mps/nssrwlk.h
+file path=usr/include/mps/nssrwlkt.h
+file path=usr/include/mps/nssutil.h
+file path=usr/include/mps/ocsp.h
+file path=usr/include/mps/ocspt.h
+file path=usr/include/mps/p12.h
+file path=usr/include/mps/p12plcy.h
+file path=usr/include/mps/p12t.h
+file path=usr/include/mps/pk11func.h
+file path=usr/include/mps/pk11pqg.h
+file path=usr/include/mps/pk11priv.h
+file path=usr/include/mps/pk11pub.h
+file path=usr/include/mps/pk11sdr.h
+file path=usr/include/mps/pkcs11.h
+file path=usr/include/mps/pkcs11f.h
+file path=usr/include/mps/pkcs11n.h
+file path=usr/include/mps/pkcs11p.h
+file path=usr/include/mps/pkcs11t.h
+file path=usr/include/mps/pkcs11u.h
+file path=usr/include/mps/pkcs12.h
+file path=usr/include/mps/pkcs12t.h
+file path=usr/include/mps/pkcs7t.h
+file path=usr/include/mps/portreg.h
+file path=usr/include/mps/preenc.h
+file path=usr/include/mps/secasn1.h
+file path=usr/include/mps/secasn1t.h
+file path=usr/include/mps/seccomon.h
+file path=usr/include/mps/secder.h
+file path=usr/include/mps/secdert.h
+file path=usr/include/mps/secdig.h
+file path=usr/include/mps/secdigt.h
+file path=usr/include/mps/secerr.h
+file path=usr/include/mps/sechash.h
+file path=usr/include/mps/secitem.h
+file path=usr/include/mps/secmime.h
+file path=usr/include/mps/secmod.h
+file path=usr/include/mps/secmodt.h
+file path=usr/include/mps/secoid.h
+file path=usr/include/mps/secoidt.h
+file path=usr/include/mps/secpkcs5.h
+file path=usr/include/mps/secpkcs7.h
+file path=usr/include/mps/secport.h
+file path=usr/include/mps/shsign.h
+file path=usr/include/mps/smime.h
+file path=usr/include/mps/ssl.h
+file path=usr/include/mps/sslerr.h
+file path=usr/include/mps/sslproto.h
+file path=usr/include/mps/sslt.h
+file path=usr/include/mps/utilrename.h
+dir  path=usr/lib
+dir  path=usr/lib/mps
+dir  path=usr/lib/mps/$(MACH64)
+file path=usr/lib/mps/$(MACH64)/libfreebl3.chk
+file path=usr/lib/mps/$(MACH64)/libfreebl3.so
+file path=usr/lib/mps/$(MACH64)/libnss3.so
+file path=usr/lib/mps/$(MACH64)/libnssckbi.so
+file path=usr/lib/mps/$(MACH64)/libnssdbm3.chk
+file path=usr/lib/mps/$(MACH64)/libnssdbm3.so
+file path=usr/lib/mps/$(MACH64)/libnssutil3.so
+file path=usr/lib/mps/$(MACH64)/libsmime3.so
+file path=usr/lib/mps/$(MACH64)/libsoftokn3.chk
+file path=usr/lib/mps/$(MACH64)/libsoftokn3.so
+file path=usr/lib/mps/$(MACH64)/libssl3.so
+file path=usr/lib/mps/libfreebl3.chk
+file path=usr/lib/mps/libfreebl3.so
+file path=usr/lib/mps/libnss3.so
+file path=usr/lib/mps/libnssckbi.so
+file path=usr/lib/mps/libnssdbm3.chk
+file path=usr/lib/mps/libnssdbm3.so
+file path=usr/lib/mps/libnssutil3.so
+file path=usr/lib/mps/libsmime3.so
+file path=usr/lib/mps/libsoftokn3.chk
+file path=usr/lib/mps/libsoftokn3.so
+file path=usr/lib/mps/libssl3.so
+dir  path=usr/lib/pkgconfig
+file path=usr/lib/pkgconfig/nss.pc
+dir  path=usr/sfw
+dir  path=usr/sfw/bin
+dir  path=usr/sfw/bin/$(MACH64)
+file path=usr/sfw/bin/$(MACH64)/addbuiltin
+file path=usr/sfw/bin/$(MACH64)/certutil
+file path=usr/sfw/bin/$(MACH64)/cmsutil
+file path=usr/sfw/bin/$(MACH64)/crlutil
+file path=usr/sfw/bin/$(MACH64)/modutil
+file path=usr/sfw/bin/$(MACH64)/pk12util
+file path=usr/sfw/bin/$(MACH64)/signtool
+file path=usr/sfw/bin/$(MACH64)/signver
+file path=usr/sfw/bin/$(MACH64)/ssltap
+file path=usr/sfw/bin/addbuiltin
+file path=usr/sfw/bin/certutil
+file path=usr/sfw/bin/cmsutil
+file path=usr/sfw/bin/crlutil
+file path=usr/sfw/bin/modutil
+file path=usr/sfw/bin/pk12util
+file path=usr/sfw/bin/signtool
+file path=usr/sfw/bin/signver
+file path=usr/sfw/bin/ssltap
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sic_team/mozilla-nss/sample-manifests/nss-3.14.1	Sun Jan 27 18:39:23 2013 +0000
@@ -0,0 +1,176 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="XXX Summary XXX"
+set name=info.classification value="org.opensolaris.category.2008:XXX Classification XXX"
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+
+dir  path=usr
+dir  path=usr/include
+dir  path=usr/include/mps
+file path=usr/include/mps/base64.h
+file path=usr/include/mps/blapit.h
+file path=usr/include/mps/cert.h
+file path=usr/include/mps/certdb.h
+file path=usr/include/mps/certt.h
+file path=usr/include/mps/ciferfam.h
+file path=usr/include/mps/cmmf.h
+file path=usr/include/mps/cmmft.h
+file path=usr/include/mps/cms.h
+file path=usr/include/mps/cmsreclist.h
+file path=usr/include/mps/cmst.h
+file path=usr/include/mps/crmf.h
+file path=usr/include/mps/crmft.h
+file path=usr/include/mps/cryptohi.h
+file path=usr/include/mps/cryptoht.h
+file path=usr/include/mps/ecl-exp.h
+file path=usr/include/mps/hasht.h
+file path=usr/include/mps/jar-ds.h
+file path=usr/include/mps/jar.h
+file path=usr/include/mps/jarfile.h
+file path=usr/include/mps/key.h
+file path=usr/include/mps/keyhi.h
+file path=usr/include/mps/keyt.h
+file path=usr/include/mps/keythi.h
+file path=usr/include/mps/nss.h
+file path=usr/include/mps/nssb64.h
+file path=usr/include/mps/nssb64t.h
+file path=usr/include/mps/nssbase.h
+file path=usr/include/mps/nssbaset.h
+file path=usr/include/mps/nssckbi.h
+file path=usr/include/mps/nssckepv.h
+file path=usr/include/mps/nssckft.h
+file path=usr/include/mps/nssckfw.h
+file path=usr/include/mps/nssckfwc.h
+file path=usr/include/mps/nssckfwt.h
+file path=usr/include/mps/nssckg.h
+file path=usr/include/mps/nssckmdt.h
+file path=usr/include/mps/nssckt.h
+file path=usr/include/mps/nssilckt.h
+file path=usr/include/mps/nssilock.h
+file path=usr/include/mps/nsslocks.h
+file path=usr/include/mps/nssrwlk.h
+file path=usr/include/mps/nssrwlkt.h
+file path=usr/include/mps/nssutil.h
+file path=usr/include/mps/ocsp.h
+file path=usr/include/mps/ocspt.h
+file path=usr/include/mps/p12.h
+file path=usr/include/mps/p12plcy.h
+file path=usr/include/mps/p12t.h
+file path=usr/include/mps/pk11func.h
+file path=usr/include/mps/pk11pqg.h
+file path=usr/include/mps/pk11priv.h
+file path=usr/include/mps/pk11pub.h
+file path=usr/include/mps/pk11sdr.h
+file path=usr/include/mps/pkcs11.h
+file path=usr/include/mps/pkcs11f.h
+file path=usr/include/mps/pkcs11n.h
+file path=usr/include/mps/pkcs11p.h
+file path=usr/include/mps/pkcs11t.h
+file path=usr/include/mps/pkcs11u.h
+file path=usr/include/mps/pkcs12.h
+file path=usr/include/mps/pkcs12t.h
+file path=usr/include/mps/pkcs7t.h
+file path=usr/include/mps/portreg.h
+file path=usr/include/mps/preenc.h
+file path=usr/include/mps/secasn1.h
+file path=usr/include/mps/secasn1t.h
+file path=usr/include/mps/seccomon.h
+file path=usr/include/mps/secder.h
+file path=usr/include/mps/secdert.h
+file path=usr/include/mps/secdig.h
+file path=usr/include/mps/secdigt.h
+file path=usr/include/mps/secerr.h
+file path=usr/include/mps/sechash.h
+file path=usr/include/mps/secitem.h
+file path=usr/include/mps/secmime.h
+file path=usr/include/mps/secmod.h
+file path=usr/include/mps/secmodt.h
+file path=usr/include/mps/secoid.h
+file path=usr/include/mps/secoidt.h
+file path=usr/include/mps/secpkcs5.h
+file path=usr/include/mps/secpkcs7.h
+file path=usr/include/mps/secport.h
+file path=usr/include/mps/shsign.h
+file path=usr/include/mps/smime.h
+file path=usr/include/mps/ssl.h
+file path=usr/include/mps/sslerr.h
+file path=usr/include/mps/sslproto.h
+file path=usr/include/mps/sslt.h
+file path=usr/include/mps/utilmodt.h
+file path=usr/include/mps/utilpars.h
+file path=usr/include/mps/utilparst.h
+file path=usr/include/mps/utilrename.h
+dir  path=usr/lib
+dir  path=usr/lib/mps
+dir  path=usr/lib/mps/$(MACH64)
+file path=usr/lib/mps/$(MACH64)/libfreebl3.chk
+file path=usr/lib/mps/$(MACH64)/libfreebl3.so
+file path=usr/lib/mps/$(MACH64)/libnss3.so
+file path=usr/lib/mps/$(MACH64)/libnssckbi.so
+file path=usr/lib/mps/$(MACH64)/libnssdbm3.chk
+file path=usr/lib/mps/$(MACH64)/libnssdbm3.so
+file path=usr/lib/mps/$(MACH64)/libnssutil3.so
+file path=usr/lib/mps/$(MACH64)/libsmime3.so
+file path=usr/lib/mps/$(MACH64)/libsoftokn3.chk
+file path=usr/lib/mps/$(MACH64)/libsoftokn3.so
+file path=usr/lib/mps/$(MACH64)/libssl3.so
+file path=usr/lib/mps/libfreebl3.chk
+file path=usr/lib/mps/libfreebl3.so
+file path=usr/lib/mps/libnss3.so
+file path=usr/lib/mps/libnssckbi.so
+file path=usr/lib/mps/libnssdbm3.chk
+file path=usr/lib/mps/libnssdbm3.so
+file path=usr/lib/mps/libnssutil3.so
+file path=usr/lib/mps/libsmime3.so
+file path=usr/lib/mps/libsoftokn3.chk
+file path=usr/lib/mps/libsoftokn3.so
+file path=usr/lib/mps/libssl3.so
+dir  path=usr/lib/pkgconfig
+file path=usr/lib/pkgconfig/nss.pc
+dir  path=usr/sfw
+dir  path=usr/sfw/bin
+dir  path=usr/sfw/bin/$(MACH64)
+file path=usr/sfw/bin/$(MACH64)/addbuiltin
+file path=usr/sfw/bin/$(MACH64)/certutil
+file path=usr/sfw/bin/$(MACH64)/cmsutil
+file path=usr/sfw/bin/$(MACH64)/crlutil
+file path=usr/sfw/bin/$(MACH64)/modutil
+file path=usr/sfw/bin/$(MACH64)/pk12util
+file path=usr/sfw/bin/$(MACH64)/signtool
+file path=usr/sfw/bin/$(MACH64)/signver
+file path=usr/sfw/bin/$(MACH64)/ssltap
+file path=usr/sfw/bin/addbuiltin
+file path=usr/sfw/bin/certutil
+file path=usr/sfw/bin/cmsutil
+file path=usr/sfw/bin/crlutil
+file path=usr/sfw/bin/modutil
+file path=usr/sfw/bin/pk12util
+file path=usr/sfw/bin/signtool
+file path=usr/sfw/bin/signver
+file path=usr/sfw/bin/ssltap
--- a/components/sic_team/mozilla-nss/system-library-mozilla-nss-header-nss.p5m	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nss/system-library-mozilla-nss-header-nss.p5m	Sun Jan 27 18:39:23 2013 +0000
@@ -10,9 +10,10 @@
 
 #
 # Copyright 2011, Andrzej Szeszo
+# Copyright 2013, Jon Tibble
 #
 
-set name=pkg.fmri value=pkg:/system/library/mozilla-nss/[email protected],$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/system/library/mozilla-nss/header-nss@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=variant.opensolaris.zone value=global value=nonglobal
 set name=description value="Network Security Services Development"
 set name=pkg.description value="Network Security Services Files for Development"
@@ -121,5 +122,8 @@
 file path=usr/include/mps/sslerr.h
 file path=usr/include/mps/sslproto.h
 file path=usr/include/mps/sslt.h
+file path=usr/include/mps/utilmodt.h
+file path=usr/include/mps/utilpars.h
+file path=usr/include/mps/utilparst.h
 file path=usr/include/mps/utilrename.h
 file path=usr/lib/pkgconfig/nss.pc
--- a/components/sic_team/mozilla-nss/system-library-mozilla-nss.p5m	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nss/system-library-mozilla-nss.p5m	Sun Jan 27 18:39:23 2013 +0000
@@ -10,9 +10,10 @@
 
 #
 # Copyright 2011, Andrzej Szeszo
+# Copyright 2013, Jon Tibble
 #
 
-set name=pkg.fmri value=pkg:/system/library/[email protected],$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/system/library/mozilla-nss@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=info.classification value=org.opensolaris.category.2008:System/Security
 set name=pkg.description value="Network Security Services"
 set name=variant.opensolaris.zone value=global value=nonglobal
--- a/components/sic_team/mozilla-nss/system-mozilla-nss.p5m	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/mozilla-nss/system-mozilla-nss.p5m	Sun Jan 27 18:39:23 2013 +0000
@@ -10,9 +10,10 @@
 
 #
 # Copyright 2011, Andrzej Szeszo
+# Copyright 2013, Jon Tibble
 #
 
-set name=pkg.fmri value=pkg:/system/[email protected],$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/system/mozilla-nss@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=info.classification value=org.opensolaris.category.2008:System/Security
 set name=pkg.summary value="Network Security Services Utilities"
 set name=variant.opensolaris.zone value=global value=nonglobal
--- a/components/sic_team/sic_team-incorporation/Makefile	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/sic_team-incorporation/Makefile	Sun Jan 27 18:39:23 2013 +0000
@@ -18,7 +18,6 @@
 
 include ../../../make-rules/ips.mk
 
-PKGMANGLE = true
 PKGLINT=    true
 
 build:
--- a/components/sic_team/sic_team-incorporation/sic_team-incorporation.p5m	Sun Jan 27 18:36:45 2013 +0000
+++ b/components/sic_team/sic_team-incorporation/sic_team-incorporation.p5m	Sun Jan 27 18:39:23 2013 +0000
@@ -10,6 +10,7 @@
 
 #
 # Copyright 2011, Andrzej Szeszo
+# Copyright 2013, Jon Tibble
 #
 
 set name=pkg.fmri value=pkg:/consolidation/sic_team/[email protected],$(BUILD_VERSION)
@@ -20,12 +21,12 @@
 set name=pkg.summary value="sic_team consolidation incorporation"
 
 depend fmri=library/java/[email protected],$(BUILD_VERSION) type=incorporate
-depend fmri=library/[email protected],$(BUILD_VERSION) type=incorporate
-depend fmri=system/library/[email protected],$(BUILD_VERSION) type=incorporate
 depend fmri=library/java/[email protected],$(BUILD_VERSION) type=incorporate
-depend fmri=library/nspr/[email protected],$(BUILD_VERSION) type=incorporate
-depend fmri=system/library/mozilla-nss/[email protected],$(BUILD_VERSION) type=incorporate
-depend fmri=system/[email protected],$(BUILD_VERSION) type=incorporate
+depend fmri=library/[email protected],$(BUILD_VERSION) type=incorporate
+depend fmri=library/nspr/[email protected],$(BUILD_VERSION) type=incorporate
+depend fmri=system/library/[email protected],$(BUILD_VERSION) type=incorporate
+depend fmri=system/library/mozilla-nss/[email protected],$(BUILD_VERSION) type=incorporate
+depend fmri=system/[email protected],$(BUILD_VERSION) type=incorporate
 
 depend [email protected] type=incorporate
 depend [email protected] type=incorporate
sustaining/oi_151a/oi-build