cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* respect CC/CFLAGS

Browse Source 
* split patches into separate files
This commit is contained in:
wilfried 2001-03-17 17:21:41 +00:00
parent a8403a3428
commit 106f413f49
17 changed files with 319 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mbone/nte/patches/patch-linux_Makefile_linux Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-linux_Makefile_linux,v 1.1 2001/03/17 17:21:41 wilfried Exp $
--- linux/Makefile.linux.orig Wed May 26 00:10:05 1999
+++ linux/Makefile.linux Fri Mar 16 20:45:42 2001
@@ -1,4 +1,4 @@
-INCLUDES += -I/usr/X11R6/include
+INCLUDES += -I/usr/X11R6/include -I/usr/local/include/tk8.0 \
+ -I/usr/local/include/tk8.0/generic -I/usr/local/include/tcl8.0
CFLAGS += -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
-LIBS += -lm -L/usr/X11R6/lib -lX11 -ldl
-
+LIBS += -lm -L/usr/X11R6/lib -lX11 -L/usr/local/lib -ltcl80 -ltk80 -lcommon

115
mbone/nte/patches/patch-nte
View File

@ -1,115 +0,0 @@
*** ./linux/Makefile.linux.orig Thu Sep 2 16:02:21 1999
--- ./linux/Makefile.linux Thu Sep 2 16:08:09 1999
***************
*** 1,4 ****
! INCLUDES += -I/usr/X11R6/include
CFLAGS += -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
! LIBS += -lm -L/usr/X11R6/lib -lX11 -ldl
!
--- 1,4 ----
! INCLUDES += -I/usr/X11R6/include -I/usr/local/include/tk8.0 \
! -I/usr/local/include/tk8.0/generic -I/usr/local/include/tcl8.0
CFLAGS += -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
! LIBS += -lm -L/usr/X11R6/lib -lX11 -L/usr/local/lib -ltcl80 -ltk80 -lcommon
*** ./src/nt.h.orig Thu Sep 2 16:00:15 1999
--- ./src/nt.h Thu Sep 2 16:00:29 1999
***************
*** 75,81 ****
#include <netdb.h>
#include <sys/utsname.h>
! #ifndef HAVE_NO_VALUES_H
#include <values.h>
#endif
--- 75,81 ----
#include <netdb.h>
#include <sys/utsname.h>
! #if !defined(HAVE_NO_VALUES_H) && !defined(__OpenBSD__)
#include <values.h>
#endif
*** ./src/www_fns.c.orig Thu Sep 2 16:03:35 1999
--- ./src/www_fns.c Thu Sep 2 16:03:55 1999
***************
*** 42,48 ****
--- 42,50 ----
#include "ui_fns.h"
#include "tcl.h"
#include "tk.h"
+ #if !defined(__OpenBSD__)
#include <malloc.h>
+ #endif
#include <string.h>
#include <fcntl.h>
#include <errno.h>
*** ./src/Makefile.template.orig Thu Sep 2 16:04:16 1999
--- ./src/Makefile.template Thu Sep 2 16:07:39 1999
***************
*** 1,8 ****
CC = gcc
! INCLUDES = -I/usr/X11R6/include -I../../tk-8.0/generic -I../../tcl-8.0/generic -I../../common
CFLAGS = -Wall -Wno-implicit-int -Werror $(INCLUDES) -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
LIB_DIR =
! LIBS = ../../tk-8.0/unix/libtk8.0.a ../../tcl-8.0/unix/libtcl8.0.a ../../common/libcommon.a -lm -L/usr/X11R6/lib -lX11 -ldl
OBJS = init.o text_pane.o typeface_fns.o ui_fns.o ui_init.o user_fns.o main.o\
tkAppInit.o tkUnixInit.o time.o network_setup.o jip.o byte_fns.o\
protocol.o network_write.o network_read.o ds_fns.o parse_packet.o ids.o \
--- 1,8 ----
CC = gcc
! INCLUDES = -I/usr/X11R6/include -I/usr/local/include/tcl8.0 -I/usr/local/include/tk8.0 -I/usr/local/include/tk8.0/generic -I/usr/local/include/common
CFLAGS = -Wall -Wno-implicit-int -Werror $(INCLUDES) -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
LIB_DIR =
! LIBS = -L/usr/local/lib -ltk80 -ltcl80 -lm -L/usr/X11R6/lib -lX11
OBJS = init.o text_pane.o typeface_fns.o ui_fns.o ui_init.o user_fns.o main.o\
tkAppInit.o tkUnixInit.o time.o network_setup.o jip.o byte_fns.o\
protocol.o network_write.o network_read.o ds_fns.o parse_packet.o ids.o \
***************
*** 115,129 ****
$(CC) -c www_ui.c
help.ehtml: text2html ../src/help/help.html
! text2html < ../src/help/help.html > help.ehtml
blocks.ehtml: text2html ../src/help/blocks.html
! text2html < ../src/help/blocks.html > blocks.ehtml
bindings.ehtml: text2html ../src/help/bindings.html
! text2html < ../src/help/bindings.html > bindings.ehtml
menus.ehtml: text2html ../src/help/menus.html
! text2html < ../src/help/menus.html > menus.ehtml
xresources.ehtml: text2html ../src/help/xresources.html
! text2html < ../src/help/xresources.html > xresources.ehtml
.c.o: ../src/$*.c
$(CC) $(CFLAGS) -c ../src/$*.c
--- 115,129 ----
$(CC) -c www_ui.c
help.ehtml: text2html ../src/help/help.html
! ./text2html < ../src/help/help.html > help.ehtml
blocks.ehtml: text2html ../src/help/blocks.html
! ./text2html < ../src/help/blocks.html > blocks.ehtml
bindings.ehtml: text2html ../src/help/bindings.html
! ./text2html < ../src/help/bindings.html > bindings.ehtml
menus.ehtml: text2html ../src/help/menus.html
! ./text2html < ../src/help/menus.html > menus.ehtml
xresources.ehtml: text2html ../src/help/xresources.html
! ./text2html < ../src/help/xresources.html > xresources.ehtml
.c.o: ../src/$*.c
$(CC) $(CFLAGS) -c ../src/$*.c
*** ./src/nt_help.c.orig Thu Sep 2 16:06:10 1999
--- ./src/nt_help.c Thu Sep 2 16:06:35 1999
***************
*** 48,57 ****
,
#include "help/xresources.ehtml"
#else
- #include "help.ehtml"
- ,
- #include "blocks.ehtml"
- ,
#include "bindings.ehtml"
,
#include "menus.ehtml"
--- 48,53 ----

