Add DragonFly support. Allow build on newer NetBSD versions.

Don't require MTREE. Simplify Makefiles by building directly
as bin/rat -- pkgsrc doesn't support multiple builds in one
WRKSRC anyway.

6 files changed, 110 insertions, 17 deletions

diff --git a/mbone/rat/patches/patch-ad b/mbone/rat/patches/patch-ad
index dc69b4bf5ad..fa0708e0993 100644
--- a/mbone/rat/patches/patch-ad
+++ b/mbone/rat/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.2 1998/11/05 02:46:09 mycroft Exp $
+$NetBSD: patch-ad,v 1.3 2006/02/24 00:35:59 joerg Exp $
 
---- Build.orig	Sat Aug 15 15:16:43 1998
-+++ Build	Wed Nov  4 21:34:06 1998
-@@ -54,7 +54,7 @@
+--- Build.orig	1998-08-15 19:16:43.000000000 +0000
++++ Build
+@@ -54,7 +54,7 @@ OSVERS=`uname -r`
  case $OSTYPE in
    Linux                  ) OSMVER=`echo $OSVERS | awk -F. '{printf("%d_%d", $1, $2)}'`
                             ;;
 -  SunOS | IRIX | FreeBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
-+  SunOS | IRIX | FreeBSD | NetBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
++  SunOS | IRIX | FreeBSD | DragonFly | NetBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
                             ;;
    HP-UX                  ) OSTYPE=HPUX
                             OSMVER=`echo $OSVERS | awk -F. '{print $2}'`
-@@ -68,18 +68,20 @@
+@@ -68,21 +68,23 @@ echo "OSTYPE=$OSTYPE"
  echo "OSVERS=$OSVERS"
  echo "OSMVER=$OSMVER"
  
@@ -36,4 +36,8 @@ $NetBSD: patch-ad,v 1.2 1998/11/05 02:46:09 mycroft Exp $
 +cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS USER=$USER"
  case $1 in
    rat   ) echo "Running: $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}"
-           eval $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}
+-          eval $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}
++          eval $cmd bin/rat
+           exit
+           ;;
+   depend|tags|tar|clean) echo "Running: $cmd $1"
diff --git a/mbone/rat/patches/patch-ae b/mbone/rat/patches/patch-ae
index bddfc617ef7..6cdbb05a10f 100644
--- a/mbone/rat/patches/patch-ae
+++ b/mbone/rat/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/06/18 12:50:51 markd Exp $
+$NetBSD: patch-ae,v 1.4 2006/02/24 00:35:59 joerg Exp $
 
---- Makefile.orig	Sat Aug 15 15:16:44 1998
-+++ Makefile	Wed Nov  4 21:27:03 1998
-@@ -9,10 +9,10 @@
+--- Makefile.orig	1998-08-15 19:16:44.000000000 +0000
++++ Makefile
+@@ -9,10 +9,10 @@ DEFS = -DNDEBUG
  # -DNDEBUG -DDEBUG -DTEST -DGSM -DDEBUG_MIX -DDEBUG_MEM
  # -DDEBUG_RTP -DREPEAT
  
@@ -16,7 +16,16 @@ $NetBSD: patch-ae,v 1.3 2004/06/18 12:50:51 markd Exp $
  LDLIBS=  $(LDLIBS) -lm
  RANLIB = ranlib
  
-@@ -50,6 +50,7 @@
+@@ -21,7 +21,7 @@ GSMFLAGS   = -DSASR -DFAST -DUSE_FLOAT_M
+ 
+ include Makefile_$(OSTYPE)_$(OSMVER)
+ 
+-BINDIR = bin/$(USER)
++BINDIR = bin
+ SRCDIR = src
+ OBJDIR = objs/$(USER)/$(OSTYPE)_$(OSVERS)
+ OBJS   = $(OBJDIR)/codec_encoder.o \
+@@ -50,6 +50,7 @@ OBJS   = $(OBJDIR)/codec_encoder.o \
           $(OBJDIR)/auddev_hpux_raw.o \
           $(OBJDIR)/auddev_linux.o \
           $(OBJDIR)/auddev_freebsd.o \
@@ -24,3 +33,16 @@ $NetBSD: patch-ae,v 1.3 2004/06/18 12:50:51 markd Exp $
           $(OBJDIR)/init_net.o \
           $(OBJDIR)/init_session.o \
           $(OBJDIR)/tabmulaw.o \
+@@ -77,9 +78,9 @@ CRYPTOBJS=$(OBJDIR)/crypt.o \
+           $(OBJDIR)/crypt_random.o \
+           $(OBJDIR)/md5c.o
+ 
+-$(BINDIR)/rat-$(OSTYPE)-$(OSVERS): $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(RATOBJS)
+-	rm -f $(BINDIR)/rat-$(OSTYPE)-$(OSVERS)
+-	$(CC) $(RATOBJS) $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(LDLIBS) $(LDFLAGS) -o $(BINDIR)/rat-$(OSTYPE)-$(OSVERS)
++$(BINDIR)/rat: $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(RATOBJS)
++	rm -f $(BINDIR)/rat
++	$(CC) $(RATOBJS) $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(LDLIBS) $(LDFLAGS) -o $(BINDIR)/rat
+ 
+ $(OBJDIR)/%.o: $(SRCDIR)/%.c
+ 	$(CC) $(CFLAGS) $(GSMFLAGS) $(CRYPTFLAGS) -c $(SRCDIR)/$*.c -o $(OBJDIR)/$*.o
diff --git a/mbone/rat/patches/patch-af b/mbone/rat/patches/patch-af
index fb6032db1b7..3152879a8fa 100644
--- a/mbone/rat/patches/patch-af
+++ b/mbone/rat/patches/patch-af
@@ -1,13 +1,23 @@
-$NetBSD: patch-af,v 1.2 1998/11/05 02:46:09 mycroft Exp $
+$NetBSD: patch-af,v 1.3 2006/02/24 00:35:59 joerg Exp $
 
 --- src/bat_include.h.orig	Sat Aug 15 15:16:47 1998
 +++ src/bat_include.h	Wed Nov  4 21:27:03 1998
