Attachment 67316 Details for Bug 99235 – linrad-2.14.patch

[patch] linrad-2.14.patch

linrad-2.14.patch (text/plain), 55.88 KB, created by Diane Bruce on 2006-06-21 03:40:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Diane Bruce

Created: 2006-06-21 03:40:19 UTC

Size: 55.88 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/comms/linrad/Makefile /usr/home/db/linrad/Makefile
>--- /usr/ports/comms/linrad/Makefile	Tue Jun 20 22:21:39 2006
>+++ /usr/home/db/linrad/Makefile	Tue Jun 20 22:30:17 2006
>@@ -2,37 +2,42 @@
> # Date created:		7 July 2004
> # Whom:			db
> #
>-# $FreeBSD: ports/comms/linrad/Makefile,v 1.5 2006/05/03 23:38:36 edwin Exp $
>+# $FreeBSD: ports/comms/linrad/Makefile,v 1.1 2004/07/14 16:09:39 pav Exp $
> #
> 
> PORTNAME=	linrad
>-PORTVERSION=	0.16a
>-CATEGORIES=	comms hamradio
>+PORTVERSION=	2.14
>+CATEGORIES=	comms
> MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/
>-DISTNAME=	lir01-20
>+DISTNAME=	lir02-14
> EXTRACT_SUFX=	.tbz
> DIST_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	db@db.net
> COMMENT=	Amateur Radio DSP utility (SDR)
> 
>-LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
> BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-01.20
>+WRKSRC=		${WRKDIR}/${PORTNAME}-02.14
> 
> USE_AUTOTOOLS=	autoconf:253
> HAS_CONFIGURE=	yes
> USE_BZIP2=	yes
>-
>-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+USE_X_PREFIX=	yes
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>-		${WRKSRC}/configure.in ${WRKSRC}/Makefile.in
>-
>+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
>+	-e 's|%%X11BASE%%|${X11BASE}|g' \
>+	-e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \
>+		${WRKSRC}/help.c
> do-install:
>-	${INSTALL_PROGRAM} -m04555 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
>+	${MKDIR} ${DATADIR}
>+	${INSTALL_DATA} ${WRKSRC}/errors.lir ${DATADIR}/errors.lir
>+	${INSTALL_DATA} ${WRKSRC}/help.lir ${DATADIR}/help.lir
>+#	${INSTALL_PROGRAM} -m04555 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
>+	${INSTALL_PROGRAM} -m04555 ${WRKSRC}/x${PORTNAME} ${PREFIX}/bin/x${PORTNAME}
>+
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/z_APM.txt ${DOCSDIR}/z_APM.txt
>@@ -40,11 +45,11 @@
> 	${INSTALL_DATA} ${WRKSRC}/z_CALIBRATE.txt ${DOCSDIR}/z_CALIBRATE.txt
> 	${INSTALL_DATA} ${WRKSRC}/z_COPYRIGHT.txt ${DOCSDIR}/z_COPYRIGHT.txt
> 	${INSTALL_DATA} ${WRKSRC}/z_GIFINFO.txt ${DOCSDIR}/z_GIFINFO.txt
>-	${INSTALL_DATA} ${WRKSRC}/z_INSTALL.txt ${DOCSDIR}/z_INSTALL.txt
> 	${INSTALL_DATA} ${WRKSRC}/z_MLOCK.txt ${DOCSDIR}/z_MLOCK.txt
>+	${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_MOUSE.txt
>+	${INSTALL_DATA} ${WRKSRC}/z_PARALLEL_PORT.txt ${DOCSDIR}/z_PARALLEL_PORT.txt
> 	${INSTALL_DATA} ${WRKSRC}/z_SETTINGS.txt ${DOCSDIR}/z_SETTINGS.txt
>-	${INSTALL_DATA} ${WRKSRC}/z_SPEED.txt ${DOCSDIR}/z_SPEED.txt
>-	${INSTALL_DATA} ${WRKSRC}/z_SVGALIB.txt ${DOCSDIR}/z_SVGALIB.txt
>+	${INSTALL_DATA} ${WRKSRC}/z_USERS_EXTRA.txt ${DOCSDIR}/z_USERS_EXTRA.txt
> 	${INSTALL_DATA} ${WRKSRC}/z_USERS_HWARE.txt ${DOCSDIR}/z_USERS_HWARE.txt
> 	${INSTALL_DATA} ${WRKSRC}/z_USLEEP.txt ${DOCSDIR}/z_USLEEP.txt
> 	@${ECHO} ""
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/distinfo /usr/home/db/linrad/distinfo
>--- /usr/ports/comms/linrad/distinfo	Tue Nov 22 13:18:59 2005
>+++ /usr/home/db/linrad/distinfo	Mon Jun  5 14:08:41 2006
>@@ -1,3 +1,3 @@
>-MD5 (linrad/lir01-20.tbz) = 34b6f5ef52adf8b9a8af444db43ddf70
>-SHA256 (linrad/lir01-20.tbz) = b463cf28cf4aa462961025f1a6c6d23d4504e738e67dca0a018ca31e52fb8f12
>-SIZE (linrad/lir01-20.tbz) = 330472
>+MD5 (linrad/lir02-14.tbz) = a4e451b891459023bb9272d5fe0f590b
>+SHA256 (linrad/lir02-14.tbz) = 4a95bf060c900899969e83d0e164ec5e9932ffe34cf2c2485bbea6179fb8e899
>+SIZE (linrad/lir02-14.tbz) = 423720
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-Makefile.in /usr/home/db/linrad/files/patch-Makefile.in
>--- /usr/ports/comms/linrad/files/patch-Makefile.in	Tue Nov 22 13:18:59 2005
>+++ /usr/home/db/linrad/files/patch-Makefile.in	Mon Jun 19 21:41:11 2006
>@@ -1,57 +1,77 @@
>---- Makefile.in.orig	Tue May 18 09:43:30 2004
>-+++ Makefile.in	Sat Nov 12 11:41:30 2005
>-@@ -1,11 +1,14 @@
>-+INCLUDE=	%%LOCALBASE%%/include
>-+LIBS=		%%LOCALBASE%%/lib
>-+
>- 
>- .c.o:
>--#	gcc -I/usr/local/include -c -o $*.o $<
>--	gcc -O -W -Wimplicit -Wreturn-type -Wformat \
>+--- Makefile.in.orig	Sat May 27 07:48:22 2006
>++++ Makefile.in	Mon Jun 19 21:40:59 2006
>+@@ -4,17 +4,14 @@
>+ # Name the output files *.ol instead of *.o 
>+ # so we definitely know it is for Linux. 
>+ # (*.o files can be present by mistake) 
>+-LCC	= gcc
>++LCC	= ${CC}
>+ # Use the mingw cross compiler for Windows
>+ # Name the output files *.ow instead of *.o 
>+ # so we definitely know it is for Windows.
>+ # (*.o files can be present by mistake) 
>+ WCC	= /usr/bin/i586-mingw32msvc-gcc
>+ # Always use the same flags.
>+-CFL	= -g -O -DOSNUM=1 -W -Wimplicit -Wreturn-type -Wformat \
> --Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
>---Wparentheses -Wstrict-prototypes -Werror -ffast-math -fforce-mem \
>---fomit-frame-pointer -c -o $*.o \
>--$< 
>-+	${CC} -I${INCLUDE} -c -o $*.o $< 
>-+#	gcc -O -W -Wimplicit -Wreturn-type -Wformat \
>-+#-Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
>-+#-Wparentheses -Wstrict-prototypes -Werror -ffast-math -fforce-mem \
>-+#-fomit-frame-pointer -c -o $*.o \
>-+#$< 
>- 
>- .s.o:
>- 	nasm -w-orphan-labels -felf -s $<
>-@@ -23,7 +26,7 @@
>- tune.o txtest.o network.o mouse.o freq_control.o vgatest mousetest morse.o \
>- cwspeed.o coh_osc.o cw_carrier.o
>- 
>--	gcc -olinrad -lvgagl -lvga -lm \
>-+	${CC} -I${INCLUDE} -L${LIBS} -olinrad -lvgagl -lvga -lm \
>- -Wl,-s,-Map,linrad.map,-warn-common,--cref\
>- 	main.o ui.o setvga.o setad.o fft1.o buf.o mouse.o wide_graph.o \
>- getiq.o fft0.o rxtest.o hires_graph.o fftasm.o baseb_graph.o mix2.o \
>-@@ -37,10 +40,10 @@
>- cw_carrier.o fft3.o 
>- 
>- vgatest: vgatest.o
>--	gcc -ovgatest -lvgagl -lvga -lm -Wl -s vgatest.o
>-+	${CC} -I${INCLUDE} -ovgatest -L${LIBS} -lvgagl -lvga -lm -Wl -s vgatest.o
>- 
>- mousetest: mousetest.o
>--	gcc -omousetest -lvgagl -lvga -lm -Wl -s mousetest.o
>-+	${CC} -I${INCLUDE} -omousetest -L${LIBS} -lvgagl -lvga -lm -Wl -s mousetest.o
>- 
>- afc_graph.o : globdef.h uidef.h fft1def.h fft2def.h screendef.h vernr.h \
>- 	seldef.h llsqdef.h sigdef.h
>-@@ -126,3 +129,11 @@
>- configure : Makefile.in conf.h.in configure.in
>- 	rm -f configure        
>- 	autoconf
>-+
>-+all:	vgatest mousetest linrad
>-+
>-+clean:
>-+	rm -f vgatest mousetest linrad *.o
>-+
>-+install:
>-+	install -oroot -m04566 linrad ${PREFIX}/bin/linrad	
>+--Wparentheses -Wstrict-prototypes -Werror -ffast-math \
>+--fomit-frame-pointer -c -o
>++CFL	= ${CFLAGS} -I%%LOCALBASE%%/include -I%%X11BASE%%/include -L%%LOCALBASE%%/lib -L%%X11BASE%%/lib -DOSNUM=1 -ffast-math -fomit-frame-pointer -c -o 
>+ CFW	= -g -O -DOSNUM=2 -W -Wimplicit -Wreturn-type -Wformat \
>+ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
>+ -Wparentheses -Wstrict-prototypes -Werror -ffast-math \
>+@@ -360,7 +357,8 @@
>+ 
>+ 
>+ # ---------------------- Linux console specific things ------------------
>+-linrad: Makefile lmain.ol ui.ol uivar.ol fft1var.ol lsetad.ol hware.ol rxin.ol \
>++all: xlinrad
>++linrad: lmain.ol ui.ol uivar.ol fft1var.ol lsetad.ol hware.ol rxin.ol \
>+ wide_graph.ol getiq.ol fft0.ol fft1.ol adtest.ol screenvar.ol sigvar.ol \
>+ baseb_graph.ol afc_graph.ol hires_graph.ol fftasm.ol palette.ol gifsave.ol \
>+ calibrate.ol calsub.ol calsub2.ol llsqvar.ol caliq.ol hwaredriver.ol \
>+@@ -374,7 +372,7 @@
>+ menu.ol screen.ol sdrvar.ol lsys.ol sdr14.ol keyboard_var.ol linvar.ol \
>+ fonts.ol screensub.ol membeg.ol lxsys.ol memend.ol
>+ 
>+-	gcc -olinrad -lvgagl -lvga -lpthread -lm \
>++	${CC} -olinrad -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib -I%%X11BASE%%/include -L%%X11BASE%%/lib -lvgagl -lvga -lpthread -lm \
>+ -Wl,-Map,linrad.lmap,-warn-common,--cref \
>+ 	membeg.ol lmain.ol linvar.ol ui.ol lsetad.ol fft1.ol buf.ol \
>+ mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \
>+@@ -403,7 +401,7 @@
>+ 	$(LCC) lmain.c $(CFL) lmain.ol
>+ 
>+ # ---------------------- Linux X11 specific things ------------------
>+-xlinrad: Makefile xmain.ol ui.ol uivar.ol fft1var.ol lsetad.ol hware.ol rxin.ol \
>++xlinrad: xmain.ol ui.ol uivar.ol fft1var.ol lsetad.ol hware.ol rxin.ol \
>+ wide_graph.ol getiq.ol fft0.ol fft1.ol adtest.ol screenvar.ol sigvar.ol \
>+ baseb_graph.ol afc_graph.ol hires_graph.ol fftasm.ol palette.ol gifsave.ol \
>+ calibrate.ol calsub.ol calsub2.ol llsqvar.ol caliq.ol hwaredriver.ol \
>+@@ -420,7 +418,7 @@
>+ 
>+ 
>+ 
>+-	gcc -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \
>++	${CC} -oxlinrad -L%%X11BASE%%/lib -lX11 -lpthread -lm \
>+ -Wl,-Map,linrad.xmap,-warn-common,--cref \
>+ membeg.ol xmain.ol xvar.ol ui.ol lsetad.ol fft1.ol buf.ol \
>+ mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \
>+@@ -636,13 +634,13 @@
>+ 
>+ # ------------------      Tools for Linux      -----------------------
>+ vgatest: vgatest.ol
>+-	gcc -ovgatest -lvgagl -lvga -lm -Wl -s vgatest.ol
>++	${CC} -ovgatest -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib -lvgagl -lvga -lm -Wl -s vgatest.ol
>+ vgatest.ol: vgatest.c
>+-	gcc vgatest.c -c -o vgatest.ol
>++	${CC} vgatest.c -I%%LOCALBASE%%/include -c -o vgatest.ol
>+ mousetest: mousetest.ol
>+-	gcc -omousetest -lvgagl -lvga -lm -Wl -s mousetest.ol
>++	${CC} -omousetest -L%%LOCALBASE%%/lib -lvgagl -lvga -lm -Wl -s mousetest.ol
>+ mousetest.ol: mousetest.c
>+-	gcc mousetest.c -c -o mousetest.ol
>++	${CC} mousetest.c -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib -c -o mousetest.ol
>+ thrdef.h: rusage.h
>+ 	rm -f x.x
>+ 	cp thrdef.h x.x
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-configure.in /usr/home/db/linrad/files/patch-configure.in
>--- /usr/ports/comms/linrad/files/patch-configure.in	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-configure.in	Wed Dec 31 19:00:00 1969
>@@ -1,31 +0,0 @@
>---- configure.in.orig	Tue May 18 09:43:30 2004
>-+++ configure.in	Fri Jul  9 12:49:33 2004
>-@@ -2,13 +2,13 @@
>- rm -f conf.h
>- AC_INIT(main.c)
>- AC_CHECK_FILE( /usr/lib/oss/soundcard.h, OSSN="1")
>--AC_CHECK_FILE( /usr/local/lib/oss/soundcard.h, OSSN="3")
>-+AC_CHECK_FILE( %%LOCALBASE%%/lib/oss/soundcard.h, OSSN="3")
>- AC_CHECK_FILE( /lib/oss/soundcard.h, OSSN="5")
>- AC_CHECK_FILE( /var/lib/oss/soundcard.h, OSSN="7")
>- AC_CHECK_FILE( /opt/oss/soundcard.h, OSSN="9")
>- AC_CHECK_FILE( /root/oss/soundcard.h, OSSN="11")
>- AC_CHECK_FILE( /usr/lib/oss/include/sys/soundcard.h, OSSN="2")
>--AC_CHECK_FILE( /usr/local/lib/oss/include/sys/soundcard.h, OSSN="4")
>-+AC_CHECK_FILE( %%LOCALBASE%%/lib/oss/include/sys/soundcard.h, OSSN="4")
>- AC_CHECK_FILE( /lib/oss/include/sys/soundcard.h, OSSN="6")
>- AC_CHECK_FILE( /var/lib/oss/include/sys/soundcard.h, OSSN="8")
>- AC_CHECK_FILE( /opt/oss/include/sys/soundcard.h, OSSN="10")
>-@@ -25,10 +25,10 @@
>- AC_SUBST(USERHWDEF)
>- AC_CHECK_FILE( ./users_hwaredef.h, DEPS2="users_hwaredef.h")
>- AC_SUBST(DEPS2)
>--AC_CHECK_HEADER(vga.h,, AC_MSG_ERROR( 
>-+AC_CHECK_HEADER(%%LOCALBASE%%/include/vga.h,, AC_MSG_ERROR( 
>- Must have svgalib package installed to compile 
>- vga.h missing!!!))
>--AC_CHECK_HEADER(vgagl.h,, AC_MSG_ERROR( 
>-+AC_CHECK_HEADER(%%LOCALBASE%%/include/vgagl.h,, AC_MSG_ERROR( 
>- Must have svgalib package installed to compile 
>- vgagl.h missing!!!))
>- AC_CHECK_FILE( /usr/include/png.h, IMGFMT="1")
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-help.c /usr/home/db/linrad/files/patch-help.c
>--- /usr/ports/comms/linrad/files/patch-help.c	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/linrad/files/patch-help.c	Tue Jun 20 20:37:18 2006
>@@ -0,0 +1,20 @@
>+--- help.c.orig	Sat May 27 07:48:22 2006
>++++ help.c	Tue Jun 20 20:37:14 2006
>+@@ -344,7 +344,7 @@
>+   printf("\n%s",s);
>+   DEB"\n%s",s);
>+   }  
>+-msg_filename="errors.lir";
>++msg_filename="%%DATADIR%%errors.lir";
>+ line=3;
>+ if(screen_mode)
>+   {
>+@@ -359,7 +359,7 @@
>+ {
>+ int line;
>+ if(msg_no < 0)return;
>+-msg_filename="help.lir";
>++msg_filename="%%DATADIR%%help.lir";
>+ line=0;
>+ settextcolor(15);
>+ clear_screen();
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-hwaredriver.c /usr/home/db/linrad/files/patch-hwaredriver.c
>--- /usr/ports/comms/linrad/files/patch-hwaredriver.c	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-hwaredriver.c	Wed Dec 31 19:00:00 1969
>@@ -1,19 +0,0 @@
>---- hwaredriver.c.orig	Tue May 18 09:43:30 2004
>-+++ hwaredriver.c	Fri Jul  9 11:26:15 2004
>-@@ -1,6 +1,6 @@
>- 
>- #include <vga.h>
>--#include <sys/io.h>
>-+#include <machine/cpufunc.h>
>- #include <ctype.h>
>- #include "conf.h"
>- #include "globdef.h"
>-@@ -169,7 +169,7 @@
>- void users_open_devices(void)
>- {
>- // Get permission to write to the parallel port
>--ioperm(HWARE_PORT,4,1);
>-+i386_set_ioperm(HWARE_PORT,4,1);
>- allow_parport=1;
>- }
>- 
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-lmain.c /usr/home/db/linrad/files/patch-lmain.c
>--- /usr/ports/comms/linrad/files/patch-lmain.c	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/linrad/files/patch-lmain.c	Sat Jun 17 23:50:40 2006
>@@ -0,0 +1,38 @@
>+--- lmain.c.orig	Sat May 27 07:48:22 2006
>++++ lmain.c	Sat Jun 17 23:49:10 2006
>+@@ -11,7 +11,6 @@
>+ #define MAX_MOUSE_CURSIZE 50
>+ 
>+ 
>+-#include <sys/io.h>
>+ #include <vga.h>
>+ #include <vgagl.h>
>+ #include <vgamouse.h>
>+@@ -97,6 +96,7 @@
>+ simd1=0;
>+ mmx_present=i&1;
>+ if(mmx_present != 0)simd_present=i/2; else simd_present=0;
>++#if 0
>+ if(i!=0)
>+   {
>+   file = fopen("/proc/cpuinfo", "r");
>+@@ -142,9 +142,11 @@
>+     file=NULL;
>+     }
>+   }  
>++#endif
>+ file = fopen(userint_filename, "rb");
>+ if (file == NULL)
>+   {
>++#if 0
>+   if(xxprint != 0)
>+     {
>+     i=0;
>+@@ -170,6 +172,7 @@
>+       printf("\nwith appropriate patches.\n\n");
>+       }
>+     }
>++#endif
>+   printf("\nSetup file %s missing.",userint_filename);
>+ full_setup:;
>+   for(i=0; i<MAX_UIPARM; i++) uiparm[i]=0;
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-lsetad.c /usr/home/db/linrad/files/patch-lsetad.c
>--- /usr/ports/comms/linrad/files/patch-lsetad.c	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/linrad/files/patch-lsetad.c	Mon Jun 19 21:43:28 2006
>@@ -0,0 +1,491 @@
>+--- lsetad.c.orig	Sat May 27 07:48:22 2006
>++++ lsetad.c	Mon Jun 19 21:43:19 2006
>+@@ -36,14 +36,13 @@
>+ 
>+ 
>+ #define SNDLOG fprintf(sndlog,
>+-#define ABOVE_MAX_SPEED 768000
>+ #if SND_DEV == 1
>+ #define DEVNAME_SIZE 12
>+-char devname[DEVNAME_SIZE]="/dev/dsp   ";
>++char dev_name[DEVNAME_SIZE]="/dev/dsp   ";
>+ #define DEVNAMPOS 8
>+ #else 
>+ #define DEVNAME_SIZE 18
>+-char devname[DEVNAME_SIZE]="/dev/sound/dsp   ";
>++char dev_name[DEVNAME_SIZE]="/dev/sound/dsp   ";
>+ #define DEVNAMPOS 14
>+ #endif
>+ int devmodes[3]={O_RDONLY,O_WRONLY,O_RDWR};
>+@@ -58,6 +57,7 @@
>+                               22050,24000,48000,96000};
>+ 
>+ FILE *sndlog;
>++int tspeed;
>+ 
>+ // Mod1:    Get info from OSS or ALSA sound-driver about the defined audio
>+ //          devices.
>+@@ -481,31 +481,12 @@
>+ 
>+ void make_devname(int n)
>+ {
>+-int k,num,m;
>+-num=n;
>+-k=DEVNAMPOS;
>+-if(num>MAX_DEVNAMES)
>++if(n>MAX_DEVNAMES)
>+   {
>+   lirerr(9236);
>+   return;
>+   }
>+-m=num/10;
>+-if(m > 0)
>+-  {
>+-  devname[k]=m+'0';
>+-  k++;
>+-  }
>+-devname[k]=num-m*10+'0';
>+-if(devname[k]<'0')devname[k]=0;
>+-k++;
>+-devname[k]=0;  
>+-// put /dev/dsp at the end of the list
>+-if ((n+2)==MAX_DEVNAMES){
>+-   k=DEVNAMPOS;
>+-   devname[k]=0;
>+-   k++;
>+-   devname[k]=0; 
>+-   }
>++  sprintf(dev_name, "/dev/dspW%d", n);
>+ }
>+ // -------------------------------------------------------------
>+ // The original code was:
>+@@ -557,7 +538,7 @@
>+ if(i&AFMT_S16_LE)ui.max_output_bytes=2;
>+ ui.max_output_speed=ABOVE_MAX_SPEED;
>+ ui.min_output_speed=1;
>+-if(ioctl(audio_out, SNDCTL_DSP_SPEED, &ui.max_output_speed) == -1)
>++if(ioctl(audio_out, SNDCTL_DSP_SPEED, &ui.min_output_speed) == -1)
>+   {
>+   lirerr(1072);
>+   return;
>+@@ -666,7 +647,7 @@
>+   return;
>+   }
>+ make_devname(ui.ad_device_no&255);
>+-audio_in=open( devname ,ui.ad_device_mode , 0);
>++audio_in=open( dev_name ,ui.ad_device_mode , 0);
>+ if(audio_in == -1)
>+   {
>+   lirerr(1007);
>+@@ -676,7 +657,7 @@
>+   {
>+   i=ui.ad_device_no/255-1;
>+   make_devname(i);
>+-  audio_in2=open( devname ,ui.ad_device_mode , 0);
>++  audio_in2=open( dev_name ,ui.ad_device_mode , 0);
>+   if(audio_in2 == -1)
>+     {
>+     lirerr(1174);
>+@@ -869,7 +850,7 @@
>+       return;
>+       }
>+     make_devname(ui.ad_device_no&255);
>+-    audio_out=open( devname ,O_WRONLY , 0);
>++    audio_out=open( dev_name ,O_WRONLY , 0);
>+     if(audio_out == -1)
>+       {
>+       lirerr(1086);
>+@@ -909,7 +890,7 @@
>+ else
>+   {
>+   make_devname(ui.da_device_no);
>+-  audio_out=open( devname ,O_WRONLY , 0);
>++  audio_out=open( dev_name ,O_WRONLY , 0);
>+   if(audio_out == -1)
>+     {
>+     if(disksave_flag==2)
>+@@ -1048,9 +1029,9 @@
>+ for(device_no=0; device_no<MAX_DEVNAMES; device_no++)
>+   {
>+   make_devname(device_no);
>+-  SNDLOG"Checking %s for output\n",devname);
>++  SNDLOG"Checking %s for output\n",dev_name);
>+   sndlog_sync();
>+-  audio_out=open( devname, O_WRONLY|O_NONBLOCK, 0);
>++  audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0);
>+   if(audio_out != -1)
>+     {
>+ #ifdef SNDCTL_DSP_COOKEDMODE
>+@@ -1058,7 +1039,7 @@
>+     ioctl(audio_out, SNDCTL_DSP_COOKEDMODE, &j);
>+ #endif
>+     for(nn=0; nn<80; nn++)SNDLOG"-");
>+-    SNDLOG"\n%s opened as %s ",devname, devmode_txt[3]);
>++    SNDLOG"\n%s opened as %s ",dev_name, devmode_txt[3]);
>+     sndlog_sync();
>+     j=AFMT_U8;
>+     if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1)
>+@@ -1110,6 +1091,7 @@
>+       {
>+       SNDLOG"\nIncorrect speed response in %d  out %d",
>+                                                    ABOVE_MAX_SPEED, j);
>++      tspeed=j;
>+       if(ioctl(audio_out, SNDCTL_DSP_SPEED, &j)==-1)
>+        {
>+         SNDLOG"\nioctl(SPEED) failed");
>+@@ -1136,7 +1118,7 @@
>+       goto errdev;  
>+       }
>+     sprintf(s,"%02d  %s  %7d - %7d Hz   %d Chan.   %d bit WRONLY",
>+-                device_no, devname,
>++                device_no, dev_name,
>+                 dev_min_wr_speed[device_no], 
>+                 dev_max_wr_speed[device_no], 
>+                 dev_wr_channels[device_no], 
>+@@ -1373,20 +1355,20 @@
>+   {
>+   dev_flag[device_no]=0;
>+   make_devname(device_no);
>+-  SNDLOG"Checking %s\n",devname);
>++  SNDLOG"Checking %s\n",dev_name);
>+   sndlog_sync();
>+   for(mode=0; mode<3; mode++)
>+     {
>+     k=1<<mode;
>+     sprintf(s,
>+     "Trying to open %s %s. Device defective if system hangs here. Read %s   ",
>+-    devname, devmode_txt[mode],logfile_name);
>++    dev_name, devmode_txt[mode],logfile_name);
>+     sndlog_sync();
>+     settextcolor(12);
>+     lir_text(0,line+1,s);
>+     lir_refresh_screen();
>+     settextcolor(7);
>+-    audio_out=open( devname, devmodes[mode]|O_NONBLOCK, 0);
>++    audio_out=open( dev_name, devmodes[mode]|O_NONBLOCK, 0);
>+     clear_lines(line+1,line+1);
>+     if(audio_out != -1)
>+       {
>+@@ -1395,7 +1377,7 @@
>+         ioctl(audio_out, SNDCTL_DSP_COOKEDMODE, &i);
>+       #endif
>+       for(nn=0; nn<80; nn++)SNDLOG"-");
>+-      SNDLOG"\n%s opened as %s ",devname, devmode_txt[mode]);
>++      SNDLOG"\n%s opened as %s ",dev_name, devmode_txt[mode]);
>+       sndlog_sync();
>+       rdwr_fmt=16;
>+       rdwr_channels=0;
>+@@ -1465,8 +1447,8 @@
>+       i=0;
>+       while(i<MAX_LOWSPEED)
>+         {
>+-        rdwr_min_speed=low_speeds[i];
>+-        if(ioctl(audio_out, SNDCTL_DSP_SPEED, &rdwr_min_speed)!=-1)goto minok;
>++        tspeed=rdwr_min_speed=low_speeds[i];
>++        if(ioctl(audio_out, SNDCTL_DSP_SPEED, &tspeed)!=-1)goto minok;
>+         i++;
>+         }
>+       lirerr(1040);
>+@@ -1577,7 +1559,7 @@
>+       if( (dev_flag[device_no]&1) == 1)
>+         {
>+         sprintf(ss,"%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit",
>+-                    device_no,devname,
>++                    device_no,dev_name,
>+                     dev_min_rd_speed[device_no], 
>+                     dev_max_rd_speed[device_no], 
>+                     dev_max_rd_channels[device_no], 
>+@@ -1588,7 +1570,7 @@
>+         if( (dev_flag[device_no]&2) == 2)
>+           {
>+           sprintf(ss,"%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit",
>+-                     device_no,devname,
>++                     device_no,dev_name,
>+                      dev_min_wr_speed[device_no], 
>+                      dev_max_wr_speed[device_no], 
>+                      dev_wr_channels[device_no], 
>+@@ -1637,13 +1619,13 @@
>+           color=0x17;
>+           sprintf(&ss[maxcolumn],
>+                      "%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s",
>+-                      device_no,devname,
>++                      device_no,dev_name,
>+                       dev_min_wr_speed[device_no], 
>+                       dev_max_wr_speed[device_no], 
>+                       dev_wr_channels[device_no], 
>+                       dev_wr_bits[device_no],devmode_txt[1]);
>+           sprintf(ss,"%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s",
>+-                      device_no,devname,
>++                      device_no,dev_name,
>+                       dev_min_rd_speed[device_no], 
>+                       dev_max_rd_speed[device_no], 
>+                       dev_max_rd_channels[device_no], 
>+@@ -1659,21 +1641,21 @@
>+             color=0x17;
>+             sprintf(&ss[2*maxcolumn],
>+                   "%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s",
>+-                      device_no,devname,
>++                      device_no,dev_name,
>+                       dev_min_wr_speed[device_no], 
>+                       dev_max_wr_speed[device_no], 
>+                       dev_wr_channels[device_no], 
>+                       dev_wr_bits[device_no],devmode_txt[1]);
>+             sprintf(&ss[maxcolumn],
>+                   "%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s",
>+-                      device_no,devname,
>++                      device_no,dev_name,
>+                       dev_min_rd_speed[device_no], 
>+                       dev_max_rd_speed[device_no], 
>+                       dev_max_rd_channels[device_no], 
>+                       dev_rd_bits[device_no],devmode_txt[0]);
>+             sprintf(ss,
>+                   "%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s",
>+-                      device_no,devname,
>++                      device_no,dev_name,
>+                       dev_min_rdwr_speed[device_no], 
>+                       dev_max_rdwr_speed[device_no], 
>+                       dev_rdwr_channels[device_no], 
>+@@ -1688,14 +1670,14 @@
>+               color=0x17;
>+               sprintf(&ss[maxcolumn],
>+                         "%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s",
>+-                        device_no,devname,
>++                        device_no,dev_name,
>+                         dev_min_wr_speed[device_no], 
>+                         dev_max_wr_speed[device_no], 
>+                         dev_wr_channels[device_no], 
>+                         dev_wr_bits[device_no],devmode_txt[1]);
>+               sprintf(ss,
>+                   "%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s  %s",
>+-                        device_no,devname,
>++                        device_no,dev_name,
>+                         dev_min_rd_speed[device_no], 
>+                         dev_max_rd_speed[device_no], 
>+                         dev_max_rd_channels[device_no], 
>+@@ -1707,14 +1689,14 @@
>+               color=0x1d;
>+               sprintf(&ss[maxcolumn],
>+                         "%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s  %s",
>+-                        device_no,devname,
>++                        device_no,dev_name,
>+                         dev_min_wr_speed[device_no], 
>+                         dev_max_wr_speed[device_no], 
>+                         dev_wr_channels[device_no], dev_wr_bits[device_no],
>+                         devmode_txt[1],devmode_txt[2]);
>+               sprintf(ss,
>+                   "%02d:%12s  %7d - %7d Hz   %d Chan.   %d bit  %s",
>+-                        device_no,devname,
>++                        device_no,dev_name,
>+                         dev_min_rd_speed[device_no], 
>+                         dev_max_rd_speed[device_no], 
>+                         dev_max_rd_channels[device_no], 
>+@@ -1822,7 +1804,7 @@
>+ 
>+ clear_screen();
>+ make_devname(ui.ad_device_no);
>+-SNDLOG"\n\n %s selected by user for input.",devname);
>++SNDLOG"\n\n %s selected by user for input.",dev_name);
>+ SNDLOG"   dev_flag=%d",dev_flag[ui.ad_device_no]);
>+ sndlog_sync();
>+ // High end users might need two devices to read four A/D channels.
>+@@ -1864,7 +1846,7 @@
>+         clear_screen();
>+         SNDLOG"\nUser wants to try to open two read devices"); 
>+         make_devname(ui.ad_device_no);
>+-        audio_in=open( devname, O_RDONLY, 0);
>++        audio_in=open( dev_name, O_RDONLY, 0);
>+         if(audio_in == -1)
>+           {
>+           lirerr(1102);
>+@@ -1899,7 +1881,7 @@
>+           }
>+         }
>+       make_devname(i);
>+-      audio_in2=open( devname, O_RDONLY|O_NONBLOCK, 0);
>++      audio_in2=open( dev_name, O_RDONLY|O_NONBLOCK, 0);
>+       if(audio_in2 != -1)
>+         {
>+         #ifdef SNDCTL_DSP_COOKEDMODE
>+@@ -1907,9 +1889,9 @@
>+           ioctl(audio_in2, SNDCTL_DSP_COOKEDMODE, &k);
>+         #endif
>+         line++;
>+-        SNDLOG"\n%s opened as second read device",devname);
>++        SNDLOG"\n%s opened as second read device",dev_name);
>+         sprintf(s,"%2d:%12s  %7d - %7d Hz   %d Chan.   %d bit",
>+-                i,devname,
>++                i,dev_name,
>+                 dev_min_rd_speed[i], 
>+                 dev_max_rd_speed[i], 
>+                 dev_max_rd_channels[i], 
>+@@ -1945,7 +1927,7 @@
>+     {
>+     dev_flag[i]&=255;
>+     }    
>+-  audio_in2=open( devname, O_RDONLY|O_NONBLOCK, 0);
>++  audio_in2=open( dev_name, O_RDONLY|O_NONBLOCK, 0);
>+   if(audio_in2 == -1)
>+     {
>+     lirerr(1172);
>+@@ -1968,7 +1950,7 @@
>+     close(audio_in2);
>+     goto skip_dual_devices;
>+     }
>+-  SNDLOG"\n %s is second input device.",devname);
>++  SNDLOG"\n %s is second input device.",dev_name);
>+   ui.input_mode=TWO_CHANNELS+IQ_DATA;
>+   ui.rx_channels=2;
>+   ui.ad_channels=4;
>+@@ -1988,7 +1970,7 @@
>+   if( (1 & dev_flag[ui.ad_device_no]) != 0)
>+     {
>+ gt_rdo:;    
>+-    sprintf(s,"Open %s as RDONLY or RDWR? (O/W)  =>",devname);  
>++    sprintf(s,"Open %s as RDONLY or RDWR? (O/W)  =>",dev_name);  
>+     lir_text(10,10,s);
>+     await_processed_keyboard();
>+     if(kill_all_flag) goto setad_errexit;
>+@@ -2010,9 +1992,9 @@
>+   }
>+ sndlog_sync();
>+ clear_screen();  
>+-sprintf(s,"For analog input: %s opened in %s mode",devname,devmode_txt[mode]);
>++sprintf(s,"For analog input: %s opened in %s mode",dev_name,devmode_txt[mode]);
>+ lir_text(0,0,s);
>+-audio_in=open( devname, ui.ad_device_mode, 0);
>++audio_in=open( dev_name, ui.ad_device_mode, 0);
>+ if(audio_in == -1)
>+   {
>+   lirerr(1038);
>+@@ -2108,13 +2090,16 @@
>+ lir_text(0,7,"to reconfigure the hardware. (Under OSS, run ossmix)");
>+ max=dev_max_rd_speed[ui.ad_device_no&255];
>+ min=dev_min_rd_speed[ui.ad_device_no&255];
>++#if 0
>+ if(max == ABOVE_MAX_SPEED || max < 1000)
>+   {
>+   max = ABOVE_MAX_SPEED;
>+   speed_warning = 1;
>+   }
>++#endif
>+ sprintf(s,"Select sampling speed(%d to %d)", min,max);
>+ lir_text(0,10,s);
>++#if 0
>+ if(speed_warning != 0)
>+   {
>+   settextcolor(12);
>+@@ -2123,6 +2108,7 @@
>+    lir_text(0,13,"Incorrect (not supported) values may cause system to hang");
>+   settextcolor(7);
>+   }
>++#endif
>+ column=0;
>+ while(s[column] != 0)column++;
>+ ui.input_speed=lir_get_integer(column+2, 10, 8, min,max);
>+@@ -2131,6 +2117,7 @@
>+ rdwr_max_speed=ui.input_speed;
>+ SNDLOG"\n%d Hz selected by user",ui.input_speed);
>+ clear_lines(5,10);
>++ui.input_speed;
>+ if(ioctl(audio_in, SNDCTL_DSP_SPEED, &ui.input_speed)==-1)
>+   {
>+   lirerr(1041);
>+@@ -2249,7 +2236,7 @@
>+   goto setad_errexit;
>+   }
>+ settextcolor(12);
>+-sprintf(s,"Trying to read %s",devname);
>++sprintf(s,"Trying to read %s",dev_name);
>+ lir_text(10,10,s);
>+ lir_text(0,12,"If you see this message for more than 2 seconds READ failed");
>+ lir_text(0,13,"Then try another device");
>+@@ -2313,7 +2300,7 @@
>+   }
>+ SNDLOG"\nRead test OK");
>+ clear_lines(10,13);
>+-sprintf(s,"Now trying to open a second device while %s is open",devname);
>++sprintf(s,"Now trying to open a second device while %s is open",dev_name);
>+ lir_text(0,6,s);
>+ lir_text(0,7,"This may cause your system to hang. Try ctrlC to exit (or reboot)");
>+ lir_text(0,8,"Try another input device or install another sound system."); 
>+@@ -2326,7 +2313,7 @@
>+   if(read_test_ad(testbuff)!=0)goto clr_wrdev;
>+   make_devname(i);
>+   cn=0;
>+-  sprintf(s,"%02d:%12s",i,devname);
>++  sprintf(s,"%02d:%12s",i,dev_name);
>+   lir_text(0,line,s);
>+   column=0;
>+   while(s[column] != 0)column++;
>+@@ -2338,7 +2325,7 @@
>+       if( (ui.input_mode&DWORD_INPUT) != 0 || ui.ad_channels > 2)
>+         {
>+         sprintf(&s[column],
>+-             " RDWR  useless (too many bits or channels) %d: %s",i,devname);
>++             " RDWR  useless (too many bits or channels) %d: %s",i,dev_name);
>+         dev_flag[i]=0;
>+         }
>+       else
>+@@ -2356,7 +2343,7 @@
>+     dev_flag[i]&=0xffff-4;
>+     if( (dev_flag[i]&2) != 0 )
>+       {
>+-      audio_out=open( devname, O_WRONLY|O_NONBLOCK, 0);
>++      audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0);
>+       if(read_test_ad(testbuff)!=0)goto clr_wrdev;
>+       if(audio_out != -1)
>+         { 
>+@@ -2364,7 +2351,7 @@
>+         j=0;
>+         ioctl(audio_out, SNDCTL_DSP_COOKEDMODE, &j);
>+ #endif
>+-        SNDLOG"\n%s opened as WRONLY",devname);
>++        SNDLOG"\n%s opened as WRONLY",dev_name);
>+         sndlog_sync();
>+         if(ioctl(audio_in, SNDCTL_DSP_GETISPACE, &ad_info) == -1)
>+           {
>+@@ -2562,20 +2549,20 @@
>+   for(i=0; i<MAX_DEVNAMES; i++)
>+     {
>+     make_devname(i);
>+-    SNDLOG"\n%s ",devname);
>++    SNDLOG"\n%s ",dev_name);
>+     cn=0;
>+-    sprintf(s,"%02d:%12s",i,devname);
>++    sprintf(s,"%02d:%12s",i,dev_name);
>+     lir_text(0,line,s);
>+     column=0;
>+     while(s[column] != 0)column++;
>+-    audio_out=open( devname, O_WRONLY|O_NONBLOCK, 0);
>++    audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0);
>+     if(audio_out != -1)
>+       { 
>+       #ifdef SNDCTL_DSP_COOKEDMODE
>+         j=0;
>+         ioctl(audio_out, SNDCTL_DSP_COOKEDMODE, &j);
>+       #endif
>+-      SNDLOG"\n%s opened as WRONLY with no input open.",devname);
>++      SNDLOG"\n%s opened as WRONLY with no input open.",dev_name);
>+       sndlog_sync();
>+       j=AFMT_U8;
>+       if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1)
>+@@ -2727,7 +2714,7 @@
>+ // -------------------------------------------------------  
>+   }
>+ make_devname(ui.da_device_no);
>+-SNDLOG"\nUser selected %s for output.",devname);
>++SNDLOG"\nUser selected %s for output.",dev_name);
>+ clear_sdi();
>+ clear_lines(6,line);
>+ lir_text(0,8,"Use close and reopen for D/A when a new signal is");
>+@@ -2762,8 +2749,8 @@
>+   }
>+ else
>+   {
>+-  audio_out=open( devname ,O_WRONLY , 0);
>+-  sprintf(s,"Using %s for output",devname);
>++  audio_out=open( dev_name ,O_WRONLY , 0);
>++  sprintf(s,"Using %s for output",dev_name);
>+   lir_text(0,6,s);
>+   if(audio_out == -1)
>+     {
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-lxsys.c /usr/home/db/linrad/files/patch-lxsys.c
>--- /usr/ports/comms/linrad/files/patch-lxsys.c	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/linrad/files/patch-lxsys.c	Mon Jun 19 23:32:24 2006
>@@ -0,0 +1,65 @@
>+--- lxsys.c.orig	Sat May 27 07:48:22 2006
>++++ lxsys.c	Mon Jun 19 23:32:08 2006
>+@@ -1,5 +1,7 @@
>+-
>+-#include <sys/io.h>
>++#include <sys/cdefs.h>
>++#include <sys/types.h>
>++#include <machine/cpufunc.h>
>++#include <machine/sysarch.h>
>+ #include <unistd.h>
>+ #include <sys/mman.h>
>+ #include <sys/resource.h>
>+@@ -14,6 +16,7 @@
>+ #include "lindef.h"
>+ #include "hwaredef.h"
>+ 
>++extern int saved_euid;
>+ 
>+ char *locktext[6]={"*W A R N I N G*  Read z_MLOCK.txt for info.",
>+                    "*** mlockall can cause system crashes!! ***",
>+@@ -40,11 +43,9 @@
>+ // Get permission to write to the parallel port
>+ if(ui.parport < 0x400-4)
>+   {
>+-  i=ioperm(ui.parport,4,1);
>+-  }
>+-else
>+-  {
>+-  i=iopl(3);
>++  seteuid(saved_euid);
>++  i=i386_set_ioperm(ui.parport,4,1);
>++  seteuid(getuid());
>+   }
>+ if(i != 0)
>+   {
>+@@ -189,11 +190,9 @@
>+ int i;
>+ if(ui.parport < 0x400-4)
>+   {
>+-  i=ioperm(ui.parport,4,1);
>+-  }
>+-else
>+-  {
>+-  i=iopl(3);
>++  seteuid(saved_euid);
>++  i=i386_set_ioperm(ui.parport,4,1);
>++  seteuid(getuid());
>+   }
>+ if(i!=0)lirerr(764921);
>+ i=1000;
>+@@ -206,11 +205,9 @@
>+ int i;
>+ if(ui.parport < 0x400-4)
>+   {
>+-  i=ioperm(ui.parport,4,1);
>+-  }
>+-else
>+-  {
>+-  i=iopl(3);
>++  seteuid(saved_euid);
>++  i=i386_set_ioperm(ui.parport,4,1);
>++  seteuid(getuid());
>+   }
>+ if(i!=0)lirerr(764921);
>+ return inb(port);
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-main.c /usr/home/db/linrad/files/patch-main.c
>--- /usr/ports/comms/linrad/files/patch-main.c	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-main.c	Wed Dec 31 19:00:00 1969
>@@ -1,37 +0,0 @@
>---- main.c.orig	Thu Jul  8 18:24:25 2004
>-+++ main.c	Thu Jul  8 18:25:02 2004
>-@@ -355,7 +355,9 @@
>-   end_program(436);
>-   } 
>- lir_errors:;
>-+#if 0
>- if(ui.memlock == 0)munlockall();
>-+#endif
>- close_all_except_vga();
>- if(lir_status > LIR_OK)
>-   {
>-@@ -640,7 +642,9 @@
>-     {
>- bufreduce:;
>-     vga_clear();
>-+#if 0
>-     if(ui.memlock == 0)munlockall();
>-+#endif
>-     settextcolor(15);
>-     switch (lir_status)
>-       {
>-@@ -854,12 +858,14 @@
>-   else
>-     {
>-     if(chr != 'Y')goto gtswap;
>-+#if 0
>-     if(mlockall(MCL_CURRENT) != 0)
>-       {
>-       if(errno == EPERM)end_program(1168);
>-       if(errno == ENOMEM)end_program(1169);
>-       end_program(1170); 
>-       }
>-+#endif
>-     }  
>-   clearscreen();
>-   printf("Use usleep when the CPU is not needed\nRead z_USLEEP.txt for info.");
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-modesub.c /usr/home/db/linrad/files/patch-modesub.c
>--- /usr/ports/comms/linrad/files/patch-modesub.c	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-modesub.c	Wed Dec 31 19:00:00 1969
>@@ -1,37 +0,0 @@
>---- modesub.c.orig	Tue May 18 09:43:30 2004
>-+++ modesub.c	Fri Jul  9 11:17:15 2004
>-@@ -5,7 +5,7 @@
>- #include <unistd.h>
>- #include <ctype.h>
>- #include <sys/mman.h>
>--#include <sys/io.h>
>-+#include <machine/cpufunc.h>
>- #include "globdef.h"
>- #include "uidef.h"
>- #include "fft1def.h"
>-@@ -1068,6 +1068,7 @@
>-     j++;
>-     if(j > 1000)
>-       {
>-+#if 0
>-       if(mlockall(MCL_CURRENT) != 0)
>-         {
>-         handle[0]=(int)(chk_free(testbuf));
>-@@ -1075,6 +1076,7 @@
>-         return 0;
>-         }
>-       j=0;
>-+#endif
>-       }  
>-     }  
>-   }
>-@@ -1597,7 +1599,9 @@
>- idle_start=recent_time;
>- if(ui.memlock == 0)
>-   {
>-+#if 0
>-   if(mlockall(MCL_CURRENT) != 0)lir_status=LIR_MEMERR;
>-+#endif
>-   }
>- work_flag=0;
>- 
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-setad.c /usr/home/db/linrad/files/patch-setad.c
>--- /usr/ports/comms/linrad/files/patch-setad.c	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-setad.c	Wed Dec 31 19:00:00 1969
>@@ -1,390 +0,0 @@
>---- setad.c.orig	Tue May 18 09:43:30 2004
>-+++ setad.c	Thu Jul  8 14:17:52 2004
>-@@ -16,11 +16,11 @@
>- #define ABOVE_MAX_SPEED 768000
>- #if SND_DEV == 1
>- #define DEVNAME_SIZE 12
>--char devname[DEVNAME_SIZE]="/dev/dsp   ";
>-+char dev_name[DEVNAME_SIZE]="/dev/dsp   ";
>- #define DEVNAMPOS 8
>- #else 
>- #define DEVNAME_SIZE 18
>--char devname[DEVNAME_SIZE]="/dev/sound/dsp   ";
>-+char dev_name[DEVNAME_SIZE]="/dev/sound/dsp   ";
>- #define DEVNAMPOS 14
>- #endif
>- 
>-@@ -36,7 +36,7 @@
>- sync();
>- }
>- 
>--void make_devname(int n)
>-+void make_dev_name(int n)
>- {
>- int k,num,m;
>- if(n < 0)end_program(9235);
>-@@ -47,13 +47,13 @@
>- m=num/10;
>- if(m > 0)
>-   {
>--  devname[k]=m+'0';
>-+  dev_name[k]=m+'0';
>-   k++;
>-   }
>--devname[k]=num-m*10+'0';
>--if(devname[k]<'0')devname[k]=0;
>-+dev_name[k]=num-m*10+'0';
>-+if(dev_name[k]<'0')dev_name[k]=0;
>- k++;
>--devname[k]=0;  
>-+dev_name[k]=0;  
>- }
>- 
>- void set_da_parms(void)
>-@@ -148,14 +148,14 @@
>- if(disksave_flag == 2 || network_flag == 2)return;
>- if( (ui.input_mode&NO_DUPLEX) != 0 && audio_out != -1)return;
>- if(  (audio_in) != -1)end_program(1000);
>--make_devname(ui.ad_device_no&255);
>--audio_in=open( devname ,ui.ad_device_mode , 0);
>-+make_dev_name(ui.ad_device_no&255);
>-+audio_in=open( dev_name ,ui.ad_device_mode , 0);
>- if(audio_in == -1)end_program(1007);
>- if(ui.ad_device_no > 255)
>-   {
>-   i=ui.ad_device_no/255-1;
>--  make_devname(i);
>--  audio_in2=open( devname ,ui.ad_device_mode , 0);
>-+  make_dev_name(i);
>-+  audio_in2=open( dev_name ,ui.ad_device_mode , 0);
>-   if(audio_in2 == -1)end_program(1174);
>-   }
>- if(ui.ad_frag != 0)
>-@@ -238,8 +238,8 @@
>-   if(disksave_flag >=2)
>-     {
>-     if(audio_in != -1)end_program(9865);
>--    make_devname(ui.ad_device_no&255);
>--    audio_out=open( devname ,O_WRONLY , 0);
>-+    make_dev_name(ui.ad_device_no&255);
>-+    audio_out=open( dev_name ,O_WRONLY , 0);
>-     if(audio_out == -1)end_program(1086);
>-     goto set_da;
>-     }
>-@@ -275,8 +275,8 @@
>-   }
>- else
>-   {
>--  make_devname(ui.da_device_no);
>--  audio_out=open( devname ,O_WRONLY|O_NONBLOCK , 0);
>-+  make_dev_name(ui.da_device_no);
>-+  audio_out=open( dev_name ,O_WRONLY|O_NONBLOCK , 0);
>-   if(audio_out == -1)end_program(1017);
>- set_da:;
>- // Set a small fragment size so we can stop playing quickly.
>-@@ -397,24 +397,24 @@
>- for(device_no=0; device_no<MAX_DEVNAMES; device_no++)
>-   {
>-   dev_flag[device_no]=0;
>--  make_devname(device_no);
>--  fprintf(sndlog,"Checking %s\n",devname);
>-+  make_dev_name(device_no);
>-+  fprintf(sndlog,"Checking %s\n",dev_name);
>-   flush_sync();
>-   for(mode=0; mode<3; mode++)
>-     {
>-     k=1<<mode;
>-     sprintf(s,
>-     "Trying to open %s %s. Device defective if system hangs here. Read %s   ",
>--    devname, devmode_txt[mode],logfile_name);
>-+    dev_name, devmode_txt[mode],logfile_name);
>-     flush_sync();
>-     settextcolor(12);
>-     xytext(0,line+1,s);
>-     settextcolor(7);
>--    audio_out=open( devname, devmodes[mode]|O_NONBLOCK, 0);
>-+    audio_out=open( dev_name, devmodes[mode]|O_NONBLOCK, 0);
>-     if(audio_out != -1)
>-       {
>-       for(nn=0; nn<80; nn++)fprintf(sndlog,"-");
>--      fprintf(sndlog,"\n%s opened as %s ",devname, devmode_txt[mode]);
>-+      fprintf(sndlog,"\n%s opened as %s ",dev_name, devmode_txt[mode]);
>-       flush_sync();
>-       rdwr_fmt=16;
>-       rdwr_channels=0;
>-@@ -575,7 +575,7 @@
>-       if( (dev_flag[device_no]&1) == 1)
>-         {
>-         sprintf(ss,"\n%02d:%12s  %7d Hz   %d Chan.   %d bit",
>--                    device_no,devname,dev_rd_speed[device_no], 
>-+                    device_no,dev_name,dev_rd_speed[device_no], 
>-                     dev_rd_channels[device_no], 
>-                     dev_rd_bits[device_no]);
>-         }
>-@@ -584,7 +584,7 @@
>-         if( (dev_flag[device_no]&2) == 2)
>-           {
>-           sprintf(ss,"\n%02d:%12s  %7d Hz   %d Chan.   %d bit",
>--                     device_no,devname,dev_wr_speed[device_no], 
>-+                     device_no,dev_name,dev_wr_speed[device_no], 
>-                      dev_wr_channels[device_no], 
>-                      dev_wr_bits[device_no]);
>-           }
>-@@ -631,11 +631,11 @@
>-           color=0x17;
>-           sprintf(&ss[maxcolumn],
>-                      "\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s",
>--                      device_no,devname,dev_wr_speed[device_no], 
>-+                      device_no,dev_name,dev_wr_speed[device_no], 
>-                       dev_wr_channels[device_no], 
>-                       dev_wr_bits[device_no],devmode_txt[1]);
>-           sprintf(ss,"\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s",
>--                      device_no,devname,dev_rd_speed[device_no], 
>-+                      device_no,dev_name,dev_rd_speed[device_no], 
>-                       dev_rd_channels[device_no], 
>-                       dev_rd_bits[device_no],devmode_txt[0]);
>-           }
>-@@ -649,17 +649,17 @@
>-             color=0x17;
>-             sprintf(&ss[2*maxcolumn],
>-                   "\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s",
>--                      device_no,devname,dev_wr_speed[device_no], 
>-+                      device_no,dev_name,dev_wr_speed[device_no], 
>-                       dev_wr_channels[device_no], 
>-                       dev_wr_bits[device_no],devmode_txt[1]);
>-             sprintf(&ss[maxcolumn],
>-                   "\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s",
>--                      device_no,devname,dev_rd_speed[device_no], 
>-+                      device_no,dev_name,dev_rd_speed[device_no], 
>-                       dev_rd_channels[device_no], 
>-                       dev_rd_bits[device_no],devmode_txt[0]);
>-             sprintf(ss,
>-                   "\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s",
>--                      device_no,devname,dev_rdwr_speed[device_no], 
>-+                      device_no,dev_name,dev_rdwr_speed[device_no], 
>-                       dev_rdwr_channels[device_no], 
>-                       dev_rdwr_bits[device_no],devmode_txt[2]);
>-             }
>-@@ -672,12 +672,12 @@
>-               color=0x17;
>-               sprintf(&ss[maxcolumn],
>-                         "\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s",
>--                        device_no,devname,dev_wr_speed[device_no], 
>-+                        device_no,dev_name,dev_wr_speed[device_no], 
>-                         dev_wr_channels[device_no], 
>-                         dev_wr_bits[device_no],devmode_txt[1]);
>-               sprintf(ss,
>-                   "\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s  %s",
>--                          device_no,devname,dev_rd_speed[device_no], 
>-+                          device_no,dev_name,dev_rd_speed[device_no], 
>-                         dev_rd_channels[device_no], dev_rd_bits[device_no],
>-                             devmode_txt[0],devmode_txt[2]);
>-               }
>-@@ -686,12 +686,12 @@
>-               color=0x1d;
>-               sprintf(&ss[maxcolumn],
>-                         "\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s  %s",
>--                        device_no,devname,dev_wr_speed[device_no], 
>-+                        device_no,dev_name,dev_wr_speed[device_no], 
>-                         dev_wr_channels[device_no], dev_wr_bits[device_no],
>-                         devmode_txt[1],devmode_txt[2]);
>-               sprintf(ss,
>-                   "\n%02d:%12s  %7d Hz   %d Chan.   %d bit  %s",
>--                          device_no,devname,dev_rd_speed[device_no], 
>-+                          device_no,dev_name,dev_rd_speed[device_no], 
>-                         dev_rd_channels[device_no], dev_rd_bits[device_no],
>-                             devmode_txt[0]);
>-               }
>-@@ -777,8 +777,8 @@
>-     }
>-   }
>- vga_clear();
>--make_devname(ui.ad_device_no);
>--fprintf(sndlog,"\n\n %s selected by user for input.",devname);
>-+make_dev_name(ui.ad_device_no);
>-+fprintf(sndlog,"\n\n %s selected by user for input.",dev_name);
>- fprintf(sndlog,"   dev_flag=%d",dev_flag[ui.ad_device_no]);
>- flush_sync();
>- // High end users might need two devices to read four A/D channels.
>-@@ -819,8 +819,8 @@
>-         if(vga_inkey != 'Y')goto gt_dual;  
>-         vga_clear();
>-         fprintf(sndlog,"\nUser wants to try to open two read devices"); 
>--        make_devname(ui.ad_device_no);
>--        audio_in=open( devname, O_RDONLY, 0);
>-+        make_dev_name(ui.ad_device_no);
>-+        audio_in=open( dev_name, O_RDONLY, 0);
>-         if(audio_in == -1)end_program(1102);
>- // Check for DSP_CAP_TRIGGER capability
>-         if(ioctl(audio_in, SNDCTL_DSP_GETCAPS,&caps) == -1)end_program(1182);
>-@@ -834,14 +834,14 @@
>-         if(ioctl(audio_in, SNDCTL_DSP_CHANNELS, &j) == -1)end_program(1185);  
>-         if(j != 2)end_program(1186);
>-         }
>--      make_devname(i);
>--      audio_in2=open( devname, O_RDONLY|O_NONBLOCK, 0);
>-+      make_dev_name(i);
>-+      audio_in2=open( dev_name, O_RDONLY|O_NONBLOCK, 0);
>-       if(audio_in2 != -1)
>-         {
>-         line++;
>--        fprintf(sndlog,"\n%s opened as second read device",devname);
>-+        fprintf(sndlog,"\n%s opened as second read device",dev_name);
>-         sprintf(s,"\n%02d:%12s  %7d Hz   %d Chan.   %d bit",
>--                i,devname,dev_rd_speed[i], dev_rd_channels[i], 
>-+                i,dev_name,dev_rd_speed[i], dev_rd_channels[i], 
>-                 dev_rd_bits[i]);
>-         xytext(0,line,s);
>-         close(audio_in2);
>-@@ -866,13 +866,13 @@
>-     goto get_addev2;
>-     }
>- // We store the second A/D device in the second byte of ad_device_no
>--  make_devname(i);
>-+  make_dev_name(i);
>-   ui.ad_device_no+=256*(i+1);
>-   for(i=0; i<MAX_DEVNAMES; i++)
>-     {
>-     dev_flag[i]&=255;
>-     }    
>--  audio_in2=open( devname, O_RDONLY|O_NONBLOCK, 0);
>-+  audio_in2=open( dev_name, O_RDONLY|O_NONBLOCK, 0);
>-   if(audio_in2 == -1)end_program(1172);
>- // Check for DSP_CAP_TRIGGER capability
>-   if(ioctl(audio_in2, SNDCTL_DSP_GETCAPS,&caps) == -1)end_program(1182);
>-@@ -883,7 +883,7 @@
>-     close(audio_in2);
>-     goto skip_dual_devices;
>-     }
>--  fprintf(sndlog,"\n %s is second input device.",devname);
>-+  fprintf(sndlog,"\n %s is second input device.",dev_name);
>-   ui.input_mode=TWO_CHANNELS+IQ_DATA;
>-   ui.rx_channels=2;
>-   ui.ad_channels=4;
>-@@ -894,7 +894,7 @@
>-   }
>- // Now that we decided what device to use for input, open it and let
>- // the user decide how to use it.
>--make_devname(ui.ad_device_no);
>-+make_dev_name(ui.ad_device_no);
>- flush_sync();
>- ui.ad_device_mode=O_RDONLY;
>- mode=0;
>-@@ -903,7 +903,7 @@
>-   if( (1 & dev_flag[ui.ad_device_no]) != 0)
>-     {
>- gt_rdo:;    
>--    sprintf(s,"Open %s as RDONLY or RDWR? (O/W)\n=>",devname);  
>-+    sprintf(s,"Open %s as RDONLY or RDWR? (O/W)\n=>",dev_name);  
>-     xytext(10,10,s);
>-     vga_inkey=vga_getkey();
>-     clean_vga_inkey();
>-@@ -925,9 +925,9 @@
>-   }
>- flush_sync();
>- vga_clear();  
>--sprintf(s,"For analog input: %s opened in %s mode",devname,devmode_txt[mode]);
>-+sprintf(s,"For analog input: %s opened in %s mode",dev_name,devmode_txt[mode]);
>- xytext(0,0,s);
>--audio_in=open( devname, ui.ad_device_mode, 0);
>-+audio_in=open( dev_name, ui.ad_device_mode, 0);
>- if(audio_in == -1)end_program(1038);
>- j=dev_rd_channels[ui.ad_device_no];
>- xytext(0,10,"Select radio interface:");
>-@@ -1123,7 +1123,7 @@
>- 
>- 
>- settextcolor(12);
>--sprintf(s,"Trying to read %s",devname);
>-+sprintf(s,"Trying to read %s",dev_name);
>- xytext(10,10,s);
>- xytext(0,12,"If you see this message for more than 2 seconds READ failed");
>- xytext(0,13,"Then try another device");
>-@@ -1176,7 +1176,7 @@
>-   }
>- fprintf(sndlog,"\nRead test OK");
>- for(i=10; i<14; i++)xytext(0,i,ss);
>--sprintf(s,"Now trying to open a second device while %s is open",devname);
>-+sprintf(s,"Now trying to open a second device while %s is open",dev_name);
>- xytext(0,6,s);
>- xytext(0,7,"This may cause your system to hang. Try ctrlC to exit (or reboot)");
>- xytext(0,8,"Try another input device or install another sound system."); 
>-@@ -1192,9 +1192,9 @@
>-      read(audio_in, testbuff, 1024);
>-      if(ioctl(audio_in,SNDCTL_DSP_GETISPACE,&ad_info) == -1)end_program(1093);
>-      }
>--  make_devname(i);
>-+  make_dev_name(i);
>-   cn=0;
>--  sprintf(s,"%02d:%12s",i,devname);
>-+  sprintf(s,"%02d:%12s",i,dev_name);
>-   xytext(0,line,s);
>-   column=0;
>-   while(s[column] != 0)column++;
>-@@ -1206,7 +1206,7 @@
>-       if( (ui.input_mode&DWORD_INPUT) != 0 || ui.ad_channels > 2)
>-         {
>-         sprintf(&s[column],
>--             " RDWR  useless (too many bits or channels) %d: %s",i,devname);
>-+             " RDWR  useless (too many bits or channels) %d: %s",i,dev_name);
>-         dev_flag[i]=0;
>-         }
>-       else
>-@@ -1224,10 +1224,10 @@
>-     dev_flag[i]&=0xffff-4;
>-     if( (dev_flag[i]&2) != 0 )
>-       {
>--      audio_out=open( devname, O_WRONLY|O_NONBLOCK, 0);
>-+      audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0);
>-       if(audio_out != -1)
>-         { 
>--        fprintf(sndlog,"\n%s opened as WRONLY",devname);
>-+        fprintf(sndlog,"\n%s opened as WRONLY",dev_name);
>-         flush_sync();
>-         if(ioctl(audio_in, SNDCTL_DSP_GETISPACE, 
>-                                           &ad_info) == -1)end_program(1094);
>-@@ -1380,17 +1380,17 @@
>-   line=0;
>-   for(i=0; i<MAX_DEVNAMES; i++)
>-     {
>--    make_devname(i);
>--    fprintf(sndlog,"\n%s ",devname);
>-+    make_dev_name(i);
>-+    fprintf(sndlog,"\n%s ",dev_name);
>-     cn=0;
>--    sprintf(s,"%02d:%12s",i,devname);
>-+    sprintf(s,"%02d:%12s",i,dev_name);
>-     xytext(0,line,s);
>-     column=0;
>-     while(s[column] != 0)column++;
>--    audio_out=open( devname, O_WRONLY|O_NONBLOCK, 0);
>-+    audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0);
>-     if(audio_out != -1)
>-       { 
>--      fprintf(sndlog,"\n%s opened as WRONLY with no input open.",devname);
>-+      fprintf(sndlog,"\n%s opened as WRONLY with no input open.",dev_name);
>-       flush_sync();
>-       j=AFMT_U8;
>-       if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1)
>-@@ -1528,8 +1528,8 @@
>-   ui.da_device_no=j;
>-   if( (6 & dev_flag[ui.da_device_no]) == 0) goto get_dadev;
>-   }
>--make_devname(ui.da_device_no);
>--fprintf(sndlog,"\nUser selected %s for output.",devname);  
>-+make_dev_name(ui.da_device_no);
>-+fprintf(sndlog,"\nUser selected %s for output.",dev_name);  
>- for(i=6; i<=line; i++)xytext(0,i,ss);  
>- xytext(0,8,"Use close and reopen for D/A when");
>- xytext(0,9,"a new signal is selected? (Y/N)");
>-@@ -1563,8 +1563,8 @@
>-   }
>- else
>-   {
>--  audio_out=open( devname ,O_WRONLY , 0);
>--  sprintf(s,"\nUsing %s for output",devname);
>-+  audio_out=open( dev_name ,O_WRONLY , 0);
>-+  sprintf(s,"\nUsing %s for output",dev_name);
>-   xytext(0,6,s);
>-   if(audio_out == -1)end_program(1068);
>-   da_wrbuf = NULL;
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-settx.c /usr/home/db/linrad/files/patch-settx.c
>--- /usr/ports/comms/linrad/files/patch-settx.c	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/linrad/files/patch-settx.c	Wed Jun  7 15:32:17 2006
>@@ -0,0 +1,93 @@
>+--- settx.c.orig	Wed Jun  7 15:31:03 2006
>++++ settx.c	Wed Jun  7 15:32:01 2006
>+@@ -21,7 +21,7 @@
>+ #define LEVEL_METER_X 65
>+ 
>+ extern void make_devname(int device_no);
>+-extern char devname[];
>++extern char dev_name[];
>+ extern char *devmode_txt[3];
>+ 
>+ #if SND_DEV == 1
>+@@ -73,7 +73,7 @@
>+ int i,j;
>+ float t1;
>+ make_devname(tx.ad_device_no);
>+-tx_audio_in=open( devname, O_RDONLY, 0);
>++tx_audio_in=open( dev_name, O_RDONLY, 0);
>+ if(tx_audio_in == -1)lirerr(991111);
>+ i=AFMT_S16_LE;
>+ #ifdef AFMT_S32_LE
>+@@ -107,7 +107,7 @@
>+ int i,j;
>+ float t1;
>+ make_devname(tx.da_device_no);
>+-tx_audio_out=open( devname, O_WRONLY|O_NONBLOCK, 0);
>++tx_audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0);
>+ if(tx_audio_out == -1)lirerr(231111);
>+ i=AFMT_S16_LE;
>+ #ifdef AFMT_S32_LE
>+@@ -300,11 +300,11 @@
>+     make_devname(device_no);
>+       {
>+       sprintf(s,"Trying to open %s %s. Device defective if system hangs here.",
>+-                                           devname, devmode_txt[1]);
>++                                           dev_name, devmode_txt[1]);
>+       settextcolor(12);
>+       lir_text(0,line+1,s);
>+       settextcolor(7);
>+-      tx_audio_out=open( devname, O_WRONLY|O_NONBLOCK, 0);
>++      tx_audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0);
>+       if(tx_audio_out != -1)
>+         {
>+         line++;
>+@@ -374,7 +374,7 @@
>+           }
>+         dev_min_speed[device_no]=rdwr_speed;
>+         settextcolor(7);  
>+-        sprintf(s,"  %02d  %s     ",device_no,devname);
>++        sprintf(s,"  %02d  %s     ",device_no,dev_name);
>+         lir_text(0,line,s);
>+         sprintf(s,"%s   ",devmode_txt[1]);
>+         if(rdwr_channels==3)
>+@@ -516,7 +516,7 @@
>+   }
>+ clear_screen();
>+ make_devname(tx.da_device_no);
>+-sprintf(s,"Tx output: %s, %d channel(s), %d bits, %d Hz",devname,
>++sprintf(s,"Tx output: %s, %d channel(s), %d bits, %d Hz",dev_name,
>+                       tx.output_channels,tx.output_bytes<<3,tx.output_speed);
>+ settextcolor(14);
>+ lir_text(15,0,s);
>+@@ -578,11 +578,11 @@
>+     make_devname(device_no);
>+       {
>+       sprintf(s,"Trying to open %s %s. Device defective if system hangs here.",
>+-                                           devname, devmode_txt[0]);
>++                                           dev_name, devmode_txt[0]);
>+       settextcolor(12);
>+       lir_text(0,line+1,s);
>+       settextcolor(7);
>+-      tx_audio_in=open( devname, O_RDONLY|O_NONBLOCK, 0);
>++      tx_audio_in=open( dev_name, O_RDONLY|O_NONBLOCK, 0);
>+       if(tx_audio_in != -1)
>+         {
>+         line++;
>+@@ -652,7 +652,7 @@
>+           }
>+         dev_min_speed[device_no]=rdwr_speed;
>+         settextcolor(7);  
>+-        sprintf(s,"  %02d  %s     ",device_no,devname);
>++        sprintf(s,"  %02d  %s     ",device_no,dev_name);
>+         lir_text(0,line,s);
>+         sprintf(s,"%s   ",devmode_txt[0]);
>+         if(rdwr_channels==3)
>+@@ -774,7 +774,7 @@
>+ clear_screen();
>+ make_devname(tx.ad_device_no);
>+ 
>+-sprintf(s,"Microphone input: %s, %d channel(s), %d bits, %d Hz",devname,
>++sprintf(s,"Microphone input: %s, %d channel(s), %d bits, %d Hz",dev_name,
>+                       tx.input_channels,tx.input_bytes<<3,tx.input_speed);
>+ settextcolor(14);
>+ lir_text(15,0,s);
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-tune.c /usr/home/db/linrad/files/patch-tune.c
>--- /usr/ports/comms/linrad/files/patch-tune.c	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-tune.c	Wed Dec 31 19:00:00 1969
>@@ -1,15 +0,0 @@
>---- tune.c.orig	Tue May 18 09:43:30 2004
>-+++ tune.c	Fri Jul  9 12:25:02 2004
>-@@ -1,10 +1,9 @@
>- 
>--
>--#include <sys/io.h>
>-+#include <sys/types.h>
>- #include <vga.h>
>- #include <vgagl.h>
>- #include <unistd.h>
>--
>-+#include <machine/cpufunc.h>
>- #include "globdef.h"
>- #include "uidef.h"
>- #include "fft1def.h"
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-uidef.h /usr/home/db/linrad/files/patch-uidef.h
>--- /usr/ports/comms/linrad/files/patch-uidef.h	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-uidef.h	Mon Jun 19 20:18:37 2006
>@@ -1,9 +1,11 @@
>---- uidef.h.orig	Tue May 18 09:43:30 2004
>-+++ uidef.h	Thu Jul  8 18:27:42 2004
>-@@ -1,4 +1,5 @@
>--#include <arpa/inet.h>
>-+#include <sys/types.h>
>-+#include <netinet/in.h>
>+--- uidef.h.orig	Mon Jun 19 20:18:17 2006
>++++ uidef.h	Mon Jun 19 20:18:24 2006
>+@@ -5,7 +5,7 @@
>+ 
>  
>  #define MAX_FLOWCNT 31
>-  
>+-#define MAX_DEVNAMES 65
>++#define MAX_DEVNAMES 10
>+ #define MAX_LOWSPEED 10
>+ #define ABOVE_MAX_SPEED 768000
>+ 
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-uivar.c /usr/home/db/linrad/files/patch-uivar.c
>--- /usr/ports/comms/linrad/files/patch-uivar.c	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-uivar.c	Wed Dec 31 19:00:00 1969
>@@ -1,11 +0,0 @@
>---- uivar.c.orig	Tue May 18 09:43:30 2004
>-+++ uivar.c	Thu Jul  8 14:17:52 2004
>-@@ -2,7 +2,7 @@
>- #include "globdef.h"
>- #include "uidef.h"
>- #include "conf.h"
>--
>-+#include <netinet/in.h>
>- 
>- 
>- ROUTINE par_from_keyboard_routine;
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-wcw.c /usr/home/db/linrad/files/patch-wcw.c
>--- /usr/ports/comms/linrad/files/patch-wcw.c	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/files/patch-wcw.c	Wed Dec 31 19:00:00 1969
>@@ -1,28 +0,0 @@
>---- wcw.c.orig	Thu Jul  8 18:22:12 2004
>-+++ wcw.c	Thu Jul  8 18:22:55 2004
>-@@ -116,10 +116,12 @@
>- int syncflag, baseb_graph_time;
>- audio_buf_info ad_info, ad_info2;
>- touch_stack();
>-+#if 0
>- if(ui.memlock == 0)
>-   {
>-   if(mlockall(MCL_CURRENT) != 0)end_program(1165);
>-   }
>-+#endif
>- baseb_graph_time=0;
>- get_buffers(0);
>- if(lir_status != LIR_OK)return;
>-@@ -181,10 +183,12 @@
>- diskread_timer=recent_time;
>- latest_idle_time=recent_time;
>- lirsta=RX_LOW_PRIO;
>-+#if 0
>- if(ui.memlock == 0)
>-   {
>-   if(mlockall(MCL_CURRENT) != 0)lir_status=LIR_MEMERR;
>-   }
>-+#endif
>- if(lir_status != LIR_OK)goto wcw_exit;
>- // *******************************************************
>- //                   MAIN RECEIVE LOOP
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-xmain.c /usr/home/db/linrad/files/patch-xmain.c
>--- /usr/ports/comms/linrad/files/patch-xmain.c	Wed Dec 31 19:00:00 1969
>+++ /usr/home/db/linrad/files/patch-xmain.c	Mon Jun 19 23:33:21 2006
>@@ -0,0 +1,20 @@
>+--- xmain.c.orig	Mon Jun 19 22:40:14 2006
>++++ xmain.c	Mon Jun 19 23:33:03 2006
>+@@ -38,7 +38,7 @@
>+ float total;
>+ }PIXINFO;
>+ 
>+-
>++int saved_euid=-1;
>+  
>+ int main(int argc, char **argv)
>+ {
>+@@ -58,6 +58,8 @@
>+ XTextProperty window_title_property;
>+ unsigned short int *ipalette;
>+ XColor xco;
>++saved_euid=geteuid();
>++setuid(getuid());	/* XXX drop perms! */
>+ if(UNINIT_MEMDATA != 0)
>+   {
>+   memptr=(void*)(&uninit_mem_begin);
>diff -ruN --exclude=CVS /usr/ports/comms/linrad/pkg-plist /usr/home/db/linrad/pkg-plist
>--- /usr/ports/comms/linrad/pkg-plist	Wed Jul 14 12:09:39 2004
>+++ /usr/home/db/linrad/pkg-plist	Tue Jun 20 21:59:14 2006
>@@ -1,14 +1,17 @@
>-bin/linrad
>+bin/xlinrad
>+%%DATADIR%%/errors.lir
>+%%DATADIR%%/help.lir
> %%PORTDOCS%%%%DOCSDIR%%/z_APM.txt
> %%PORTDOCS%%%%DOCSDIR%%/z_BUFFERS.txt
> %%PORTDOCS%%%%DOCSDIR%%/z_CALIBRATE.txt
> %%PORTDOCS%%%%DOCSDIR%%/z_COPYRIGHT.txt
> %%PORTDOCS%%%%DOCSDIR%%/z_GIFINFO.txt
>-%%PORTDOCS%%%%DOCSDIR%%/z_INSTALL.txt
> %%PORTDOCS%%%%DOCSDIR%%/z_MLOCK.txt
>+%%PORTDOCS%%%%DOCSDIR%%/z_MOUSE.txt
>+%%PORTDOCS%%%%DOCSDIR%%/z_PARALLEL_PORT.txt
> %%PORTDOCS%%%%DOCSDIR%%/z_SETTINGS.txt
>-%%PORTDOCS%%%%DOCSDIR%%/z_SPEED.txt
>-%%PORTDOCS%%%%DOCSDIR%%/z_SVGALIB.txt
>+%%PORTDOCS%%%%DOCSDIR%%/z_USERS_EXTRA.txt
> %%PORTDOCS%%%%DOCSDIR%%/z_USERS_HWARE.txt
> %%PORTDOCS%%%%DOCSDIR%%/z_USLEEP.txt
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 99235: 67316