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.

8 files changed, 126 insertions, 31 deletions

diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index b78a1f775f3..99852a743f8 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:10:05 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/02/24 00:35:59 joerg Exp $
 #
 
 DISTNAME=	rat-3.0.28
@@ -10,8 +10,7 @@ MAINTAINER=	mycroft@NetBSD.org
 HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/
 COMMENT=	Robust Audio Tool - multicast audioconferencing
 
-BROKEN_IN=	pkgsrc-2005Q4
-
+NO_MTREE=	yes
 CRYPTO=		yes
 USE_TOOLS+=	gmake
 USE_X11BASE=	yes
@@ -22,17 +21,18 @@ INSTALLATION_DIRS=	bin man/man1
 
 post-patch:
 	${CP} ${WRKSRC}/Makefile_NetBSD_1 ${WRKSRC}/Makefile_NetBSD_2
+	${CP} ${WRKSRC}/Makefile_NetBSD_1 ${WRKSRC}/Makefile_NetBSD_3
+	${CP} ${WRKSRC}/Makefile_NetBSD_1 ${WRKSRC}/Makefile_NetBSD_4
+	${CP} ${WRKSRC}/Makefile_NetBSD_1 ${WRKSRC}/Makefile_DragonFly_1
 
 do-build:
 	cd ${WRKSRC} && USER=${USER} PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} LDFLAGS="${LDFLAGS}" X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh ./Build rat
 
 do-install:
-	cd ${WRKSRC} && ( \
-	 ${INSTALL_PROGRAM} \
-	    bin/${USER}/rat-${OPSYS}-${OS_VERSION} \
-	    ${PREFIX}/bin/rat; \
-	 ${INSTALL_MAN} \
-	    man/man1/rat.1 ${PREFIX}/man/man1/rat.1 )
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/rat ${PREFIX}/bin/rat
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/rat.1 ${PREFIX}/${PKGMANDIR}/man1/rat.1
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/mbone/rat/distinfo b/mbone/rat/distinfo
index 036ff0c9400..edb32c14f3f 100644
--- a/mbone/rat/distinfo
+++ b/mbone/rat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/22 21:33:50 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/02/24 00:35:59 joerg Exp $
 
 SHA1 (rat-3.0.28.tar.gz) = 37ddf3a98fa9182016b1d132e767aec9838a2a9c
 RMD160 (rat-3.0.28.tar.gz) = 38e7061cecb866fe1ae8c4806bb6cc8246be7118
@@ -6,10 +6,12 @@ Size (rat-3.0.28.tar.gz) = 351749 bytes
 SHA1 (patch-aa) = 0bfc55971ad645ba82e6455324c0f97b3d92b193
 SHA1 (patch-ab) = c2729989f62aab05f3a741e1880c2e51d370a0dc
 SHA1 (patch-ac) = cad434382ac8c533215e2566d2ada219f1922d6a
-SHA1 (patch-ad) = 65ee926927401cb6c53786e6398f7de3c0c003b8
-SHA1 (patch-ae) = 744982811f36e8bc18ae392d105b1e7fd14a9654
-SHA1 (patch-af) = 8b58c5ed398fb9d5c0bbe6d901fa90c6721ab703
-SHA1 (patch-ag) = ab08f597ce646a0fbc915c1b235da92e8bd83e5f
+SHA1 (patch-ad) = a795bc34eaf6b680178b4707d800468638830040
+SHA1 (patch-ae) = 479cb0419d6e39caa2359184cd39ec660d243e20
+SHA1 (patch-af) = 2d9c6ce8bead3b902b536074dfbff16d2aafffa1
+SHA1 (patch-ag) = d467b152ae6b1ccaa3020c78bf457f73a745c1ad
 SHA1 (patch-ah) = c727b18be73f6e91cb273735dbca45b822cf7126
 SHA1 (patch-ai) = 0cfe2a570e5870279ac765df458e727df134aaa2
 SHA1 (patch-aj) = 9e972414ced6aeb8ba434204dde7df22d9535379
+SHA1 (patch-ak) = 022e57bbf176f28eb7f3f4eb34cfe27c81d01771
+SHA1 (patch-al) = 6358b40664ab89daa938b34e73285f65625b9038
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;