[pkgsrc/trunk]: pkgsrc/net/gupnp-tools Prepare patch-aa for upstreaming.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0eaf62c109e3
branches:  trunk
changeset: 644958:0eaf62c109e3
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jan 20 10:28:52 2015 +0000

description:
Prepare patch-aa for upstreaming.
Extend to FreeBSD.
Bump PKGREVISION.

diffstat:

 net/gupnp-tools/Makefile         |   5 ++---
 net/gupnp-tools/distinfo         |   4 ++--
 net/gupnp-tools/patches/patch-aa |  28 +++++++++++++++-------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diffs (77 lines):

diff -r 2f66810c127b -r 0eaf62c109e3 net/gupnp-tools/Makefile
--- a/net/gupnp-tools/Makefile  Tue Jan 20 10:25:54 2015 +0000
+++ b/net/gupnp-tools/Makefile  Tue Jan 20 10:28:52 2015 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2014/10/07 16:47:32 adam Exp $
-#
+# $NetBSD: Makefile,v 1.45 2015/01/20 10:28:52 wiz Exp $
 
 DISTNAME=      gupnp-tools-0.8.9
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gupnp-tools/0.8/}
 EXTRACT_SUFX=  .tar.xz
diff -r 2f66810c127b -r 0eaf62c109e3 net/gupnp-tools/distinfo
--- a/net/gupnp-tools/distinfo  Tue Jan 20 10:25:54 2015 +0000
+++ b/net/gupnp-tools/distinfo  Tue Jan 20 10:28:52 2015 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2014/02/05 17:33:12 drochner Exp $
+$NetBSD: distinfo,v 1.9 2015/01/20 10:28:52 wiz Exp $
 
 SHA1 (gupnp-tools-0.8.9.tar.xz) = afe0855510740bf44bc32b716bd0687edcda0f94
 RMD160 (gupnp-tools-0.8.9.tar.xz) = b59c317338bffb9ef2b8b4fba09a703baab73c43
 Size (gupnp-tools-0.8.9.tar.xz) = 479616 bytes
-SHA1 (patch-aa) = 9fbf1acae567517ca7be3b41b4499adc6c179985
+SHA1 (patch-aa) = 4d651ceaa575d6c6c27a9ec2010aeefeb3bfb3ad
diff -r 2f66810c127b -r 0eaf62c109e3 net/gupnp-tools/patches/patch-aa
--- a/net/gupnp-tools/patches/patch-aa  Tue Jan 20 10:25:54 2015 +0000
+++ b/net/gupnp-tools/patches/patch-aa  Tue Jan 20 10:28:52 2015 +0000
@@ -1,12 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2012/10/06 08:21:00 ryoon Exp $
+$NetBSD: patch-aa,v 1.5 2015/01/20 10:28:53 wiz Exp $
 
---- src/network-light/upnp.c.orig      2011-07-30 07:39:56.000000000 +0000
+Add UUID support for *BSD
+https://bugzilla.gnome.org/show_bug.cgi?id=743234
+
+--- src/network-light/upnp.c.orig      2013-10-20 11:15:48.000000000 +0000
 +++ src/network-light/upnp.c
 @@ -27,7 +27,11 @@
  #include <string.h>
  #include <gmodule.h>
  #ifndef G_OS_WIN32
-+#if defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
 +#include <uuid.h>
 +#else
  #include <uuid/uuid.h>
@@ -14,19 +17,18 @@
  #else
  #include <rpc.h>
  typedef UUID uuid_t;
-@@ -335,8 +339,19 @@ static void init_uuid ()
+@@ -335,8 +339,18 @@ static void init_uuid ()
          char *udn;
  
  #ifndef G_OS_WIN32
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+char *myuuidstr;
-+#endif
-+
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+      uuid_create(&uuid_context, 0);
-+      uuid_to_string(&uuid_context, &myuuidstr, 0);
-+      strncpy(uuid, myuuidstr, sizeof(uuid));
-+      free(myuuidstr);
++#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
++        {
++                char *myuuidstr;
++                uuid_create (&uuid_context, 0);
++                uuid_to_string (&uuid_context, &myuuidstr, 0);
++                strncpy (uuid, myuuidstr, sizeof(uuid));
++                free (myuuidstr);
++        }
 +#else
          uuid_generate (uuid_context);
          uuid_unparse (uuid_context, uuid);