diff --git a/mozilla/nsprpub/pkg/linux/Makefile.in b/mozilla/nsprpub/pkg/linux/Makefile.in index b6a4589624b..bc210550417 100644 --- a/mozilla/nsprpub/pkg/linux/Makefile.in +++ b/mozilla/nsprpub/pkg/linux/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in,v 1.2 2003-02-13 01:57:42 wtc%netscape.com Exp $" +#ident "$Id: Makefile.in,v 1.3 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" # MOD_DEPTH = ../.. @@ -11,34 +11,33 @@ srcdir = @srcdir@ VPATH = @srcdir@ NAME = sun-nspr -RELEASE = 1 +RELEASE = 2 TOPDIR = /usr/src/redhat VERSION = `grep PR_VERSION $(dist_includedir)/prinit.h \ | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'` +SPECFILE = $(NAME).spec + include $(MOD_DEPTH)/config/autoconf.mk publish: $(MAKE) clean - mkdir -p usr/lib/mps - cp -L $(MOD_DEPTH)/dist/lib/* usr/lib/mps - mkdir -p usr/include/mps - cp -Lr $(MOD_DEPTH)/dist/include/* usr/include/mps - tar czvf $(NAME)-$(VERSION).tar.gz usr - echo "%define name $(NAME)" >$(NAME).spec - echo "%define version $(VERSION)" >>$(NAME).spec - echo "%define release $(RELEASE)" >>$(NAME).spec - - cat $(srcdir)/$(NAME).spec >>$(NAME).spec - cp $(NAME)-$(VERSION).tar.gz $(TOPDIR)/SOURCES - rpm -ba $(NAME).spec - if [ ! -d RPMS ] ; then mkdir -p RPMS ; fi - if [ ! -d SRPMS ] ; then mkdir -p SRPMS ; fi - cp -v $(TOPDIR)/RPMS/i386/$(NAME)-$(VERSION)-* RPMS - cp -v $(TOPDIR)/RPMS/i386/$(NAME)-devel-$(VERSION)-* RPMS - cp -v $(TOPDIR)/SRPMS/$(NAME)-$(VERSION)-* SRPMS + mkdir -p SOURCES SRPMS RPMS BUILD + (cd $(MOD_DEPTH)/../../dist/$(RELEASE_OBJDIR_NAME)/lib && tar cphf - .) \ + | (mkdir -p opt/sun/private/lib && cd opt/sun/private/lib && tar xvfBp -) + (cd $(MOD_DEPTH)/../../dist/$(RELEASE_OBJDIR_NAME)/include && tar cphf - .) \ + | (mkdir -p opt/sun/private/include/nspr && cd opt/sun/private/include/nspr && tar xvfBp -) + tar czvf SOURCES/$(NAME)-$(VERSION).tar.gz opt + echo "%define name $(NAME)" >$(SPECFILE) + echo "%define version $(VERSION)" >>$(SPECFILE) + echo "%define release $(RELEASE)" >>$(SPECFILE) + echo "%define buildroot `pwd`/$(NAME)-root" >>$(SPECFILE) + echo "%define _topdir `pwd`" >>$(SPECFILE) + cat $(srcdir)/$(NAME).spec >>$(SPECFILE) + rpm -ba $(SPECFILE) clean: rm -rf $(TOPDIR)/BUILD/$(NAME) - rm -rf RPMS SRPMS usr + rm -rf SOURCES SRPMS RPMS BUILD + rm -rf RPMS SRPMS opt rm -f $(NAME)-$(VERSION).tar.gz diff --git a/mozilla/nsprpub/pkg/linux/sun-nspr.spec b/mozilla/nsprpub/pkg/linux/sun-nspr.spec index 1fed504842c..1b492a27f3e 100644 --- a/mozilla/nsprpub/pkg/linux/sun-nspr.spec +++ b/mozilla/nsprpub/pkg/linux/sun-nspr.spec @@ -1,9 +1,11 @@ Summary: Netscape Portable Runtime Name: %{name} -Vendor: Sun Microsystems +Vendor: Sun Microsystems, Inc. Version: %{version} Release: %{release} -Copyright: MPL/GPL +Copyright: Copyright 2004 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Also under other license(s) as shown at the Description field. +Distribution: Sun Java(TM) Enterprise System +URL: http://www.sun.com Group: System Environment/Base Source: %{name}-%{version}.tar.gz ExclusiveOS: Linux @@ -18,6 +20,8 @@ memory management (malloc and free) and shared library linking. See: http://www.mozilla.org/projects/nspr/about-nspr.html +Under "MPL/GPL" license. + %package devel Summary: Development Libraries for the Netscape Portable Runtime Group: Development/Libraries @@ -26,6 +30,8 @@ Requires: %{name} = %{version}-%{release} %description devel Header files for doing development with the Netscape Portable Runtime. +Under "MPL/GPL" license. + %prep %setup -c @@ -42,80 +48,72 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir /usr -%dir /usr/lib -%dir /usr/lib/mps -/usr/lib/mps/libnspr4.so -/usr/lib/mps/libplc4.so -/usr/lib/mps/libplds4.so +%dir /opt +%dir /opt/sun +%dir /opt/sun/private +%dir /opt/sun/private/lib +/opt/sun/private/lib/libnspr4.so +/opt/sun/private/lib/libplc4.so +/opt/sun/private/lib/libplds4.so %files devel %defattr(-,root,root) -/usr/lib/mps/libnspr4.a -/usr/lib/mps/libplc4.a -/usr/lib/mps/libplds4.a -%dir /usr -%dir /usr/include -%dir /usr/include/mps -%dir /usr/include/mps/nspr -%dir /usr/include/mps/nspr/obsolete -%dir /usr/include/mps/nspr/private -/usr/include/mps/nspr/private/pprio.h -/usr/include/mps/nspr/private/pprthred.h -/usr/include/mps/nspr/private/prpriv.h -/usr/include/mps/nspr/prcpucfg.h -/usr/include/mps/nspr/obsolete/pralarm.h -/usr/include/mps/nspr/obsolete/probslet.h -/usr/include/mps/nspr/obsolete/protypes.h -/usr/include/mps/nspr/obsolete/prsem.h -/usr/include/mps/nspr/nspr.h -/usr/include/mps/nspr/pratom.h -/usr/include/mps/nspr/prbit.h -/usr/include/mps/nspr/prclist.h -/usr/include/mps/nspr/prcmon.h -/usr/include/mps/nspr/prcountr.h -/usr/include/mps/nspr/prcvar.h -/usr/include/mps/nspr/prdtoa.h -/usr/include/mps/nspr/prenv.h -/usr/include/mps/nspr/prerr.h -/usr/include/mps/nspr/prerror.h -/usr/include/mps/nspr/prinet.h -/usr/include/mps/nspr/prinit.h -/usr/include/mps/nspr/prinrval.h -/usr/include/mps/nspr/prio.h -/usr/include/mps/nspr/pripcsem.h -/usr/include/mps/nspr/prlink.h -/usr/include/mps/nspr/prlock.h -/usr/include/mps/nspr/prlog.h -/usr/include/mps/nspr/prlong.h -/usr/include/mps/nspr/prmem.h -/usr/include/mps/nspr/prmon.h -/usr/include/mps/nspr/prmwait.h -/usr/include/mps/nspr/prnetdb.h -/usr/include/mps/nspr/prolock.h -/usr/include/mps/nspr/prpdce.h -/usr/include/mps/nspr/prprf.h -/usr/include/mps/nspr/prproces.h -/usr/include/mps/nspr/prrng.h -/usr/include/mps/nspr/prrwlock.h -/usr/include/mps/nspr/prshma.h -/usr/include/mps/nspr/prshm.h -/usr/include/mps/nspr/prsystem.h -/usr/include/mps/nspr/prthread.h -/usr/include/mps/nspr/prtime.h -/usr/include/mps/nspr/prtpool.h -/usr/include/mps/nspr/prtrace.h -/usr/include/mps/nspr/prtypes.h -/usr/include/mps/nspr/prvrsion.h -/usr/include/mps/nspr/prwin16.h -/usr/include/mps/nspr/plarenas.h -/usr/include/mps/nspr/plarena.h -/usr/include/mps/nspr/plhash.h -/usr/include/mps/nspr/plbase64.h -/usr/include/mps/nspr/plerror.h -/usr/include/mps/nspr/plgetopt.h -/usr/include/mps/nspr/plresolv.h -/usr/include/mps/nspr/plstr.h +%dir /opt +%dir /opt/sun +%dir /opt/sun/private +%dir /opt/sun/private/include +%dir /opt/sun/private/include/nspr +%dir /opt/sun/private/include/nspr/obsolete +/opt/sun/private/include/nspr/prcpucfg.h +/opt/sun/private/include/nspr/obsolete/protypes.h +/opt/sun/private/include/nspr/nspr.h +/opt/sun/private/include/nspr/pratom.h +/opt/sun/private/include/nspr/prbit.h +/opt/sun/private/include/nspr/prclist.h +/opt/sun/private/include/nspr/prcmon.h +/opt/sun/private/include/nspr/prcountr.h +/opt/sun/private/include/nspr/prcvar.h +/opt/sun/private/include/nspr/prdtoa.h +/opt/sun/private/include/nspr/prenv.h +/opt/sun/private/include/nspr/prerr.h +/opt/sun/private/include/nspr/prerror.h +/opt/sun/private/include/nspr/prinet.h +/opt/sun/private/include/nspr/prinit.h +/opt/sun/private/include/nspr/prinrval.h +/opt/sun/private/include/nspr/prio.h +/opt/sun/private/include/nspr/pripcsem.h +/opt/sun/private/include/nspr/prlink.h +/opt/sun/private/include/nspr/prlock.h +/opt/sun/private/include/nspr/prlog.h +/opt/sun/private/include/nspr/prlong.h +/opt/sun/private/include/nspr/prmem.h +/opt/sun/private/include/nspr/prmon.h +/opt/sun/private/include/nspr/prmwait.h +/opt/sun/private/include/nspr/prnetdb.h +/opt/sun/private/include/nspr/prolock.h +/opt/sun/private/include/nspr/prpdce.h +/opt/sun/private/include/nspr/prprf.h +/opt/sun/private/include/nspr/prproces.h +/opt/sun/private/include/nspr/prrng.h +/opt/sun/private/include/nspr/prrwlock.h +/opt/sun/private/include/nspr/prshma.h +/opt/sun/private/include/nspr/prshm.h +/opt/sun/private/include/nspr/prsystem.h +/opt/sun/private/include/nspr/prthread.h +/opt/sun/private/include/nspr/prtime.h +/opt/sun/private/include/nspr/prtpool.h +/opt/sun/private/include/nspr/prtrace.h +/opt/sun/private/include/nspr/prtypes.h +/opt/sun/private/include/nspr/prvrsion.h +/opt/sun/private/include/nspr/prwin16.h +/opt/sun/private/include/nspr/plarenas.h +/opt/sun/private/include/nspr/plarena.h +/opt/sun/private/include/nspr/plhash.h +/opt/sun/private/include/nspr/plbase64.h +/opt/sun/private/include/nspr/plerror.h +/opt/sun/private/include/nspr/plgetopt.h +/opt/sun/private/include/nspr/plresolv.h +/opt/sun/private/include/nspr/plstr.h %changelog * Sat Jan 18 2003 Kirk Erickson diff --git a/mozilla/nsprpub/pkg/solaris/Makefile-devl.com b/mozilla/nsprpub/pkg/solaris/Makefile-devl.com new file mode 100755 index 00000000000..8d1334ae93f --- /dev/null +++ b/mozilla/nsprpub/pkg/solaris/Makefile-devl.com @@ -0,0 +1,30 @@ +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "$Id: Makefile-devl.com,v 1.2 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" +# + +MACH = $(shell mach) + +PUBLISH_ROOT = $(DIST) +ifeq ($(MOD_DEPTH),../..) +ROOT = ROOT +else +ROOT = $(subst ../../,,$(MOD_DEPTH))/ROOT +endif + +PKGARCHIVE = $(dist_prefix)/pkgarchive +DATAFILES = copyright +FILES = $(DATAFILES) pkginfo + +PACKAGE = $(shell basename `pwd`) + +PRODUCT_VERSION = "$(MOD_VERSION).$(MOD_MINOR).$(MOD_PATCH)$(MOD_BETA)" +LN = /usr/bin/ln + +CLOBBERFILES = $(FILES) + +include $(topsrcdir)/config/rules.mk + +# vim: ft=make diff --git a/mozilla/nsprpub/pkg/solaris/Makefile-devl.targ b/mozilla/nsprpub/pkg/solaris/Makefile-devl.targ new file mode 100755 index 00000000000..995ab3b4cd6 --- /dev/null +++ b/mozilla/nsprpub/pkg/solaris/Makefile-devl.targ @@ -0,0 +1,30 @@ +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "$Id: Makefile-devl.targ,v 1.2 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" +# + +include $(srcdir)/../proto64.mk + +pkginfo: pkginfo.tmpl ../awk_pkginfo + $(RM) $@; nawk -f ../awk_pkginfo $(srcdir)/$@.tmpl > $@ + +pkg: $(PKGARCHIVE) + cat $(srcdir)/prototype | sed $(sed_proto64) > prototype + cp $(srcdir)/depend . + pkgmk -f prototype -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE) + +$(PKGARCHIVE): + [ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE) + +$(DATAFILES): %: $(srcdir)/../common_files/% + $(RM) $@; cp $(srcdir)/../common_files/$@ $@ + +$(MACHDATAFILES): %: $(srcdir)/../common_files/%_$(MACH) + $(RM) $@; cp $(srcdir)/../common_files/$@_$(MACH) $@ + +clobber clean:: + -$(RM) $(CLOBBERFILES) $(CLEANFILES) + +.PHONY: pkg diff --git a/mozilla/nsprpub/pkg/solaris/Makefile.com b/mozilla/nsprpub/pkg/solaris/Makefile.com index 18e8590f4ab..d75dfcbac2d 100644 --- a/mozilla/nsprpub/pkg/solaris/Makefile.com +++ b/mozilla/nsprpub/pkg/solaris/Makefile.com @@ -1,8 +1,8 @@ # -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.com,v 1.6 2003-02-26 15:11:34 wtc%netscape.com Exp $" +#ident "$Id: Makefile.com,v 1.7 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" # MACH = $(shell mach) @@ -14,9 +14,9 @@ else ROOT = $(subst ../../,,$(MOD_DEPTH))/ROOT endif -PKGARCHIVE = $(dist_libdir)/pkgarchive +PKGARCHIVE = $(dist_prefix)/pkgarchive DATAFILES = copyright -FILES = $(DATAFILES) pkginfo prototype +FILES = $(DATAFILES) pkginfo PACKAGE = $(shell basename `pwd`) @@ -24,6 +24,7 @@ PRODUCT_VERSION = $(shell grep PR_VERSION $(dist_includedir)/prinit.h \ | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') LN = /usr/bin/ln +CP = /usr/bin/cp CLOBBERFILES = $(FILES) diff --git a/mozilla/nsprpub/pkg/solaris/Makefile.in b/mozilla/nsprpub/pkg/solaris/Makefile.in index d010cdb775b..72eae482cf5 100644 --- a/mozilla/nsprpub/pkg/solaris/Makefile.in +++ b/mozilla/nsprpub/pkg/solaris/Makefile.in @@ -1,8 +1,8 @@ # -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in,v 1.1 2003-01-04 02:13:58 wtc%netscape.com Exp $" +#ident "$Id: Makefile.in,v 1.2 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" # MOD_DEPTH = ../.. @@ -12,30 +12,47 @@ VPATH = @srcdir@ include $(MOD_DEPTH)/config/autoconf.mk +abs_dist_libdir := $(shell (cd $(dist_libdir);pwd)) +abs_dist_includedir := $(shell (cd $(dist_includedir);pwd)) + %: %.ksh $(RM) $@ cp $< $@ chmod +x $@ -ifeq ($(USE_64), 1) DIRS = \ - SUNWprx -else -DIRS = \ - SUNWpr -endif + SUNWpr \ + SUNWprd + +include $(srcdir)/Makefile.com PROTO = \ $(ROOT) \ - $(ROOT)/usr \ - $(ROOT)/usr/lib \ - $(ROOT)/usr/lib/mps + $(ROOT)/usr/lib/mps \ + $(ROOT)/usr/include/mps -ifdef USE_64 -PROTO += $(ROOT)/usr/lib/mps/sparcv9 +ifeq ($(MACH), sparc) + PROTO += $(ROOT)/usr/lib/mps/cpu/sparcv8plus endif -include $(srcdir)/Makefile.com +ifeq ($(USE_64), 1) +ifeq ($(MACH), sparc) +# Sparc + PROTO += $(ROOT)/usr/lib/mps/sparcv9 +else +# AMD64 + PROTO += $(ROOT)/usr/lib/mps/amd64 +endif + abs_dist64_libdir = $(abs_dist_libdir) + abs_dist32_libdir = $(shell echo $(abs_dist_libdir) | sed -e "s|_64_OPT|_OPT|g" -e "s|_64_DBG|_DBG|g") + abs_dist64_includedir = $(abs_dist_includedir) + abs_dist32_includedir = $(shell echo $(abs_dist_includedir) | sed -e "s|_64_OPT|_OPT|g" -e "s|_64_DBG|_DBG|g") +else + abs_dist32_libdir = $(abs_dist_libdir) + abs_dist64_libdir = $(shell echo $(abs_dist_libdir) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g") + abs_dist32_includedir = $(abs_dist_includedir) + abs_dist64_includedir = $(shell echo $(abs_dist_includedir) | 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) @@ -48,13 +65,21 @@ clean clobber:: $(RM) awk_pkginfo bld_awk_pkginfo $(RM) -r $(ROOT) -$(ROOT) $(ROOT)/%: +$(ROOT): mkdir -p $@ -ifdef USE_64 $(ROOT)/usr/lib/mps/sparcv9: - $(LN) -sf ../../../../$(dist_libdir) $@ -else + mkdir -p $@ + $(CP) -r $(abs_dist64_libdir)/*.so $@ +$(ROOT)/usr/lib/mps/amd64: + mkdir -p $@ + $(CP) -r $(abs_dist64_libdir)/*.so $@ $(ROOT)/usr/lib/mps: - $(LN) -sf ../../../$(dist_libdir) $@ -endif + mkdir -p $@ + $(CP) -r $(abs_dist32_libdir)/*.so $@ +$(ROOT)/usr/lib/mps/cpu/sparcv8plus: + mkdir -p $@ + $(CP) -r $(abs_dist32_libdir)/cpu/sparcv8plus/*.so $@ +$(ROOT)/usr/include/mps: + mkdir -p $@ + $(CP) -r $(abs_dist32_includedir)/* $@ diff --git a/mozilla/nsprpub/pkg/solaris/Makefile.targ b/mozilla/nsprpub/pkg/solaris/Makefile.targ index c46b13ceadf..8f9c94d9339 100644 --- a/mozilla/nsprpub/pkg/solaris/Makefile.targ +++ b/mozilla/nsprpub/pkg/solaris/Makefile.targ @@ -1,24 +1,18 @@ # -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.targ,v 1.4 2003-02-08 22:45:13 sonja.mirtitsch%sun.com Exp $" +#ident "$Id: Makefile.targ,v 1.5 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" # +include $(srcdir)/../proto64.mk + pkginfo: pkginfo.tmpl ../awk_pkginfo $(RM) $@; nawk -f ../awk_pkginfo $< > $@ -# we need to copy prototype_sparc to current too find copyright in current -prototype: $(srcdir)/prototype_com $(srcdir)/prototype_$(MACH) - cat $(srcdir)/prototype_$(MACH) | sed -e \ -'/^!include[ ][ ]*prototype_com/ r ./prototype_com' \ --e 's/^!include[ ][ ]*prototype_com//g' >prototype - - - -pkg: $(PKGARCHIVE) prototype +pkg: $(PKGARCHIVE) prototype_$(MACH) cp $(srcdir)/prototype_com . - cp $(srcdir)/prototype_$(MACH) . + cat $(srcdir)/prototype_$(MACH) | sed $(sed_proto64) > prototype_$(MACH) cp $(srcdir)/depend . pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE) @@ -28,12 +22,6 @@ $(PKGARCHIVE): $(DATAFILES): %: $(srcdir)/../common_files/% $(RM) $@; cp $(srcdir)/../common_files/$@ $@ -#$(MACHDATAFILES): %: $(srcdir)/../common_files/%_$(MACH) -# $(RM) $@; cp $(srcdir)/../common_files/$@_$(MACH) $@ -# -#$(MACHDATAFILES): %: $(srcdir)/%_$(MACH) -# $(RM) $@; cp $(srcdir)/$@_$(MACH) $@ - clobber clean:: -$(RM) $(CLOBBERFILES) $(CLEANFILES) diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_com b/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_com index 087d965914a..532c09de577 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_com +++ b/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_com @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_com,v 1.2 2003-01-04 02:14:02 wtc%netscape.com Exp $" +#ident "$Id: prototype_com,v 1.3 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package @@ -26,6 +26,10 @@ i depend d none usr 755 root sys d none usr/lib 755 root bin d none usr/lib/mps 755 root bin +d none usr/lib/mps/secv1 755 root bin f none usr/lib/mps/libnspr4.so 755 root bin f none usr/lib/mps/libplc4.so 755 root bin f none usr/lib/mps/libplds4.so 755 root bin +s none usr/lib/mps/secv1/libnspr4.so=../libnspr4.so +s none usr/lib/mps/secv1/libplc4.so=../libplc4.so +s none usr/lib/mps/secv1/libplds4.so=../libplds4.so diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_i386 b/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_i386 index fefc566a977..2c32c770343 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_i386 +++ b/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_i386 @@ -1,8 +1,8 @@ # -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_i386,v 1.2 2003-01-04 02:14:02 wtc%netscape.com Exp $" +#ident "$Id: prototype_i386,v 1.3 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package @@ -28,3 +28,14 @@ # # SUNWpr # +#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/libnspr4.so 755 root bin +#64#f none usr/lib/mps/amd64/libplc4.so 755 root bin +#64#f none usr/lib/mps/amd64/libplds4.so 755 root bin +#64#s none usr/lib/mps/secv1/amd64/libnspr4.so=../../amd64/libnspr4.so +#64#s none usr/lib/mps/secv1/amd64/libplc4.so=../../amd64/libplc4.so +#64#s none usr/lib/mps/secv1/amd64/libplds4.so=../../amd64/libplds4.so + diff --git a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_sparc b/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_sparc index eb8b5987b78..24f6d76d493 100644 --- a/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_sparc +++ b/mozilla/nsprpub/pkg/solaris/SUNWpr/prototype_sparc @@ -1,8 +1,8 @@ # -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_sparc,v 1.2 2003-01-04 02:14:02 wtc%netscape.com Exp $" +#ident "$Id: prototype_sparc,v 1.3 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package @@ -30,4 +30,18 @@ # d none usr/lib/mps/cpu 755 root bin d none usr/lib/mps/cpu/sparcv8plus 755 root bin +d none usr/lib/mps/secv1/cpu 755 root bin +d none usr/lib/mps/secv1/cpu/sparcv8plus 755 root bin f none usr/lib/mps/cpu/sparcv8plus/libnspr_flt4.so 755 root bin +s none usr/lib/mps/secv1/cpu/sparcv8plus/libnspr_flt4.so=../../../cpu/sparcv8plus/libnspr_flt4.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/libnspr4.so 755 root bin +#64#f none usr/lib/mps/sparcv9/libplc4.so 755 root bin +#64#f none usr/lib/mps/sparcv9/libplds4.so 755 root bin +#64#s none usr/lib/mps/secv1/sparcv9/libnspr4.so=../../sparcv9/libnspr4.so +#64#s none usr/lib/mps/secv1/sparcv9/libplc4.so=../../sparcv9/libplc4.so +#64#s none usr/lib/mps/secv1/sparcv9/libplds4.so=../../sparcv9/libplds4.so + diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/Makefile.in b/mozilla/nsprpub/pkg/solaris/SUNWprd/Makefile.in old mode 100644 new mode 100755 similarity index 53% rename from mozilla/nsprpub/pkg/solaris/SUNWprx/Makefile.in rename to mozilla/nsprpub/pkg/solaris/SUNWprd/Makefile.in index 7a662789c38..aa5913cd2a7 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/Makefile.in +++ b/mozilla/nsprpub/pkg/solaris/SUNWprd/Makefile.in @@ -2,21 +2,21 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in,v 1.1 2003-01-04 02:14:04 wtc%netscape.com Exp $" +#ident "$Id: Makefile.in,v 1.2 2004-11-29 16:26:03 christophe.ravel.bugs%sun.com Exp $" # MOD_DEPTH = ../../.. topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ include $(MOD_DEPTH)/config/autoconf.mk -include $(srcdir)/../Makefile.com +include $(srcdir)/../Makefile-devl.com DATAFILES += all:: $(FILES) publish:: all pkg -include $(srcdir)/../Makefile.targ +include $(srcdir)/../Makefile-devl.targ diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/depend b/mozilla/nsprpub/pkg/solaris/SUNWprd/depend old mode 100644 new mode 100755 similarity index 62% rename from mozilla/nsprpub/pkg/solaris/SUNWprx/depend rename to mozilla/nsprpub/pkg/solaris/SUNWprd/depend index af7f4f267ea..c1c8b0d042d --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/depend +++ b/mozilla/nsprpub/pkg/solaris/SUNWprd/depend @@ -1,7 +1,7 @@ # Copyright 2002 Microsystems, Inc. All Rights Reserved. # Use is subject to license terms. # -# $Id: depend,v 1.2 2003-01-04 02:14:04 wtc%netscape.com Exp $ +# $Id: depend,v 1.2 2004-11-29 16:26:03 christophe.ravel.bugs%sun.com Exp $ # # This package information file defines software dependencies associated # with the pkg. You can define three types of pkg dependencies with this file: @@ -19,12 +19,4 @@ # # ... -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 SUNWpr Netscape Portable Runtime diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl b/mozilla/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl old mode 100644 new mode 100755 similarity index 74% rename from mozilla/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl rename to mozilla/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl index bd90dbfd8da..c83d7669b4a --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl +++ b/mozilla/nsprpub/pkg/solaris/SUNWprd/pkginfo.tmpl @@ -2,24 +2,23 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: pkginfo.tmpl,v 1.2 2003-01-04 02:14:06 wtc%netscape.com Exp $" +#ident "$Id: pkginfo.tmpl,v 1.2 2004-11-29 16:26:03 christophe.ravel.bugs%sun.com Exp $" # # # This required package information file describes characteristics of the # package, such as package abbreviation, full package name, package version, # and package architecture. # -PKG="SUNWprx" -NAME="Netscape Portable Runtime (64-bit)" +PKG="SUNWprd" +NAME="Netscape Portable Runtime Development" ARCH="ISA" -SUNW_ISA="sparcv9" VERSION="NSPRVERS,REV=0.0.0" -SUNW_PRODNAME="Netscape Portable Runtime" +SUNW_PRODNAME="Netscape Portable Runtime Development" SUNW_PRODVERS="NSPRVERS" SUNW_PKGTYPE="usr" MAXINST="1000" CATEGORY="system" -DESC="Netscape Portable Runtime Interface (64-bit)" +DESC="Netscape Portable Runtime Interface Files for Development" VENDOR="Sun Microsystems, Inc." HOTLINE="Please contact your local service provider" EMAIL="" diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprd/prototype b/mozilla/nsprpub/pkg/solaris/SUNWprd/prototype new file mode 100755 index 00000000000..8d7e71dce1c --- /dev/null +++ b/mozilla/nsprpub/pkg/solaris/SUNWprd/prototype @@ -0,0 +1,79 @@ +# +# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "$Id: prototype,v 1.2 2004-11-29 16:26:03 christophe.ravel.bugs%sun.com Exp $" +# +# 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 +# +# source locations relative to .h 0644 root bine prototype file +# +# SUNWprd +# +d none usr 0755 root sys +d none usr/include 0755 root bin +d none usr/include/mps 0755 root bin +d none usr/include/mps/obsolete 0755 root bin +f none usr/include/mps/obsolete/protypes.h 0644 root bin +f none usr/include/mps/prcpucfg.h 0644 root bin +f none usr/include/mps/nspr.h 0644 root bin +f none usr/include/mps/pratom.h 0644 root bin +f none usr/include/mps/prbit.h 0644 root bin +f none usr/include/mps/prclist.h 0644 root bin +f none usr/include/mps/prcmon.h 0644 root bin +f none usr/include/mps/prcountr.h 0644 root bin +f none usr/include/mps/prcvar.h 0644 root bin +f none usr/include/mps/prdtoa.h 0644 root bin +f none usr/include/mps/prenv.h 0644 root bin +f none usr/include/mps/prerr.h 0644 root bin +f none usr/include/mps/prerror.h 0644 root bin +f none usr/include/mps/prinet.h 0644 root bin +f none usr/include/mps/prinit.h 0644 root bin +f none usr/include/mps/prinrval.h 0644 root bin +f none usr/include/mps/prio.h 0644 root bin +f none usr/include/mps/pripcsem.h 0644 root bin +f none usr/include/mps/prlink.h 0644 root bin +f none usr/include/mps/prlock.h 0644 root bin +f none usr/include/mps/prlog.h 0644 root bin +f none usr/include/mps/prlong.h 0644 root bin +f none usr/include/mps/prmem.h 0644 root bin +f none usr/include/mps/prmon.h 0644 root bin +f none usr/include/mps/prmwait.h 0644 root bin +f none usr/include/mps/prnetdb.h 0644 root bin +f none usr/include/mps/prolock.h 0644 root bin +f none usr/include/mps/prpdce.h 0644 root bin +f none usr/include/mps/prprf.h 0644 root bin +f none usr/include/mps/prproces.h 0644 root bin +f none usr/include/mps/prrng.h 0644 root bin +f none usr/include/mps/prrwlock.h 0644 root bin +f none usr/include/mps/prshm.h 0644 root bin +f none usr/include/mps/prshma.h 0644 root bin +f none usr/include/mps/prsystem.h 0644 root bin +f none usr/include/mps/prthread.h 0644 root bin +f none usr/include/mps/prtime.h 0644 root bin +f none usr/include/mps/prtpool.h 0644 root bin +f none usr/include/mps/prtrace.h 0644 root bin +f none usr/include/mps/prtypes.h 0644 root bin +f none usr/include/mps/prvrsion.h 0644 root bin +f none usr/include/mps/prwin16.h 0644 root bin +f none usr/include/mps/plarenas.h 0644 root bin +f none usr/include/mps/plarena.h 0644 root bin +f none usr/include/mps/plbase64.h 0644 root bin +f none usr/include/mps/plerror.h 0644 root bin +f none usr/include/mps/plgetopt.h 0644 root bin +f none usr/include/mps/plhash.h 0644 root bin +f none usr/include/mps/plresolv.h 0644 root bin +f none usr/include/mps/plstr.h 0644 root bin diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/prototype_com b/mozilla/nsprpub/pkg/solaris/SUNWprx/prototype_com deleted file mode 100644 index 4aaa59df200..00000000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/prototype_com +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "$Id: prototype_com,v 1.2 2003-01-04 02:14:06 wtc%netscape.com Exp $" -# -# 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 -# -# source locations relative to the prototype file -# -# SUNWprx -# -d none usr 755 root sys -d none usr/lib 755 root bin -d none usr/lib/mps 755 root bin diff --git a/mozilla/nsprpub/pkg/solaris/SUNWprx/prototype_sparc b/mozilla/nsprpub/pkg/solaris/SUNWprx/prototype_sparc deleted file mode 100644 index 21a7002f08d..00000000000 --- a/mozilla/nsprpub/pkg/solaris/SUNWprx/prototype_sparc +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "$Id: prototype_sparc,v 1.2 2003-01-04 02:14:07 wtc%netscape.com Exp $" -# -# 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 -# -# -# SUNWprx -# -s none usr/lib/mps/64=sparcv9 -d none usr/lib/mps/sparcv9 755 root bin -f none usr/lib/mps/sparcv9/libnspr4.so 755 root bin -f none usr/lib/mps/sparcv9/libplc4.so 755 root bin -f none usr/lib/mps/sparcv9/libplds4.so 755 root bin diff --git a/mozilla/nsprpub/pkg/solaris/proto64.mk b/mozilla/nsprpub/pkg/solaris/proto64.mk new file mode 100644 index 00000000000..ea7f0e9f337 --- /dev/null +++ b/mozilla/nsprpub/pkg/solaris/proto64.mk @@ -0,0 +1,14 @@ +# +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +#ident "$Id: proto64.mk,v 1.2 2004-11-29 16:26:02 christophe.ravel.bugs%sun.com Exp $" +# + +ifeq ($(USE_64), 1) + # Remove 64 tag + sed_proto64='s/\#64\#//g' +else + # Strip 64 lines + sed_proto64='/\#64\#/d' +endif