From f28b28dd5f0b4ab6d4dd5df8bfd4db9f14f82e92 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 22 Aug 2006 15:52:15 +0000 Subject: Fix pthread and errno usage. Include sys/uio.h on DragonFly. --- net/udpcast/patches/patch-ac | 14 ++++++++++++++ net/udpcast/patches/patch-ad | 14 ++++++++++++++ net/udpcast/patches/patch-ae | 13 +++++++++++++ net/udpcast/patches/patch-af | 13 +++++++++++++ net/udpcast/patches/patch-ag | 14 ++++++++++++++ net/udpcast/patches/patch-ah | 14 ++++++++++++++ 6 files changed, 82 insertions(+) create mode 100644 net/udpcast/patches/patch-ac create mode 100644 net/udpcast/patches/patch-ad create mode 100644 net/udpcast/patches/patch-ae create mode 100644 net/udpcast/patches/patch-af create mode 100644 net/udpcast/patches/patch-ag create mode 100644 net/udpcast/patches/patch-ah (limited to 'net/udpcast/patches') diff --git a/net/udpcast/patches/patch-ac b/net/udpcast/patches/patch-ac new file mode 100644 index 00000000000..93b3024d7a8 --- /dev/null +++ b/net/udpcast/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1 2006/08/22 15:52:15 joerg Exp $ + +--- receivedata.c.orig 2006-08-22 17:39:33.000000000 +0000 ++++ receivedata.c +@@ -4,6 +4,9 @@ + #include + #include + #include ++#if defined(__DragonFly__) ++#include ++#endif + + #include "threads.h" + #include "log.h" diff --git a/net/udpcast/patches/patch-ad b/net/udpcast/patches/patch-ad new file mode 100644 index 00000000000..81f3ac804b3 --- /dev/null +++ b/net/udpcast/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.1 2006/08/22 15:52:15 joerg Exp $ + +--- udpr-negotiate.c.orig 2006-08-22 17:40:14.000000000 +0000 ++++ udpr-negotiate.c +@@ -107,9 +107,6 @@ int startReceiver(int doWarn, + } + outFile = open(disk_config->fileName, oflags | O_BINARY, 0644); + if(outFile < 0) { +-#ifdef NO_BB +- extern int errno; +-#endif + udpc_fatal(1, "open outfile %s: %s\n", + disk_config->fileName, strerror(errno)); + } diff --git a/net/udpcast/patches/patch-ae b/net/udpcast/patches/patch-ae new file mode 100644 index 00000000000..995e1073d60 --- /dev/null +++ b/net/udpcast/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2006/08/22 15:52:16 joerg Exp $ + +--- libbb_udpcast.h.orig 2006-08-22 17:40:46.000000000 +0000 ++++ libbb_udpcast.h +@@ -14,7 +14,7 @@ + #define TRUE 1 + #define FALSE 0 + +-#include ++#include + #define xmalloc malloc + + #endif /* BB_VER */ diff --git a/net/udpcast/patches/patch-af b/net/udpcast/patches/patch-af new file mode 100644 index 00000000000..cd01b913c2e --- /dev/null +++ b/net/udpcast/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2006/08/22 15:52:16 joerg Exp $ + +--- Makefile.orig 2006-08-22 17:41:12.000000000 +0000 ++++ Makefile +@@ -3,7 +3,7 @@ DESTDIR = + #CFLAGS = -O4 -Wall -DNDEBUG -DLOSSTEST + CFLAGS =-Wall -Wshadow -DBB_FEATURE_UDPCAST_FEC -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG -DUSE_ASSEMBLER -O6 + LDFLAGS =-s -Wl,-warn-common +-LIBS=-lpthread ++LIBS=${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + BUSYBOX=../udp-busybox/busybox + BBTARGET=$(BUSYBOX)/udpcast + EXESUFFIX= diff --git a/net/udpcast/patches/patch-ag b/net/udpcast/patches/patch-ag new file mode 100644 index 00000000000..3f9d6f197ce --- /dev/null +++ b/net/udpcast/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 2006/08/22 15:52:16 joerg Exp $ + +--- sender-diskio.c.orig 2006-08-22 17:45:14.000000000 +0000 ++++ sender-diskio.c +@@ -26,9 +26,6 @@ int openFile(struct disk_config *config) + if(config->fileName != NULL) { + int in = open(config->fileName, O_RDONLY | O_BINARY, 0); + if (in < 0) { +-#ifdef NO_BB +- extern int errno; +-#endif + udpc_fatal(1, "Could not open file %s: %s\n", config->fileName, + strerror(errno)); + } diff --git a/net/udpcast/patches/patch-ah b/net/udpcast/patches/patch-ah new file mode 100644 index 00000000000..bf3bad1bea0 --- /dev/null +++ b/net/udpcast/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.1 2006/08/22 15:52:16 joerg Exp $ + +--- senddata.c.orig 2006-08-22 17:46:18.000000000 +0000 ++++ senddata.c +@@ -3,6 +3,9 @@ + #include + #include + #include ++#if defined(__DragonFly__) ++#include ++#endif + + #include "threads.h" + #include "fec.h" -- cgit v1.2.3