Various solaris fixes. In particular:

- when building with gcc, the solaris /usr/ccs/bin/as assembler is still
  used in a couple of places but the correct flags aren't set.
- The object directory has a different name when building with gcc instead
  of the sun studio compilers.
- There are a couple of libs which are installed that aren't part of the install
  for other systems (freebl).

4 files changed, 59 insertions, 15 deletions

diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 0651691c541..4f635b95ad1 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/10/16 12:50:43 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/10/22 15:32:47 dmcmahill Exp $
 
 DISTNAME=		nss-3.11
 CATEGORIES=		security
@@ -35,6 +35,20 @@ MAKEFLAGS+=	NS_USE_GCC=YES
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 NSS_OBJ_DIR=	${OPSYS}${OS_VERSION}_OPT.OBJ
+.elif ${OPSYS} == "SunOS"
+.  if ${PKGSRC_COMPILER} == "gcc"
+NSS_OBJ_DIR=	${OPSYS}${OS_VERSION}_gcc_OPT.OBJ
+.  else
+NSS_OBJ_DIR=	${OPSYS}${OS_VERSION}_OPT.OBJ
+.  endif
+
+# on solaris/sparc, we get a different set of libs.  
+# How about NetBSD/sparc and sparc64?
+.  if ${MACHINE_ARCH} == "sparc"
+SUNOS_TRUE=	
+SUNOS_FALSE=	"@comment "
+.  endif
+
 .elif ${OPSYS} == "Linux"
 NSS_SHORT_OS_VERSION!=	echo ${OS_VERSION} | ${SED} -e 's/^\([[:digit:]]\.[[:digit:]]\)\..*$$/\1/'
 .  if ${MACHINE_ARCH} == "i386"
@@ -48,7 +62,13 @@ NSS_MACHINE_ARCH=	_${MACHINE_ARCH}
 .  endif
 NSS_OBJ_DIR=	${OPSYS}${NSS_SHORT_OS_VERSION}${NSS_MACHINE_ARCH}_glibc_PTH_OPT.OBJ
 .endif
-NSS_OBJ_DIR?=	${OPSYS}${OS_VERSION}_OPT.OBJ
+
+SUNOS_TRUE?=	"@comment "
+SUNOS_FALSE?=	
+PLIST_SUBST+=	SUNOS_TRUE=${SUNOS_TRUE:Q}
+PLIST_SUBST+=	SUNOS_FALSE=${SUNOS_FALSE}
+
+NSS_OBJ_DIR?=  ${OPSYS}${OS_VERSION}_OPT.OBJ
 
 pre-configure:
 	${CP} ${FILESDIR}/DragonFly.mk \
diff --git a/devel/nss/PLIST b/devel/nss/PLIST
index 8168a77f453..6caed29c987 100644
--- a/devel/nss/PLIST
+++ b/devel/nss/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/07/12 16:30:03 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/10/22 15:32:47 dmcmahill Exp $
 include/nss/dbm/cdefs.h
 include/nss/dbm/mcom_db.h
 include/nss/dbm/ncompat.h
@@ -94,7 +94,10 @@ include/nss/nss/sslerr.h
 include/nss/nss/sslproto.h
 include/nss/nss/sslt.h
 include/nss/nss/watcomfx.h
-lib/nss/libfreebl3.${SO_SUFFIX}
+${SUNOS_FALSE}lib/nss/libfreebl3.${SO_SUFFIX}
+${SUNOS_TRUE}lib/nss/libfreebl_32fpu_3.${SO_SUFFIX}
+${SUNOS_TRUE}lib/nss/libfreebl_32int64_3.${SO_SUFFIX}
+${SUNOS_TRUE}lib/nss/libfreebl_32int_3.${SO_SUFFIX}
 lib/nss/libnss3.${SO_SUFFIX}
 lib/nss/libnssckbi.${SO_SUFFIX}
 lib/nss/libsmime3.${SO_SUFFIX}
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index 2560ece6ae5..686e8ea1d35 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/07/12 16:32:00 rillig Exp $
+$NetBSD: distinfo,v 1.15 2006/10/22 15:32:47 dmcmahill Exp $
 
 SHA1 (nss-3.11.tar.gz) = 0abccde9a351fb9fa662c75754eb980e04fad482
 RMD160 (nss-3.11.tar.gz) = 90be4b42e490084c23451ce8abcf089150357d1e
