Update to 0.4.6. Bump depends in bl3 file because of shlib major bump.

* Version 0.4.6 (released 2004-05-24)

** The header file idn-free.h is actually installed by 'make install'.

** API and ABI is backwards compatible with the previous version.

* Version 0.4.5 (released 2004-05-21)

** In IDNA ToUnicode, a `free' on a stale pointer fixed by Ulrich Drepper.

** Several memory leaks fixed by Ulrich Drepper.

** Added more SASLPrep and NFKC test vectors.

** Automake 1.8.4 is used.

** API and ABI is backwards compatible with the previous version.
idn_free: ADD.  Wrapper around system `free'.
idn-free.h: ADD.  Prototype for `idn_free'.
                See idn-free.h for discussion.  The interface is
                currently not documented.  Comments and feedback is
                appreciated.

* Version 0.4.4 (released 2004-04-29)

** Fixed two bugs in iSCSI definition, syncing with newly published RFC 3722.
The first bug was an omission of prohibiting the characters in C.1.1,
C.1.2 and C.7 (space characters and characters that are inappropriate
for canonical representation).  The second was a bug in the definition
of the table, causing the entire table to be skipped, of the special
prohibited output character table defined in RFC 3722 (see section 6,
the characters in the table are various ASCII characters and U+3002).

** A few test vectors for iSCSI were added.

** The self tests are linked with libtool -no-install to avoid wrapper script.

** Separated self test utilities into a separate library, shared by all tests.

** More translations.
Added Romanian (by Laurentiu Buzdugan).

** API and ABI is backwards compatible with the previous version.

* Version 0.4.3 (released 2004-04-22)

** Fixed a bug in table processing code to prohibit control characters.
The problem was that the code used a code point of 0 to indicate end
of table, but if (as for table C.2.1) a range starts with 0, this
logic would fail.  The end-of-table test is now that both the start
and end code points of the range is 0.  Table C.2.1 is responsible for
prohibiting non-ASCII control characters, i.e. ASCII 0-31 and 127.
Before, libidn silently accepted such strings without complaining.

** A few test vectors for SASLprep were added.

** The pkg-config script no longer include a -R parameter.

** More translations.
Added Dutch (by Elros Cyriatan), and German (by Roland Illig).

** API and ABI is backwards compatible with the previous version.

* Version 0.4.2 (released 2004-03-20)

** A Punycode implementation in Java was added, by Oliver Hitz.
Eventually hopefully a StringPrep, Nameprep and IDNA implementation
will be added as well.  Currently you need to specify --enable-java to
enable the Java interface.  The Java sources (below java/) are
compiled into byte-code (not native code) into a JAR library.

** More translations.
Added Danish (by Morten Bo Johansen), French (by Michel Robitaille),
Polish (by Jakub Bogusz), and Serbian (by Aleksandar Jelenak).

** Norwegian TLD table added, by Thomas Jacob.

** API and ABI is backwards compatible with the previous version.

* Version 0.4.1 (released 2004-03-08)

** The user messages from the command line utility are now translated.
Currently English and Swedish is supported.

** Logic of stringprep_locale_charset modified.
Future versions will use, in order, $CHARSET iff defined, nl_langinfo
(CODESET) iff working, or fall back to returning "ASCII".  Earlier it
attempted to guess the system locale, in contrast with the current
application's locale, via some setlocale save/set/reset magic.  This
change may require you to invoke setlocale() in your application,
which is (should be) required for non-ASCII to work anyway.  Based on
discussion with Ulrich Drepper.

** The command-line utility now invoke setlocale (LC_ALL, "") at startup.

** Fixed SASLprep tables to prohibit non-ASCII space in output.
Non-ASCII space has always been mapped to ASCII space, so it is not
clear this really have any effect, but the specification require it.

** Building Libidn as part of GLIBC has been updated.
Refer to libc/README for more information.  Incidentally, GLIBC in CVS
now include a copy of Libidn.

** API and ABI is backwards compatible with the previous version.
IDNA_DLOPEN_ERROR: ADD.  Only used internally by Libidn in libc.

* Version 0.4.0 (released 2004-02-28)

** Support for TLD restrictions on IDN strings, contributed by Thomas Jacob.
Many TLDs restrict the set of characters that can be used, from the
full Unicode 3.2 range that is normally available.  This contribution
make it possible for you to test strings for TLD conformance locally.
The code can be disabled by --disable-tld.  If enabled (the default),
the new API "tld.h" is installed which can be used to check a string
for conformance to TLD specific rules.  This add a new self test, and
a new chapter in the manual.  People responsible for maintaining TLD
tables are hereby encouraged to contribute them (under reasonable
licensing terms) for inclusion in future versions of Libidn.  Be
warned that the API for TLD checking may change throughout the 0.4.x
series as we get feedback on it.

** Kerberos 5 stringprep profile macro is no longer documented.
The macro itself will probably be removed in the future, if the
specification is dropped from the Kerberos WG agenda.

** API and ABI is backwards compatible with the previous version.
stringprep_kerberos5: DEPRECATED.
Tld_table_element:
Tld_table:
Tld_rc: ADD.  New data types.
tld_get_4:
tld_get_4z:
tld_get_z: ADD.  New functions to extract TLD from string.
tld_get_table:
tld_default_table: ADD.  New functions to get TLD table from TLD name.
tld_check_4t:
tld_check_4tz: ADD.  New function to provide core TLD operations.
tld_check_4:
tld_check_4z:
tld_check_8z:
tld_check_lz: ADD.  New functions that combine all TLD operations in one call.

* Version 0.3.7 (released 2004-01-22)

** The command line parameter '--' idiom is documented.

** The iSCSI stringprep profile now recognized as "iSCSI".
The earlier name "ISCSIprep" is still recognized, for backwards
compatibility.

** DocBook manuals no longer included (the tools are too unstable).

** API and ABI is backwards compatible with the previous version.

* Version 0.3.6 (released 2004-01-06)

** The manual now contain a troubleshooting section for the command line tool.

** The PHP interface pass the string directly on the command line.

** The macro that create 'idn-int.h' has been updated to latest version.

** API and ABI is backwards compatible with the previous version.

* Version 0.3.5 (released 2003-12-15)

** The program 'idn' accepts input strings directly on the command line.

** The program 'idn' defaults to --idna-to-ascii if no parameter is given.

** The program 'idn' now print user instructions before waiting for input.

** DocBook HTML output not included any longer.
The reason is that the filenames generated by docbook2html appear to
be rather random, so it is difficult to maintain the Makefile.am rules
for them.

** Autoconf 2.59, automake 1.8 and libtool from CVS is used.

** API and ABI is backwards compatible with the previous version.
IDNA_CONTAINS_NON_LDH: ADD.  Same integer value as IDNA_CONTAINS_LDH.
IDNA_CONTAINS_LDH: DEPRECATED.  LDH (letter-digits-hyphens) characters
   		are not an error, but non-LDH characters are, when
   		IDNA_USE_STD3_ASCII_RULES is used.  The logic of the
   		mnemonic name of this error constant was reversed.

* Version 0.3.4 (released 2003-11-09)

** DocBook manuals in XML, PDF, PostScript, ASCII and HTML formats included.

5 files changed, 37 insertions, 10 deletions

diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 45dbef2d0a0..1924013eeb1 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/05/07 01:14:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/26 14:55:21 wiz Exp $
 #
 
-DISTNAME=		libidn-0.3.3
+DISTNAME=		libidn-0.4.6
 CATEGORIES=		devel
 MASTER_SITES=		ftp://alpha.gnu.org/pub/gnu/libidn/ \
 			http://josefsson.org/libidn/releases/
diff --git a/devel/libidn/PLIST b/devel/libidn/PLIST
index 170672b2b7e..ae2f9a32152 100644
--- a/devel/libidn/PLIST
+++ b/devel/libidn/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/16 12:53:30 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/26 14:55:21 wiz Exp $
 bin/idn
+include/idn-free.h
 include/idn-int.h
 include/idna.h
 include/punycode.h
 include/stringprep.h
+include/tld.h
 lib/libidn.a
 lib/libidn.la
 lib/libidn.so
-lib/libidn.so.12
-lib/libidn.so.12.0
+lib/libidn.so.14
+lib/libidn.so.14.1
 lib/pkgconfig/libidn.pc
 man/man1/idn.1
 man/man3/idna_to_ascii_4i.3
@@ -38,3 +40,14 @@ man/man3/stringprep_utf8_nfkc_normalize.3
 man/man3/stringprep_utf8_to_locale.3
 man/man3/stringprep_utf8_to_ucs4.3
 man/man3/stringprep_utf8_to_unichar.3
+man/man3/tld_check_4.3
+man/man3/tld_check_4t.3
+man/man3/tld_check_4tz.3
+man/man3/tld_check_4z.3
+man/man3/tld_check_8z.3
+man/man3/tld_check_lz.3
+man/man3/tld_default_table.3
+man/man3/tld_get_4.3
+man/man3/tld_get_4z.3
+man/man3/tld_get_table.3
+man/man3/tld_get_z.3
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index 9ea9f7e8e41..7bf755fe3c6 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/05/26 14:55:21 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDN_BUILDLINK3_MK:=	${LIBIDN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibidn}
 BUILDLINK_PACKAGES+=	libidn
 
 .if !empty(LIBIDN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libidn+=	libidn>=0.3.3
+BUILDLINK_DEPENDS.libidn+=	libidn>=0.4.6
 BUILDLINK_PKGSRCDIR.libidn?=	../../devel/libidn
 .endif	# LIBIDN_BUILDLINK3_MK
 
diff --git a/devel/libidn/distinfo b/devel/libidn/distinfo
index 93999515f58..41974cb62ed 100644
--- a/devel/libidn/distinfo
+++ b/devel/libidn/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/03 19:17:10 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/05/26 14:55:21 wiz Exp $
 
-SHA1 (libidn-0.3.3.tar.gz) = 23317b0322bc24e1d1d6cfe891e7361452110073
-Size (libidn-0.3.3.tar.gz) = 1518379 bytes
+SHA1 (libidn-0.4.6.tar.gz) = b74eb18bdd98a45a3761e4dc04d15967898b8955
+Size (libidn-0.4.6.tar.gz) = 1657104 bytes
+SHA1 (patch-aa) = 11c4e8ce2f0328c06a848a0295f6511ee2a98f71
diff --git a/devel/libidn/patches/patch-aa b/devel/libidn/patches/patch-aa
new file mode 100644
index 00000000000..4b270a3d929
--- /dev/null
+++ b/devel/libidn/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/05/26 14:55:21 wiz Exp $
+
+--- src/Makefile.in.orig	2004-05-24 10:31:38.000000000 +0200
++++ src/Makefile.in
+@@ -512,7 +512,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-dist_lispDATA
++install-data-am:
+ 
+ install-exec-am: install-binPROGRAMS
+