36
mbone/nte/patches/patch-src_Makefile_template Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-src_Makefile_template,v 1.1 2001/03/17 17:21:42 wilfried Exp $
--- src/Makefile.template.orig Fri May 28 18:11:08 1999
+++ src/Makefile.template Fri Mar 16 20:46:44 2001
@@ -1,8 +1,7 @@
-CC = gcc
-INCLUDES = -I/usr/X11R6/include -I../../tk-8.0/generic -I../../tcl-8.0/generic -I../../common
-CFLAGS = -Wall -Wno-implicit-int -Werror $(INCLUDES) -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
+INCLUDES = -I/usr/X11R6/include -I/usr/local/include/tcl8.0 -I/usr/local/include/tk8.0 -I/usr/local/include/tk8.0/generic -I/usr/local/include/common
+CFLAGS += -Wall -Wno-implicit-int -Werror $(INCLUDES) -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
LIB_DIR =
-LIBS = ../../tk-8.0/unix/libtk8.0.a ../../tcl-8.0/unix/libtcl8.0.a ../../common/libcommon.a -lm -L/usr/X11R6/lib -lX11 -ldl
+LIBS = -L/usr/local/lib -ltk80 -ltcl80 -lm -L/usr/X11R6/lib -lX11
OBJS = init.o text_pane.o typeface_fns.o ui_fns.o ui_init.o user_fns.o main.o\
tkAppInit.o tkUnixInit.o time.o network_setup.o jip.o byte_fns.o\
protocol.o network_write.o network_read.o ds_fns.o parse_packet.o ids.o \
@@ -115,15 +114,15 @@ www_ui.o: www_ui.c
$(CC) -c www_ui.c
help.ehtml: text2html ../src/help/help.html
- text2html < ../src/help/help.html > help.ehtml
+ ./text2html < ../src/help/help.html > help.ehtml
blocks.ehtml: text2html ../src/help/blocks.html
- text2html < ../src/help/blocks.html > blocks.ehtml
+ ./text2html < ../src/help/blocks.html > blocks.ehtml
bindings.ehtml: text2html ../src/help/bindings.html
- text2html < ../src/help/bindings.html > bindings.ehtml
+ ./text2html < ../src/help/bindings.html > bindings.ehtml
menus.ehtml: text2html ../src/help/menus.html
- text2html < ../src/help/menus.html > menus.ehtml
+ ./text2html < ../src/help/menus.html > menus.ehtml
xresources.ehtml: text2html ../src/help/xresources.html
- text2html < ../src/help/xresources.html > xresources.ehtml
+ ./text2html < ../src/help/xresources.html > xresources.ehtml
.c.o: ../src/$*.c
$(CC) $(CFLAGS) -c ../src/$*.c

