Add patches from silc cvs repository.

Should fix build on Darwin/Mac OS X.

4 files changed, 72 insertions, 1 deletions

diff --git a/devel/silc-toolkit/distinfo b/devel/silc-toolkit/distinfo
index 1479779b09b..76d747c45a5 100644
--- a/devel/silc-toolkit/distinfo
+++ b/devel/silc-toolkit/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/06 12:23:23 salo Exp $
+$NetBSD: distinfo,v 1.2 2004/06/11 10:05:06 salo Exp $
 
 SHA1 (silc-toolkit-0.9.12.tar.bz2) = 03cae96ce4358ba27f601db1084d0421084a72ea
 Size (silc-toolkit-0.9.12.tar.bz2) = 2547108 bytes
 SHA1 (patch-aa) = 18a35ea14c980fbcaf582139479a53d7996a28e0
+SHA1 (patch-ab) = a265c4d5f98e0dc10080fbcc29a9c0c43659907d
+SHA1 (patch-ac) = 9511132935ecc38e6192458e61e2445a381f0ea4
+SHA1 (patch-ad) = c4d1e29691dc993a5d27b3b8242e0bb4ae4dc018
diff --git a/devel/silc-toolkit/patches/patch-ab b/devel/silc-toolkit/patches/patch-ab
new file mode 100644
index 00000000000..f8daba86179
--- /dev/null
+++ b/devel/silc-toolkit/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,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/devel/silc-toolkit/patches/patch-ac b/devel/silc-toolkit/patches/patch-ac
new file mode 100644
index 00000000000..38dc44a44ae
--- /dev/null
+++ b/devel/silc-toolkit/patches/patch-ac
@@ -0,0 +1,38 @@
+$NetBSD: patch-ac,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/devel/silc-toolkit/patches/patch-ad b/devel/silc-toolkit/patches/patch-ad
new file mode 100644
index 00000000000..550ba9172e1
--- /dev/null
+++ b/devel/silc-toolkit/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,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