-@@ -70,7 +70,7 @@
+@@ -44,9 +44,6 @@
+ 
+ #include "config.h"
+ 
+-#ifndef __FreeBSD__
+-#include <malloc.h>
+-#endif
+ #include <stdio.h>
+ #include <memory.h>
+ #include <errno.h>
+@@ -70,7 +67,7 @@
  #include <netdb.h>
  #include <arpa/inet.h>
  extern int h_errno;
 -#if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__)
-+#if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <stropts.h>
  #include <sys/filio.h>  
  #endif /* HPUX */
diff --git a/mbone/rat/patches/patch-ag b/mbone/rat/patches/patch-ag
index a193fe70ca9..d18e4fc5c19 100644
--- a/mbone/rat/patches/patch-ag
+++ b/mbone/rat/patches/patch-ag
@@ -1,11 +1,24 @@
-$NetBSD: patch-ag,v 1.2 1998/11/05 02:46:09 mycroft Exp $
+$NetBSD: patch-ag,v 1.3 2006/02/24 00:35:59 joerg Exp $
 
 --- src/config.h.orig	Sat Aug 15 15:16:46 1998
 +++ src/config.h	Wed Nov  4 21:27:03 1998
-@@ -56,6 +56,17 @@
+@@ -56,6 +56,30 @@
  #define AUDIO_LINE_IN    2
  #endif /* FreeBSD */
  
++#ifdef __DragonFly__
++#define OSNAME "DragonFly"
++#include <unistd.h>
++#include <stdlib.h>
++#include <sys/soundcard.h>
++#define DIFF_BYTE_ORDER  1
++#define AUDIO_SPEAKER    0
++#define AUDIO_HEADPHONE  1
++#define AUDIO_LINE_OUT   4
++#define AUDIO_MICROPHONE 1
++#define AUDIO_LINE_IN    2
++#endif /* DragonFly */
++
 +#ifdef __NetBSD__
 +#define OSNAME "NetBSD"
 +#define DEFINED_ERRLIST
diff --git a/mbone/rat/patches/patch-ak b/mbone/rat/patches/patch-ak
new file mode 100644
index 00000000000..e09b9767657
--- /dev/null
+++ b/mbone/rat/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2006/02/24 00:35:59 joerg Exp $
+
+--- src/auddev_freebsd.c.orig	2006-02-24 00:11:07.000000000 +0000
++++ src/auddev_freebsd.c
+@@ -43,7 +43,7 @@
+ 
+ #include "assert.h"
+ #include "bat_include.h"
+-#ifdef FreeBSD
++#if defined(FreeBSD) || defined(__DragonFly__)
+ 
+ #include <sys/soundcard.h>
+ 
diff --git a/mbone/rat/patches/patch-al b/mbone/rat/patches/patch-al
new file mode 100644
index 00000000000..20a68df5bca
--- /dev/null
+++ b/mbone/rat/patches/patch-al
@@ -0,0 +1,31 @@
+$NetBSD: patch-al,v 1.1 2006/02/24 00:35:59 joerg Exp $
+
+--- src/net.c.orig	2006-02-24 00:13:12.000000000 +0000
++++ src/net.c
+@@ -273,7 +273,7 @@ read_packets_and_add_to_queue(int fd, u_
+ 			/* on each read to get it right...               */
+ 			nb -= pckt_ptr->len;
+ 			nb -= nbdecryption;
+-#if defined(SunOS_4) || defined(IRIX) || defined(HPUX) || defined(FreeBSD)
++#if defined(SunOS_4) || defined(IRIX) || defined(HPUX) || defined(FreeBSD) || defined(__DragonFly__)
+ 			nb -= 16;
+ #endif
+ 			put_on_pckt_queue(pckt_ptr, queue);
+@@ -323,7 +323,7 @@ network_read(session_struct    *session_
+ 		FD_ZERO(&rfds);
+ 		FD_SET(session_pointer->rtp_fd, &rfds);
+ 		FD_SET(session_pointer->rtcp_fd, &rfds);
+-#if defined(WIN32) || defined(HPUX) || defined(Linux) || defined(FreeBSD)
++#if defined(WIN32) || defined(HPUX) || defined(Linux) || defined(FreeBSD) || defined(__DragonFly__)
+ 		timeout.tv_sec  = 0;
+ 		timeout.tv_usec = session_pointer->loop_delay;
+ 		tvp = &timeout;
+@@ -351,7 +351,7 @@ network_read(session_struct    *session_
+ 				read_packets_and_add_to_queue(session_pointer->rtcp_fd, cur_time, rtcp_pckt_queue_ptr, PACKET_RTCP);
+ 			}
+ 		}
+-#if !defined(WIN32) && !defined(HPUX) && !defined(Linux) && !defined(FreeBSD)
++#if !defined(WIN32) && !defined(HPUX) && !defined(Linux) && !defined(FreeBSD) && !defined(__DragonFly__)
+ 		if (session_pointer->mode == AUDIO_TOOL) {
+ 			if (session_pointer->audio_fd == -1 || FD_ISSET(session_pointer->audio_fd, &rfds)) {
+ 				break;