12
mbone/nte/patches/patch-src_nt_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_nt_h,v 1.1 2001/03/17 17:21:42 wilfried Exp $
--- src/nt.h.orig Fri May 28 18:05:46 1999
+++ src/nt.h Fri Mar 16 20:45:42 2001
@@ -75,7 +75,7 @@ time_t time(time_t *);
#include <netdb.h>
#include <sys/utsname.h>
-#ifndef HAVE_NO_VALUES_H
+#if !defined(HAVE_NO_VALUES_H) && !defined(__OpenBSD__)
#include <values.h>
#endif

14
mbone/nte/patches/patch-src_nt_help_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_nt_help_c,v 1.1 2001/03/17 17:21:42 wilfried Exp $
--- src/nt_help.c.orig Thu Sep 17 16:39:14 1998
+++ src/nt_help.c Fri Mar 16 20:45:42 2001
@@ -48,10 +48,6 @@ char *helpdata[NO_OF_HELP] =
,
#include "help/xresources.ehtml"
#else
-#include "help.ehtml"
- ,
-#include "blocks.ehtml"
- ,
#include "bindings.ehtml"
,
#include "menus.ehtml"

13
mbone/nte/patches/patch-src_www_fns_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_www_fns_c,v 1.1 2001/03/17 17:21:42 wilfried Exp $
--- src/www_fns.c.orig Wed May 26 00:10:31 1999
+++ src/www_fns.c Fri Mar 16 20:45:42 2001
@@ -42,7 +42,9 @@
#include "ui_fns.h"
#include "tcl.h"
#include "tk.h"
+#if !defined(__OpenBSD__)
#include <malloc.h>
+#endif
#include <string.h>
#include <fcntl.h>
#include <errno.h>

56
mbone/rat/patches/patch-Build Normal file
View File

@ -0,0 +1,56 @@
$OpenBSD: patch-Build,v 1.1 2001/03/17 17:23:27 wilfried Exp $
--- Build.orig Mon Mar 1 18:23:47 1999
+++ Build Fri Mar 16 20:49:24 2001
@@ -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 | OpenBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
;;
HP-UX ) OSTYPE=HPUX
OSMVER=`echo $OSVERS | awk -F. '{print $2}'`
@@ -69,20 +69,19 @@ echo "OSVERS=$OSVERS"
echo "OSMVER=$OSMVER"
# Create a directory for the .o files, if it doesn't exist...
-if [ ! -d objs/${USER:=`whoami`}/${OSTYPE}_${OSVERS} ]; then
- echo "Creating object directory objs/${USER}/${OSTYPE}_${OSVERS}..."
- mkdir -p bin/${USER}
- mkdir -p objs/${USER}
- mkdir -p objs/${USER}/${OSTYPE}_${OSVERS}
- chmod 775 bin/${USER}
- chmod 775 objs/${USER}
- chmod 775 objs/${USER}/${OSTYPE}_${OSVERS}
+if [ ! -d objs/${OSTYPE}_${OSVERS} ]; then
+ echo "Creating object directory objs/${OSTYPE}_${OSVERS}..."
+ mkdir -p objs/${OSTYPE}_${OSVERS}
+ mkdir -p bin
+ chmod 775 bin
+ chmod 775 objs
+ chmod 775 objs/${OSTYPE}_${OSVERS}
fi
-cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS USER=`whoami`"
+cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS"
case $1 in
- rat ) echo "Running: $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}"
- eval $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}
+ rat ) echo "Running: $cmd bin/rat-${OSTYPE}-${OSVERS}"
+ eval $cmd bin/rat-${OSTYPE}-${OSVERS}
exit
;;
depend|tags|tar|clean) echo "Running: $cmd $1"
@@ -94,10 +93,10 @@ case $1 in
cd dist
cp ../man/man1/rat.1 man/man1/rat.1
cp ../README ../MODS ../COPYRIGHT .
- for i in `ls ../bin/${USER}/`
+ for i in `ls ../bin/`
do
echo "Making distribution $i"
- cp ../bin/${USER}/$i bin/rat
+ cp ../bin/$i bin/rat
tar chf $i.tar README MODS COPYRIGHT bin man
gzip $i.tar
done

