238319: Sun packages changes.

3 files changed, 64 insertions, 9 deletions

diff --git a/pkg/solaris/Makefile-devl.targ b/pkg/solaris/Makefile-devl.targ
index 58590b08..92805839 100755
--- a/pkg/solaris/Makefile-devl.targ
+++ b/pkg/solaris/Makefile-devl.targ
@@ -5,11 +5,13 @@
 #ident	"$Id$"
 #
 
+include $(srcdir)/../proto64.mk
+
 pkginfo: pkginfo.tmpl ../awk_pkginfo
 	$(RM) $@; nawk -f ../awk_pkginfo $(srcdir)/$@.tmpl > $@
 
 pkg: $(PKGARCHIVE)
-	cp $(srcdir)/prototype .
+	cat $(srcdir)/prototype | sed $(sed_proto64) > prototype
 	cp $(srcdir)/depend .
 	pkgmk -f prototype -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
 
diff --git a/pkg/solaris/Makefile.in b/pkg/solaris/Makefile.in
index 32cc3aa2..adcdfede 100644
--- a/pkg/solaris/Makefile.in
+++ b/pkg/solaris/Makefile.in
@@ -43,11 +43,16 @@ else
 # AMD64
 	PROTO += $(ROOT)/usr/lib/mps/amd64
 endif
+	PROTO += $(ROOT)/usr/include/mps/64
 	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
@@ -78,4 +83,7 @@ $(ROOT)/usr/lib/mps/cpu/sparcv8plus:
 	$(CP) -r $(abs_dist32_libdir)/cpu/sparcv8plus/*.so $@
 $(ROOT)/usr/include/mps:
 	mkdir -p $@
-	$(CP) -r $(abs_dist_includedir)/* $@
+	$(CP) -r $(abs_dist32_includedir)/* $@
+$(ROOT)/usr/include/mps/64:
+	mkdir -p $@
+	$(CP) -r $(abs_dist64_includedir)/* $@
diff --git a/pkg/solaris/SUNWprd/prototype b/pkg/solaris/SUNWprd/prototype
index 10dd3d13..893c09d3 100755
--- a/pkg/solaris/SUNWprd/prototype
+++ b/pkg/solaris/SUNWprd/prototype
@@ -26,15 +26,8 @@ i depend
 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/private 0755 root bin
-#f none usr/include/mps/private/pprio.h 0644 root bin
-#f none usr/include/mps/private/pprthred.h 0644 root bin
-#f none usr/include/mps/private/prpriv.h 0644 root bin
 d none usr/include/mps/obsolete 0755 root bin
-#f none usr/include/mps/obsolete/pralarm.h 0644 root bin
-#f none usr/include/mps/obsolete/probslet.h 0644 root bin
 f none usr/include/mps/obsolete/protypes.h 0644 root bin
-#f none usr/include/mps/obsolete/prsem.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
@@ -84,3 +77,55 @@ 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
+#64#d none usr/include/mps/64 0755 root bin
+#64#d none usr/include/mps/64/obsolete 0755 root bin
+#64#s none usr/include/mps/64/obsolete/protypes.h=../../obsolete/protypes.h
+#64#f none usr/include/mps/64/prcpucfg.h 0644 root bin
+#64#s none usr/include/mps/64/nspr.h=../nspr.h
+#64#s none usr/include/mps/64/pratom.h=../pratom.h
+#64#s none usr/include/mps/64/prbit.h=../prbit.h
+#64#s none usr/include/mps/64/prclist.h=../prclist.h
+#64#s none usr/include/mps/64/prcmon.h=../prcmon.h
+#64#s none usr/include/mps/64/prcountr.h=../prcountr.h
+#64#s none usr/include/mps/64/prcvar.h=../prcvar.h
+#64#s none usr/include/mps/64/prdtoa.h=../prdtoa.h
+#64#s none usr/include/mps/64/prenv.h=../prenv.h
+#64#s none usr/include/mps/64/prerr.h=../prerr.h
+#64#s none usr/include/mps/64/prerror.h=../prerror.h
+#64#s none usr/include/mps/64/prinet.h=../prinet.h
+#64#s none usr/include/mps/64/prinit.h=../prinit.h
+#64#s none usr/include/mps/64/prinrval.h=../prinrval.h
+#64#s none usr/include/mps/64/prio.h=../prio.h
+#64#s none usr/include/mps/64/pripcsem.h=../pripcsem.h
+#64#s none usr/include/mps/64/prlink.h=../prlink.h
+#64#s none usr/include/mps/64/prlock.h=../prlock.h
+#64#s none usr/include/mps/64/prlog.h=../prlog.h
+#64#s none usr/include/mps/64/prlong.h=../prlong.h
+#64#s none usr/include/mps/64/prmem.h=../prmem.h
+#64#s none usr/include/mps/64/prmon.h=../prmon.h
+#64#s none usr/include/mps/64/prmwait.h=../prmwait.h
+#64#s none usr/include/mps/64/prnetdb.h=../prnetdb.h
+#64#s none usr/include/mps/64/prolock.h=../prolock.h
+#64#s none usr/include/mps/64/prpdce.h=../prpdce.h
+#64#s none usr/include/mps/64/prprf.h=../prprf.h
+#64#s none usr/include/mps/64/prproces.h=../prproces.h
+#64#s none usr/include/mps/64/prrng.h=../prrng.h
+#64#s none usr/include/mps/64/prrwlock.h=../prrwlock.h
+#64#s none usr/include/mps/64/prshm.h=../prshm.h
+#64#s none usr/include/mps/64/prshma.h=../prshma.h
+#64#s none usr/include/mps/64/prsystem.h=../prsystem.h
+#64#s none usr/include/mps/64/prthread.h=../prthread.h
+#64#s none usr/include/mps/64/prtime.h=../prtime.h
+#64#s none usr/include/mps/64/prtpool.h=../prtpool.h
+#64#s none usr/include/mps/64/prtrace.h=../prtrace.h
+#64#s none usr/include/mps/64/prtypes.h=../prtypes.h
+#64#s none usr/include/mps/64/prvrsion.h=../prvrsion.h
+#64#s none usr/include/mps/64/prwin16.h=../prwin16.h
+#64#s none usr/include/mps/64/plarenas.h=../plarenas.h
+#64#s none usr/include/mps/64/plarena.h=../plarena.h
+#64#s none usr/include/mps/64/plbase64.h=../plbase64.h
+#64#s none usr/include/mps/64/plerror.h=../plerror.h
+#64#s none usr/include/mps/64/plgetopt.h=../plgetopt.h
+#64#s none usr/include/mps/64/plhash.h=../plhash.h
+#64#s none usr/include/mps/64/plresolv.h=../plresolv.h
+#64#s none usr/include/mps/64/plstr.h=../plstr.h