Resolve conflicts. I should have cvs add'ed this instead of cvs import'ing, as

wip/seamonkey has already existed in pkgsrc-wip.

4 files changed, 18 insertions, 68 deletions

diff --git a/www/seamonkey/patches/patch-ab b/www/seamonkey/patches/patch-ab
index 7fa720dddd9..4992bfefd55 100644
--- a/www/seamonkey/patches/patch-ab
+++ b/www/seamonkey/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2006/11/22 12:48:29 ghen Exp $
 
---- configure.in.orig	2006-04-14 22:00:40.000000000 +0200
+--- configure.in.orig	2006-10-30 14:43:55.000000000 +0100
 +++ configure.in
-@@ -1399,7 +1399,6 @@ case "$target" in
+@@ -1433,7 +1433,6 @@ case "$target" in
      DSO_LDOPTS=''
      STRIP="$STRIP -x -S"
      _PLATFORM_DEFAULT_TOOLKIT='mac'
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $
      TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      # set MACOSX to generate lib/mac/MoreFiles/Makefile
      MACOSX=1
-@@ -1418,7 +1418,7 @@ case "$target" in
+@@ -1452,7 +1451,7 @@ case "$target" in
      LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1432,6 +1431,9 @@ case "$target" in
+@@ -1466,6 +1465,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -29,30 +29,16 @@ $NetBSD: patch-ab,v 1.3 2006/06/28 21:23:29 joerg Exp $
      ;; 
  
  *-hpux*)
-@@ -1826,6 +1828,13 @@ case "$target" in
-     if test "$LIBRUNPATH"; then
- 	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
-     fi
-+
-+    case "${target_cpu}" in
-+    alpha*)
-+    	CFLAGS="$CFLAGS -mieee"
-+    	CXXFLAGS="$CXXFLAGS -mieee"
-+    ;;
-+    esac
-     ;;
- 
- *-nto*) 
-@@ -2051,7 +2060,7 @@ dnl the qsort routine under solaris is f
-        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
+@@ -2136,7 +2138,7 @@ dnl the qsort routine under solaris is f
+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -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 $@'
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs'
++       DSO_LDOPTS='-G -z muldefs'
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
-@@ -5279,7 +5288,7 @@ dnl ====================================
+@@ -5637,7 +5639,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then
diff --git a/www/seamonkey/patches/patch-ap b/www/seamonkey/patches/patch-ap
index 6b533f0d324..792776febeb 100644
--- a/www/seamonkey/patches/patch-ap
+++ b/www/seamonkey/patches/patch-ap
@@ -1,11 +1,11 @@
-$NetBSD: patch-ap,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
+$NetBSD: patch-ap,v 1.2 2006/11/22 12:48:29 ghen Exp $
 
---- security/coreconf/command.mk.orig	2004-04-25 17:02:17.000000000 +0200
+--- security/coreconf/command.mk.orig	2006-02-03 23:26:36.000000000 +0100
 +++ security/coreconf/command.mk
-@@ -46,7 +46,7 @@ CCF           = $(CC) $(CFLAGS)
+@@ -45,7 +45,7 @@ ASFLAGS      += $(CFLAGS)
+ CCF           = $(CC) $(CFLAGS)
  LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
  LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
- NFSPWD        = $(NSINSTALL_DIR)/nfspwd
 -CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
 +CFLAGS       += $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
  		$(XCFLAGS)
diff --git a/www/seamonkey/patches/patch-at b/www/seamonkey/patches/patch-at
deleted file mode 100644
index 864d6b219dd..00000000000
--- a/www/seamonkey/patches/patch-at
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/10/23 10:49:34 markd Exp $
-
---- directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c.orig	2006-05-25 11:38:04.000000000 +1200
-+++ directory/c-sdk/ldap/libraries/libprldap/ldappr-io.c
-@@ -292,12 +292,12 @@ prldap_try_one_address( struct lextiof_s
-      * Set up address and open a TCP socket:
-      */
-     if ( PR_SUCCESS != PR_SetNetAddr( PR_IpAddrNull, /* don't touch IP addr. */
--		PRLDAP_DEFAULT_ADDRESS_FAMILY, (PRUint16)port, addrp )) { 
-+		PR_NetAddrFamily( addrp ), (PRUint16)port, addrp )) { 
- 	return( -1 );
-     }
- 
-     if (( prsockp->prsock_prfd = PR_OpenTCPSocket(
--		PRLDAP_DEFAULT_ADDRESS_FAMILY )) == NULL ) {
-+		PR_NetAddrFamily( addrp ))) == NULL ) {
- 	return( -1 );
-     }
- 
-@@ -390,14 +390,14 @@ prldap_connect( const char *hostlist, in
- 
- 	if ( PR_SUCCESS == PR_StringToNetAddr( host, &addr )) {
- 		
--		if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
-+		/*if ( PRLDAP_DEFAULT_ADDRESS_FAMILY == PR_AF_INET6 &&
- 				PR_AF_INET == PR_NetAddrFamily( &addr )) {
- 			PRUint32	ipv4ip = addr.inet.ip;
- 			memset( &addr, 0, sizeof(addr));
- 			PR_ConvertIPv4AddrToIPv6( ipv4ip, &addr.ipv6.ip );
- 			addr.ipv6.family = PR_AF_INET6;
- 			
--		}
-+		}*/
- 	    rc = prldap_try_one_address( prsockp, &addr, port,
- 			timeout, options );
- 	} else {
diff --git a/www/seamonkey/patches/patch-ax b/www/seamonkey/patches/patch-ax
index 654ab7920f4..f27619cd4ec 100644
--- a/www/seamonkey/patches/patch-ax
+++ b/www/seamonkey/patches/patch-ax
@@ -1,10 +1,10 @@
-$NetBSD: patch-ax,v 1.1.1.1 2006/03/30 19:15:48 ghen Exp $
+$NetBSD: patch-ax,v 1.2 2006/11/22 12:48:30 ghen Exp $
 
---- security/coreconf/SunOS5.mk.orig	2004-10-11 04:15:42.000000000 +0200
+--- security/coreconf/SunOS5.mk.orig	2006-02-03 23:26:36.000000000 +0100
 +++ security/coreconf/SunOS5.mk
-@@ -182,6 +182,10 @@ endif
- 	DSO_LDOPTS += -G -h $(notdir $@)
+@@ -176,6 +176,10 @@ endif
  endif
+ DSO_LDOPTS += -z combreloc -z defs -z ignore
  
 +ifdef LIBRUNPATH
 +DSO_LDOPTS += -R$(LIBRUNPATH)