Update to 0.9.

3 files changed, 40 insertions, 29 deletions

diff --git a/www/seamonkey/files/patch-ap b/www/seamonkey/files/patch-ap
index 059c80a10f0..2db3c470725 100644
--- a/www/seamonkey/files/patch-ap
+++ b/www/seamonkey/files/patch-ap
@@ -1,28 +1,17 @@
---- security/coreconf/config.mk.orig	Thu Jan 18 21:58:30 2001
-+++ security/coreconf/config.mk	Thu Jan 18 21:58:41 2001
+--- security/coreconf/config.mk.orig	Tue Mar 13 21:00:48 2001
++++ security/coreconf/config.mk	Mon May 14 18:13:01 2001
 @@ -56,7 +56,7 @@
  #       each OS release.                                              #
  #######################################################################
  
--ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET)))
-+ifeq (,$(filter-out NetBSD OS2 FreeBSD,$(OS_TARGET)))
+-ifeq (,$(filter-out BSD_OS NetBSD OS2,$(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS NetBSD OS2 FreeBSD,$(OS_TARGET)))
  include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
  else
  include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
---- security/psm/Makefile.in.orig	Thu Jan 18 22:00:05 2001
-+++ security/psm/Makefile.in	Thu Jan 18 22:00:19 2001
-@@ -28,7 +28,7 @@
- CORE_DEPTH=$(topsrcdir)/security
- 
- include $(CORE_DEPTH)/coreconf/arch.mk
--ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET)))
-+ifeq (,$(filter-out NetBSD OS2 FreeBSD,$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
- else
- include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
---- security/psm/server/Makefile.orig	Tue Dec 19 17:24:58 2000
-+++ security/psm/server/Makefile	Fri Jan 19 03:49:36 2001
-@@ -59,11 +59,11 @@
+--- security/psm/server/Makefile.orig	Fri Mar 30 21:46:06 2001
++++ security/psm/server/Makefile	Mon May 14 18:03:23 2001
+@@ -67,11 +67,11 @@
  endif
  endif
  
@@ -36,7 +25,7 @@
  endif
  endif
  
-@@ -153,8 +153,8 @@
+@@ -165,8 +165,8 @@
  XPCOM_LINK_LIBS = -lxpcom
  XPCOM_LIBS += $(DIST)/lib/libz.$(DLL_SUFFIX)
  else
diff --git a/www/seamonkey/files/patch-qt b/www/seamonkey/files/patch-qt
index 20c5d31abc0..5558e352ede 100644
--- a/www/seamonkey/files/patch-qt
+++ b/www/seamonkey/files/patch-qt
@@ -1,15 +1,18 @@
---- configure.orig	Sat Sep 30 23:16:14 2000
-+++ configure	Thu Dec 21 00:49:23 2000
-@@ -6020,7 +6020,7 @@
- 	echo $ac_n "checking for Qt insanity""... $ac_c" 1>&6
- echo "configure:6022: checking for Qt insanity" >&5
+
+$FreeBSD$
+
+--- configure.orig	Tue Apr 24 01:59:58 2001
++++ configure	Mon May 14 21:48:26 2001
+@@ -6596,7 +6596,7 @@
+ fi
  
--    QT_CFLAGS="-I${QTDIR}/include/qt"
-+    QT_CFLAGS="-I${QTDIR}/include/X11/qt"
+ 
+-    QT_CFLAGS="-I${QTDIR}/include -DQT_GENUINE_STR"
++    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
      QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
  
      # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8052,6 +8052,9 @@
+@@ -8703,6 +8703,9 @@
  os2*)
      LIBS=
      ;;
@@ -19,7 +22,7 @@
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -8702,8 +8705,6 @@
+@@ -9392,8 +9395,6 @@
  	if test $? -eq 0; 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
@@ -28,7 +31,7 @@
  		fi
  	fi
  	rm -f conftest*
-@@ -8737,7 +8738,7 @@
+@@ -9427,7 +9428,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -37,3 +40,11 @@
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
+@@ -13902,6 +13903,7 @@
+         ;;
+     *)
+         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
++	NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
+         $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
+         ;;
+     esac
diff --git a/www/seamonkey/files/patch-security::manager::Makefile.in b/www/seamonkey/files/patch-security::manager::Makefile.in
new file mode 100644
index 00000000000..0ddf7c6a12a
--- /dev/null
+++ b/www/seamonkey/files/patch-security::manager::Makefile.in
@@ -0,0 +1,11 @@
+--- security/manager/Makefile.in.orig	Mon Apr 16 00:50:16 2001
++++ security/manager/Makefile.in	Tue May 22 10:10:27 2001
+@@ -44,7 +44,7 @@
+ include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
+ endif
+ include $(CORE_DEPTH)/coreconf/prefix.mk
+-CPU_TAG := _$(CPU_ARCH)
++#CPU_TAG := _$(CPU_ARCH)
+ LOADABLE_ROOT_MODULE := $(DLL_PREFIX)nssckbi.$(DLL_SUFFIX)
+ CORECONF_OBJDIR:=$(OBJDIR_NAME)
+