Update libupnp to 1.6.4.

Changes:
*******************************************************************************
Version 1.6.4
*******************************************************************************

2008-01-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Workaround for a problem with the new automake AM_CONDITIONAL macro
	from autotools-1.10. Thanks to Ingo Hofmann for helping with debugging
	this one.

2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Added quoting to macros AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR and
	AC_CONFIG_SRCDIR in configure.ac. Also changed the name of the
	auxiliary directory in AC_CONFIG_AUX_DIR to build-aux.

2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Fix for setsockopt() in Threadpool.c to allow more than one process
	to join the multicast-group on OSX. Thanks to Ingo Hofmann.

2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Using defined(__OSX__) || defined(__APPLE__) instead of just
	defined(__OSX__) in the code. Thanks to Ingo Hofmann and Chris
	Pickel.

2008-01-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Fix for isFileInVirtualDir. Thanks to Peter Hartley for the patch.

2008-01-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* Putting back a "defined(__OSX__)" that has been removed in the
	previous *BSD patch. Thanks to Chris Pickel for pointing it out.

2008-01-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
	* SF Patches Tracker [ 1865812 ] typo in docs comment
	Submitted By: Hartmut Holzgraefe - hholzgra
	typo in docs comment ACCAPTED instead of ACCEPTED in
	@name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302]
	Also, the documentation file name was mispelled and was corrected in
	the Makefile.am.

4 files changed, 13 insertions, 13 deletions

diff --git a/net/libupnp/Makefile b/net/libupnp/Makefile
index 322c227aca1..705c7dc929c 100644
--- a/net/libupnp/Makefile
+++ b/net/libupnp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2008/01/03 12:32:34 obache Exp $
+# $NetBSD: Makefile,v 1.10 2008/01/27 06:11:24 obache Exp $
 #
 
-DISTNAME=		libupnp-1.6.3
+DISTNAME=		libupnp-1.6.4
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pupnp/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/libupnp/PLIST b/net/libupnp/PLIST
index 29675e88ec1..3f3026e9201 100644
--- a/net/libupnp/PLIST
+++ b/net/libupnp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/01/03 12:32:34 obache Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/01/27 06:11:24 obache Exp $
 include/upnp/FreeList.h
 include/upnp/LinkedList.h
 include/upnp/ThreadPool.h
@@ -59,7 +59,7 @@ share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_TIMEDOUT-207.html
 share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_ERROR-208.html
 share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_CANCELED-210.html
 share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCAPTED-302.html
+share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html
 share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html
 share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_ARGUMENT-501.html
 share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_FILE_NOT_FOUND-502.html
diff --git a/net/libupnp/distinfo b/net/libupnp/distinfo
index 416714836eb..75bb2777ba7 100644
--- a/net/libupnp/distinfo
+++ b/net/libupnp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2008/01/03 12:32:34 obache Exp $
+$NetBSD: distinfo,v 1.10 2008/01/27 06:11:24 obache Exp $
 
-SHA1 (libupnp-1.6.3.tar.bz2) = 60c45f2a1090b186cdb4a968f76b85b5cef9b28b
-RMD160 (libupnp-1.6.3.tar.bz2) = 12a36ad263e4e66fb9c4d9d5ca9ea41dcb55d650
-Size (libupnp-1.6.3.tar.bz2) = 1136813 bytes
-SHA1 (patch-aa) = 5999583dfe62e1293f08547008f531c2d3caae8b
+SHA1 (libupnp-1.6.4.tar.bz2) = 8dc48a6c5a29e211db07565ec4570a73845108c4
+RMD160 (libupnp-1.6.4.tar.bz2) = 901ce5a3f733b7f2c9f5147a73c49fc615857aa8
+Size (libupnp-1.6.4.tar.bz2) = 1137057 bytes
+SHA1 (patch-aa) = 96abe92b59b9aab6f3a761823d76638d62f02d32
 SHA1 (patch-ac) = 05ba4584d2ebdb2de041e67f4c8d1c05e4fc1970
 SHA1 (patch-ae) = 7331c61d5b3a47ca3865788cf88a973d5e9352a1
 SHA1 (patch-ag) = b6b555fd2e7d5ddf5f63b25d8b915cdd7d0d03ba
diff --git a/net/libupnp/patches/patch-aa b/net/libupnp/patches/patch-aa
index d9cc527129b..e2cd6107e26 100644
--- a/net/libupnp/patches/patch-aa
+++ b/net/libupnp/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2008/01/03 12:32:34 obache Exp $
+$NetBSD: patch-aa,v 1.7 2008/01/27 06:11:24 obache Exp $
 
---- threadutil/src/ThreadPool.c.orig	2007-12-25 17:32:22.000000000 +0000
+--- threadutil/src/ThreadPool.c.orig	2008-01-22 10:16:37.000000000 +0000
 +++ threadutil/src/ThreadPool.c
 @@ -234,7 +234,7 @@ static int SetPolicyType( PolicyType in 
  	return 0;
@@ -24,8 +24,8 @@ $NetBSD: patch-aa,v 1.6 2008/01/03 12:32:34 obache Exp $
  	gettimeofday(&t, NULL);
  #if defined(WIN32)
   	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+-#elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
++#elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__)
   	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
  #elif defined(__linux__)
   	srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );