From db@db.net Sun Dec 3 04:06:08 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1270016A403 for ; Sun, 3 Dec 2006 04:06:08 +0000 (UTC) (envelope-from db@db.net) Received: from diana.db.net (diana.db.net [204.228.225.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8D3343CA6 for ; Sun, 3 Dec 2006 04:05:43 +0000 (GMT) (envelope-from db@db.net) Received: from db by diana.db.net with local (Exim 4.63 (FreeBSD)) (envelope-from ) id 1Gqibq-000BYx-VC for FreeBSD-gnats-submit@freebsd.org; Sat, 02 Dec 2006 21:05:46 -0700 Message-Id: Date: Sat, 02 Dec 2006 21:05:46 -0700 From: Diane Bruce Sender: Diane Bruce To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [MAINTAINER] comms/linrad: update to 2.20 fix X11BASE X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 106247 >Category: ports >Synopsis: [MAINTAINER] comms/linrad: update to 2.20 fix X11BASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: laszlof >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Dec 03 04:10:11 GMT 2006 >Closed-Date: Sun Dec 03 23:21:24 GMT 2006 >Last-Modified: Sun Dec 3 23:30:11 GMT 2006 >Originator: Diane Bruce >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: none >Environment: System: FreeBSD diana.db.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Sat Oct 14 14:44:56 MDT 2006 >Description: - Update to 2.20 - fix X11BASE while at it Removed file(s): - files/patch-lsetad.c Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- linrad-2.20.patch begins here --- diff -ruN --exclude=CVS /usr/ports/comms/linrad/Makefile /usr/home/db/ports/linrad/Makefile --- /usr/ports/comms/linrad/Makefile Fri Oct 13 20:53:23 2006 +++ /usr/home/db/ports/linrad/Makefile Sat Dec 2 10:49:43 2006 @@ -2,17 +2,16 @@ # Date created: 7 July 2004 # Whom: db # -# $FreeBSD: ports/comms/linrad/Makefile,v 1.8 2006/09/12 08:14:21 itetcu Exp $ +# $FreeBSD: ports/comms/linrad/Makefile,v 1.7 2006/09/08 22:52:36 itetcu Exp $ # PORTNAME= linrad -PORTVERSION= 2.17 -PORTREVISION= 1 +PORTVERSION= 2.20 CATEGORIES= comms MASTER_SITES= http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\ http://g7rau.demon.co.uk/sm5bsz/linuxdsp/archive/\ http://www.sm5bsz.com/linuxdsp/archive/ -DISTNAME= lir02-17 +DISTNAME= lir02-20 EXTRACT_SUFX= .tbz DIST_SUBDIR= ${PORTNAME} @@ -21,10 +20,11 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -WRKSRC= ${WRKDIR}/${PORTNAME}-02.17 +WRKSRC= ${WRKDIR}/${PORTNAME}-02.20 USE_AUTOTOOLS= autoconf:253 -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes +USE_GMAKE= yes USE_BZIP2= yes ALL_TARGET= xlinrad USE_X_PREFIX= yes @@ -32,7 +32,7 @@ .include .if ${OSVERSION} < 500000 -IGNORE= does not compile on FreeBSD 4.x +BROKEN= Does not compile on FreeBSD 4.x .endif post-patch: @@ -49,7 +49,6 @@ # Some day we may want the svga version as well. # ${INSTALL_PROGRAM} -m04555 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}.svga ${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 @@ -57,12 +56,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_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_USERS_EXTRA.txt ${DOCSDIR}/z_USERS_EXTRA.txt - ${INSTALL_DATA} ${WRKSRC}/z_USERS_HWARE.txt ${DOCSDIR}/z_USERS_HWARE.txt + ${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_PARALLEL_PORT.txt + ${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_SETTINGS.txt + ${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_USERS_EXTRA.txt + ${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_USERS_HWARE.txt ${INSTALL_DATA} ${WRKSRC}/z_USLEEP.txt ${DOCSDIR}/z_USLEEP.txt @${ECHO} "" @${ECHO} "linrad docs installed in ${DOCSDIR}" diff -ruN --exclude=CVS /usr/ports/comms/linrad/distinfo /usr/home/db/ports/linrad/distinfo --- /usr/ports/comms/linrad/distinfo Fri Oct 13 20:53:23 2006 +++ /usr/home/db/ports/linrad/distinfo Fri Nov 24 15:58:23 2006 @@ -1,3 +1,3 @@ -MD5 (linrad/lir02-17.tbz) = 8c87228f11be0baf48a54ec51992d93e -SHA256 (linrad/lir02-17.tbz) = c48a3d31a56e147c9c86acfe787bfae96b4c9c81325f64d3ed65844332dad40b -SIZE (linrad/lir02-17.tbz) = 429631 +MD5 (linrad/lir02-20.tbz) = 00a7e94eb52ce4941004e7ca96243c84 +SHA256 (linrad/lir02-20.tbz) = 91b91128ff441d6807fd7ea4957fb159748b24dc1d44c6203ac01f296711fde8 +SIZE (linrad/lir02-20.tbz) = 445625 diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-Makefile.in /usr/home/db/ports/linrad/files/patch-Makefile.in --- /usr/ports/comms/linrad/files/patch-Makefile.in Fri Oct 13 20:53:23 2006 +++ /usr/home/db/ports/linrad/files/patch-Makefile.in Sat Dec 2 07:48:16 2006 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jul 14 17:35:38 2006 -+++ Makefile.in Fri Jul 28 13:12:35 2006 +--- Makefile.in.orig Tue Nov 7 13:45:32 2006 ++++ Makefile.in Sat Dec 2 09:47:50 2006 @@ -4,17 +4,14 @@ # Name the output files *.ol instead of *.o # so we definitely know it is for Linux. @@ -20,3 +20,12 @@ CFW = -g -O -DOSNUM=2 -W -Wimplicit -Wreturn-type -Wformat \ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \ -Wparentheses -Wstrict-prototypes -Werror -ffast-math \ +@@ -432,7 +429,7 @@ + + + +- gcc -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \ ++ gcc -oxlinrad -L%%X11BASE%%/lib -lX11 -lpthread -lm \ + -Wl,-Map,linrad.xmap,-warn-common \ + 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 \ diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-help.c /usr/home/db/ports/linrad/files/patch-help.c --- /usr/ports/comms/linrad/files/patch-help.c Fri Sep 8 16:52:36 2006 +++ /usr/home/db/ports/linrad/files/patch-help.c Wed Nov 29 20:28:39 2006 @@ -1,20 +1,20 @@ ---- help.c.orig Fri Jul 28 13:12:59 2006 -+++ help.c Sat Jul 29 00:50:34 2006 -@@ -337,7 +337,7 @@ +--- help.c.orig Tue Nov 7 13:45:32 2006 ++++ help.c Fri Nov 24 18:02:31 2006 +@@ -352,7 +352,7 @@ printf("\n%s",s); DEB"\n%s",s); } -msg_filename="errors.lir"; -+msg_filename="%%DATADIR%%errors.lir"; ++msg_filename="/usr/X11R6/share/linrad/errors.lir"; line=3; if(screen_mode) { -@@ -352,7 +352,7 @@ +@@ -367,7 +367,7 @@ { int line; if(msg_no < 0)return; -msg_filename="help.lir"; -+msg_filename="%%DATADIR%%help.lir"; ++msg_filename="/usr/X11R6/share/linrad/help.lir"; line=0; settextcolor(15); clear_screen(); diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-lsetad.c /usr/home/db/ports/linrad/files/patch-lsetad.c --- /usr/ports/comms/linrad/files/patch-lsetad.c Tue Sep 12 02:14:22 2006 +++ /usr/home/db/ports/linrad/files/patch-lsetad.c Wed Dec 31 17:00:00 1969 @@ -1,1289 +0,0 @@ ---- lsetad.c.orig Tue Aug 15 15:27:44 2006 -+++ lsetad.c Mon Sep 11 15:46:13 2006 -@@ -39,7 +39,7 @@ - #define ABOVE_MAX_SPEED 768000 - #if SND_DEV == 1 - #define DEVNAME_BASE "/dev/dsp" --#else -+#else - #define DEVNAME_BASE "/dev/sound/dsp" - #endif - -@@ -83,15 +83,12 @@ - sdr=-1; - } - -- - void display_sdi(void) - { - FILE *sdifile; --int ch_cnt; --char ch_read[80]; -+char *p; - char work_line [80]; --int work_line_pos ; --int sdi_screen_line_counter; -+int sdi_screen_line_counter; - char sdi_intro_msg [26]= "SOUND DRIVER INFORMATION:" ; - char sdi_error_msg [46]= "No OSS or ALSA sound-driver information found"; - char sndstat_filename [25]; -@@ -111,59 +108,46 @@ - // if OSS not active, try ALSA - if (sdifile==NULL) - { -- strcpy (sndstat_filename,"/proc/asound/oss/sndstat"); -- sdifile=fopen (sndstat_filename,"r"); -- } --if (sdifile==NULL) -- { -- settextcolor(LIGHT_RED); -- lir_text ( 80, sdi_screen_line_counter++, sdi_error_msg); -- fprintf (sndlog,"\n%s",sdi_error_msg ); -- goto display_sdi_x; -+ strcpy (sndstat_filename,"/proc/asound/oss/sndstat"); -+ sdifile=fopen (sndstat_filename,"r"); - } --fprintf (sndlog,"\n(output of 'cat %s' command): \n\n",sndstat_filename ); --memset (work_line, '\0',sizeof(work_line)); --work_line_pos =0; --settextcolor(LIGHT_GREEN); --ch_cnt=fread(ch_read,1,1,sdifile); --while (ch_cnt== 1) -+if (sdifile!=NULL) - { --// check if work_line is ready for output processing -- if ((ch_read[0] =='\n') || (work_line_pos == 78)) -+ fprintf (sndlog,"\n(output of 'cat %s' command): \n\n",sndstat_filename ); -+ settextcolor(LIGHT_GREEN); -+ while(fgets(work_line, sizeof(work_line)-1, sdifile) != NULL) - { -+// check if work_line is ready for output processing -+ p=strchr(work_line, '\n'); -+ if(p != NULL)p[0]=0; -+ if (*work_line != '\0') -+ { - // display work_line only if it is not blank - // and there are enough lines available on the screen - // and there are at least 40 characters available on a line -- if ((work_line_pos >1) && -- ( sdi_screen_line_counter < screen_last_line) && -- ((screen_last_col - 40)>= 80)) -- { -- if (ch_read[0] !='\n') work_line[work_line_pos]=ch_read[0]; -- sdi_screen_line_counter++; -- lir_text (80, sdi_screen_line_counter, work_line); -- } -+ if (sdi_screen_line_counter < screen_last_line && -+ (screen_last_col - 40)>= 80) -+ { -+ sdi_screen_line_counter++; -+ lir_text (80, sdi_screen_line_counter, work_line); -+ } - // write to soundboard_init.log -- if (ch_read[0] =='\n') work_line[work_line_pos]=ch_read[0]; -- if (ch_read[0] !='\n') -- { --// this is a truncated line. Add newline character -- work_line[work_line_pos]=ch_read[0]; -- work_line[work_line_pos+1]='\n'; -- } -- fprintf (sndlog,"%s",work_line); -- memset (work_line, '\0',sizeof(work_line)); -- work_line_pos=-1; -- } -- work_line[work_line_pos]=ch_read[0]; -- work_line_pos++; -- ch_cnt=fread(ch_read,1,1,sdifile); -+ fprintf (sndlog,"%s\n",work_line); -+ } -+ } -+ fclose(sdifile); -+ } -+else -+ { -+ settextcolor(LIGHT_RED); -+ lir_text ( 80, sdi_screen_line_counter++, sdi_error_msg); -+ fprintf (sndlog,"\n%s",sdi_error_msg ); - } --fclose(sdifile); --display_sdi_x:; - fprintf(sndlog,sndlog_sep); - fflush(sndlog); - } - -+ - void clear_sdi(void) - { - int x, w; -@@ -209,6 +193,8 @@ - thread_status_flag[THREAD_SCREEN]!=THRFLAG_IDLE && - thread_status_flag[THREAD_SCREEN]!=THRFLAG_SEM_WAIT) - { -+ if(thread_command_flag[THREAD_RX_ADINPUT] == -+ THRFLAG_KILL)goto rxadin_error_exit; - lir_sleep(10000); - } - } -@@ -239,7 +225,7 @@ - } - #endif - if(hware_flag != 0) -- { -+ { - dt1=current_time(); - if(dt1 - hware_time > 0.005) - { -@@ -265,7 +251,7 @@ - measured_ad_speed=total_reads*ad_read_fragments/dt1; - } - } --// Here we post to the screen routine every 0.1 second. -+// Here we post to the screen routine every 0.1 second. - screen_loop_counter--; - if(screen_loop_counter == 0) - { -@@ -304,8 +290,8 @@ - rxin_int[4*i+2]=rxin_int2[2*i ]; - rxin_int[4*i+3]=rxin_int2[2*i+1]; - } -- } -- } -+ } -+ } - if(network_flag == 1) - { - if(network_modeno == 1) -@@ -321,14 +307,14 @@ - } - write(network_sockfd, rxin_isho, ad_read_bytes); - } -- } -+ } - finish_rx_read(rxin_isho); - if(kill_all_flag) goto rxadin_error_exit; - } --rxadin_error_exit:; -+rxadin_error_exit:; - while( audio_out == audio_in)lir_sleep(10000); --close_rx_sndin(); --rx_adin_init_error:; -+close_rx_sndin(); -+rx_adin_init_error:; - thread_status_flag[THREAD_RX_ADINPUT]=THRFLAG_RETURNED; - while(thread_command_flag[THREAD_RX_ADINPUT] != THRFLAG_NOT_ACTIVE) - { -@@ -360,7 +346,7 @@ - lir_sleep(3000); - i++; - if(i<10)goto buftest; -- } -+ } - i=da_totbytes-da_info.bytes; - i/=(da_output_channels*da_output_bytes); - return i; -@@ -375,13 +361,13 @@ - for(i=0; i>=1; - frag++; - } --if(frag < 4)frag=4; -+if(frag < 4)frag=4; - frag|=0x7fff0000; - return frag; - } -@@ -614,7 +606,7 @@ - free(da_wrbuf); - da_wrbuf=NULL; - } -- } -+ } - audio_out=-1; - } - -@@ -623,7 +615,7 @@ - float t1; - int i, j, frag; - audio_buf_info ad_info; --if( disksave_flag == 2 || -+if( disksave_flag == 2 || - network_flag == 2 || - ui.ad_device_no == SDR14_DEVICE_CODE || - ( (ui.input_mode&NO_DUPLEX) != 0 && audio_out != -1) ) -@@ -632,7 +624,7 @@ - } - if( (audio_in) != -1) - { -- if( ui.ad_device_mode == O_RDWR)return; -+ if( ui.ad_device_mode == O_RDWR)return; - lirerr(100031); - return; - } -@@ -662,22 +654,22 @@ - i>>=1; - frag++; - } --if(frag < 4)frag=4; -+if(frag < 4)frag=4; - if(ui.ad_device_no > 255) - { - frag--; -- if(frag < 4)frag=4; -+ if(frag < 4)frag=4; - frag=frag|0x7fff0000; - if(ioctl(audio_in2, SNDCTL_DSP_SETFRAGMENT, &frag) == -1) - { -- lirerr(1175); -+ lirerr(1175); - return; - } - } - frag=frag|0x7fff0000; - if(ioctl(audio_in, SNDCTL_DSP_SETFRAGMENT, &frag) == -1) - { -- lirerr(1008); -+ lirerr(1008); - return; - } - i=AFMT_S16_LE; -@@ -721,7 +713,7 @@ - i=j; - if(ioctl(audio_in, SNDCTL_DSP_CHANNELS, &i) == -1) - { -- lirerr(1009); -+ lirerr(1009); - return; - } - if(i != j) -@@ -734,7 +726,7 @@ - i=j; - if(ioctl(audio_in2, SNDCTL_DSP_CHANNELS, &i) == -1) - { -- lirerr(1178); -+ lirerr(1178); - return; - } - if(i != j) -@@ -791,7 +783,7 @@ - i=PCM_ENABLE_INPUT; - if(ioctl(audio_in2,SNDCTL_DSP_SETTRIGGER,&i)==-1) - { -- lirerr(1184); -+ lirerr(1184); - return; - } - } -@@ -814,7 +806,7 @@ - } - } - ioctl(audio_in,SNDCTL_DSP_GETBLKSIZE,&i); --} -+} - - - -@@ -854,7 +846,7 @@ - } - } - // ******************************************* --if(ui.ad_device_no == ui.da_device_no && -+if(ui.ad_device_no == ui.da_device_no && - ui.ad_device_mode == O_RDWR && - network_flag != 2) - { -@@ -887,7 +879,7 @@ - { - lirerr(1191); - } -- else -+ else - { - lirerr(1017); - } -@@ -907,7 +899,7 @@ - i=da_output_channels; - if(ioctl(audio_out, SNDCTL_DSP_CHANNELS, &i) == -1) - { -- lirerr(1019); -+ lirerr(1019); - return; - } - if(i != da_output_channels) -@@ -923,7 +915,7 @@ - { - i=AFMT_S16_LE; - } -- j=i; -+ j=i; - if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &i) == -1) - { - lirerr(1020); -@@ -957,7 +949,7 @@ - lirerr(1025); - return; - } --for(i=0; i0) -+ while (m >0) - { - m--; - line++; -@@ -1715,15 +1758,15 @@ - bottom_line=maxline; - line=1; - } -- settextcolor(color); -+ settextcolor(color); - column=0; - while(ss[m*maxcolumn+column]!=0)column++; - while(column < maxcolumn) - { - ss[m*maxcolumn+column]=' '; -- column++; -+ column++; - } -- ss[(m+1)*maxcolumn-1]=0; -+ ss[(m+1)*maxcolumn-1]=0; - lir_text(0,line,&ss[m*maxcolumn]); - lir_refresh_screen(); - SNDLOG"\n%s color=%d m=%d",&ss[m*maxcolumn],color,m); -@@ -1732,7 +1775,7 @@ - SNDLOG"\n"); - } - } --settextcolor(7); -+settextcolor(7); - line++; - clear_lines(line,line); - if(bottom_line > line)line=bottom_line; -@@ -1750,7 +1793,7 @@ - lir_text(0,line+10, - "Sound board drivers are usually configured during Linux install"); - lir_text(20,line+12,press_any_key); -- await_keyboard(); -+ await_keyboard(); - if(kill_all_flag) goto setad_errexit; - SNDLOG"\nNo input device found"); - goto setad_errexit; -@@ -1761,7 +1804,7 @@ - get_addev:; - settextcolor(14); - lir_text(0,line,"Select device for input by first number on line"); -- display_sdi(); -+ display_sdi(); - settextcolor(7); - ui.ad_device_no=lir_get_integer(48, line, 3, 0,MAX_DEVNAMES-1); - if(kill_all_flag)goto setad_errexit; -@@ -1802,7 +1845,7 @@ - // channels with the Lynx Two card (model A). - // Do not confuse other users by asking for a second input device - // unless the selected device has 32 bits but only allows 2 channels. --if( dev_rd_bits[ui.ad_device_no] == 32 && -+if( dev_rd_bits[ui.ad_device_no] == 32 && - dev_max_rd_channels[ui.ad_device_no]==2 && - (dev_flag[ui.ad_device_no]&1) != 0) - { -@@ -1811,7 +1854,7 @@ - line=1; - for(i=0; i",dev_name); -+gt_rdo:; -+ 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; -@@ -1970,7 +2013,7 @@ - } - else - { --rdwr:; -+rdwr:; - ui.ad_device_mode=O_RDWR; - mode=2; - SNDLOG"\nUser selected RDWR"); -@@ -1981,7 +2024,7 @@ - SNDLOG"\nOnly RDONLY available"); - } - sndlog_sync(); --clear_screen(); -+clear_screen(); - sprintf(s,"For analog input: %s opened in %s mode",dev_name,devmode_txt[mode]); - lir_text(0,0,s); - audio_in=open( dev_name, ui.ad_device_mode, 0); -@@ -2031,7 +2074,7 @@ - ui.rx_channels=1; - ui.ad_channels=2; - break; -- -+ - case '3': - ui.input_mode=TWO_CHANNELS; - ui.rx_channels=2; -@@ -2288,7 +2331,7 @@ - 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."); -+lir_text(0,8,"Try another input device or install another sound system."); - // Find devices that we may use for output. - n=0; - cn=0; -@@ -2314,16 +2357,16 @@ - dev_flag[i]=0; - } - else -- { -+ { - sprintf(&s[column]," %d Hz %d Chan. 16 bit RDWR", - ui.input_speed, ui.ad_channels); - n++; -- ui.da_device_no=i; -+ ui.da_device_no=i; - } - } - } - else -- { -+ { - // Remove duplex flags on all devices except the one we use for input - dev_flag[i]&=0xffff-4; - if( (dev_flag[i]&2) != 0 ) -@@ -2331,7 +2374,7 @@ - audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0); - if(read_test_ad(testbuff)!=0)goto clr_wrdev; - if(audio_out != -1) -- { -+ { - #ifdef SNDCTL_DSP_COOKEDMODE - j=0; - ioctl(audio_out, SNDCTL_DSP_COOKEDMODE, &j); -@@ -2351,13 +2394,13 @@ - dev_wr_bits[i]=0; - } - else -- { -+ { - SNDLOG"\n8-bit output supported"); - dev_wr_bits[i]=8; - } - sndlog_sync(); - j=AFMT_S16_LE; -- if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1 || j != AFMT_S16_LE) -+ if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1 || j != AFMT_S16_LE) - { - SNDLOG"\nCould not set 16-bit output"); - } -@@ -2368,7 +2411,7 @@ - SNDLOG"\n16-bit output supported"); - sndlog_sync(); - if(dev_wr_bits[i]==0) goto skip_wr_dev; -- sndlog_sync(); -+ sndlog_sync(); - j=2; - if(ioctl(audio_out, SNDCTL_DSP_CHANNELS, &j) == -1) - { -@@ -2397,7 +2440,7 @@ - SNDLOG"\nioctl(SPEED) failed"); - goto skip_wr_dev; - } -- } -+ } - dev_max_wr_speed[i]=j; - SNDLOG"\nMax output speed %d", dev_max_wr_speed[i]); - j=1; -@@ -2409,7 +2452,7 @@ - SNDLOG"\nioctl(SPEED) failed"); - goto skip_wr_dev; - } -- } -+ } - dev_min_wr_speed[i]=j; - SNDLOG"\nMin output speed %d", dev_min_wr_speed[i]); - sndlog_sync(); -@@ -2426,7 +2469,7 @@ - SNDLOG"\nWrite failed"); - goto skip_wr_dev; - } -- sound_start_time=current_time(); -+ sound_start_time=current_time(); - wrcnt=0; - j=ad_info.bytes; - while(wrcnt+ad_info.bytes < 3*1024+j ) -@@ -2438,7 +2481,7 @@ - SNDLOG"\nSNDCTL_DSP_GETOSPACE failed"); - goto skip_wr_dev; - } -- if( current_time() - sound_start_time > 0.7) -+ if( current_time() - sound_start_time > 0.7) - { - SNDLOG"\nTimeout"); - goto skip_wr_dev; -@@ -2456,7 +2499,7 @@ - lirerr(1095); - goto setad_errexit; - } -- olbytes=ad_info.bytes; -+ olbytes=ad_info.bytes; - gettimeofday(&tim2,NULL); - while(ad_info.bytes-olbytes < 512) - { -@@ -2475,31 +2518,31 @@ - } - if(close(audio_out)==-1) - { -- goto skip_wr_dev; -+ goto skip_wr_dev; - } - sprintf(&s[column]," %7d - %7d Hz %d Chan. %d bit WRONLY", -- dev_min_wr_speed[i], -- dev_max_wr_speed[i], -- dev_wr_channels[i], -+ dev_min_wr_speed[i], -+ dev_max_wr_speed[i], -+ dev_wr_channels[i], - dev_wr_bits[i]); - cn=1; - n++; -- ui.da_device_no=i; -+ ui.da_device_no=i; - } -- else -+ else - { -- goto clr_wrdev; -+ goto clr_wrdev; - skip_wr_dev:; - sndlog_sync(); - if(close(audio_out)==-1) - { -- lirerr(1067); -+ lirerr(1067); - goto setad_errexit; - } - clr_wrdev:; - dev_flag[i]&=0xffff-2; - } -- } -+ } - } - if(cn != 0) - { -@@ -2542,7 +2585,7 @@ - while(s[column] != 0)column++; - 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); -@@ -2556,11 +2599,11 @@ - dev_wr_bits[i]=0; - } - else -- { -+ { - dev_wr_bits[i]=8; - } - j=AFMT_S16_LE; -- if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1 || j != AFMT_S16_LE) -+ if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1 || j != AFMT_S16_LE) - { - SNDLOG"\nCould not set 16-bit output"); - } -@@ -2569,7 +2612,7 @@ - dev_wr_bits[i]=16; - } - if(dev_wr_bits[i]==0) goto skip_wr_dev_nodup; -- sndlog_sync(); -+ sndlog_sync(); - j=2; - if(ioctl(audio_out, SNDCTL_DSP_CHANNELS, &j) == -1) - { -@@ -2597,7 +2640,7 @@ - SNDLOG"\nioctl(SPEED) failed"); - goto skip_wr_dev_nodup; - } -- } -+ } - dev_max_wr_speed[i]=j; - SNDLOG"\nMax output speed %d", dev_max_wr_speed[i]); - sndlog_sync(); -@@ -2613,17 +2656,17 @@ - if(ioctl(audio_out,SNDCTL_DSP_GETOSPACE, &ad_info) == -1) - goto skip_wr_dev_nodup; - } -- if(close(audio_out)==-1)goto skip_wr_dev_nodup; -+ if(close(audio_out)==-1)goto skip_wr_dev_nodup; - sprintf(&s[column]," %d Hz %d Chan. %d bit WRONLY", - dev_max_wr_speed[i], dev_wr_channels[i], dev_wr_bits[i]); - cn=1; - n++; -- ui.da_device_no=i; -+ ui.da_device_no=i; - dev_flag[i] |= 2; - } -- else -+ else - { -- goto clr_wrdev_nodup; -+ goto clr_wrdev_nodup; - skip_wr_dev_nodup:; - sndlog_sync(); - if(close(audio_out)==-1) -@@ -2655,10 +2698,10 @@ - lirerr(1139); - goto setad_errexit; - } -- ui.input_mode|=NO_DUPLEX; -+ ui.input_mode|=NO_DUPLEX; - ad_info.bytes=0; - } --dadev_select:; -+dadev_select:; - if(n > 1) - { - get_dadev:; -@@ -2666,7 +2709,7 @@ - j=0; - settextcolor(14); - lir_text(0,line,"Select device for output by line number"); -- display_sdi(); -+ display_sdi(); - settextcolor(7); - while(i<2) - { -@@ -2683,7 +2726,7 @@ - } - ui.da_device_no=j; - // Mod3: Modified error message handling in get_dadev and get_addev -- if( (6 & dev_flag[ui.da_device_no]) == 0) -+ if( (6 & dev_flag[ui.da_device_no]) == 0) - { - settextcolor(15); - lir_text(43,line,"???"); -@@ -2693,10 +2736,10 @@ - clear_lines(line,line+1); - goto get_dadev; - } --// ------------------------------------------------------- -+// ------------------------------------------------------- - // The original code was: - // if( (6 & dev_flag[ui.da_device_no]) == 0) goto get_dadev; --// ------------------------------------------------------- -+// ------------------------------------------------------- - } - make_devname(ui.da_device_no); - SNDLOG"\nUser selected %s for output.",dev_name); -@@ -2711,7 +2754,7 @@ - { - ui.da_stopstart=1; - } --else -+else - { - if(lir_inkey != 'N')goto get_da_stopstart; - ui.da_stopstart=0; -@@ -2720,7 +2763,7 @@ - // If we selected the same device for input and output, - // check if it was opened ad RDWR or if we shall open it - // for output now --if( ui.da_device_no == ui.ad_device_no && -+if( ui.da_device_no == ui.ad_device_no && - ui.ad_device_mode == O_RDWR && - (ui.input_mode&NO_DUPLEX) == 0 ) - { -@@ -2751,20 +2794,20 @@ - close_rx_sndout(); - } - close_rx_sndin(); --sprintf(s,"Min output channels: %d",ui.min_output_channels); -+sprintf(s,"Min output channels: %d",ui.min_output_channels); - lir_text(0,8,s); --sprintf(s,"Max output channels: %d",ui.max_output_channels); -+sprintf(s,"Max output channels: %d",ui.max_output_channels); - lir_text(0,9,s); - da_output_channels=ui.min_output_channels; - da_output_bytes=ui.max_output_bytes; --sprintf(s,"Output no of bits=%d",8*ui.max_output_bytes); -+sprintf(s,"Output no of bits=%d",8*ui.max_output_bytes); - lir_text(35,7,s); - if(ui.max_output_bytes != ui.min_output_bytes) - { -- sprintf(s,"or %d",8*ui.min_output_bytes); -+ sprintf(s,"or %d",8*ui.min_output_bytes); - lir_text(56,7,s); - } --// Reopen with the current parameters. -+// Reopen with the current parameters. - // We will not goto setad_errexit here if something goes wrong. - if( (ui.input_mode&NO_DUPLEX) == 0 && ui.ad_device_no != SDR14_DEVICE_CODE) - { diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-lxsys.c /usr/home/db/ports/linrad/files/patch-lxsys.c --- /usr/ports/comms/linrad/files/patch-lxsys.c Fri Sep 8 16:52:36 2006 +++ /usr/home/db/ports/linrad/files/patch-lxsys.c Wed Nov 29 20:44:18 2006 @@ -1,5 +1,5 @@ ---- lxsys.c.orig Tue Aug 15 15:27:44 2006 -+++ lxsys.c Fri Sep 8 16:35:10 2006 +--- lxsys.c.orig Tue Nov 7 13:45:32 2006 ++++ lxsys.c Fri Nov 24 18:02:31 2006 @@ -1,12 +1,14 @@ - -#include @@ -18,15 +18,15 @@ #include #include #include "thrdef.h" -@@ -16,6 +18,7 @@ +@@ -17,6 +19,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!! ***", -@@ -66,11 +69,9 @@ + void lirerr(int errcod) + { +@@ -60,11 +63,9 @@ // Get permission to write to the parallel port if(ui.parport < 0x400-4) { @@ -41,7 +41,7 @@ } if(i != 0) { -@@ -214,11 +215,9 @@ +@@ -208,11 +209,9 @@ int i; if(ui.parport < 0x400-4) { @@ -56,7 +56,7 @@ } if(i!=0)lirerr(764921); i=1000; -@@ -231,11 +230,9 @@ +@@ -225,11 +224,9 @@ int i; if(ui.parport < 0x400-4) { @@ -71,4 +71,3 @@ } if(i!=0)lirerr(764921); return inb(port); - diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-uidef.h /usr/home/db/ports/linrad/files/patch-uidef.h --- /usr/ports/comms/linrad/files/patch-uidef.h Fri Oct 13 20:53:24 2006 +++ /usr/home/db/ports/linrad/files/patch-uidef.h Wed Nov 29 20:29:07 2006 @@ -1,5 +1,5 @@ ---- uidef.h.orig Sat Jul 29 16:29:21 2006 -+++ uidef.h Sat Jul 29 16:29:34 2006 +--- uidef.h.orig Tue Nov 7 13:45:32 2006 ++++ uidef.h Fri Nov 24 18:02:31 2006 @@ -5,7 +5,7 @@ diff -ruN --exclude=CVS /usr/ports/comms/linrad/files/patch-xmain.c /usr/home/db/ports/linrad/files/patch-xmain.c --- /usr/ports/comms/linrad/files/patch-xmain.c Fri Sep 8 16:52:36 2006 +++ /usr/home/db/ports/linrad/files/patch-xmain.c Wed Nov 29 20:43:40 2006 @@ -1,6 +1,6 @@ ---- xmain.c.orig Fri Jul 14 17:35:38 2006 -+++ xmain.c Fri Jul 28 12:45:20 2006 -@@ -39,7 +39,7 @@ +--- xmain.c.orig Tue Nov 7 13:45:33 2006 ++++ xmain.c Fri Nov 24 18:02:31 2006 +@@ -40,7 +40,7 @@ float total; }PIXINFO; @@ -9,7 +9,7 @@ int main(int argc, char **argv) { -@@ -59,6 +59,8 @@ +@@ -60,6 +60,8 @@ XTextProperty window_title_property; unsigned short int *ipalette; XColor xco; diff -ruN --exclude=CVS /usr/ports/comms/linrad/pkg-message /usr/home/db/ports/linrad/pkg-message --- /usr/ports/comms/linrad/pkg-message Fri Sep 8 16:52:36 2006 +++ /usr/home/db/ports/linrad/pkg-message Sat Dec 2 07:53:58 2006 @@ -1,5 +1,5 @@ linrad is now installed. -linrad is now a shell script which "wraps" xlinrad. +linrad is a shell script which "wraps" xlinrad. When used for the first time, the linrad wrapper will create a ~/.linrad directory which will be your working directory. diff -ruN --exclude=CVS /usr/ports/comms/linrad/pkg-plist /usr/home/db/ports/linrad/pkg-plist --- /usr/ports/comms/linrad/pkg-plist Fri Oct 13 20:53:24 2006 +++ /usr/home/db/ports/linrad/pkg-plist Sat Dec 2 11:53:27 2006 @@ -7,7 +7,6 @@ %%PORTDOCS%%%%DOCSDIR%%/z_CALIBRATE.txt %%PORTDOCS%%%%DOCSDIR%%/z_COPYRIGHT.txt %%PORTDOCS%%%%DOCSDIR%%/z_GIFINFO.txt -%%PORTDOCS%%%%DOCSDIR%%/z_MLOCK.txt %%PORTDOCS%%%%DOCSDIR%%/z_MOUSE.txt %%PORTDOCS%%%%DOCSDIR%%/z_PARALLEL_PORT.txt %%PORTDOCS%%%%DOCSDIR%%/z_SETTINGS.txt --- linrad-2.20.patch ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->xride Responsible-Changed-By: edwin Responsible-Changed-When: Sun Dec 3 04:10:44 UTC 2006 Responsible-Changed-Why: xride@ wants his PRs http://www.freebsd.org/cgi/query-pr.cgi?pr=106247 Responsible-Changed-From-To: xride->laszlof Responsible-Changed-By: laszlof Responsible-Changed-When: Sun Dec 3 17:01:38 UTC 2006 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=106247 From: "Frank J. Laszlo" To: bug-followup@FreeBSD.org Cc: db@db.net, "Frank J. Laszlo" Subject: Re: ports/106247: [MAINTAINER] comms/linrad: update to 2.20 fix X11BASE Date: Sun, 03 Dec 2006 15:25:32 -0500 This is a multi-part message in MIME format. --------------070304010704090107030900 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 You missed a few files for X11BASE-clean. I have attach a patch to fix all the associated files, and it will now be X11BASE clean. Do you approve? - -Frank -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iQIVAwUBRXMyu61QwXwBI2DsAQKzEg/7B1//Ow/dqIXa3+qen23RRYQZ11Mpy3b7 N/OT4u5DuEh3seb0nJcjaflvqYWD1kQdUtmu3MgrN9kmlhr9ynqQAhXZmYKmy4FY qhspKqYbXgErL5hX+zqf09diqRP1Uql7exMujDH3OrL3t7jXip36mi1rOpE5pGL+ cFmSQP4F5O7JL0ORoJ3TWbH3rkZ3aLuXOz4bw/ftHj6GE9nsudwSmw4TZg2WEsBQ EJUELR8Lrpky3rfv1eRFeD6dhvBbm5PGK3cc0YPvjXZBJWor2x+bdIFJEQ4u7WuY GhV+XZC4cvVHCGP64qtdtA4ExLbSCoXSjl/POFrlhcTLTLNx7rmDRrc+U/vT3auw qfawYGUXsJA1AwTQEnyGQ9ClGlAce5EbozVT7NCsVvtoswVK8vhuveLomxU+MbGS dsn8xnsBncjUNB0G9BtJZtX8BgkNM3ozbSgwAOihCOpJ5xjwxRlAC+pTpj43racs DFHGzGFhXIWiLjPpspL2MevlESINBRA+EXHjxlAH+jr3qo2LjROwJiUtwO1VErgR xDPY6B60TMMWzht1oayJ21CjuTHIU4X0DKE8oE2lR9xAuuixl5e8DKfotjCvqr1i odLHvdXMgpCJ1e+j9GBfNGSnm23MFRQiqSLbtkGyvZZe4fYwkR8/yBnktZeStgbN tIBEA5cG0VE= =Qyk0 -----END PGP SIGNATURE----- --------------070304010704090107030900 Content-Type: text/x-patch; name="linrad-2.20-X11BASE.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="linrad-2.20-X11BASE.diff" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/comms/linrad/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 12 Sep 2006 08:14:21 -0000 1.8 +++ Makefile 3 Dec 2006 20:12:34 -0000 @@ -2,17 +2,16 @@ # Date created: 7 July 2004 # Whom: db # -# $FreeBSD: ports/comms/linrad/Makefile,v 1.8 2006/09/12 08:14:21 itetcu Exp $ +# $FreeBSD: ports/comms/linrad/Makefile,v 1.7 2006/09/08 22:52:36 itetcu Exp $ # PORTNAME= linrad -PORTVERSION= 2.17 -PORTREVISION= 1 +PORTVERSION= 2.20 CATEGORIES= comms MASTER_SITES= http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\ http://g7rau.demon.co.uk/sm5bsz/linuxdsp/archive/\ http://www.sm5bsz.com/linuxdsp/archive/ -DISTNAME= lir02-17 +DISTNAME= lir02-20 EXTRACT_SUFX= .tbz DIST_SUBDIR= ${PORTNAME} @@ -21,26 +20,31 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -WRKSRC= ${WRKDIR}/${PORTNAME}-02.17 +WRKSRC= ${WRKDIR}/${PORTNAME}-02.20 USE_AUTOTOOLS= autoconf:253 -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes +USE_GMAKE= yes USE_BZIP2= yes ALL_TARGET= xlinrad USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 +X11_PATCHFILES= Makefile.in help.c xmain.c .include .if ${OSVERSION} < 500000 -IGNORE= does not compile on FreeBSD 4.x +BROKEN= Does not compile on FreeBSD 4.x .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \ ${WRKSRC}/help.c +.for f in ${X11_PATCHFILES} + @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${f} +.endfor + do-install: ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/errors.lir ${DATADIR}/errors.lir @@ -49,7 +53,6 @@ # Some day we may want the svga version as well. # ${INSTALL_PROGRAM} -m04555 ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}.svga ${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 @@ -57,12 +60,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_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_USERS_EXTRA.txt ${DOCSDIR}/z_USERS_EXTRA.txt - ${INSTALL_DATA} ${WRKSRC}/z_USERS_HWARE.txt ${DOCSDIR}/z_USERS_HWARE.txt + ${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_PARALLEL_PORT.txt + ${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_SETTINGS.txt + ${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_USERS_EXTRA.txt + ${INSTALL_DATA} ${WRKSRC}/z_MOUSE.txt ${DOCSDIR}/z_USERS_HWARE.txt ${INSTALL_DATA} ${WRKSRC}/z_USLEEP.txt ${DOCSDIR}/z_USLEEP.txt @${ECHO} "" @${ECHO} "linrad docs installed in ${DOCSDIR}" Index: distinfo =================================================================== RCS file: /home/pcvs/ports/comms/linrad/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 8 Sep 2006 22:52:36 -0000 1.4 +++ distinfo 3 Dec 2006 20:12:34 -0000 @@ -1,3 +1,3 @@ -MD5 (linrad/lir02-17.tbz) = 8c87228f11be0baf48a54ec51992d93e -SHA256 (linrad/lir02-17.tbz) = c48a3d31a56e147c9c86acfe787bfae96b4c9c81325f64d3ed65844332dad40b -SIZE (linrad/lir02-17.tbz) = 429631 +MD5 (linrad/lir02-20.tbz) = 00a7e94eb52ce4941004e7ca96243c84 +SHA256 (linrad/lir02-20.tbz) = 91b91128ff441d6807fd7ea4957fb159748b24dc1d44c6203ac01f296711fde8 +SIZE (linrad/lir02-20.tbz) = 445625 Index: pkg-message =================================================================== RCS file: /home/pcvs/ports/comms/linrad/pkg-message,v retrieving revision 1.1 diff -u -r1.1 pkg-message --- pkg-message 8 Sep 2006 22:52:36 -0000 1.1 +++ pkg-message 3 Dec 2006 20:12:34 -0000 @@ -1,5 +1,5 @@ linrad is now installed. -linrad is now a shell script which "wraps" xlinrad. +linrad is a shell script which "wraps" xlinrad. When used for the first time, the linrad wrapper will create a ~/.linrad directory which will be your working directory. Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/comms/linrad/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 8 Sep 2006 22:52:36 -0000 1.3 +++ pkg-plist 3 Dec 2006 20:12:34 -0000 @@ -7,7 +7,6 @@ %%PORTDOCS%%%%DOCSDIR%%/z_CALIBRATE.txt %%PORTDOCS%%%%DOCSDIR%%/z_COPYRIGHT.txt %%PORTDOCS%%%%DOCSDIR%%/z_GIFINFO.txt -%%PORTDOCS%%%%DOCSDIR%%/z_MLOCK.txt %%PORTDOCS%%%%DOCSDIR%%/z_MOUSE.txt %%PORTDOCS%%%%DOCSDIR%%/z_PARALLEL_PORT.txt %%PORTDOCS%%%%DOCSDIR%%/z_SETTINGS.txt Index: files/patch-Makefile.in =================================================================== RCS file: /home/pcvs/ports/comms/linrad/files/patch-Makefile.in,v retrieving revision 1.4 diff -u -r1.4 patch-Makefile.in --- files/patch-Makefile.in 8 Sep 2006 22:52:36 -0000 1.4 +++ files/patch-Makefile.in 3 Dec 2006 20:12:34 -0000 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jul 14 17:35:38 2006 -+++ Makefile.in Fri Jul 28 13:12:35 2006 +--- Makefile.in.orig Tue Nov 7 13:45:32 2006 ++++ Makefile.in Sun Dec 3 15:06:40 2006 @@ -4,17 +4,14 @@ # Name the output files *.ol instead of *.o # so we definitely know it is for Linux. @@ -16,7 +16,25 @@ --Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \ --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 ++CFL = ${CFLAGS} -I/usr/local/include -I/usr/X11R6/include -L/usr/local/lib -L/usr/X11R6/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 \ +@@ -386,7 +383,7 @@ + meter_graph.ol fonts.ol screensub.ol membeg.ol lxsys.ol memend.ol + + +- gcc -olinrad -lvgagl -lvga -lpthread -lm \ ++ gcc -olinrad -lvgagl -lvga -pthread -lm \ + -Wl,-Map,linrad.lmap,-warn-common \ + 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 \ +@@ -432,7 +429,7 @@ + + + +- gcc -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \ ++ gcc -oxlinrad -L/usr/X11R6/lib -lX11 -pthread -lm \ + -Wl,-Map,linrad.xmap,-warn-common \ + 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 \ Index: files/patch-help.c =================================================================== RCS file: /home/pcvs/ports/comms/linrad/files/patch-help.c,v retrieving revision 1.2 diff -u -r1.2 patch-help.c --- files/patch-help.c 8 Sep 2006 22:52:36 -0000 1.2 +++ files/patch-help.c 3 Dec 2006 20:12:34 -0000 @@ -1,20 +1,20 @@ ---- help.c.orig Fri Jul 28 13:12:59 2006 -+++ help.c Sat Jul 29 00:50:34 2006 -@@ -337,7 +337,7 @@ +--- help.c.orig Tue Nov 7 13:45:32 2006 ++++ help.c Fri Nov 24 18:02:31 2006 +@@ -352,7 +352,7 @@ printf("\n%s",s); DEB"\n%s",s); } -msg_filename="errors.lir"; -+msg_filename="%%DATADIR%%errors.lir"; ++msg_filename="/usr/X11R6/share/linrad/errors.lir"; line=3; if(screen_mode) { -@@ -352,7 +352,7 @@ +@@ -367,7 +367,7 @@ { int line; if(msg_no < 0)return; -msg_filename="help.lir"; -+msg_filename="%%DATADIR%%help.lir"; ++msg_filename="/usr/X11R6/share/linrad/help.lir"; line=0; settextcolor(15); clear_screen(); Index: files/patch-lsetad.c =================================================================== RCS file: files/patch-lsetad.c diff -N files/patch-lsetad.c --- files/patch-lsetad.c 12 Sep 2006 08:14:22 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,1289 +0,0 @@ ---- lsetad.c.orig Tue Aug 15 15:27:44 2006 -+++ lsetad.c Mon Sep 11 15:46:13 2006 -@@ -39,7 +39,7 @@ - #define ABOVE_MAX_SPEED 768000 - #if SND_DEV == 1 - #define DEVNAME_BASE "/dev/dsp" --#else -+#else - #define DEVNAME_BASE "/dev/sound/dsp" - #endif - -@@ -83,15 +83,12 @@ - sdr=-1; - } - -- - void display_sdi(void) - { - FILE *sdifile; --int ch_cnt; --char ch_read[80]; -+char *p; - char work_line [80]; --int work_line_pos ; --int sdi_screen_line_counter; -+int sdi_screen_line_counter; - char sdi_intro_msg [26]= "SOUND DRIVER INFORMATION:" ; - char sdi_error_msg [46]= "No OSS or ALSA sound-driver information found"; - char sndstat_filename [25]; -@@ -111,59 +108,46 @@ - // if OSS not active, try ALSA - if (sdifile==NULL) - { -- strcpy (sndstat_filename,"/proc/asound/oss/sndstat"); -- sdifile=fopen (sndstat_filename,"r"); -- } --if (sdifile==NULL) -- { -- settextcolor(LIGHT_RED); -- lir_text ( 80, sdi_screen_line_counter++, sdi_error_msg); -- fprintf (sndlog,"\n%s",sdi_error_msg ); -- goto display_sdi_x; -+ strcpy (sndstat_filename,"/proc/asound/oss/sndstat"); -+ sdifile=fopen (sndstat_filename,"r"); - } --fprintf (sndlog,"\n(output of 'cat %s' command): \n\n",sndstat_filename ); --memset (work_line, '\0',sizeof(work_line)); --work_line_pos =0; --settextcolor(LIGHT_GREEN); --ch_cnt=fread(ch_read,1,1,sdifile); --while (ch_cnt== 1) -+if (sdifile!=NULL) - { --// check if work_line is ready for output processing -- if ((ch_read[0] =='\n') || (work_line_pos == 78)) -+ fprintf (sndlog,"\n(output of 'cat %s' command): \n\n",sndstat_filename ); -+ settextcolor(LIGHT_GREEN); -+ while(fgets(work_line, sizeof(work_line)-1, sdifile) != NULL) - { -+// check if work_line is ready for output processing -+ p=strchr(work_line, '\n'); -+ if(p != NULL)p[0]=0; -+ if (*work_line != '\0') -+ { - // display work_line only if it is not blank - // and there are enough lines available on the screen - // and there are at least 40 characters available on a line -- if ((work_line_pos >1) && -- ( sdi_screen_line_counter < screen_last_line) && -- ((screen_last_col - 40)>= 80)) -- { -- if (ch_read[0] !='\n') work_line[work_line_pos]=ch_read[0]; -- sdi_screen_line_counter++; -- lir_text (80, sdi_screen_line_counter, work_line); -- } -+ if (sdi_screen_line_counter < screen_last_line && -+ (screen_last_col - 40)>= 80) -+ { -+ sdi_screen_line_counter++; -+ lir_text (80, sdi_screen_line_counter, work_line); -+ } - // write to soundboard_init.log -- if (ch_read[0] =='\n') work_line[work_line_pos]=ch_read[0]; -- if (ch_read[0] !='\n') -- { --// this is a truncated line. Add newline character -- work_line[work_line_pos]=ch_read[0]; -- work_line[work_line_pos+1]='\n'; -- } -- fprintf (sndlog,"%s",work_line); -- memset (work_line, '\0',sizeof(work_line)); -- work_line_pos=-1; -- } -- work_line[work_line_pos]=ch_read[0]; -- work_line_pos++; -- ch_cnt=fread(ch_read,1,1,sdifile); -+ fprintf (sndlog,"%s\n",work_line); -+ } -+ } -+ fclose(sdifile); -+ } -+else -+ { -+ settextcolor(LIGHT_RED); -+ lir_text ( 80, sdi_screen_line_counter++, sdi_error_msg); -+ fprintf (sndlog,"\n%s",sdi_error_msg ); - } --fclose(sdifile); --display_sdi_x:; - fprintf(sndlog,sndlog_sep); - fflush(sndlog); - } - -+ - void clear_sdi(void) - { - int x, w; -@@ -209,6 +193,8 @@ - thread_status_flag[THREAD_SCREEN]!=THRFLAG_IDLE && - thread_status_flag[THREAD_SCREEN]!=THRFLAG_SEM_WAIT) - { -+ if(thread_command_flag[THREAD_RX_ADINPUT] == -+ THRFLAG_KILL)goto rxadin_error_exit; - lir_sleep(10000); - } - } -@@ -239,7 +225,7 @@ - } - #endif - if(hware_flag != 0) -- { -+ { - dt1=current_time(); - if(dt1 - hware_time > 0.005) - { -@@ -265,7 +251,7 @@ - measured_ad_speed=total_reads*ad_read_fragments/dt1; - } - } --// Here we post to the screen routine every 0.1 second. -+// Here we post to the screen routine every 0.1 second. - screen_loop_counter--; - if(screen_loop_counter == 0) - { -@@ -304,8 +290,8 @@ - rxin_int[4*i+2]=rxin_int2[2*i ]; - rxin_int[4*i+3]=rxin_int2[2*i+1]; - } -- } -- } -+ } -+ } - if(network_flag == 1) - { - if(network_modeno == 1) -@@ -321,14 +307,14 @@ - } - write(network_sockfd, rxin_isho, ad_read_bytes); - } -- } -+ } - finish_rx_read(rxin_isho); - if(kill_all_flag) goto rxadin_error_exit; - } --rxadin_error_exit:; -+rxadin_error_exit:; - while( audio_out == audio_in)lir_sleep(10000); --close_rx_sndin(); --rx_adin_init_error:; -+close_rx_sndin(); -+rx_adin_init_error:; - thread_status_flag[THREAD_RX_ADINPUT]=THRFLAG_RETURNED; - while(thread_command_flag[THREAD_RX_ADINPUT] != THRFLAG_NOT_ACTIVE) - { -@@ -360,7 +346,7 @@ - lir_sleep(3000); - i++; - if(i<10)goto buftest; -- } -+ } - i=da_totbytes-da_info.bytes; - i/=(da_output_channels*da_output_bytes); - return i; -@@ -375,13 +361,13 @@ - for(i=0; i>=1; - frag++; - } --if(frag < 4)frag=4; -+if(frag < 4)frag=4; - frag|=0x7fff0000; - return frag; - } -@@ -614,7 +606,7 @@ - free(da_wrbuf); - da_wrbuf=NULL; - } -- } -+ } - audio_out=-1; - } - -@@ -623,7 +615,7 @@ - float t1; - int i, j, frag; - audio_buf_info ad_info; --if( disksave_flag == 2 || -+if( disksave_flag == 2 || - network_flag == 2 || - ui.ad_device_no == SDR14_DEVICE_CODE || - ( (ui.input_mode&NO_DUPLEX) != 0 && audio_out != -1) ) -@@ -632,7 +624,7 @@ - } - if( (audio_in) != -1) - { -- if( ui.ad_device_mode == O_RDWR)return; -+ if( ui.ad_device_mode == O_RDWR)return; - lirerr(100031); - return; - } -@@ -662,22 +654,22 @@ - i>>=1; - frag++; - } --if(frag < 4)frag=4; -+if(frag < 4)frag=4; - if(ui.ad_device_no > 255) - { - frag--; -- if(frag < 4)frag=4; -+ if(frag < 4)frag=4; - frag=frag|0x7fff0000; - if(ioctl(audio_in2, SNDCTL_DSP_SETFRAGMENT, &frag) == -1) - { -- lirerr(1175); -+ lirerr(1175); - return; - } - } - frag=frag|0x7fff0000; - if(ioctl(audio_in, SNDCTL_DSP_SETFRAGMENT, &frag) == -1) - { -- lirerr(1008); -+ lirerr(1008); - return; - } - i=AFMT_S16_LE; -@@ -721,7 +713,7 @@ - i=j; - if(ioctl(audio_in, SNDCTL_DSP_CHANNELS, &i) == -1) - { -- lirerr(1009); -+ lirerr(1009); - return; - } - if(i != j) -@@ -734,7 +726,7 @@ - i=j; - if(ioctl(audio_in2, SNDCTL_DSP_CHANNELS, &i) == -1) - { -- lirerr(1178); -+ lirerr(1178); - return; - } - if(i != j) -@@ -791,7 +783,7 @@ - i=PCM_ENABLE_INPUT; - if(ioctl(audio_in2,SNDCTL_DSP_SETTRIGGER,&i)==-1) - { -- lirerr(1184); -+ lirerr(1184); - return; - } - } -@@ -814,7 +806,7 @@ - } - } - ioctl(audio_in,SNDCTL_DSP_GETBLKSIZE,&i); --} -+} - - - -@@ -854,7 +846,7 @@ - } - } - // ******************************************* --if(ui.ad_device_no == ui.da_device_no && -+if(ui.ad_device_no == ui.da_device_no && - ui.ad_device_mode == O_RDWR && - network_flag != 2) - { -@@ -887,7 +879,7 @@ - { - lirerr(1191); - } -- else -+ else - { - lirerr(1017); - } -@@ -907,7 +899,7 @@ - i=da_output_channels; - if(ioctl(audio_out, SNDCTL_DSP_CHANNELS, &i) == -1) - { -- lirerr(1019); -+ lirerr(1019); - return; - } - if(i != da_output_channels) -@@ -923,7 +915,7 @@ - { - i=AFMT_S16_LE; - } -- j=i; -+ j=i; - if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &i) == -1) - { - lirerr(1020); -@@ -957,7 +949,7 @@ - lirerr(1025); - return; - } --for(i=0; i0) -+ while (m >0) - { - m--; - line++; -@@ -1715,15 +1758,15 @@ - bottom_line=maxline; - line=1; - } -- settextcolor(color); -+ settextcolor(color); - column=0; - while(ss[m*maxcolumn+column]!=0)column++; - while(column < maxcolumn) - { - ss[m*maxcolumn+column]=' '; -- column++; -+ column++; - } -- ss[(m+1)*maxcolumn-1]=0; -+ ss[(m+1)*maxcolumn-1]=0; - lir_text(0,line,&ss[m*maxcolumn]); - lir_refresh_screen(); - SNDLOG"\n%s color=%d m=%d",&ss[m*maxcolumn],color,m); -@@ -1732,7 +1775,7 @@ - SNDLOG"\n"); - } - } --settextcolor(7); -+settextcolor(7); - line++; - clear_lines(line,line); - if(bottom_line > line)line=bottom_line; -@@ -1750,7 +1793,7 @@ - lir_text(0,line+10, - "Sound board drivers are usually configured during Linux install"); - lir_text(20,line+12,press_any_key); -- await_keyboard(); -+ await_keyboard(); - if(kill_all_flag) goto setad_errexit; - SNDLOG"\nNo input device found"); - goto setad_errexit; -@@ -1761,7 +1804,7 @@ - get_addev:; - settextcolor(14); - lir_text(0,line,"Select device for input by first number on line"); -- display_sdi(); -+ display_sdi(); - settextcolor(7); - ui.ad_device_no=lir_get_integer(48, line, 3, 0,MAX_DEVNAMES-1); - if(kill_all_flag)goto setad_errexit; -@@ -1802,7 +1845,7 @@ - // channels with the Lynx Two card (model A). - // Do not confuse other users by asking for a second input device - // unless the selected device has 32 bits but only allows 2 channels. --if( dev_rd_bits[ui.ad_device_no] == 32 && -+if( dev_rd_bits[ui.ad_device_no] == 32 && - dev_max_rd_channels[ui.ad_device_no]==2 && - (dev_flag[ui.ad_device_no]&1) != 0) - { -@@ -1811,7 +1854,7 @@ - line=1; - for(i=0; i",dev_name); -+gt_rdo:; -+ 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; -@@ -1970,7 +2013,7 @@ - } - else - { --rdwr:; -+rdwr:; - ui.ad_device_mode=O_RDWR; - mode=2; - SNDLOG"\nUser selected RDWR"); -@@ -1981,7 +2024,7 @@ - SNDLOG"\nOnly RDONLY available"); - } - sndlog_sync(); --clear_screen(); -+clear_screen(); - sprintf(s,"For analog input: %s opened in %s mode",dev_name,devmode_txt[mode]); - lir_text(0,0,s); - audio_in=open( dev_name, ui.ad_device_mode, 0); -@@ -2031,7 +2074,7 @@ - ui.rx_channels=1; - ui.ad_channels=2; - break; -- -+ - case '3': - ui.input_mode=TWO_CHANNELS; - ui.rx_channels=2; -@@ -2288,7 +2331,7 @@ - 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."); -+lir_text(0,8,"Try another input device or install another sound system."); - // Find devices that we may use for output. - n=0; - cn=0; -@@ -2314,16 +2357,16 @@ - dev_flag[i]=0; - } - else -- { -+ { - sprintf(&s[column]," %d Hz %d Chan. 16 bit RDWR", - ui.input_speed, ui.ad_channels); - n++; -- ui.da_device_no=i; -+ ui.da_device_no=i; - } - } - } - else -- { -+ { - // Remove duplex flags on all devices except the one we use for input - dev_flag[i]&=0xffff-4; - if( (dev_flag[i]&2) != 0 ) -@@ -2331,7 +2374,7 @@ - audio_out=open( dev_name, O_WRONLY|O_NONBLOCK, 0); - if(read_test_ad(testbuff)!=0)goto clr_wrdev; - if(audio_out != -1) -- { -+ { - #ifdef SNDCTL_DSP_COOKEDMODE - j=0; - ioctl(audio_out, SNDCTL_DSP_COOKEDMODE, &j); -@@ -2351,13 +2394,13 @@ - dev_wr_bits[i]=0; - } - else -- { -+ { - SNDLOG"\n8-bit output supported"); - dev_wr_bits[i]=8; - } - sndlog_sync(); - j=AFMT_S16_LE; -- if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1 || j != AFMT_S16_LE) -+ if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1 || j != AFMT_S16_LE) - { - SNDLOG"\nCould not set 16-bit output"); - } -@@ -2368,7 +2411,7 @@ - SNDLOG"\n16-bit output supported"); - sndlog_sync(); - if(dev_wr_bits[i]==0) goto skip_wr_dev; -- sndlog_sync(); -+ sndlog_sync(); - j=2; - if(ioctl(audio_out, SNDCTL_DSP_CHANNELS, &j) == -1) - { -@@ -2397,7 +2440,7 @@ - SNDLOG"\nioctl(SPEED) failed"); - goto skip_wr_dev; - } -- } -+ } - dev_max_wr_speed[i]=j; - SNDLOG"\nMax output speed %d", dev_max_wr_speed[i]); - j=1; -@@ -2409,7 +2452,7 @@ - SNDLOG"\nioctl(SPEED) failed"); - goto skip_wr_dev; - } -- } -+ } - dev_min_wr_speed[i]=j; - SNDLOG"\nMin output speed %d", dev_min_wr_speed[i]); - sndlog_sync(); -@@ -2426,7 +2469,7 @@ - SNDLOG"\nWrite failed"); - goto skip_wr_dev; - } -- sound_start_time=current_time(); -+ sound_start_time=current_time(); - wrcnt=0; - j=ad_info.bytes; - while(wrcnt+ad_info.bytes < 3*1024+j ) -@@ -2438,7 +2481,7 @@ - SNDLOG"\nSNDCTL_DSP_GETOSPACE failed"); - goto skip_wr_dev; - } -- if( current_time() - sound_start_time > 0.7) -+ if( current_time() - sound_start_time > 0.7) - { - SNDLOG"\nTimeout"); - goto skip_wr_dev; -@@ -2456,7 +2499,7 @@ - lirerr(1095); - goto setad_errexit; - } -- olbytes=ad_info.bytes; -+ olbytes=ad_info.bytes; - gettimeofday(&tim2,NULL); - while(ad_info.bytes-olbytes < 512) - { -@@ -2475,31 +2518,31 @@ - } - if(close(audio_out)==-1) - { -- goto skip_wr_dev; -+ goto skip_wr_dev; - } - sprintf(&s[column]," %7d - %7d Hz %d Chan. %d bit WRONLY", -- dev_min_wr_speed[i], -- dev_max_wr_speed[i], -- dev_wr_channels[i], -+ dev_min_wr_speed[i], -+ dev_max_wr_speed[i], -+ dev_wr_channels[i], - dev_wr_bits[i]); - cn=1; - n++; -- ui.da_device_no=i; -+ ui.da_device_no=i; - } -- else -+ else - { -- goto clr_wrdev; -+ goto clr_wrdev; - skip_wr_dev:; - sndlog_sync(); - if(close(audio_out)==-1) - { -- lirerr(1067); -+ lirerr(1067); - goto setad_errexit; - } - clr_wrdev:; - dev_flag[i]&=0xffff-2; - } -- } -+ } - } - if(cn != 0) - { -@@ -2542,7 +2585,7 @@ - while(s[column] != 0)column++; - 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); -@@ -2556,11 +2599,11 @@ - dev_wr_bits[i]=0; - } - else -- { -+ { - dev_wr_bits[i]=8; - } - j=AFMT_S16_LE; -- if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1 || j != AFMT_S16_LE) -+ if(ioctl(audio_out, SNDCTL_DSP_SETFMT, &j) == -1 || j != AFMT_S16_LE) - { - SNDLOG"\nCould not set 16-bit output"); - } -@@ -2569,7 +2612,7 @@ - dev_wr_bits[i]=16; - } - if(dev_wr_bits[i]==0) goto skip_wr_dev_nodup; -- sndlog_sync(); -+ sndlog_sync(); - j=2; - if(ioctl(audio_out, SNDCTL_DSP_CHANNELS, &j) == -1) - { -@@ -2597,7 +2640,7 @@ - SNDLOG"\nioctl(SPEED) failed"); - goto skip_wr_dev_nodup; - } -- } -+ } - dev_max_wr_speed[i]=j; - SNDLOG"\nMax output speed %d", dev_max_wr_speed[i]); - sndlog_sync(); -@@ -2613,17 +2656,17 @@ - if(ioctl(audio_out,SNDCTL_DSP_GETOSPACE, &ad_info) == -1) - goto skip_wr_dev_nodup; - } -- if(close(audio_out)==-1)goto skip_wr_dev_nodup; -+ if(close(audio_out)==-1)goto skip_wr_dev_nodup; - sprintf(&s[column]," %d Hz %d Chan. %d bit WRONLY", - dev_max_wr_speed[i], dev_wr_channels[i], dev_wr_bits[i]); - cn=1; - n++; -- ui.da_device_no=i; -+ ui.da_device_no=i; - dev_flag[i] |= 2; - } -- else -+ else - { -- goto clr_wrdev_nodup; -+ goto clr_wrdev_nodup; - skip_wr_dev_nodup:; - sndlog_sync(); - if(close(audio_out)==-1) -@@ -2655,10 +2698,10 @@ - lirerr(1139); - goto setad_errexit; - } -- ui.input_mode|=NO_DUPLEX; -+ ui.input_mode|=NO_DUPLEX; - ad_info.bytes=0; - } --dadev_select:; -+dadev_select:; - if(n > 1) - { - get_dadev:; -@@ -2666,7 +2709,7 @@ - j=0; - settextcolor(14); - lir_text(0,line,"Select device for output by line number"); -- display_sdi(); -+ display_sdi(); - settextcolor(7); - while(i<2) - { -@@ -2683,7 +2726,7 @@ - } - ui.da_device_no=j; - // Mod3: Modified error message handling in get_dadev and get_addev -- if( (6 & dev_flag[ui.da_device_no]) == 0) -+ if( (6 & dev_flag[ui.da_device_no]) == 0) - { - settextcolor(15); - lir_text(43,line,"???"); -@@ -2693,10 +2736,10 @@ - clear_lines(line,line+1); - goto get_dadev; - } --// ------------------------------------------------------- -+// ------------------------------------------------------- - // The original code was: - // if( (6 & dev_flag[ui.da_device_no]) == 0) goto get_dadev; --// ------------------------------------------------------- -+// ------------------------------------------------------- - } - make_devname(ui.da_device_no); - SNDLOG"\nUser selected %s for output.",dev_name); -@@ -2711,7 +2754,7 @@ - { - ui.da_stopstart=1; - } --else -+else - { - if(lir_inkey != 'N')goto get_da_stopstart; - ui.da_stopstart=0; -@@ -2720,7 +2763,7 @@ - // If we selected the same device for input and output, - // check if it was opened ad RDWR or if we shall open it - // for output now --if( ui.da_device_no == ui.ad_device_no && -+if( ui.da_device_no == ui.ad_device_no && - ui.ad_device_mode == O_RDWR && - (ui.input_mode&NO_DUPLEX) == 0 ) - { -@@ -2751,20 +2794,20 @@ - close_rx_sndout(); - } - close_rx_sndin(); --sprintf(s,"Min output channels: %d",ui.min_output_channels); -+sprintf(s,"Min output channels: %d",ui.min_output_channels); - lir_text(0,8,s); --sprintf(s,"Max output channels: %d",ui.max_output_channels); -+sprintf(s,"Max output channels: %d",ui.max_output_channels); - lir_text(0,9,s); - da_output_channels=ui.min_output_channels; - da_output_bytes=ui.max_output_bytes; --sprintf(s,"Output no of bits=%d",8*ui.max_output_bytes); -+sprintf(s,"Output no of bits=%d",8*ui.max_output_bytes); - lir_text(35,7,s); - if(ui.max_output_bytes != ui.min_output_bytes) - { -- sprintf(s,"or %d",8*ui.min_output_bytes); -+ sprintf(s,"or %d",8*ui.min_output_bytes); - lir_text(56,7,s); - } --// Reopen with the current parameters. -+// Reopen with the current parameters. - // We will not goto setad_errexit here if something goes wrong. - if( (ui.input_mode&NO_DUPLEX) == 0 && ui.ad_device_no != SDR14_DEVICE_CODE) - { Index: files/patch-lxsys.c =================================================================== RCS file: /home/pcvs/ports/comms/linrad/files/patch-lxsys.c,v retrieving revision 1.2 diff -u -r1.2 patch-lxsys.c --- files/patch-lxsys.c 8 Sep 2006 22:52:36 -0000 1.2 +++ files/patch-lxsys.c 3 Dec 2006 20:12:34 -0000 @@ -1,5 +1,5 @@ ---- lxsys.c.orig Tue Aug 15 15:27:44 2006 -+++ lxsys.c Fri Sep 8 16:35:10 2006 +--- lxsys.c.orig Tue Nov 7 13:45:32 2006 ++++ lxsys.c Fri Nov 24 18:02:31 2006 @@ -1,12 +1,14 @@ - -#include @@ -18,15 +18,15 @@ #include #include #include "thrdef.h" -@@ -16,6 +18,7 @@ +@@ -17,6 +19,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!! ***", -@@ -66,11 +69,9 @@ + void lirerr(int errcod) + { +@@ -60,11 +63,9 @@ // Get permission to write to the parallel port if(ui.parport < 0x400-4) { @@ -41,7 +41,7 @@ } if(i != 0) { -@@ -214,11 +215,9 @@ +@@ -208,11 +209,9 @@ int i; if(ui.parport < 0x400-4) { @@ -56,7 +56,7 @@ } if(i!=0)lirerr(764921); i=1000; -@@ -231,11 +230,9 @@ +@@ -225,11 +224,9 @@ int i; if(ui.parport < 0x400-4) { @@ -71,4 +71,3 @@ } if(i!=0)lirerr(764921); return inb(port); - Index: files/patch-uidef.h =================================================================== RCS file: /home/pcvs/ports/comms/linrad/files/patch-uidef.h,v retrieving revision 1.3 diff -u -r1.3 patch-uidef.h --- files/patch-uidef.h 8 Sep 2006 22:52:36 -0000 1.3 +++ files/patch-uidef.h 3 Dec 2006 20:12:34 -0000 @@ -1,5 +1,5 @@ ---- uidef.h.orig Sat Jul 29 16:29:21 2006 -+++ uidef.h Sat Jul 29 16:29:34 2006 +--- uidef.h.orig Tue Nov 7 13:45:32 2006 ++++ uidef.h Fri Nov 24 18:02:31 2006 @@ -5,7 +5,7 @@ Index: files/patch-xmain.c =================================================================== RCS file: /home/pcvs/ports/comms/linrad/files/patch-xmain.c,v retrieving revision 1.2 diff -u -r1.2 patch-xmain.c --- files/patch-xmain.c 8 Sep 2006 22:52:36 -0000 1.2 +++ files/patch-xmain.c 3 Dec 2006 20:12:34 -0000 @@ -1,6 +1,6 @@ ---- xmain.c.orig Fri Jul 14 17:35:38 2006 -+++ xmain.c Fri Jul 28 12:45:20 2006 -@@ -39,7 +39,7 @@ +--- xmain.c.orig Tue Nov 7 13:45:33 2006 ++++ xmain.c Fri Nov 24 18:02:31 2006 +@@ -40,7 +40,7 @@ float total; }PIXINFO; @@ -9,7 +9,7 @@ int main(int argc, char **argv) { -@@ -59,6 +59,8 @@ +@@ -60,6 +60,8 @@ XTextProperty window_title_property; unsigned short int *ipalette; XColor xco; --------------070304010704090107030900 Content-Type: application/octet-stream; name="linrad-2.20-X11BASE.diff.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="linrad-2.20-X11BASE.diff.sig" iQIVAwUARXMyu61QwXwBI2DsAQJwRQ/+M6c3SILKOm+smlrOpwvPfQ9SOidjxAUXnzUtRjOh 0+vK2V55vH92xXZ6VtZhH0q9bXlbi2NghAxYLMEOdPUoDyarlQtt4hwPfYKSYjhDGkOkJLZZ P1gAqFKyxrbwqDDuODtqSuNDRxkJ6VQZpk32b9W8aADeVGnRV9+EkZ4yBxEAHBS2KlkOd0jR CFl36bpdas4moUdXX6OsyKtD/7afa+j0BHACDKRi2eLBVLK4BYFIZeoV3FYCmGvu9IQqnocF CJxuldHn7FmsemYbLv5G5DNJcL3GlRuTQtebTwkTL3r9gdK3ES3YO2c5avmNmKQroVtT9WKU E4HVv14gKZBsQEf6A7bIqj/AWCxst/4scQ6uaovX8G50AiCZOMv1R9mljpmDCB3Gd+DrF2dr Lkf1MZXt8ZjRm0jLjG2qpiTjQE5ySjzcXb1PioBEARfzS9YA484jCiKe0oe8x4J6aK5tcYe1 Cw0W/cU4VxFy5RDi0Q5NUvju2raPsl40j9F9e5/KnatBHWugqNfT2Qj0vQdt6XomiB4SSuP2 qzdHNWp09gyDd/J34GvV9gOcS5GSDbV4iGgcTCwxUgMHV8R97NU8j6RO8oV1ZTPESMzLWp7v KF6gyvr0S3P4v0Vl7gikBU9A7p09WiT64Oc4TCSP77u7k3C/acfWd4Q3VSwiwa/Ipbk= --------------070304010704090107030900-- From: Diane Bruce To: "Frank J. Laszlo" Cc: bug-followup@FreeBSD.org, db@db.net Subject: Re: ports/106247: [MAINTAINER] comms/linrad: update to 2.20 fix X11BASE Date: Sun, 3 Dec 2006 18:11:13 -0500 On Sun, Dec 03, 2006 at 03:25:32PM -0500, Frank J. Laszlo wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > You missed a few files for X11BASE-clean. I have attach a patch to fix > all the associated files, and it will now be X11BASE clean. Do you approve? > I don't have a tinder for testing X11BASE-clean, I thought I had them all. *sigh* I trust your testing. approved. > - -Frank > -----BEGIN PGP SIGNATURE----- -- - db@db.net http://www.db.net/~db State-Changed-From-To: open->closed State-Changed-By: laszlof State-Changed-When: Sun Dec 3 23:21:21 UTC 2006 State-Changed-Why: Committed, with minor changes. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=106247 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/106247: commit references a PR Date: Sun, 3 Dec 2006 23:21:09 +0000 (UTC) laszlof 2006-12-03 23:21:04 UTC FreeBSD ports repository Modified files: comms/linrad Makefile distinfo pkg-message pkg-plist comms/linrad/files patch-Makefile.in patch-help.c patch-lxsys.c patch-uidef.h patch-xmain.c Removed files: comms/linrad/files patch-lsetad.c Log: 1) Update to version 2.20 2) Respect X11BASE PR: ports/106247 Submitted by: Diane Bruce (maintainer) Revision Changes Path 1.9 +15 -13 ports/comms/linrad/Makefile 1.5 +3 -3 ports/comms/linrad/distinfo 1.5 +21 -3 ports/comms/linrad/files/patch-Makefile.in 1.3 +6 -6 ports/comms/linrad/files/patch-help.c 1.4 +0 -1289 ports/comms/linrad/files/patch-lsetad.c (dead) 1.3 +8 -9 ports/comms/linrad/files/patch-lxsys.c 1.4 +2 -2 ports/comms/linrad/files/patch-uidef.h 1.3 +4 -4 ports/comms/linrad/files/patch-xmain.c 1.2 +1 -1 ports/comms/linrad/pkg-message 1.4 +0 -1 ports/comms/linrad/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: