Update to version 0.9.13

Changes:
- convert to options.mk

0.9.13:
=======
After a long break the SILC Toolkit 0.9.13 is out.  This version finalizes
the SILC protocol version 1.2 development by including the few last features
that was missing from previous version.  One of the major features is the
support for UTF-8 encoded nicknames, channel names, user names and host
names.  The SILC Toolkit 0.9.13 API is compatible with the previous 0.9.12
version, however, several new functions has been added, and reading the
following summary of changes is recommended:

- Added UTF-8 encoded nicknames, channel names, server names, host names,
  usernames, crypto property names and algorithm names.  All strings
  library sends to application are always UTF-8 encoded.  All strings
  application sends to library must be UTF-8 encoded.

- Added SILC Stringprep API (RFC 3454) into silcstringprep.h.  It can
  be used to prepare strings into the correct format.  The format is
  specified by the SILC protocol, and those formats are supported by
  this API.

  The API can also be used to do other UTF-8 string preparation, such
  as case folding.  See the API for different features supported by
  the API.

- Added silc_identifier_check and silc_identifier_verify routines to
  help application easily format and verify the new UTF-8 encoded
  nicknames, channel names and other identifier strings.

  Ref:
  http://silcnet.org/docs/toolkit/silcstrutil-silc_identifier_check.html
  http://silcnet.org/docs/toolkit/silcstrutil-silc_identifier_verify.html

- Added SILC_STRING_LOCALE that now deprecates SILC_STRING_LANGUAGE.
  The old type is supported but may be removed in later versions.

  Ref:
  http://silcnet.org/docs/toolkit/silcstrutil-SilcStringEncoding.html

- Added new string encoding/decoding types: SILC_STRING_LOCALE,
  SILC_STRING_UTF8, SILC_STRING_PRINTABLE, SILC_STRING_VISIBLE,
  SILC_STRING_TELETEX, SILC_STRING_NUMERICAL, SILC_STRING_LDAP_DN and
  SILC_STRING_UTF8_ESCAPE.  These types can currently be used with
  the SILC UTF-8 API.

  Ref:
  http://silcnet.org/docs/toolkit/silcstrutil-SilcStringEncoding.html

- Splitted UTF-8 string routines from silcstrutil.h into own file
  silcutf8.h.

- Added silc_utf8_strcasecmp and silc_utf8_strncasecmp to do caseless
  UTF-8 string comparison.

  Ref:
  http://silcnet.org/docs/toolkit/silcutf8.html

- Added dont_register_crypto_library into SilcClientParams.  If set
  to TRUE the Client Library will not register/unregister cyprto library,
  and application is expected to do it.  By default this is set to FALSE.

  Ref:
  http://silcnet.org/docs/toolkit/silcclient-SilcClientParams.html

- All created log files by SILC Log API are now with 0600 mode.

  Ref:
  http://silcnet.org/docs/toolkit/silclog.html

- The bool type on Mac OS X is now _Bool.

  Ref:
  http://silcnet.org/docs/toolkit/silctypes-bool.html

- The silc_net_create_connection[_async] now revert to IPv4 address if
  IPv6 sockets are not supported.

- Added __SILC_XXX defines into silcincludes.h that third-party
  applications can check to determine how a binary version of the SILC
  Toolkit has been compiled.  The following defines may be set:

  __SILC_HAVE_PTHREAD           Compiled with threads support
  __SILC_HAVE_SIM               Compiled with SIM support
  __SILC_ENABLE_DEBUG           Compiled with debug enabled

  A third-party application can check these defines in configure.ac or
  in compile time to determine what libraries should be linked against
  the application.

- Install pkg-config .pc files for the SILC Core library and SILC Client
  library.  silc.pc and silcclient.pc will be installed.

- Several other minor bugfixes were made.

6 files changed, 31 insertions, 98 deletions

diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile
index 110a5d229fd..95ffeaa8b88 100644
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/12/18 18:13:53 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/08 15:15:17 salo Exp $
 #
 
-DISTNAME=		silc-toolkit-0.9.12
-PKGREVISION=		1
+DISTNAME=		silc-toolkit-0.9.13
 CATEGORIES=		devel chat security
 MASTER_SITES=		http://www.silcnet.org/download/toolkit/sources/ \
 			ftp://ftp.silcnet.org/silc/toolkit/sources/ \
