misc/92828: port mbone/rat30 update

[Roman Kurakin]

>Number:         92828
>Category:       misc
>Synopsis:       port mbone/rat30 update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 04 23:00:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Roman Kurakin
>Release:        FreeBSD 5.4-STABLE
>Organization:
FreeBSD & RRC KI
>Environment:
FreeBSD serv 5.4-STABLE FreeBSD 5.4-STABLE #0: Tue Jan  3 18:31:26 MSK 2006     root at serv:/Arch/Software/Unix/FreeBSD/obj/Arch/Software/Unix/FreeBSD/src/sys/GENERIC  i386

>Description:
Fix compilation + support of 6.0 (tested at work on 6.0, audio no fully functional, but works partially and compiles, for example rat do not work at all
(some network problems)).

>How-To-Repeat:
Try to compile ;-)
>Fix:
Patch available at http://www.inse.ru/~rik/FreeBSD/ports/rat30_060205-1.pch

Index: Makefile
===================================================================
RCS file: /CVS/FreeBSD/ports/mbone/rat30/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile    6 Feb 2004 13:11:44 -0000       1.11
+++ Makefile    2 Feb 2006 21:22:17 -0000
@@ -27,10 +27,6 @@
  
 .include <bsd.port.pre.mk>
  
-.if ${OSVERSION} >= 501000
-BROKEN=                "Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 do-build:
        (cd ${WRKSRC};${SETENV} ${MAKE_ENV} MAKE=${GMAKE} ${SH} ./Build rat)
  
--- /dev/null   Sun Feb  5 01:33:00 2006
+++ files/patch-src:main.c      Fri Feb  3 00:24:24 2006
@@ -0,0 +1,16 @@
+--- src/main.c.orig    Fri Feb  3 00:23:21 2006
++++ src/main.c Fri Feb  3 00:23:37 2006
+@@ -118,11 +118,11 @@
+       NEW_QUEUE(pckt_queue_struct, rtcp_pckt_queue)
+       NEW_QUEUE(rx_queue_struct,   rx_unit_queue)
+
+-#define INIT_QUEUE(T,Q) Q##_ptr[0] = &Q##[0]; \
++#define INIT_QUEUE(T,Q) Q##_ptr[0] = &Q[0]; \
+                       Q##_ptr[0]->queue_empty_flag = 1; \
+                         Q##_ptr[0]->head_ptr         = NULL; \
+                         Q##_ptr[0]->tail_ptr         = NULL; \
+-                      Q##_ptr[1] = &Q##[1]; \
++                      Q##_ptr[1] = &Q[1]; \
+                       Q##_ptr[1]->queue_empty_flag = 1; \
+                         Q##_ptr[1]->head_ptr         = NULL; \
+                         Q##_ptr[1]->tail_ptr         = NULL;
--- /dev/null   Sun Feb  5 01:33:00 2006
+++ files/patch-Makefile_FreeBSD_6      Fri Feb  3 00:27:14 2006
@@ -0,0 +1,9 @@
+--- Makefile_FreeBSD_6.orig    Sun Oct 20 14:03:11 2002
++++ Makefile_FreeBSD_6 Sun Oct 20 14:03:06 2002
+@@ -0,0 +1,6 @@
++TCL_INC = /usr/local/include/tcl8.2
++TK_INC  = /usr/local/include/tk8.2
++INCS   = -I/usr/X11R6/include \
++         -I$(TCL_INC)/generic -I$(TK_INC)/generic
++LDLIBS = -L/usr/local/lib \
++         -L/usr/X11R6/lib -ltk82 -ltcl82 -lXext -lX11 -lm

>Release-Note:
>Audit-Trail:
>Unformatted: