238319: Sun packaging changes.

9 files changed, 131 insertions, 110 deletions

diff --git a/configure b/configure
index ede750ec..37e313ef 100755
--- a/configure
+++ b/configure
@@ -5737,6 +5737,8 @@ pkg/linux/Makefile
 pkg/solaris/Makefile
 pkg/solaris/SUNWpr/Makefile
 pkg/solaris/SUNWprx/Makefile
+pkg/solaris/SUNWprd/Makefile
+pkg/solaris/SUNWprdx/Makefile
 pr/Makefile 
 pr/include/Makefile 
 pr/include/md/Makefile 
diff --git a/configure.in b/configure.in
index ac95bc01..5dc3e33f 100644
--- a/configure.in
+++ b/configure.in
@@ -2503,6 +2503,8 @@ pkg/linux/Makefile
 pkg/solaris/Makefile
 pkg/solaris/SUNWpr/Makefile
 pkg/solaris/SUNWprx/Makefile
+pkg/solaris/SUNWprd/Makefile
+pkg/solaris/SUNWprdx/Makefile
 pr/Makefile 
 pr/include/Makefile 
 pr/include/md/Makefile 
diff --git a/pkg/linux/Makefile.in b/pkg/linux/Makefile.in
index aac22aab..b712206b 100644
--- a/pkg/linux/Makefile.in
+++ b/pkg/linux/Makefile.in
@@ -16,29 +16,28 @@ 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/pkg/linux/sun-nspr.spec b/pkg/linux/sun-nspr.spec
index 1fed5048..60732ca6 100644
--- a/pkg/linux/sun-nspr.spec
+++ b/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
+Distribution: Sun Java(TM) Enterprise System
+URL: http://www.sun.com
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 ExclusiveOS: Linux
@@ -42,80 +44,82 @@ 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
+/opt/sun/private/lib/libnspr4.a
+/opt/sun/private/lib/libplc4.a
+/opt/sun/private/lib/libplds4.a
+%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
+%dir /opt/sun/private/include/nspr/private
+/opt/sun/private/include/nspr/private/pprio.h
+/opt/sun/private/include/nspr/private/pprthred.h
+/opt/sun/private/include/nspr/private/prpriv.h
+/opt/sun/private/include/nspr/prcpucfg.h
+/opt/sun/private/include/nspr/obsolete/pralarm.h
+/opt/sun/private/include/nspr/obsolete/probslet.h
+/opt/sun/private/include/nspr/obsolete/protypes.h
+/opt/sun/private/include/nspr/obsolete/prsem.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 <kirk.erickson@sun.com>
diff --git a/pkg/solaris/Makefile.com b/pkg/solaris/Makefile.com
index 523460be..f364039d 100644
--- a/pkg/solaris/Makefile.com
+++ b/pkg/solaris/Makefile.com
@@ -14,7 +14,7 @@ else
 ROOT = $(subst ../../,,$(MOD_DEPTH))/ROOT
 endif
 
-PKGARCHIVE = $(dist_libdir)/pkgarchive
+PKGARCHIVE = $(dist_prefix)/pkgarchive
 DATAFILES = copyright
 FILES = $(DATAFILES) pkginfo prototype
 
diff --git a/pkg/solaris/Makefile.in b/pkg/solaris/Makefile.in
index b5c0acbe..f1effceb 100644
--- a/pkg/solaris/Makefile.in
+++ b/pkg/solaris/Makefile.in
@@ -12,6 +12,9 @@ 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 $< $@
@@ -19,20 +22,26 @@ include $(MOD_DEPTH)/config/autoconf.mk
 
 ifeq ($(USE_64), 1)
 DIRS = \
-	SUNWprx
+	SUNWprx \
+	SUNWprdx
 else
 DIRS = \
-	SUNWpr
+	SUNWpr \
+	SUNWprd
 endif
 
 PROTO = \
 	$(ROOT) \
 	$(ROOT)/usr \
 	$(ROOT)/usr/lib \
-	$(ROOT)/usr/lib/mps
+	$(ROOT)/usr/lib/mps \
+	$(ROOT)/usr/lib/mps/secv1 \
+	$(ROOT)/usr/include \
+	$(ROOT)/usr/include/mps
 
 ifdef USE_64
-PROTO += $(ROOT)/usr/lib/mps/sparcv9
+PROTO += $(ROOT)/usr/lib/mps/secv1/sparcv9 \
+	$(ROOT)/usr/include/mps/sparcv9
 endif
 
 include $(srcdir)/Makefile.com
@@ -52,9 +61,13 @@ $(ROOT) $(ROOT)/%:
 	mkdir -p $@
 
 ifdef USE_64
-$(ROOT)/usr/lib/mps/sparcv9:
-	$(LN) -sf ../../../../$(dist_libdir) $@
+$(ROOT)/usr/lib/mps/secv1/sparcv9: $(ROOT)/usr/lib
+	$(LN) -sf $(abs_dist_libdir) $@
+$(ROOT)/usr/include/mps/sparcv9: $(ROOT)/usr/include
+	$(LN) -sf $(abs_dist_includedir) $@
 else
-$(ROOT)/usr/lib/mps:
-	$(LN) -sf ../../../$(dist_libdir) $@
+$(ROOT)/usr/lib/mps/secv1: $(ROOT)/usr/lib
+	$(LN) -sf $(abs_dist_libdir) $@
+$(ROOT)/usr/include/mps: $(ROOT)/usr/include
+	$(LN) -sf $(abs_dist_includedir) $@
 endif
diff --git a/pkg/solaris/SUNWpr/prototype_com b/pkg/solaris/SUNWpr/prototype_com
index 1462665f..0a0d72cb 100644
--- a/pkg/solaris/SUNWpr/prototype_com
+++ b/pkg/solaris/SUNWpr/prototype_com
@@ -26,6 +26,7 @@ i depend
 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/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
+d none usr/lib/mps/secv1 755 root bin
+f none usr/lib/mps/secv1/libnspr4.so 755 root bin
+f none usr/lib/mps/secv1/libplc4.so 755 root bin
+f none usr/lib/mps/secv1/libplds4.so 755 root bin
diff --git a/pkg/solaris/SUNWpr/prototype_sparc b/pkg/solaris/SUNWpr/prototype_sparc
index 40bc6dcd..3aa74082 100644
--- a/pkg/solaris/SUNWpr/prototype_sparc
+++ b/pkg/solaris/SUNWpr/prototype_sparc
@@ -28,6 +28,6 @@
 #
 # SUNWpr
 #
-d none usr/lib/mps/cpu 755 root bin
-d none usr/lib/mps/cpu/sparcv8plus 755 root bin
-f none usr/lib/mps/cpu/sparcv8plus/libnspr_flt4.so 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/secv1/cpu/sparcv8plus/libnspr_flt4.so 755 root bin
diff --git a/pkg/solaris/SUNWprx/prototype_sparc b/pkg/solaris/SUNWprx/prototype_sparc
index 2bcbd5ec..4d6baa13 100644
--- a/pkg/solaris/SUNWprx/prototype_sparc
+++ b/pkg/solaris/SUNWprx/prototype_sparc
@@ -28,8 +28,8 @@
 #
 # 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
+s none usr/lib/mps/secv1/64=sparcv9
+d none usr/lib/mps/secv1/sparcv9 755 root bin
+f none usr/lib/mps/secv1/sparcv9/libnspr4.so 755 root bin
+f none usr/lib/mps/secv1/sparcv9/libplc4.so 755 root bin
+f none usr/lib/mps/secv1/sparcv9/libplds4.so 755 root bin