@@ -40,19 +39,10 @@ CONFIGURE_ENV+=		F77=${FALSE}
 # lib/silcclient/client_attrs.c causes an ICE with xlc on Darwin.
 NOT_FOR_COMPILER+=	xlc
 
-BUILD_DEFS+=		USE_INET6
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-# If you want to build debugging version of libraries in silc-toolkit,
-# uncomment the line below.
-#
-#CONFIGURE_ARGS+=       --enable-debug
-
 .if ${MACHINE_ARCH} != "i386"
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/silc-toolkit/PLIST b/devel/silc-toolkit/PLIST
index c486f12eb37..2af843fd684 100644
--- a/devel/silc-toolkit/PLIST
+++ b/devel/silc-toolkit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/04/08 15:15:17 salo Exp $
 include/silc/aes.h
 include/silc/blowfish.h
 include/silc/cast.h
@@ -7,7 +7,6 @@ include/silc/ciphers_def.h
 include/silc/client.h
 include/silc/command.h
 include/silc/command_reply.h
-include/silc/getopt.h
 include/silc/idlist.h
 include/silc/md5.h
 include/silc/mp_gmp.h
@@ -18,7 +17,6 @@ include/silc/mplogic.h
 include/silc/none.h
 include/silc/protocol.h
 include/silc/rc5.h
-include/silc/regex.h
 include/silc/rsa.h
 include/silc/sha1.h
 include/silc/silcapputil.h
@@ -70,9 +68,11 @@ include/silc/silcske_payload.h
 include/silc/silcske_status.h
 include/silc/silcsockconn.h
 include/silc/silcstatus.h
+include/silc/silcstringprep.h
 include/silc/silcstrutil.h
 include/silc/silcthread.h
 include/silc/silctypes.h
+include/silc/silcutf8.h
 include/silc/silcutil.h
 include/silc/silcvcard.h
 include/silc/silcversion.h
@@ -306,11 +306,11 @@ share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_channel_by_id_reso
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_channel_resolve.html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_client_by_id.html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_client_by_id_resolve.html
-share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_clients(1).html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_clients.html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_clients_by_channel.html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_clients_by_list.html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_clients_local.html
+share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_clients_whois.html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_server.html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_get_server_by_id.html
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_init.html
@@ -332,6 +332,7 @@ share/doc/html/silc-toolkit/manual/silcclient-silc_client_start_key_exchange.htm
 share/doc/html/silc-toolkit/manual/silcclient-silc_client_stop.html
 share/doc/html/silc-toolkit/manual/silcclient.html
 share/doc/html/silc-toolkit/manual/silcclient.xref
+share/doc/html/silc-toolkit/manual/silcclient_unicode.html
 share/doc/html/silc-toolkit/manual/silcclient_using.html
 share/doc/html/silc-toolkit/manual/silcclientlib.html
 share/doc/html/silc-toolkit/manual/silccommand-SilcCommand.html
@@ -1005,17 +1006,19 @@ share/doc/html/silc-toolkit/manual/silcstatus-silc_status_get_args.html
 share/doc/html/silc-toolkit/manual/silcstatus.html
 share/doc/html/silc-toolkit/manual/silcstatus.xref
 share/doc/html/silc-toolkit/manual/silcstatus_args.html
+share/doc/html/silc-toolkit/manual/silcstringprep-SilcStringprepFlags.html
+share/doc/html/silc-toolkit/manual/silcstringprep-SilcStringprepStatus.html
+share/doc/html/silc-toolkit/manual/silcstringprep-silc_stringprep.html
+share/doc/html/silc-toolkit/manual/silcstringprep.html
+share/doc/html/silc-toolkit/manual/silcstringprep.xref
 share/doc/html/silc-toolkit/manual/silcstrutil-SilcStringEncoding.html
+share/doc/html/silc-toolkit/manual/silcstrutil-silc_identifier_check.html
+share/doc/html/silc-toolkit/manual/silcstrutil-silc_identifier_verify.html
 share/doc/html/silc-toolkit/manual/silcstrutil-silc_mime_parse.html
 share/doc/html/silc-toolkit/manual/silcstrutil-silc_pem_decode.html
 share/doc/html/silc-toolkit/manual/silcstrutil-silc_pem_encode.html
 share/doc/html/silc-toolkit/manual/silcstrutil-silc_pem_encode_file.html
 share/doc/html/silc-toolkit/manual/silcstrutil-silc_strncat.html
