Let this also build on DragonFly.

14 files changed, 76 insertions, 50 deletions

diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo
index 8af805fbb96..8a96b8dc8b5 100644
--- a/net/DarwinStreamingServer/distinfo
+++ b/net/DarwinStreamingServer/distinfo
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: distinfo,v 1.2 2007/03/07 18:22:43 joerg Exp $
 
 SHA1 (DarwinStreamingSrvr5.5.4-Source.tar) = 8d7c50abd9dee2da8bfcf5b080ad6a5f04b7e159
 RMD160 (DarwinStreamingSrvr5.5.4-Source.tar) = 741844be26fca61ae2da809191d80ae7894f845d
 Size (DarwinStreamingSrvr5.5.4-Source.tar) = 32829440 bytes
-SHA1 (patch-aa) = 3e5dd1ecf1892677937424966a6825735290f62d
-SHA1 (patch-ab) = 6ef4b4a419fe4760c607829f0131a9eec49899d4
-SHA1 (patch-ac) = a54ea3650b48ea951630e17bee311722ec0e02cd
-SHA1 (patch-ad) = f86c6c9372cdef07953ebaa3643d1254e6a3e1eb
-SHA1 (patch-ae) = 90196ccc784f85527452821cb32da6ee4d131a68
-SHA1 (patch-af) = c699baddac5fce4e974a0b2b992545255c6e9d05
-SHA1 (patch-ag) = e2d174cac6568725343443e1fc01545a5c984655
-SHA1 (patch-ah) = 351c35db68160fbdf8492885c4ad05269e3efe13
+SHA1 (patch-aa) = 2fc84964264f9b6529d031801b36bcca89f591a6
+SHA1 (patch-ab) = a2eb1ed133e3ebdc7e520a14062a48dcce58d9a6
+SHA1 (patch-ac) = be78f45065581e635457f3e345b674e0d720e8c2
+SHA1 (patch-ad) = d31372ce9770e98ad5fba665a32a3be079849a3b
+SHA1 (patch-ae) = 2759de18749753cb3243641122a0c2dd9f6d6506
+SHA1 (patch-af) = 043799c14d7c1c1ed8068d161eba820afc33317a
+SHA1 (patch-ag) = 3f788ef927e9d4206e73c74a4176213088ae8232
+SHA1 (patch-ah) = bc32a0b4f367d45810b80764c5f7468ef5f71577
 SHA1 (patch-ai) = 91248634b1ab3e1961ce800183d965b45bd686dd
-SHA1 (patch-aj) = 271167cb450f6fe4bc81b4e9705ea4c6069d72c6
-SHA1 (patch-ak) = 6e7b780a5d79fca8d187408dcba08adc2a8fed35
-SHA1 (patch-al) = d0accc9d15c09c3ff5c8d53c6981a7be41e6a6b3
-SHA1 (patch-am) = ea0fd464440eb749e2c0eba0d255218e4ccc37cc
-SHA1 (patch-an) = 5634d5f22002f07ec2abd4ebdd49366979149c74
+SHA1 (patch-aj) = b6fa42c1550a80d77a10da3c4537a321a858f783
+SHA1 (patch-ak) = d573cee55a6097caf36de30cf95ea542c1f7a24f
+SHA1 (patch-al) = bd076ddc40df092d92cc18aba319f732287cdb6b
+SHA1 (patch-am) = 68de6ee8be78b602a5c615a5ed72c2e97d0eb953
+SHA1 (patch-an) = 9477b41eddeb0496cf8d3326a4e5fb9800efc157
 SHA1 (patch-ao) = 24c52b5de2f4a5d8484822a3225921d929e3b59b
 SHA1 (patch-ap) = 08828b78fa5847826061b3766d113cecc55a48cb
 SHA1 (patch-aq) = 1168e928db76833d25774a3fb5fd9223ba669d78
