Add patches from silc cvs repository.

Should fix build on Darwin/Mac OS X.

8 files changed, 144 insertions, 2 deletions

diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo
index 5119fdfd058..1ff3d6402f3 100644
--- a/chat/silc-client/distinfo
+++ b/chat/silc-client/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.26 2004/06/06 11:45:06 salo Exp $
+$NetBSD: distinfo,v 1.27 2004/06/11 10:05:06 salo Exp $
 
 SHA1 (silc-client-1.0.1.tar.bz2) = e53a8f9577282734723fe9ad8eaf5d3bce035048
 Size (silc-client-1.0.1.tar.bz2) = 1404404 bytes
 SHA1 (patch-aa) = b9ae5da26840b193d3c9484c975af89294fa8049
 SHA1 (patch-ab) = fffda0e4c9a9227c1eb8d8646a02ce9ec5cdefef
 SHA1 (patch-ac) = 3102941eea03bbd78d361fb0e00bfedb064d93f5
+SHA1 (patch-ad) = 9511132935ecc38e6192458e61e2445a381f0ea4
+SHA1 (patch-ae) = c4d1e29691dc993a5d27b3b8242e0bb4ae4dc018
+SHA1 (patch-af) = a265c4d5f98e0dc10080fbcc29a9c0c43659907d
diff --git a/chat/silc-client/patches/patch-ad b/chat/silc-client/patches/patch-ad
new file mode 100644
index 00000000000..21a5d47e798
--- /dev/null
+++ b/chat/silc-client/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.1 2004/06/11 10:05:06 salo Exp $
+
+--- configure.orig	Wed Jan 14 14:28:30 2004
++++ configure	Wed Jun  9 10:22:17 2004
+@@ -10456,9 +10456,16 @@
+ 
+ fi
+ if test $ac_cv_header_regex_h = yes; then
++
++    cat >>confdefs.h <<\_ACEOF
++#define HAVE_REGEX 1
++_ACEOF
++
+   have_regex=1
++
+ else
+   have_regex=0
++
+ fi
+ 
+ 
+@@ -10563,9 +10570,16 @@
+ echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5
+ echo "${ECHO_T}$ac_cv_func_getopt_long" >&6
+ if test $ac_cv_func_getopt_long = yes; then
++
++    cat >>confdefs.h <<\_ACEOF
++#define HAVE_GETOPT_LONG 1
++_ACEOF
++
+   have_getopt_long=1
++
+ else
+   have_getopt_long=0
++
+ fi
+ 
+ 
diff --git a/chat/silc-client/patches/patch-ae b/chat/silc-client/patches/patch-ae
new file mode 100644
index 00000000000..b2bd5aa8ec0
--- /dev/null
+++ b/chat/silc-client/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2004/06/11 10:05:06 salo Exp $
+
+--- includes/silcdefs.h.in.orig	Wed Jan 14 14:33:17 2004
++++ includes/silcdefs.h.in	Wed Jun  9 10:22:31 2004
+@@ -42,6 +42,10 @@
+ #undef SILC_MP_GMP
+ #undef SILC_MP_NSS_MPI
+ 
++/* contrib library */
++#undef HAVE_REGEX
++#undef HAVE_GETOPT_LONG
++
+ /* Redefs for SOCKS5 library */
+ /* macros/curses checks */
+ #undef HAS_CURSES
diff --git a/chat/silc-client/patches/patch-af b/chat/silc-client/patches/patch-af
new file mode 100644
index 00000000000..ec3b7946c8e
--- /dev/null
+++ b/chat/silc-client/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2004/06/11 10:05:06 salo Exp $
+
+--- lib/contrib/Makefile.in.orig	2004-02-29 16:10:01.000000000 +0100
++++ lib/contrib/Makefile.in	2004-06-11 11:31:45.000000000 +0200
+@@ -287,7 +298,9 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
+-noinst_LTLIBRARIES = libcontrib.la
++@HAVE_GETOPT_LONG_FALSE@noinst_LTLIBRARIES = libcontrib.la
++@HAVE_GETOPT_LONG_TRUE@@HAVE_REGEX_FALSE@noinst_LTLIBRARIES = libcontrib.la
++@HAVE_GETOPT_LONG_TRUE@@HAVE_REGEX_TRUE@noinst_LTLIBRARIES = 
+ @HAVE_GETOPT_LONG_FALSE@GETOPT = getopt.c getopt1.c
+ @HAVE_GETOPT_LONG_TRUE@GETOPT = 
+ @HAVE_REGEX_FALSE@REGEX = regex.c
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index 81fffda5466..d1b000b0544 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.23 2004/03/03 19:05:52 salo Exp $
+$NetBSD: distinfo,v 1.24 2004/06/11 10:05:06 salo Exp $
 
 SHA1 (silc-server-0.9.18.tar.bz2) = 232f10fc0f587b8028346bacf80d11443c4792c8
 Size (silc-server-0.9.18.tar.bz2) = 1169331 bytes
 SHA1 (patch-aa) = 181bf9a721abaeaaa0afd7e24017cd49a8020ac4
 SHA1 (patch-ab) = 55b3f00076c5b8a443465753ae07b9e812236f18