@@ -12,4 +12,4 @@ SHA1 (patch-ah) = 01e8644a0a1dfc70985aed213fc753f376560865
 SHA1 (patch-ai) = 995add5e536bb0fba425295cc7972b8725f4e10d
 SHA1 (patch-ak) = 4816bf73acfa3edcd0a74d0e235eee7974b42dd6
 SHA1 (patch-al) = 711ae5b0ed4a5b8dd8e3735b25fcc5419c27e63e
-SHA1 (patch-an) = eccddecb756410c61fad1e745564eccebf740740
+SHA1 (patch-an) = 2ee154aff8a0b5a968718d52dcf20e345e2f2373
diff --git a/devel/nss/patches/patch-an b/devel/nss/patches/patch-an
index 9d89862b603..4e137c3cb28 100644
--- a/devel/nss/patches/patch-an
+++ b/devel/nss/patches/patch-an
@@ -1,18 +1,18 @@
-$NetBSD: patch-an,v 1.1 2006/07/12 16:30:04 rillig Exp $
+$NetBSD: patch-an,v 1.2 2006/10/22 15:32:47 dmcmahill Exp $
 
 https://bugzilla.mozilla.org/show_bug.cgi?id=323977
 https://bugzilla.mozilla.org/attachment.cgi?id=209007&action=view
 
 Added DragonFly.
 
-Index: mozilla/security/nss/lib/freebl/Makefile
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/freebl/Makefile,v
-retrieving revision 1.70
-diff -u -r1.70 Makefile
---- mozilla/security/nss/lib/freebl/Makefile	22 Nov 2005 07:13:32 -0000	1.70
-+++ mozilla/security/nss/lib/freebl/Makefile	19 Jan 2006 21:47:47 -0000
-@@ -188,6 +188,17 @@
+Also, when building on solaris with gcc, be sure to correctly set the
+flags used by the solaris assembler which is explicitly called out in
+the makefile in a couple of places.  This prevents errors when trying to
+assemble files which contain cpu specific instructions.
+
+--- mozilla/security/nss/lib/freebl/Makefile.orig	2005-11-22 02:13:32.000000000 -0500
++++ mozilla/security/nss/lib/freebl/Makefile
+@@ -188,6 +188,17 @@ endif
  endif
  endif
  
@@ -30,3 +30,24 @@ diff -u -r1.70 Makefile
  ifeq ($(OS_TARGET),SunOS)
  
  # The -R '$ORIGIN' linker option instructs this library to search for its
+@@ -227,16 +238,20 @@ ifeq ($(CPU_ARCH),sparc)
+ 	endif
+ 	ifdef USE_ABI32_INT64
+ 	    ARCHFLAG=-mcpu=v9 -Wa,-xarch=v8plus
++	    SOLARIS_AS_FLAGS = -xarch=v8plus -K PIC
+ 	endif
+ 	ifdef USE_ABI32_FPU
+ 	    ARCHFLAG=-mcpu=v9 -Wa,-xarch=v8plus
++	    SOLARIS_AS_FLAGS = -xarch=v8plusa -K PIC
+ 	endif # USE_ABI32_FPU
+ 	ifdef USE_ABI64_INT
+ 	    # this builds for Sparc v9a pure 64-bit architecture
++	    SOLARIS_AS_FLAGS = -xarch=v9 -K PIC
+ 	endif
+ 	ifdef USE_ABI64_FPU
+ 	    # this builds for Sparc v9a pure 64-bit architecture
+ 	    # It uses floating point, and 32-bit word size
++	    SOLARIS_AS_FLAGS = -xarch=v9a -K PIC
+ 	endif
+     else # NS_USE_GCC
+ 	ifdef USE_ABI32_INT32