Add a better patch to teach nspr that we have socklen_t.

Submitted by:	tmm

8 files changed, 92 insertions, 84 deletions

diff --git a/www/mozilla-devel/files/patch-nspr-unix.c b/www/mozilla-devel/files/patch-nspr-unix.c
deleted file mode 100644
index 6bb4ed08fb40..000000000000
--- a/www/mozilla-devel/files/patch-nspr-unix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
-+++ nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
-@@ -65,7 +65,8 @@
-  * PRInt32* pointer to a _PRSockLen_t* pointer.
-  */
- #if defined(HAVE_SOCKLEN_T) \
--    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
-+    || defined(FREEBSD)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-     || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -73,7 +74,7 @@
-     || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
-     || defined(NEXTSTEP) || defined(QNX)
- #define _PRSockLen_t int
--#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-+#elif (defined(AIX) && !defined(AIX4_1)) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
-     || defined(DGUX) || defined(VMS) || defined(NTO)
- #define _PRSockLen_t size_t
diff --git a/www/mozilla-devel/files/patch-nsprpub-configure b/www/mozilla-devel/files/patch-nsprpub-configure
new file mode 100644
index 000000000000..27ae64ee0c97
--- /dev/null
+++ b/www/mozilla-devel/files/patch-nsprpub-configure
@@ -0,0 +1,23 @@
+--- nsprpub/configure.in.orig	Sun Jun  1 00:16:23 2003
++++ nsprpub/configure.in	Sun Jun  1 00:13:09 2003
+@@ -920,6 +920,7 @@
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(FREEBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
++    AC_DEFINE(HAVE_SOCKLEN_T)
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
+--- nsprpub/configure.orig	Sun Jun  1 00:11:33 2003
++++ nsprpub/configure	Sun Jun  1 00:12:49 2003
+@@ -3300,6 +3300,10 @@
+ #define HAVE_BSD_FLOCK 1
+ EOF
+ 
++    cat >> confdefs.h <<\EOF
++#define HAVE_SOCKLEN_T 1
++EOF
++
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
diff --git a/www/mozilla/files/patch-nspr-unix.c b/www/mozilla/files/patch-nspr-unix.c
deleted file mode 100644
index 6bb4ed08fb40..000000000000
--- a/www/mozilla/files/patch-nspr-unix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
-+++ nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
-@@ -65,7 +65,8 @@
-  * PRInt32* pointer to a _PRSockLen_t* pointer.
-  */
- #if defined(HAVE_SOCKLEN_T) \
--    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
-+    || defined(FREEBSD)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-     || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -73,7 +74,7 @@
-     || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
-     || defined(NEXTSTEP) || defined(QNX)
- #define _PRSockLen_t int
--#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-+#elif (defined(AIX) && !defined(AIX4_1)) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
-     || defined(DGUX) || defined(VMS) || defined(NTO)
- #define _PRSockLen_t size_t
diff --git a/www/mozilla/files/patch-nsprpub-configure b/www/mozilla/files/patch-nsprpub-configure
new file mode 100644
index 000000000000..27ae64ee0c97
--- /dev/null
+++ b/www/mozilla/files/patch-nsprpub-configure
@@ -0,0 +1,23 @@
+--- nsprpub/configure.in.orig	Sun Jun  1 00:16:23 2003
++++ nsprpub/configure.in	Sun Jun  1 00:13:09 2003
+@@ -920,6 +920,7 @@
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(FREEBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
++    AC_DEFINE(HAVE_SOCKLEN_T)
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
+--- nsprpub/configure.orig	Sun Jun  1 00:11:33 2003
++++ nsprpub/configure	Sun Jun  1 00:12:49 2003
+@@ -3300,6 +3300,10 @@
+ #define HAVE_BSD_FLOCK 1
+ EOF
+ 
++    cat >> confdefs.h <<\EOF
++#define HAVE_SOCKLEN_T 1
++EOF
++
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
diff --git a/www/seamonkey/files/patch-nspr-unix.c b/www/seamonkey/files/patch-nspr-unix.c
deleted file mode 100644
index 6bb4ed08fb40..000000000000
--- a/www/seamonkey/files/patch-nspr-unix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
-+++ nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
-@@ -65,7 +65,8 @@
-  * PRInt32* pointer to a _PRSockLen_t* pointer.
-  */
- #if defined(HAVE_SOCKLEN_T) \
--    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
-+    || defined(FREEBSD)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-     || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -73,7 +74,7 @@
-     || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
-     || defined(NEXTSTEP) || defined(QNX)
- #define _PRSockLen_t int
--#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-+#elif (defined(AIX) && !defined(AIX4_1)) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
-     || defined(DGUX) || defined(VMS) || defined(NTO)
- #define _PRSockLen_t size_t
diff --git a/www/seamonkey/files/patch-nsprpub-configure b/www/seamonkey/files/patch-nsprpub-configure
new file mode 100644
index 000000000000..27ae64ee0c97
--- /dev/null
+++ b/www/seamonkey/files/patch-nsprpub-configure
@@ -0,0 +1,23 @@
+--- nsprpub/configure.in.orig	Sun Jun  1 00:16:23 2003
++++ nsprpub/configure.in	Sun Jun  1 00:13:09 2003
+@@ -920,6 +920,7 @@
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(FREEBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
++    AC_DEFINE(HAVE_SOCKLEN_T)
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
+--- nsprpub/configure.orig	Sun Jun  1 00:11:33 2003
++++ nsprpub/configure	Sun Jun  1 00:12:49 2003
+@@ -3300,6 +3300,10 @@
+ #define HAVE_BSD_FLOCK 1
+ EOF
+ 
++    cat >> confdefs.h <<\EOF
++#define HAVE_SOCKLEN_T 1
++EOF
++
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
diff --git a/www/seamonkey2/files/patch-nspr-unix.c b/www/seamonkey2/files/patch-nspr-unix.c
deleted file mode 100644
index 6bb4ed08fb40..000000000000
--- a/www/seamonkey2/files/patch-nspr-unix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
-+++ nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
-@@ -65,7 +65,8 @@
-  * PRInt32* pointer to a _PRSockLen_t* pointer.
-  */
- #if defined(HAVE_SOCKLEN_T) \
--    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
-+    || defined(FREEBSD)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-     || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -73,7 +74,7 @@
-     || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
-     || defined(NEXTSTEP) || defined(QNX)
- #define _PRSockLen_t int
--#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-+#elif (defined(AIX) && !defined(AIX4_1)) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
-     || defined(DGUX) || defined(VMS) || defined(NTO)
- #define _PRSockLen_t size_t
diff --git a/www/seamonkey2/files/patch-nsprpub-configure b/www/seamonkey2/files/patch-nsprpub-configure
new file mode 100644
index 000000000000..27ae64ee0c97
--- /dev/null
+++ b/www/seamonkey2/files/patch-nsprpub-configure
@@ -0,0 +1,23 @@
+--- nsprpub/configure.in.orig	Sun Jun  1 00:16:23 2003
++++ nsprpub/configure.in	Sun Jun  1 00:13:09 2003
+@@ -920,6 +920,7 @@
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(FREEBSD)
+     AC_DEFINE(HAVE_BSD_FLOCK)
++    AC_DEFINE(HAVE_SOCKLEN_T)
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+     if test "$MOZ_OBJFORMAT" = "elf"; then
+--- nsprpub/configure.orig	Sun Jun  1 00:11:33 2003
++++ nsprpub/configure	Sun Jun  1 00:12:49 2003
+@@ -3300,6 +3300,10 @@
+ #define HAVE_BSD_FLOCK 1
+ EOF
+ 
++    cat >> confdefs.h <<\EOF
++#define HAVE_SOCKLEN_T 1
++EOF
++
+     CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
+     MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+     if test "$MOZ_OBJFORMAT" = "elf"; then