+SHA1 (patch-ac) = a265c4d5f98e0dc10080fbcc29a9c0c43659907d
+SHA1 (patch-ad) = 9511132935ecc38e6192458e61e2445a381f0ea4
+SHA1 (patch-ae) = c4d1e29691dc993a5d27b3b8242e0bb4ae4dc018
diff --git a/chat/silc-server/patches/patch-ac b/chat/silc-server/patches/patch-ac
new file mode 100644
index 00000000000..0c385bf82a2
--- /dev/null
+++ b/chat/silc-server/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.10 2004/06/11 10:05:06 salo Exp $
+
+--- lib/contrib/Makefile.in.orig	2004-02-29 16:10:01.000000000 +0100
++++ lib/contrib/Makefile.in	2004-06-11 11:31:45.000000000 +0200
+@@ -287,7 +298,9 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
+-noinst_LTLIBRARIES = libcontrib.la
++@HAVE_GETOPT_LONG_FALSE@noinst_LTLIBRARIES = libcontrib.la
++@HAVE_GETOPT_LONG_TRUE@@HAVE_REGEX_FALSE@noinst_LTLIBRARIES = libcontrib.la
++@HAVE_GETOPT_LONG_TRUE@@HAVE_REGEX_TRUE@noinst_LTLIBRARIES = 
+ @HAVE_GETOPT_LONG_FALSE@GETOPT = getopt.c getopt1.c
+ @HAVE_GETOPT_LONG_TRUE@GETOPT = 
+ @HAVE_REGEX_FALSE@REGEX = regex.c
diff --git a/chat/silc-server/patches/patch-ad b/chat/silc-server/patches/patch-ad
new file mode 100644
index 00000000000..fdcf65c7918
--- /dev/null
+++ b/chat/silc-server/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.5 2004/06/11 10:05:06 salo Exp $
+
+--- configure.orig	Wed Jan 14 14:28:30 2004
++++ configure	Wed Jun  9 10:22:17 2004
+@@ -10456,9 +10456,16 @@
+ 
+ fi
+ if test $ac_cv_header_regex_h = yes; then
++
++    cat >>confdefs.h <<\_ACEOF
++#define HAVE_REGEX 1
++_ACEOF
++
+   have_regex=1
++
+ else
+   have_regex=0
++
+ fi
+ 
+ 
+@@ -10563,9 +10570,16 @@
+ echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5
+ echo "${ECHO_T}$ac_cv_func_getopt_long" >&6
+ if test $ac_cv_func_getopt_long = yes; then
++
++    cat >>confdefs.h <<\_ACEOF
++#define HAVE_GETOPT_LONG 1
++_ACEOF
++
+   have_getopt_long=1
++
+ else
+   have_getopt_long=0
++
+ fi
+ 
+ 
diff --git a/chat/silc-server/patches/patch-ae b/chat/silc-server/patches/patch-ae
new file mode 100644
index 00000000000..f503666cf2c
--- /dev/null
+++ b/chat/silc-server/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.3 2004/06/11 10:05:06 salo Exp $
+
+--- includes/silcdefs.h.in.orig	Wed Jan 14 14:33:17 2004
++++ includes/silcdefs.h.in	Wed Jun  9 10:22:31 2004
+@@ -42,6 +42,10 @@
+ #undef SILC_MP_GMP
+ #undef SILC_MP_NSS_MPI
+ 
++/* contrib library */
++#undef HAVE_REGEX
++#undef HAVE_GETOPT_LONG
++
+ /* Redefs for SOCKS5 library */
+ /* macros/curses checks */
+ #undef HAS_CURSES