-share/doc/html/silc-toolkit/manual/silcstrutil-silc_utf8_decode.html
-share/doc/html/silc-toolkit/manual/silcstrutil-silc_utf8_decoded_len.html
-share/doc/html/silc-toolkit/manual/silcstrutil-silc_utf8_encode.html
-share/doc/html/silc-toolkit/manual/silcstrutil-silc_utf8_encoded_len.html
-share/doc/html/silc-toolkit/manual/silcstrutil-silc_utf8_valid.html
 share/doc/html/silc-toolkit/manual/silcstrutil.html
 share/doc/html/silc-toolkit/manual/silcstrutil.xref
 share/doc/html/silc-toolkit/manual/silcthread-SilcThread.html
@@ -1055,6 +1058,15 @@ share/doc/html/silc-toolkit/manual/silctypes-TRUE.html
 share/doc/html/silc-toolkit/manual/silctypes-bool.html
 share/doc/html/silc-toolkit/manual/silctypes.html
 share/doc/html/silc-toolkit/manual/silctypes.xref
+share/doc/html/silc-toolkit/manual/silcutf8-silc_utf8_decode.html
+share/doc/html/silc-toolkit/manual/silcutf8-silc_utf8_decoded_len.html
+share/doc/html/silc-toolkit/manual/silcutf8-silc_utf8_encode.html
+share/doc/html/silc-toolkit/manual/silcutf8-silc_utf8_encoded_len.html
+share/doc/html/silc-toolkit/manual/silcutf8-silc_utf8_strcasecmp.html
+share/doc/html/silc-toolkit/manual/silcutf8-silc_utf8_strncasecmp.html
+share/doc/html/silc-toolkit/manual/silcutf8-silc_utf8_valid.html
+share/doc/html/silc-toolkit/manual/silcutf8.html
+share/doc/html/silc-toolkit/manual/silcutf8.xref
 share/doc/html/silc-toolkit/manual/silcutil-silc_check_line.html
 share/doc/html/silc-toolkit/manual/silcutil-silc_client_chmode.html
 share/doc/html/silc-toolkit/manual/silcutil-silc_client_chumode.html
@@ -1084,6 +1096,8 @@ share/doc/html/silc-toolkit/manual/silcutil-silc_hash_public_key_compare.html
 share/doc/html/silc-toolkit/manual/silcutil-silc_hash_string.html
 share/doc/html/silc-toolkit/manual/silcutil-silc_hash_string_compare.html
 share/doc/html/silc-toolkit/manual/silcutil-silc_hash_uint.html
+share/doc/html/silc-toolkit/manual/silcutil-silc_hash_utf8_compare.html
+share/doc/html/silc-toolkit/manual/silcutil-silc_hash_utf8_string.html
 share/doc/html/silc-toolkit/manual/silcutil-silc_id_render.html
 share/doc/html/silc-toolkit/manual/silcutil-silc_parse_command_line.html
 share/doc/html/silc-toolkit/manual/silcutil-silc_parse_userfqdn.html
diff --git a/devel/silc-toolkit/distinfo b/devel/silc-toolkit/distinfo
index 1b2bdef7a77..7d513d3fada 100644
--- a/devel/silc-toolkit/distinfo
+++ b/devel/silc-toolkit/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:33 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/04/08 15:15:17 salo Exp $
 
-SHA1 (silc-toolkit-0.9.12.tar.bz2) = 03cae96ce4358ba27f601db1084d0421084a72ea
-RMD160 (silc-toolkit-0.9.12.tar.bz2) = 82ea6528b4550f4eee3be7a0cb51eb1241815319
-Size (silc-toolkit-0.9.12.tar.bz2) = 2547108 bytes
+SHA1 (silc-toolkit-0.9.13.tar.bz2) = 957513aaf7785b7626eddf203520acc63192b6ea
+RMD160 (silc-toolkit-0.9.13.tar.bz2) = dad8e919cedec78c852aa0625496bb30621b798d
+Size (silc-toolkit-0.9.13.tar.bz2) = 2879639 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
deleted file mode 100644
index f8daba86179..00000000000
--- a/devel/silc-toolkit/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 38dc44a44ae..00000000000
--- a/devel/silc-toolkit/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$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
deleted file mode 100644
index 550ba9172e1..00000000000
--- a/devel/silc-toolkit/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$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