diff --git a/net/DarwinStreamingServer/patches/patch-aa b/net/DarwinStreamingServer/patches/patch-aa
index ef7dc5820d8..343d78f8f76 100644
--- a/net/DarwinStreamingServer/patches/patch-aa
+++ b/net/DarwinStreamingServer/patches/patch-aa
@@ -1,10 +1,32 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
---- PlatformHeader.h.orig	2005-12-09 18:18:00.000000000 +0000
-+++ PlatformHeader.h	2005-12-09 18:20:17.000000000 +0000
-@@ -144,6 +144,26 @@
+$NetBSD: patch-aa,v 1.2 2007/03/07 18:22:43 joerg Exp $
+
+--- PlatformHeader.h.orig	2005-05-19 00:51:25.000000000 +0000
++++ PlatformHeader.h
+@@ -144,6 +144,47 @@
  #define EXPORT
  #define _REENTRANT 1
  
++#elif defined(__DragonFly__)
++
++#include <sys/endian.h>
++#if _BYTE_ORDER == _BIG_ENDIAN
++    #define BIGENDIAN      1
++#else
++    #define BIGENDIAN      0
++#endif
++
++#define USE_ATOMICLIB 0
++#define MACOSXEVENTQUEUE 0
++#define __PTHREADS__    1
++#define __PTHREADS_MUTEXES__    1
++#define ALLOW_NON_WORD_ALIGN_ACCESS 1
++#define USE_THREAD      1 //Flag used in QTProxy
++#define THREADING_IS_COOPERATIVE        1 
++#define USE_THR_YIELD   0
++#define kPlatformNameString     "DragonFly"
++#define EXPORT
++#define _REENTRANT 1
++
 +#elif __NetBSD__ 
 +
 +#define USE_ATOMICLIB 0
diff --git a/net/DarwinStreamingServer/patches/patch-ab b/net/DarwinStreamingServer/patches/patch-ab
index 17df7dc1a8c..50fb13b5da4 100644
--- a/net/DarwinStreamingServer/patches/patch-ab
+++ b/net/DarwinStreamingServer/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-ab,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- Server.tproj/RTSPSession.cpp.orig	2005-04-27 12:17:44.000000000 +0200
 +++ Server.tproj/RTSPSession.cpp	2005-12-17 18:49:56.000000000 +0100
 @@ -47,7 +47,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
  #include "md5digest.h"
  
 -#if __FreeBSD__ || __hpux__	
-+#if __FreeBSD__ || __hpux__ || __NetBSD__
++#if __FreeBSD__ || __hpux__ || __NetBSD__ || defined(__DragonFly__)
      #include <unistd.h>
  #endif
  
diff --git a/net/DarwinStreamingServer/patches/patch-ac b/net/DarwinStreamingServer/patches/patch-ac
index efdf4abf441..9c27ed9e48b 100644
--- a/net/DarwinStreamingServer/patches/patch-ac
+++ b/net/DarwinStreamingServer/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-ac,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- RTSPClientLib/ClientSocket.cpp.orig	2003-08-16 01:53:20.000000000 +0200
 +++ RTSPClientLib/ClientSocket.cpp	2005-12-17 22:20:45.000000000 +0100
 @@ -69,7 +69,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
              
          inSocket->NoDelay();
 -#if __FreeBSD__ || __MacOSX__
-+#if __FreeBSD__ || __MacOSX__ || __NetBSD__
++#if __FreeBSD__ || __MacOSX__ || __NetBSD__ || defined(__DragonFly__)
      // no KeepAlive -- probably should be off for all platforms.
  #else
          inSocket->KeepAlive();
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
      AssertV(err == 0, OSThread::GetErrno());
  
 -#if __FreeBSD__ || __MacOSX__
-+#if __FreeBSD__ || __MacOSX__ || __NetBSD__
++#if __FreeBSD__ || __MacOSX__ || __NetBSD__ || defined(__DragonFly__)
      struct timeval time;
      //int len = sizeof(time);
      time.tv_sec = 0;
