preflight...

[pkgsrc-firefox3.git] / patches / patch-bo

diff --git a/patches/patch-bo b/patches/patch-bo
index 8cb1e54f1a9ef6c62f33878dc07bdf6276397017..82443a506fc4bed4f6572760248ac2acfea67b55 100644 (file)
--- a/patches/patch-bo
+++ b/patches/patch-bo
@@ -1,9 +1,9 @@
 $NetBSD: patch-bo,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
 
 diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
---- ../Orig/mozilla/nsprpub/configure.in       2005-09-16 07:37:52.000000000 +0900
-+++ ./nsprpub/configure.in     2005-12-04 19:17:56.000000000 +0900
-@@ -57,7 +57,7 @@
+--- nsprpub/configure.in.orig  2008-04-29 08:21:11.000000000 +0900
++++ nsprpub/configure.in
+@@ -62,7 +62,7 @@ USE_CPLUS=
  USE_IPV6=
  USE_MDUPDATE=
  _MACOSX_DEPLOYMENT_TARGET=
@@ -12,7 +12,24 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
  _DEBUG_FLAGS=-g
  MOZ_DEBUG=1
  MOZ_OPTIMIZE=
-@@ -1045,6 +1045,34 @@
+@@ -1010,7 +1010,7 @@ case "$target" in
+             ;;
+     esac
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
++    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$(MOZILLA_PKG_NAME)/$@'
+     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     STRIP="$STRIP -x -S"
+     DLL_SUFFIX=dylib
+@@ -1020,7 +1020,6 @@ case "$target" in
+ 
+     # Add Mac OS X support for loading CFM & CFBundle plugins
+     if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
+-        AC_DEFINE(XP_MACOSX)
+         OS_TARGET=MacOSX
+ 
+         if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
+@@ -1177,6 +1176,34 @@ tools are selected during the Xcode/Deve
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -47,7 +64,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
      ;;
  
  *-hpux*)
-@@ -1544,6 +1572,7 @@
+@@ -1726,6 +1753,7 @@ mips-nec-sysv*)
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
@@ -55,7 +72,16 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
      USE_NSPR_THREADS=1
      MDCPUCFG_H=_netbsd.cfg
      PR_MD_CSRCS=netbsd.c
-@@ -2307,7 +2336,7 @@
+@@ -2248,8 +2276,6 @@ dnl since it's not used and not part of 
+ dnl The same goes for BeOS.
+ 
+ case $target in
+-*-darwin*|*-beos*)
+-    ;;
+ *)
+     AC_CHECK_LIB(dl, dlopen,
+         AC_CHECK_HEADER(dlfcn.h,
+@@ -2490,7 +2516,7 @@ if test -n "$USE_PTHREADS"; then
        if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
            ac_cv_have_dash_pthread=yes
                case "$target_os" in
@@ -64,7 +90,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
  # Freebsd doesn't use -pthread for compiles, it uses them for linking
              ;;
            *)
-@@ -2345,7 +2374,7 @@
+@@ -2528,7 +2554,7 @@ if test -n "$USE_PTHREADS"; then
              _PTHREAD_LDFLAGS=
          fi
            ;;
@@ -73,7 +99,7 @@ diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
            AC_DEFINE(_REENTRANT)
            AC_DEFINE(_THREAD_SAFE)
            dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2426,7 +2455,7 @@
+@@ -2609,7 +2635,7 @@ case "$target" in
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;