on Solaris when creating shared objects, don't pass `-Qoption ld'

(SunPro and the Solaris 9 linker don't understand/use it) and ensure
we pass the rpath.

fixes install on Solaris.

4 files changed, 50 insertions, 10 deletions

diff --git a/www/MozillaFirebird/distinfo b/www/MozillaFirebird/distinfo
index 2d364dcde9c..31f8d0cdb08 100644
--- a/www/MozillaFirebird/distinfo
+++ b/www/MozillaFirebird/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/12/26 06:13:52 grant Exp $
+$NetBSD: distinfo,v 1.4 2004/02/04 11:09:13 grant Exp $
 
 SHA1 (MozillaFirebird-source-0.7.tar.gz) = 6c70c89f8ce63dd9e84a0f87c22d2c2be51675a5
 Size (MozillaFirebird-source-0.7.tar.gz) = 38758572 bytes
-SHA1 (patch-ab) = 3fcea982f9cfac21c519c9b5c8bbc46e0a6a0a4e
+SHA1 (patch-ab) = e71202f8dee1f84f118f9f18287bfa4ebe0bb928
 SHA1 (patch-ac) = 3181d6004e513988f5169df3cc13b4ca98c19bec
 SHA1 (patch-ad) = 09091d0a2ded2775ca35d1315ae9b95c506b28ef
 SHA1 (patch-ae) = 99935f034e6485e9e0d4eaf20e6ddd2b90b75ad5
@@ -10,6 +10,8 @@ SHA1 (patch-af) = 3b6f5c71146b3a402b164b7f10fb652408712b73
 SHA1 (patch-ag) = fd8470f7ac0003797401ed68f459315170cbe9a8
 SHA1 (patch-am) = fec537d148e706fc4514f461d88af5e305e818c4
 SHA1 (patch-aw) = ba1a408cd3b44dcd2123672ec4cbcefb436e5330
+SHA1 (patch-ax) = 070c88dee0446b093ab1c2a9120dc1747642d46f
+SHA1 (patch-ay) = f1b80542aa9e122dafd0f2eab350874414112302
 SHA1 (patch-ba) = 35256ee83e446c174adf311d8d8aaf90207f309e
 SHA1 (patch-bb) = 2c59471e94e3d96baf62b668a411f8f5d5b96aa4
 SHA1 (patch-be) = dd85f24f2ebb10d2435055ab4540d27178d8074d
diff --git a/www/MozillaFirebird/patches/patch-ab b/www/MozillaFirebird/patches/patch-ab
index bd1b17e8589..0eb4008a7b1 100644
--- a/www/MozillaFirebird/patches/patch-ab
+++ b/www/MozillaFirebird/patches/patch-ab
@@ -1,9 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/11/27 00:10:55 taya Exp $
+$NetBSD: patch-ab,v 1.3 2004/02/04 11:09:13 grant Exp $
 
-diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in	2003-08-30 02:14:58.000000000 +0900
-+++ ./configure.in	2003-10-20 10:17:13.000000000 +0900
-@@ -902,6 +902,9 @@
+--- configure.in.orig	2003-08-30 03:14:58.000000000 +1000
++++ configure.in
+@@ -902,6 +902,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -13,7 +12,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;; 
  
  *-hpux*)
-@@ -1190,6 +1193,13 @@
+@@ -1190,6 +1193,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -27,7 +26,16 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;;
  
  *-nto*) 
-@@ -1596,7 +1606,7 @@
+@@ -1425,7 +1435,7 @@ dnl the qsort routine under solaris is f
+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@'
+        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
+        MKSHLIB_UNFORCE_ALL=''
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
++       DSO_LDOPTS='-G -z muldefs -h $@'
+        AR_LIST="$AR t"
+        AR_EXTRACT="$AR x"
+        AR_DELETE="$AR d"
+@@ -1596,7 +1606,7 @@ AC_CACHE_VAL(ac_cv_siginfo_t,
                   [siginfo_t* info;],
                   [ac_cv_siginfo_t=true],
                   [ac_cv_siginfo_t=false])])
@@ -36,7 +44,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
    AC_DEFINE(HAVE_SIGINFO_T)
    AC_MSG_RESULT(yes)
  else
-@@ -2143,9 +2153,6 @@
+@@ -2143,9 +2153,6 @@ then
  				CXXFLAGS="$CXXFLAGS -mt" 
  			fi
  			;;
diff --git a/www/MozillaFirebird/patches/patch-ax b/www/MozillaFirebird/patches/patch-ax
new file mode 100644
index 00000000000..a4b4a941f65
--- /dev/null
+++ b/www/MozillaFirebird/patches/patch-ax
@@ -0,0 +1,15 @@
+$NetBSD: patch-ax,v 1.1 2004/02/04 11:09:13 grant Exp $
+
+--- security/coreconf/SunOS5.mk.orig	2003-03-21 15:45:37.000000000 +1100
++++ security/coreconf/SunOS5.mk
+@@ -165,6 +165,10 @@ endif
+ 	DSO_LDOPTS += -G -h $(notdir $@)
+ endif
+ 
++ifdef LIBRUNPATH
++DSO_LDOPTS += -R$(LIBRUNPATH)
++endif
++
+ # -KPIC generates position independent code for use in shared libraries.
+ # (Similarly for -fPIC in case of gcc.)
+ ifdef NS_USE_GCC
diff --git a/www/MozillaFirebird/patches/patch-ay b/www/MozillaFirebird/patches/patch-ay
new file mode 100644
index 00000000000..53dfcaf80b2
--- /dev/null
+++ b/www/MozillaFirebird/patches/patch-ay
@@ -0,0 +1,15 @@
+$NetBSD: patch-ay,v 1.1 2004/02/04 11:09:13 grant Exp $
+
+--- nsprpub/config/SunOS5.mk.orig	2000-12-22 17:02:50.000000000 +1100
++++ nsprpub/config/SunOS5.mk
+@@ -162,6 +162,10 @@ MKSHLIB			= $(LD) $(DSO_LDOPTS)
+ # -z defs: no unresolved symbols allowed
+ DSO_LDOPTS		= -G -h $(notdir $@)
+ 
++ifdef LIBRUNPATH
++DSO_LDOPTS		+=-R$(LIBRUNPATH)
++endif
++
+ # -KPIC generates position independent code for use in shared libraries.
+ # (Similarly for -fPIC in case of gcc.)
+ ifdef NS_USE_GCC