diff --git a/net/DarwinStreamingServer/patches/patch-ad b/net/DarwinStreamingServer/patches/patch-ad
index 2342a7a1431..8f1cbd9d846 100644
--- a/net/DarwinStreamingServer/patches/patch-ad
+++ b/net/DarwinStreamingServer/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-ad,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp.orig	2005-03-12 00:24:54.000000000 +0100
 +++ PlaylistBroadcaster.tproj/PlaylistBroadcaster.cpp	2005-12-17 22:20:45.000000000 +0100
 @@ -43,7 +43,9 @@
@@ -17,7 +17,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
          #include "daemon.h"
      #else
 -        #ifndef __FreeBSD__
-+        #ifndef __FreeBSD__ || __NetBSD__
++        #ifndef __FreeBSD__ || __NetBSD__ || defined(__DragonFly__)
              #include <sys/sysctl.h>
          #endif
      #endif
diff --git a/net/DarwinStreamingServer/patches/patch-ae b/net/DarwinStreamingServer/patches/patch-ae
index e02e052baf3..05672e8fe7e 100644
--- a/net/DarwinStreamingServer/patches/patch-ae
+++ b/net/DarwinStreamingServer/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-ae,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- PlaylistBroadcaster.tproj/GetLocalIPAddressString.c.orig	2003-08-16 01:53:06.000000000 +0200
 +++ PlaylistBroadcaster.tproj/GetLocalIPAddressString.c	2005-12-17 22:20:45.000000000 +0100
 @@ -82,7 +82,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
  #if (__linux__ || __MacOSX__ || __MACOS__ || __linuxppc__ || __solaris__ || __sgi__)
          err = ioctl(tempSocket, SIOCGIFCONF, (char*)&ifc);
 -#elif __FreeBSD__
-+#elif __FreeBSD__ || __NetBSD__
++#elif __FreeBSD__ || __NetBSD__ || defined(__DragonFly__)
          err = ioctl(tempSocket, OSIOCGIFCONF, (char*)&ifc);
  #else
          #error
@@ -15,7 +15,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
          
  
 -#if __FreeBSD__
