Make GUPnP build on DragonFly.

This commit is contained in:
hasso 2009-08-18 18:31:18 +00:00
parent 4341555132
commit a2fe9c50d0
5 changed files with 15 additions and 15 deletions

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.1.1.1 2009/08/02 11:41:49 drochner Exp $
$NetBSD: distinfo,v 1.2 2009/08/18 18:31:18 hasso Exp $
SHA1 (gupnp-tools-0.7.1.tar.gz) = 2dbfc6b09eebe00c6584bffc1fcd1eb5e38074b7
RMD160 (gupnp-tools-0.7.1.tar.gz) = bd960e5e961288e66c8110c6639e8ed8709c2e00
Size (gupnp-tools-0.7.1.tar.gz) = 580161 bytes
SHA1 (patch-aa) = 28b9d70d6bfc2696c7ea8b6bcde6da083abca64b
SHA1 (patch-aa) = 7f378dbd6d08daace9fe4b4232e50f05fdc88f1a

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.1.1.1 2009/08/02 11:41:49 drochner Exp $
$NetBSD: patch-aa,v 1.2 2009/08/18 18:31:18 hasso Exp $
--- src/network-light/upnp.c.orig 2009-04-30 14:30:23.000000000 +0200
+++ src/network-light/upnp.c
@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/08/02 11:41:49 drochner Exp $
#include <stdio.h>
#include <locale.h>
#include <string.h>
+#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <uuid.h>
+#else
#include <uuid/uuid.h>
@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/08/02 11:41:49 drochner Exp $
xmlNode *uuid_node;
uuid_t uuid;
char *udn, uuidstr[37];
+#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__DragonFly__)
+ char *myuuidstr;
+#endif
@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/08/02 11:41:49 drochner Exp $
return NULL;
}
+#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__DragonFly__)
+ uuid_create(&uuid, 0);
+ uuid_to_string(&uuid, &myuuidstr, 0);
+ strncpy(uuidstr, myuuidstr, sizeof(uuidstr));

View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.1.1.1 2009/08/02 11:35:26 drochner Exp $
$NetBSD: distinfo,v 1.2 2009/08/18 18:31:18 hasso Exp $
SHA1 (gupnp-0.12.8.tar.gz) = b64bea62856b25e4c7f93faa32829f7bd3700aac
RMD160 (gupnp-0.12.8.tar.gz) = f2732d85d600b2f485ee69cd4169183728d881d9
Size (gupnp-0.12.8.tar.gz) = 475001 bytes
SHA1 (patch-aa) = 4446a062a086cc762680511514398fe45e933ed4
SHA1 (patch-aa) = 2c63c7406ddb08cf5fa8d707fbe51e6405e5546b
SHA1 (patch-ab) = e43380eac64d815fff1a1b62f73e35e1bdfb9633
SHA1 (patch-ac) = 6d33a9c2fd175ad7a8cbb49f55ddccf58009f1ad
SHA1 (patch-ad) = bc81da86498206d4f18e448bd40a8e0f834b55ae
SHA1 (patch-ad) = 1eb7c6e6b87f671ad80907587789d42754768717
SHA1 (patch-ae) = 4601bc1d9c56a509241c99e529ea65fe5bf7986c

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.1.1.1 2009/08/02 11:35:26 drochner Exp $
$NetBSD: patch-aa,v 1.2 2009/08/18 18:31:18 hasso Exp $
--- libgupnp/gupnp-context.c.orig 2009-04-30 14:31:58.000000000 +0200
+++ libgupnp/gupnp-context.c
@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/08/02 11:35:26 drochner Exp $
-#if defined(__FreeBSD__)
- if ((fp = popen ("netstat -r -f inet -n -W", "r"))) {
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ if ((fp = popen ("netstat -r -f inet -n", "r"))) {
char buffer[BUFSIZ];

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ad,v 1.1.1.1 2009/08/02 11:35:26 drochner Exp $
$NetBSD: patch-ad,v 1.2 2009/08/18 18:31:18 hasso Exp $
--- libgupnp/gupnp-service.c.orig 2009-06-02 14:10:25.000000000 +0200
+++ libgupnp/gupnp-service.c
@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/08/02 11:35:26 drochner Exp $
#include <gobject/gvaluecollector.h>
#include <gmodule.h>
#include <libsoup/soup-date.h>
+#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <uuid.h>
+#else
#include <uuid/uuid.h>
@ -19,11 +19,11 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/08/02 11:35:26 drochner Exp $
uuid_t id;
char out[39];
-
+#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__DragonFly__)
+ char *myout;
+#endif
+
+#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__DragonFly__)
+ uuid_create(&id, 0);
+ uuid_to_string(&id, &myout, 0);
+ strncpy(out, myout, sizeof(out));