From owner-freebsd-bugs@FreeBSD.ORG Sat Feb 4 23:00:15 2006 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E132C16A420 for ; Sat, 4 Feb 2006 23:00:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 232E643D55 for ; Sat, 4 Feb 2006 23:00:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k14N0DRM055755 for ; Sat, 4 Feb 2006 23:00:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k14N0Dbo055754; Sat, 4 Feb 2006 23:00:13 GMT (envelope-from gnats) Resent-Date: Sat, 4 Feb 2006 23:00:13 GMT Resent-Message-Id: <200602042300.k14N0Dbo055754@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Roman Kurakin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3E7A16A423 for ; Sat, 4 Feb 2006 22:52:40 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6086E43D5A for ; Sat, 4 Feb 2006 22:52:40 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k14MqeVj041087 for ; Sat, 4 Feb 2006 22:52:40 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k14MqdNu041085; Sat, 4 Feb 2006 22:52:39 GMT (envelope-from nobody) Message-Id: <200602042252.k14MqdNu041085@www.freebsd.org> Date: Sat, 4 Feb 2006 22:52:39 GMT From: Roman Kurakin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: misc/92828: port mbone/rat30 update X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Feb 2006 23:00:15 -0000 >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@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 -.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: