* fixes build with libupnp>=1.6.7

* bump PKGREVISION from libupnp shlib bump

4 files changed, 57 insertions, 3 deletions

diff --git a/filesystems/fuse-djmount/Makefile b/filesystems/fuse-djmount/Makefile
index b4f499e9193..46eb9c157d4 100644
--- a/filesystems/fuse-djmount/Makefile
+++ b/filesystems/fuse-djmount/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2011/03/18 05:50:04 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/13 23:55:37 obache Exp $
 
 DISTNAME=	djmount-0.71
 PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=djmount/}
 
diff --git a/filesystems/fuse-djmount/distinfo b/filesystems/fuse-djmount/distinfo
index c973a90664f..965f63c2ec0 100644
--- a/filesystems/fuse-djmount/distinfo
+++ b/filesystems/fuse-djmount/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/04/11 14:55:45 agc Exp $
+$NetBSD: distinfo,v 1.2 2012/04/13 23:55:37 obache Exp $
 
 SHA1 (djmount-0.71.tar.gz) = 527d4603d85b7fb86dc97d326b78c97bdcc4d687
 RMD160 (djmount-0.71.tar.gz) = 695e2ea0cd3fe654339f82c5101eb74da739d3f7
 Size (djmount-0.71.tar.gz) = 1159653 bytes
 SHA1 (patch-aa) = 5cc9d72ee0035f51ff968862a54adad055fae7b9
+SHA1 (patch-djmount_upnp__util.c) = 56247528bb7fbe2964e39893c014c2b4602285b6
+SHA1 (patch-djmount_upnp__util.h) = 72d1b7dbd1544fa4702cf149ded983f625d936e7
diff --git a/filesystems/fuse-djmount/patches/patch-djmount_upnp__util.c b/filesystems/fuse-djmount/patches/patch-djmount_upnp__util.c
new file mode 100644
index 00000000000..c1fa62a147d
--- /dev/null
+++ b/filesystems/fuse-djmount/patches/patch-djmount_upnp__util.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-djmount_upnp__util.c,v 1.1 2012/04/13 23:55:37 obache Exp $
+
+* upnp header files will not include string.h anymore.
+
+--- djmount/upnp_util.c.orig	2006-08-27 20:12:20.000000000 +0000
++++ djmount/upnp_util.c
+@@ -28,6 +28,10 @@
+ #	include <config.h>
+ #endif
+ 
++#ifdef HAVE_STRING_H
++#	include <string.h>
++#endif
++
+ #include "upnp_util.h"
+ #include "log.h"
+ #include "xml_util.h"
diff --git a/filesystems/fuse-djmount/patches/patch-djmount_upnp__util.h b/filesystems/fuse-djmount/patches/patch-djmount_upnp__util.h
new file mode 100644
index 00000000000..17a8ed51fdf
--- /dev/null
+++ b/filesystems/fuse-djmount/patches/patch-djmount_upnp__util.h
@@ -0,0 +1,35 @@
+$NetBSD: patch-djmount_upnp__util.h,v 1.1 2012/04/13 23:55:37 obache Exp $
+
+* some definithins had been moved to upnp.h.
+* IN/OUT/INOUT in libupnp was deprecated.
+
+--- djmount/upnp_util.h.orig	2006-08-27 20:12:20.000000000 +0000
++++ djmount/upnp_util.h
+@@ -27,6 +27,7 @@
+ #define UPNP_UTIL_H_INCLUDED
+ 
+ 
++#include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+ 
+@@ -46,8 +47,8 @@ extern "C" {
+  *****************************************************************************/
+ char*
+ UpnpUtil_GetEventString (void* talloc_context,
+-			 IN Upnp_EventType eventType, 
+-			 IN const void* event);
++			 Upnp_EventType eventType, 
++			 const void* event);
+ 
+ 
+ /*****************************************************************************
+@@ -55,7 +56,7 @@ UpnpUtil_GetEventString (void* talloc_co
+  * @return 	a static constant string, or NULL if unknown event type.
+  *****************************************************************************/
+ const char*
+-UpnpUtil_GetEventTypeString (IN Upnp_EventType e);
++UpnpUtil_GetEventTypeString (Upnp_EventType e);
+ 
+ 
+