4 files changed, 17 insertions, 27 deletions

diff --git a/www/seamonkey2/files/patch-ao b/www/seamonkey2/files/patch-ao
deleted file mode 100644
index 29a1b3ecbad7..000000000000
--- a/www/seamonkey2/files/patch-ao
+++ /dev/null
@@ -1,10 +0,0 @@
---- nsprpub/pr/src/misc/prnetdb.c.orig	Wed Mar  8 08:27:18 2000
-+++ nsprpub/pr/src/misc/prnetdb.c	Thu Jan 18 17:52:51 2001
-@@ -924,6 +924,7 @@
-     PRStatus rv = PR_SUCCESS;
-     if (!_pr_initialized) _PR_ImplicitInitialization();
- 
-+	bzero(&(addr->inet),sizeof(addr->inet));
- 	addr->inet.family = AF_INET;
- 	addr->inet.port = htons(port);
- 	switch (val)
diff --git a/www/seamonkey2/files/patch-ap b/www/seamonkey2/files/patch-ap
index beef296a4102..0c7ad10d2fac 100644
--- a/www/seamonkey2/files/patch-ap
+++ b/www/seamonkey2/files/patch-ap
@@ -4,8 +4,8 @@
  #       each OS release.                                              #
  #######################################################################
  
--ifeq (,$(filter-out NetBSD,$(OS_TARGET)))
-+ifeq (,$(filter-out FreeBSD,$(OS_TARGET)))
+-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
@@ -15,23 +15,23 @@
  CORE_DEPTH=$(topsrcdir)/security
  
  include $(CORE_DEPTH)/coreconf/arch.mk
--ifeq (,$(filter-out NetBSD,$(OS_TARGET)))
-+ifeq (,$(filter-out FreeBSD,$(OS_TARGET)))
+-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
-@@ -37,7 +37,7 @@
- endif
- 
- ifneq ($(OS_ARCH), WINNT)
+@@ -39,7 +39,7 @@
+ # The following don't need a CPLUSPLUSRUNTIME defined:  WINNT, HP-UX
+ # so filter them out.
+ ifeq (,$(filter WINNT HP-UX,$(OS_ARCH)))
 -ifeq ($(OS_ARCH), Linux)
 +ifeq ($(OS_ARCH), FreeBSD)
  # On linux, we link with libstdc++ (we're always using egcs on linux, right?)
  CPLUSPLUSRUNTIME = -L /usr/lib -lstdc++ -lm
  else
-@@ -57,11 +57,11 @@
+@@ -59,11 +59,11 @@
  endif
  endif
  
@@ -45,7 +45,7 @@
  endif
  endif
  
-@@ -158,8 +158,8 @@
+@@ -153,8 +153,8 @@
  XPCOM_LINK_LIBS = -lxpcom
  XPCOM_LIBS += $(DIST)/lib/libz.$(DLL_SUFFIX)
  else
diff --git a/www/seamonkey2/files/patch-aq b/www/seamonkey2/files/patch-aq
index 0418737cfcf3..4e5ff8746c33 100644
--- a/www/seamonkey2/files/patch-aq
+++ b/www/seamonkey2/files/patch-aq
@@ -1,5 +1,5 @@
---- nsprpub/pr/include/md/_pth.h.orig	Sat Jan 20 17:28:34 2001
-+++ nsprpub/pr/include/md/_pth.h	Sat Jan 20 17:29:04 2001
+--- nsprpub/pr/include/md/_pth.h.orig	Mon Apr  3 17:25:43 2000
++++ nsprpub/pr/include/md/_pth.h	Fri Feb 16 00:30:46 2001
 @@ -183,7 +183,7 @@
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #endif /* defined(_PR_DCETHREADS) */
diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt
index 76dc15b78237..20c5d31abc0c 100644
--- a/www/seamonkey2/files/patch-qt
+++ b/www/seamonkey2/files/patch-qt
@@ -1,15 +1,15 @@
 --- configure.orig	Sat Sep 30 23:16:14 2000
 +++ configure	Thu Dec 21 00:49:23 2000
-@@ -5786,7 +5786,7 @@
+@@ -6020,7 +6020,7 @@
  	echo $ac_n "checking for Qt insanity""... $ac_c" 1>&6
- echo "configure:5788: checking for Qt insanity" >&5
+ echo "configure:6022: checking for Qt insanity" >&5
  
 -    QT_CFLAGS="-I${QTDIR}/include/qt"
 +    QT_CFLAGS="-I${QTDIR}/include/X11/qt"
      QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
  
      # Check whether --with-static-qt or --without-static-qt was given.
-@@ -7702,6 +7702,9 @@
+@@ -8052,6 +8052,9 @@
  os2*)
      LIBS=
      ;;
@@ -19,7 +19,7 @@
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -8655,8 +8658,6 @@
+@@ -8702,8 +8705,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 +28,7 @@
  		fi
  	fi
  	rm -f conftest*
-@@ -8672,7 +8673,7 @@
+@@ -8737,7 +8738,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then