-+#if __FreeBSD__ || __NetBSD__
++#if __FreeBSD__ || __NetBSD__ || defined(__DragonFly__)
          {
              int netdev1, netdev2;
              struct ifreq *netdevifr;
diff --git a/net/DarwinStreamingServer/patches/patch-af b/net/DarwinStreamingServer/patches/patch-af
index 734cb2c6386..243e7973125 100644
--- a/net/DarwinStreamingServer/patches/patch-af
+++ b/net/DarwinStreamingServer/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-af,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- PlaylistBroadcaster.tproj/BroadcasterSession.cpp.orig	2004-09-30 16:40:54.000000000 +0200
 +++ PlaylistBroadcaster.tproj/BroadcasterSession.cpp	2005-12-17 22:20:45.000000000 +0100
 @@ -350,7 +350,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
          qtss_printf("Session timing out.\n");
  #endif
 -#if __FreeBSD__ || __MacOSX__
-+#if __FreeBSD__ || __MacOSX__ || __NetBSD__
++#if __FreeBSD__ || __MacOSX__ || __NetBSD__ || defined(__DragonFly__)
          if (fTransportType != kTCPTransportType)
          {
              fTimeoutTask.RefreshTimeout();
@@ -15,7 +15,7 @@ $NetBSD: patch-af,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
                  break;
              }
 -#if __FreeBSD__ || __MacOSX__
-+#if __FreeBSD__ || __MacOSX__ || __NetBSD__
++#if __FreeBSD__ || __MacOSX__ || __NetBSD__ || defined(__DragonFly__)
              case kBroadcasting:
              {   
  #if BROADCAST_SESSION_DEBUG
diff --git a/net/DarwinStreamingServer/patches/patch-ag b/net/DarwinStreamingServer/patches/patch-ag
index 0ce495005ae..4c091ede675 100644
--- a/net/DarwinStreamingServer/patches/patch-ag
+++ b/net/DarwinStreamingServer/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-ag,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- PlaylistBroadcaster.tproj/BCasterTracker.cpp.orig	2003-08-16 01:53:06.000000000 +0200
 +++ PlaylistBroadcaster.tproj/BCasterTracker.cpp	2005-12-17 22:20:45.000000000 +0100
 @@ -49,8 +49,10 @@
@@ -9,7 +9,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
  #include <sys/types.h>
 -#if !(defined(__solaris__) || defined(__osf__) || defined(__hpux__))
 +#endif
-+#if !(defined(__solaris__) || defined(__osf__) || defined(__hpux__) || defined(__NetBSD__))
++#if !(defined(__solaris__) || defined(__osf__) || defined(__hpux__) || defined(__NetBSD__) || defined(__DragonFly__))
  	#include <sys/sysctl.h>
  #endif
  #include <sys/time.h>
diff --git a/net/DarwinStreamingServer/patches/patch-ah b/net/DarwinStreamingServer/patches/patch-ah
index 0b1237cc9f5..4ca2d92e5bf 100644
--- a/net/DarwinStreamingServer/patches/patch-ah
+++ b/net/DarwinStreamingServer/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-ah,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- MP3Broadcaster/MP3Broadcaster.cpp.orig  2003-08-16 01:53:04.000000000 +0200
 +++ MP3Broadcaster/MP3Broadcaster.cpp	2005-02-25 17:03:32.000000000 +0100
 @@ -38,13 +38,16 @@
@@ -15,7 +15,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
          #include "daemon.h"
      #else
 -        #ifndef __FreeBSD__
-+        #ifndef __FreeBSD__ || __OpenBSD__ || __NetBSD__
++        #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
              #include <sys/sysctl.h>
          #endif
      #endif
diff --git a/net/DarwinStreamingServer/patches/patch-aj b/net/DarwinStreamingServer/patches/patch-aj
index 60b384aba00..3174c1779c8 100644
--- a/net/DarwinStreamingServer/patches/patch-aj
+++ b/net/DarwinStreamingServer/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-aj,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- CommonUtilitiesLib/SocketUtils.cpp.orig  2003-08-16 01:52:53.000000000 +0200
 +++ CommonUtilitiesLib/SocketUtils.cpp	2005-02-25 17:03:31.000000000 +0100
 @@ -342,7 +342,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
  #if __linux__ || __linuxppc__ || __solaris__ || __MacOSX__ || __sgi__ || __osf__
      int err = ::ioctl(tempSocket, SIOCGIFCONF, (char*)&ifc);
 -#elif __FreeBSD__
-+#elif __FreeBSD__ || __NetBSD__
++#elif __FreeBSD__ || __NetBSD__ || defined(__DragonFly__)
      int err = ::ioctl(tempSocket, OSIOCGIFCONF, (char*)&ifc);
  #else
      #error
@@ -15,7 +15,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
          return;
  
 -#if __FreeBSD__
-+#if __FreeBSD__ || __NetBSD__
++#if __FreeBSD__ || __NetBSD__ || defined(__DragonFly__)
      int netdev1, netdev2;
      struct ifreq *netdevifr;
      netdevifr = ifc.ifc_req;
diff --git a/net/DarwinStreamingServer/patches/patch-ak b/net/DarwinStreamingServer/patches/patch-ak
index 415f65520bb..12e0425a026 100644
--- a/net/DarwinStreamingServer/patches/patch-ak
+++ b/net/DarwinStreamingServer/patches/patch-ak
@@ -1,12 +1,16 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
---- CommonUtilitiesLib/OSThread.h.orig  2003-08-16 01:52:53.000000000 +0200
-+++ CommonUtilitiesLib/OSThread.h	2005-02-25 17:03:31.000000000 +0100
-@@ -37,7 +37,7 @@
+$NetBSD: patch-ak,v 1.2 2007/03/07 18:22:43 joerg Exp $
+
+--- CommonUtilitiesLib/OSThread.h.orig	2005-05-31 10:54:25.000000000 +0000
++++ CommonUtilitiesLib/OSThread.h
+@@ -37,11 +37,7 @@
  
  #ifndef __Win32__
  #if __PTHREADS__
 -#if __solaris__ || __sgi__ || __hpux__
-+#if __solaris__ || __sgi__ || __hpux__ || __NetBSD__
      #include <errno.h>
+-#else
+-    #include <sys/errno.h>
+-#endif
+     #include <pthread.h>
  #else
-     #include <sys/errno.h>
+     #include <mach/mach.h>
diff --git a/net/DarwinStreamingServer/patches/patch-al b/net/DarwinStreamingServer/patches/patch-al
index f1afae08442..7d5882426da 100644
--- a/net/DarwinStreamingServer/patches/patch-al
+++ b/net/DarwinStreamingServer/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-al,v 1.2 2007/03/07 18:22:43 joerg Exp $
 --- CommonUtilitiesLib/OSHeaders.h.orig  2003-08-16 01:52:52.000000000 +0200
 +++ CommonUtilitiesLib/OSHeaders.h	2005-02-25 17:03:31.000000000 +0100
 @@ -48,7 +48,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-al,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
  
  /* Platform-specific components */
 -#if __linux__ || __linuxppc__ || __FreeBSD__ || __MacOSX__
-+#if __linux__ || __linuxppc__ || __FreeBSD__ || __MacOSX__ || __NetBSD__
++#if __linux__ || __linuxppc__ || __FreeBSD__ || __MacOSX__ || __NetBSD__ || defined(__DragonFly__)
      
      /* Defines */
      #define _64BITARG_ "q"
diff --git a/net/DarwinStreamingServer/patches/patch-am b/net/DarwinStreamingServer/patches/patch-am
index 0068ba8a06b..14b31f74929 100644
--- a/net/DarwinStreamingServer/patches/patch-am
+++ b/net/DarwinStreamingServer/patches/patch-am
@@ -1,11 +1,11 @@
-$NetBSD: patch-am,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-am,v 1.2 2007/03/07 18:22:44 joerg Exp $
 --- CommonUtilitiesLib/OSCodeFragment.cpp.orig  2003-08-16 01:52:52.000000000 +0200
 +++ CommonUtilitiesLib/OSCodeFragment.cpp	2005-02-25 17:03:31.000000000 +0100
 @@ -62,6 +62,8 @@
      fFragmentP = dlopen((char *)inPath, RTLD_NOW | RTLD_GLOBAL);
  #elif defined(__FreeBSD__)
      fFragmentP = dlopen(inPath, RTLD_NOW);
-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__DragonFly__)
 +    fFragmentP = dlopen(inPath, RTLD_LAZY);
  #elif defined(__sgi__) 
      fFragmentP = dlopen(inPath, RTLD_NOW); // not sure this should be either RTLD_NOW or RTLD_LAZY
diff --git a/net/DarwinStreamingServer/patches/patch-an b/net/DarwinStreamingServer/patches/patch-an
index cc10006c6cf..cff0ee36d2d 100644
--- a/net/DarwinStreamingServer/patches/patch-an
+++ b/net/DarwinStreamingServer/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
+$NetBSD: patch-an,v 1.2 2007/03/07 18:22:44 joerg Exp $
 --- MP3Broadcaster/BroadcasterMain.cpp.orig	2005-12-11 18:56:36.000000000 +0000
 +++ MP3Broadcaster/BroadcasterMain.cpp	2005-12-11 18:57:08.000000000 +0000
 @@ -216,7 +216,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-an,v 1.1.1.1 2006/12/15 09:03:47 adam Exp $
  struct sigaction act;
      
 -#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__)
-+#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__NetBSD__)
++#if defined(sun) || defined(i386) || defined(__MacOSX__) || defined(__sgi__) || defined(__osf__) || defined(__hpux__) || defined(__NetBSD__) || defined(__DragonFly__)
      sigemptyset(&act.sa_mask);
      act.sa_flags = 0;
      act.sa_handler = (void(*)(int))&SignalEventHandler;