From 7d888ba164b7e4c494514c9cd6758a9b9704cec4 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 19 Jan 2015 12:42:37 +0000
Subject: Style changes requested by upstream. No functional change intended.

---
 net/gupnp/distinfo         |  4 ++--
 net/gupnp/patches/patch-ad | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/net/gupnp/distinfo b/net/gupnp/distinfo
index 00970be6c1a..d0ffecbe307 100644
--- a/net/gupnp/distinfo
+++ b/net/gupnp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2015/01/17 09:42:01 wiz Exp $
+$NetBSD: distinfo,v 1.20 2015/01/19 12:42:37 wiz Exp $
 
 SHA1 (gupnp-0.20.13.tar.xz) = eaec209a94e40dc98ba3af96277d79eeba59ddad
 RMD160 (gupnp-0.20.13.tar.xz) = bb1c41f910de4b14e7babda0fef0420415400a4b
 Size (gupnp-0.20.13.tar.xz) = 395356 bytes
 SHA1 (patch-ab) = e43380eac64d815fff1a1b62f73e35e1bdfb9633
-SHA1 (patch-ad) = e2575fef4f03c57e158a0b2f112e07f2b7812752
+SHA1 (patch-ad) = 253dc40d138c88a4bfdf2579f820aca5d23bebb6
diff --git a/net/gupnp/patches/patch-ad b/net/gupnp/patches/patch-ad
index 10745e66d6a..7aec5898c56 100644
--- a/net/gupnp/patches/patch-ad
+++ b/net/gupnp/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.6 2015/01/17 09:42:01 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2015/01/19 12:42:37 wiz Exp $
 
 Add support for BSD uuid library.
 https://bugzilla.gnome.org/show_bug.cgi?id=743072
 
---- libgupnp/gupnp-service.c.orig	2013-02-20 12:35:57.000000000 +0000
+--- libgupnp/gupnp-service.c.orig	2015-01-04 11:58:24.000000000 +0000
 +++ libgupnp/gupnp-service.c
-@@ -44,8 +44,12 @@
+@@ -46,8 +46,12 @@
  #ifdef G_OS_WIN32
  #include <rpc.h>
  #else
@@ -18,19 +18,20 @@ https://bugzilla.gnome.org/show_bug.cgi?id=743072
  
  #define SUBSCRIPTION_TIMEOUT 300 /* DLNA (7.2.22.1) enforced */
  
-@@ -1100,9 +1104,19 @@ generate_sid (void)
+@@ -1110,9 +1114,19 @@ generate_sid (void)
  #else
          uuid_t id;
          char out[39];
+-
 +#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
-+	char *myout;
-+#endif
- 
-+#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
-+	uuid_create(&id, 0);
-+	uuid_to_string(&id, &myout, 0);
-+	strncpy(out, myout, sizeof(out));
-+	free(myout);
++        {
++	        char *myout;
++
++	        uuid_create (&id, 0);
++	        uuid_to_string (&id, &myout, 0);
++	        strncpy (out, myout, sizeof(out));
++	        free (myout);
++        }
 +#else
          uuid_generate (id);
          uuid_unparse (id, out);
-- 
cgit v1.2.3