26
mbone/rat/patches/patch-Makefile Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-Makefile,v 1.1 2001/03/17 17:23:27 wilfried Exp $
--- Makefile.orig Mon Mar 1 18:23:47 1999
+++ Makefile Fri Mar 16 20:50:15 2001
@@ -9,9 +9,7 @@ DEFS = -DNDEBUG
# -DNDEBUG -DDEBUG -DTEST -DGSM -DDEBUG_MIX -DDEBUG_MEM
# -DDEBUG_RTP -DREPEAT
-DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) -D$(USER)
-CC = gcc
-CFLAGS = -Wall -Werror $(INCS) $(DEFS) -g -O -fsigned-char
+CFLAGS += -Wall -Werror $(INCS) $(DEFS) -g -fsigned-char
LDFLAGS=
LDLIBS= $(LDLIBS) -lm
RANLIB = ranlib
@@ -21,9 +19,9 @@ GSMFLAGS = -DSASR -DFAST -DUSE_FLOAT_M
include Makefile_$(OSTYPE)_$(OSMVER)
-BINDIR = bin/$(USER)
+BINDIR = bin
SRCDIR = src
-OBJDIR = objs/$(USER)/$(OSTYPE)_$(OSVERS)
+OBJDIR = objs/$(OSTYPE)_$(OSVERS)
OBJS = $(OBJDIR)/codec_encoder.o \
$(OBJDIR)/codec_decoder.o \
$(OBJDIR)/codec_lpc.o \

9
mbone/rat/patches/patch-Makefile_OpenBSD_2 Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-Makefile_OpenBSD_2,v 1.1 2001/03/17 17:23:27 wilfried Exp $
--- Makefile_OpenBSD_2.orig Fri Mar 16 20:49:24 2001
+++ Makefile_OpenBSD_2 Fri Mar 16 20:49:24 2001
@@ -0,0 +1,5 @@
+INCS = -I/usr/X11R6/include -I/usr/local/include/tcl8.0\
+ -I/usr/local/include/tcl8.0/generic -I/usr/local/include/tk8.0 \
+ -I/usr/local/include/tk8.0/generic
+LDLIBS = -L/usr/local/lib -L/usr/X11R6/lib -ltk80 -ltcl80 -lXext -lX11 -lm \
+ -lossaudio

336
mbone/rat/patches/patch-rat
View File

