3 files changed, 23 insertions, 30 deletions

diff --git a/www/seamonkey2/files/patch-extensions_negotiateauth_Makefile.in b/www/seamonkey2/files/patch-extensions_negotiateauth_Makefile.in
index ca1f969ce5fe..d2241dbfe9f6 100644
--- a/www/seamonkey2/files/patch-extensions_negotiateauth_Makefile.in
+++ b/www/seamonkey2/files/patch-extensions_negotiateauth_Makefile.in
@@ -1,12 +1,19 @@
---- extensions/negotiateauth/Makefile.in.orig	Tue Apr 13 12:19:44 2004
-+++ extensions/negotiateauth/Makefile.in	Tue Apr 13 12:19:53 2004
-@@ -68,8 +68,8 @@
+--- extensions/negotiateauth/Makefile.in.orig	Wed Apr 28 03:26:19 2004
++++ extensions/negotiateauth/Makefile.in	Tue Jul  6 16:27:07 2004
+@@ -66,7 +66,6 @@
  		$(NULL)
  
  EXTRA_DSO_LDOPTS = \
 -		$(MOZ_COMPONENT_LIBS) \
- 		$(GSSAPI_LIBS) \
-+		$(MOZ_COMPONENT_LIBS) \
  		$(NULL)
  
+ ifneq (,$(GSSAPI_LIBS))
+@@ -74,6 +73,8 @@
+ EXTRA_DSO_LDOPTS += $(GSSAPI_LIBS)
+ CPPSRCS		 += nsNegotiateAuthGSSAPI.cpp
+ endif
++
++EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+ 
  # make sure this component is never statically linked into the main
+ # application.  this is necessary since we don't want to force users
diff --git a/www/seamonkey2/files/patch-nsprpub-pr-src-io-prprf.c b/www/seamonkey2/files/patch-nsprpub-pr-src-io-prprf.c
deleted file mode 100644
index f9949d6d9c96..000000000000
--- a/www/seamonkey2/files/patch-nsprpub-pr-src-io-prprf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- nsprpub/pr/src/io/prprf.c.orig	Mon Mar  8 22:18:19 2004
-+++ nsprpub/pr/src/io/prprf.c	Fri Mar 19 15:26:55 2004
-@@ -51,7 +51,10 @@
- ** Note: on some platforms va_list is defined as an array,
- ** and requires array notation.
- */
--#if (defined(LINUX) && defined(__x86_64__))
-+#if defined(__amd64__)
-+#include <stdarg.h>
-+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
-+#elif (defined(LINUX) && defined(__x86_64__))
- #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
- #elif (defined(LINUX) && defined(__powerpc__)) || \
-     (defined(LINUX) && defined(__s390__)) || \
diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt
index 6b72f3f007ae..8b6b84543152 100644
--- a/www/seamonkey2/files/patch-qt
+++ b/www/seamonkey2/files/patch-qt
@@ -1,15 +1,15 @@
---- configure.orig	Tue Apr 20 21:39:17 2004
-+++ configure	Thu Apr 29 14:01:52 2004
-@@ -9362,7 +9362,7 @@
+--- configure.orig	Wed May 19 14:22:51 2004
++++ configure	Tue Jul  6 16:45:02 2004
+@@ -9366,7 +9366,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 9368 "configure"
+ #line 9372 "configure"
  #include "confdefs.h"
-@@ -9393,7 +9393,7 @@
+@@ -9397,7 +9397,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -18,16 +18,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -9403,7 +9403,7 @@
+@@ -9407,7 +9407,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 9409 "configure"
+ #line 9413 "configure"
  #include "confdefs.h"
-@@ -9434,7 +9434,7 @@
+@@ -9438,7 +9438,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,15 +36,15 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12298,9 +12298,9 @@
+@@ -12467,9 +12467,9 @@
  
  
  
 -MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth"
 +MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth"
  
--MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks"
-+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks"
+-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks sql"
++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm datetime finger cview layout-debug tasks sql"
  
  # Check whether --enable-extensions or --disable-extensions was given.
  if test "${enable_extensions+set}" = set; then