@ -1,336 +0,0 @@
*** ./src/bat_include.h.orig Fri Sep 3 12:46:37 1999
--- ./src/bat_include.h Fri Sep 3 12:47:53 1999
***************
*** 44,50 ****
#include "config.h"
! #ifndef __FreeBSD__
#include <malloc.h>
#endif
#include <stdio.h>
--- 44,50 ----
#include "config.h"
! #if !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#include <stdio.h>
***************
*** 71,77 ****
#include <netdb.h>
#include <arpa/inet.h>
extern int h_errno;
! #if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__)
#include <stropts.h>
#include <sys/filio.h>
#endif /* HPUX */
--- 71,77 ----
#include <netdb.h>
#include <arpa/inet.h>
extern int h_errno;
! #if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <stropts.h>
#include <sys/filio.h>
#endif /* HPUX */
*** ./src/rtcp_pckt.c.orig Fri Sep 3 12:48:16 1999
--- ./src/rtcp_pckt.c Fri Sep 3 14:52:10 1999
***************
*** 348,356 ****
--- 348,362 ----
break;
}
case 3 : if (sp->mode == TRANSCODER) {
+ #if !defined(__OpenBSD__)
len += rtcp_add_sdes_item(&ptr[len], RTCP_SDES_TOOL, RAT_VERSION " " OSNAME " [Transcoder]");
} else {
len += rtcp_add_sdes_item(&ptr[len], RTCP_SDES_TOOL, RAT_VERSION " " OSNAME);
+ #else
+ len += rtcp_add_sdes_item(&ptr[len], RTCP_SDES_TOOL, RAT_VERSION " OpenBSD" " [Transcoder]");
+ } else {
+ len += rtcp_add_sdes_item(&ptr[len], RTCP_SDES_TOOL, RAT_VERSION " OpenBSD");
+ #endif
}
break;
default: printf("ERROR: sdes_ter_count has strange value! %ld\n", sp->db.sdes_ter_count);
*** ./src/qfDES.c.orig Fri Sep 3 12:49:50 1999
--- ./src/qfDES.c Fri Sep 3 12:50:08 1999
***************
*** 23,29 ****
#include <string.h>
#include <stdio.h>
#include <memory.h>
! #ifndef FreeBSD
#include <malloc.h>
#endif
#include <ctype.h>
--- 23,29 ----
#include <string.h>
#include <stdio.h>
#include <memory.h>
! #if !defined(FreeBSD) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#include <ctype.h>
*** ./src/gsm_create.c.orig Fri Sep 3 12:50:29 1999
--- ./src/gsm_create.c Fri Sep 3 12:50:43 1999
***************
*** 11,17 ****
#include "assert.h"
#include "gsm.h"
! #ifndef FreeBSD
#include <malloc.h>
#endif
--- 11,17 ----
#include "assert.h"
#include "gsm.h"
! #if !defined(FreeBSD) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
*** ./src/gsm_destroy.c.orig Fri Sep 3 12:50:59 1999
--- ./src/gsm_destroy.c Fri Sep 3 12:51:13 1999
***************
*** 6,12 ****
/* $Header: /home/cvs/ports/mbone/rat/patches/Attic/patch-rat,v 1.1.1.1 1999/09/04 01:54:34 angelos Exp $ */
! #ifndef FreeBSD
#include <malloc.h>
#endif
--- 6,12 ----
/* $Header: /home/cvs/ports/mbone/rat/patches/Attic/patch-rat,v 1.1.1.1 1999/09/04 01:54:34 angelos Exp $ */
! #if !defined(FreeBSD) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
*** ./src/ui.c.orig Fri Sep 3 12:51:51 1999
--- ./src/ui.c Fri Sep 3 12:52:58 1999
***************
*** 42,47 ****
--- 42,51 ----
#include <ctype.h> /* for toupper() [csp] */
#include <math.h>
+ #if defined(__OpenBSD__)
+ #include <sys/types.h>
+ #include <sys/audioio.h>
+ #endif
#include "version.h"
#include "bat_include.h"
#include "crypt.h"
***************
*** 203,209 ****
eval_check(interp, comm);
}
! static us_active = 0;
void
ui_info_activate_us(void)
--- 207,213 ----
eval_check(interp, comm);
}
! static int us_active = 0;
void
ui_info_activate_us(void)
*** /dev/null Fri Sep 3 14:47:02 1999
--- Makefile_OpenBSD_2 Fri Sep 3 12:53:32 1999
***************
*** 0 ****
--- 1,5 ----
+ INCS = -I/usr/X11R6/include -I/usr/local/include/tcl8.0\
+ -I/usr/local/include/tcl8.0/generic -I/usr/local/include/tk8.0 \
+ -I/usr/local/include/tk8.0/generic
+ LDLIBS = -L/usr/local/lib -L/usr/X11R6/lib -ltk80 -ltcl80 -lXext -lX11 -lm \
+ -lossaudio
*** Makefile.orig Mon Mar 1 12:23:47 1999
--- Makefile Fri Sep 3 19:42:24 1999
***************
*** 9,15 ****
# -DNDEBUG -DDEBUG -DTEST -DGSM -DDEBUG_MIX -DDEBUG_MEM
# -DDEBUG_RTP -DREPEAT
- DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) -D$(USER)
CC = gcc
CFLAGS = -Wall -Werror $(INCS) $(DEFS) -g -O -fsigned-char
LDFLAGS=
--- 9,14 ----
***************
*** 21,29 ****
include Makefile_$(OSTYPE)_$(OSMVER)
! BINDIR = bin/$(USER)
SRCDIR = src
! OBJDIR = objs/$(USER)/$(OSTYPE)_$(OSVERS)
OBJS = $(OBJDIR)/codec_encoder.o \
$(OBJDIR)/codec_decoder.o \
$(OBJDIR)/codec_lpc.o \
--- 20,28 ----
include Makefile_$(OSTYPE)_$(OSMVER)
! BINDIR = bin
SRCDIR = src
! OBJDIR = objs/$(OSTYPE)_$(OSVERS)
OBJS = $(OBJDIR)/codec_encoder.o \
$(OBJDIR)/codec_decoder.o \
$(OBJDIR)/codec_lpc.o \
*** Build.orig Mon Mar 1 12:23:47 1999
--- Build Fri Sep 3 19:43:42 1999
***************
*** 54,60 ****
case $OSTYPE in
Linux ) OSMVER=`echo $OSVERS | awk -F. '{printf("%d_%d", $1, $2)}'`
;;
! SunOS | IRIX | FreeBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
;;
HP-UX ) OSTYPE=HPUX
OSMVER=`echo $OSVERS | awk -F. '{print $2}'`
--- 54,60 ----
case $OSTYPE in
Linux ) OSMVER=`echo $OSVERS | awk -F. '{printf("%d_%d", $1, $2)}'`
;;
! SunOS | IRIX | FreeBSD | OpenBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
;;
HP-UX ) OSTYPE=HPUX
OSMVER=`echo $OSVERS | awk -F. '{print $2}'`
***************
*** 69,88 ****
echo "OSMVER=$OSMVER"
# Create a directory for the .o files, if it doesn't exist...
! if [ ! -d objs/${USER:=`whoami`}/${OSTYPE}_${OSVERS} ]; then
! echo "Creating object directory objs/${USER}/${OSTYPE}_${OSVERS}..."
! mkdir -p bin/${USER}
! mkdir -p objs/${USER}
! mkdir -p objs/${USER}/${OSTYPE}_${OSVERS}
! chmod 775 bin/${USER}
! chmod 775 objs/${USER}
! chmod 775 objs/${USER}/${OSTYPE}_${OSVERS}
fi
! cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS USER=`whoami`"
case $1 in
! rat ) echo "Running: $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}"
! eval $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}
exit
;;
depend|tags|tar|clean) echo "Running: $cmd $1"
--- 69,87 ----
echo "OSMVER=$OSMVER"
# Create a directory for the .o files, if it doesn't exist...
! if [ ! -d objs/${OSTYPE}_${OSVERS} ]; then
! echo "Creating object directory objs/${OSTYPE}_${OSVERS}..."
! mkdir -p objs/${OSTYPE}_${OSVERS}
! mkdir -p bin
! chmod 775 bin
! chmod 775 objs
! chmod 775 objs/${OSTYPE}_${OSVERS}
fi
! cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS"
case $1 in
! rat ) echo "Running: $cmd bin/rat-${OSTYPE}-${OSVERS}"
! eval $cmd bin/rat-${OSTYPE}-${OSVERS}
exit
;;
depend|tags|tar|clean) echo "Running: $cmd $1"
***************
*** 94,103 ****
cd dist
cp ../man/man1/rat.1 man/man1/rat.1
cp ../README ../MODS ../COPYRIGHT .
! for i in `ls ../bin/${USER}/`
do
echo "Making distribution $i"
! cp ../bin/${USER}/$i bin/rat
tar chf $i.tar README MODS COPYRIGHT bin man
gzip $i.tar
done
--- 93,102 ----
cd dist
cp ../man/man1/rat.1 man/man1/rat.1
cp ../README ../MODS ../COPYRIGHT .
! for i in `ls ../bin/`
do
echo "Making distribution $i"
! cp ../bin/$i bin/rat
tar chf $i.tar README MODS COPYRIGHT bin man
gzip $i.tar
done
*** src/auddev_sparc.c.orig Fri Sep 3 21:42:45 1999
--- src/auddev_sparc.c Fri Sep 3 21:47:05 1999
***************
*** 45,55 ****
#include "assert.h"
#include "bat_include.h"
! #ifdef SunOS
#include <multimedia/audio_hdr.h>
typedef Audio_hdr* audio_header_pointer;
static audio_info_t dev_info;
static int mulaw_device = FALSE; /* TRUE if the hardware can only do 8bit mulaw sampling */
--- 45,63 ----
#include "assert.h"
#include "bat_include.h"
! #if defined(SunOS) || defined(__OpenBSD__)
+ #if defined(SunOS)
#include <multimedia/audio_hdr.h>
+ #else
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/audioio.h>
+ #endif
+ #if !defined(__OpenBSD__)
typedef Audio_hdr* audio_header_pointer;
+ #endif
static audio_info_t dev_info;
static int mulaw_device = FALSE; /* TRUE if the hardware can only do 8bit mulaw sampling */
***************
*** 69,75 ****
--- 77,85 ----
if (audio_fd > 0) {
AUDIO_INITINFO(&dev_info);
dev_info.monitor_gain = 0;
+ #if !defined(__OpenBSD__)
dev_info.output_muted = 0; /* 0==not muted */
+ #endif
dev_info.play.sample_rate = format.sample_rate;
dev_info.record.sample_rate = format.sample_rate;
dev_info.play.channels = format.num_channels;
***************
*** 157,163 ****
void
audio_drain(int audio_fd)
{
! ioctl(audio_fd, I_FLUSH, (caddr_t)FLUSHR);
}
/* Gain and volume values are in the range 0 - MAX_AMP */
--- 167,173 ----
void
audio_drain(int audio_fd)
{
! ioctl(audio_fd, AUDIO_FLUSH, NULL);
}
/* Gain and volume values are in the range 0 - MAX_AMP */

43
mbone/rat/patches/patch-src_auddev_sparc_c Normal file
View File

@ -0,0 +1,43 @@
$OpenBSD: patch-src_auddev_sparc_c,v 1.1 2001/03/17 17:23:27 wilfried Exp $
--- src/auddev_sparc.c.orig Mon Mar 1 18:23:49 1999
+++ src/auddev_sparc.c Fri Mar 16 20:49:24 2001
@@ -45,11 +45,19 @@
#include "assert.h"
#include "bat_include.h"
-#ifdef SunOS
+#if defined(SunOS) || defined(__OpenBSD__)
+#if defined(SunOS)
#include <multimedia/audio_hdr.h>
+#else
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
+#endif
+#if !defined(__OpenBSD__)
typedef Audio_hdr* audio_header_pointer;
+#endif
static audio_info_t dev_info;
static int mulaw_device = FALSE; /* TRUE if the hardware can only do 8bit mulaw sampling */
@@ -69,7 +77,9 @@ audio_open(audio_format format)
if (audio_fd > 0) {
AUDIO_INITINFO(&dev_info);
dev_info.monitor_gain = 0;
+#if !defined(__OpenBSD__)
dev_info.output_muted = 0; /* 0==not muted */
+#endif
dev_info.play.sample_rate = format.sample_rate;
dev_info.record.sample_rate = format.sample_rate;
dev_info.play.channels = format.num_channels;
@@ -157,7 +167,7 @@ audio_close(int audio_fd)
void
audio_drain(int audio_fd)
{
- ioctl(audio_fd, I_FLUSH, (caddr_t)FLUSHR);
+ ioctl(audio_fd, AUDIO_FLUSH, NULL);
}
/* Gain and volume values are in the range 0 - MAX_AMP */

21
mbone/rat/patches/patch-src_bat_include_h Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_bat_include_h,v 1.1 2001/03/17 17:23:29 wilfried Exp $
--- src/bat_include.h.orig Mon Mar 1 18:23:49 1999
+++ src/bat_include.h Fri Mar 16 20:49:24 2001
@@ -44,7 +44,7 @@
#include "config.h"
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#include <stdio.h>
@@ -71,7 +71,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(__OpenBSD__)
#include <stropts.h>
#include <sys/filio.h>
#endif /* HPUX */

12
mbone/rat/patches/patch-src_gsm_create_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_gsm_create_c,v 1.1 2001/03/17 17:23:29 wilfried Exp $
--- src/gsm_create.c.orig Mon Mar 1 18:23:51 1999
+++ src/gsm_create.c Fri Mar 16 20:49:24 2001
@@ -11,7 +11,7 @@
#include "assert.h"
#include "gsm.h"
-#ifndef FreeBSD
+#if !defined(FreeBSD) && !defined(__OpenBSD__)
#include <malloc.h>
#endif

12
mbone/rat/patches/patch-src_gsm_destroy_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_gsm_destroy_c,v 1.1 2001/03/17 17:23:29 wilfried Exp $
--- src/gsm_destroy.c.orig Mon Mar 1 18:23:51 1999
+++ src/gsm_destroy.c Fri Mar 16 20:49:24 2001
@@ -6,7 +6,7 @@
/* $Header: /home/cvs/ports/mbone/rat/patches/Attic/patch-src_gsm_destroy_c,v 1.1 2001/03/17 17:23:29 wilfried Exp $ */
-#ifndef FreeBSD
+#if !defined(FreeBSD) && !defined(__OpenBSD__)
#include <malloc.h>
#endif

12
mbone/rat/patches/patch-src_qfDES_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_qfDES_c,v 1.1 2001/03/17 17:23:29 wilfried Exp $
--- src/qfDES.c.orig Mon Mar 1 18:23:52 1999
+++ src/qfDES.c Fri Mar 16 20:49:24 2001
@@ -23,7 +23,7 @@ Added 2 August 1996, Saleem
#include <string.h>
#include <stdio.h>
#include <memory.h>
-#ifndef FreeBSD
+#if !defined(FreeBSD) && !defined(__OpenBSD__)
#include <malloc.h>
#endif
#include <ctype.h>

19
mbone/rat/patches/patch-src_rtcp_pckt_c Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_rtcp_pckt_c,v 1.1 2001/03/17 17:23:29 wilfried Exp $
--- src/rtcp_pckt.c.orig Mon Mar 1 18:23:53 1999
+++ src/rtcp_pckt.c Fri Mar 16 20:49:24 2001
@@ -348,9 +348,15 @@ rtcp_packet_fmt_sdes(session_struct *sp,
break;
}
case 3 : if (sp->mode == TRANSCODER) {
+#if !defined(__OpenBSD__)
len += rtcp_add_sdes_item(&ptr[len], RTCP_SDES_TOOL, RAT_VERSION " " OSNAME " [Transcoder]");
} else {
len += rtcp_add_sdes_item(&ptr[len], RTCP_SDES_TOOL, RAT_VERSION " " OSNAME);
+#else
+ len += rtcp_add_sdes_item(&ptr[len], RTCP_SDES_TOOL, RAT_VERSION " OpenBSD" " [Transcoder]");
+ } else {
+ len += rtcp_add_sdes_item(&ptr[len], RTCP_SDES_TOOL, RAT_VERSION " OpenBSD");
+#endif
}
break;
default: printf("ERROR: sdes_ter_count has strange value! %ld\n", sp->db.sdes_ter_count);

23
mbone/rat/patches/patch-src_ui_c Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_ui_c,v 1.1 2001/03/17 17:23:29 wilfried Exp $
--- src/ui.c.orig Mon Mar 1 18:23:55 1999
+++ src/ui.c Fri Mar 16 20:49:24 2001
@@ -42,6 +42,10 @@
#include <ctype.h> /* for toupper() [csp] */
#include <math.h>
+#if defined(__OpenBSD__)
+#include <sys/types.h>
+#include <sys/audioio.h>
+#endif
#include "version.h"
#include "bat_include.h"
#include "crypt.h"
@@ -203,7 +207,7 @@ ui_info_deactivate(rtcp_dbentry *e)
eval_check(interp, comm);
}
-static us_active = 0;
+static int us_active = 0;
void
ui_info_activate_us(void)