Index: head/comms/linrad/Makefile =================================================================== --- head/comms/linrad/Makefile (revision 200246) +++ head/comms/linrad/Makefile (revision 200247) @@ -1,68 +1,68 @@ # ports collection makefile for: linrad # Date created: 7 July 2004 # Whom: db # # $FreeBSD$ # PORTNAME= linrad -PORTVERSION= 2.34 +PORTVERSION= 2.38 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-34 +DISTNAME= lir02-38 EXTRACT_SUFX= .tbz DIST_SUBDIR= ${PORTNAME} MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio DSP utility (SDR) BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm WRKSRC= ${WRKDIR}/${PORTNAME}-0${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} USE_GMAKE= yes USE_BZIP2= yes ALL_TARGET= xlinrad USE_XORG= x11 ONLY_FOR_ARCHS= i386 X11_PATCHFILES= Makefile.in help.c xmain.c LINRAD_DOCFILES= z_APM.txt z_BUFFERS.txt z_CALIBRATE.txt \ z_COPYRIGHT.txt z_GIFINFO.txt \ z_MOUSE.txt z_NETWORK.txt \ z_PARALLEL_PORT.txt z_SETTINGS.txt \ z_USERS_EXTRA.txt z_USERS_HWARE.txt post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|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 ${INSTALL_DATA} ${WRKSRC}/help.lir ${DATADIR}/help.lir ${INSTALL_SCRIPT} -m04555 ${FILESDIR}/linrad ${PREFIX}/bin/linrad # 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} .for f in ${LINRAD_DOCFILES} @${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}/$f .endfor @${ECHO} "" @${ECHO} "linrad docs installed in ${DOCSDIR}" @${ECHO} "" .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/comms/linrad/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/comms/linrad/distinfo =================================================================== --- head/comms/linrad/distinfo (revision 200246) +++ head/comms/linrad/distinfo (revision 200247) @@ -1,3 +1,3 @@ -MD5 (linrad/lir02-34.tbz) = ebaeddd5455daa1dc23ef41ad33866b1 -SHA256 (linrad/lir02-34.tbz) = def769123a6d41c472127eedf59146411ec83ea594ce8c73f0223814b425b7c8 -SIZE (linrad/lir02-34.tbz) = 472578 +MD5 (linrad/lir02-38.tbz) = 7b2a948cc1bdee81a052fbc751f4fcd2 +SHA256 (linrad/lir02-38.tbz) = 42b1540baf30beb9e7735090333328e2e28c1469a5a4625d983ad90e4e558549 +SIZE (linrad/lir02-38.tbz) = 484257 Property changes on: head/comms/linrad/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/comms/linrad/files/patch-Makefile.in =================================================================== --- head/comms/linrad/files/patch-Makefile.in (revision 200246) +++ head/comms/linrad/files/patch-Makefile.in (revision 200247) @@ -1,41 +1,41 @@ ---- Makefile.in.orig Wed May 9 15:23:18 2007 -+++ Makefile.in Fri Jun 29 17:53:19 2007 +--- Makefile.in.orig Tue Sep 4 18:14:34 2007 ++++ Makefile.in Thu Sep 27 21:10:12 2007 @@ -4,7 +4,7 @@ # 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} WCC = /usr/bin/i586-mingw32msvc-gcc WINWCC = C:\mingw\bin\mingw32-gcc NASM = nasm @@ -14,10 +14,7 @@ # so we definitely know it is for Windows. # (*.o files can be present by mistake) # Always use the same flags. -CFL = -g -O -DOSNUM=1 -W -Wimplicit -Wreturn-type -Wformat \ -@MEM@ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \ --Wparentheses -Wstrict-prototypes -Werror -ffast-math \ --fomit-frame-pointer -c -o +CFL = ${CFLAGS} -DOSNUM=1 -I${X11BASE}/include -c -o CFW = -g -O -DOSNUM=2 -W -Wimplicit -Wreturn-type -Wformat \ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \ -Wparentheses -Wstrict-prototypes -Werror -ffast-math \ -@@ -624,7 +621,7 @@ - meter_graph.ol fonts.ol screensub.ol lxsys.ol +@@ -634,7 +631,7 @@ + meter_graph.ol fonts.ol screensub.ol tx_graph.ol txssb.ol lxsys.ol - gcc @MEM@ -olinrad -lvgagl -lvga -lpthread -lm \ + ${CC} @MEM@ -olinrad -lvgagl -lvga -pthread -lm \ -Wl,-Map,linrad.lmap,-warn-common \ lmain.ol lvar.ol ui.ol lsetad.ol fft1.ol buf.ol \ mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \ -@@ -671,7 +668,7 @@ +@@ -681,7 +678,7 @@ - gcc @MEM@ -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \ + gcc @MEM@ -oxlinrad -L/usr/local/lib -lX11 -pthread -lm \ -Wl,-Map,linrad.xmap,-warn-common \ xmain.ol xvar.ol ui.ol lsetad.ol fft1.ol buf.ol lvar.ol \ mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \ Property changes on: head/comms/linrad/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/comms/linrad/files/patch-help.c =================================================================== --- head/comms/linrad/files/patch-help.c (revision 200246) +++ head/comms/linrad/files/patch-help.c (revision 200247) @@ -1,20 +1,20 @@ ---- help.c.orig Wed May 9 15:23:18 2007 -+++ help.c Fri Jun 29 17:59:12 2007 -@@ -370,7 +370,7 @@ +--- help.c.orig Tue Sep 4 18:14:33 2007 ++++ help.c Thu Sep 27 21:08:19 2007 +@@ -381,7 +381,7 @@ printf("\n%s",s); DEB"\n%s",s); } -msg_filename="errors.lir"; +msg_filename="/usr/X11R6/share/linrad/errors.lir"; line=3; if(screen_mode) { -@@ -385,7 +385,7 @@ +@@ -396,7 +396,7 @@ { int line; if(msg_no < 0)return; -msg_filename="help.lir"; +msg_filename="/usr/X11R6/share/linrad/help.lir"; line=0; settextcolor(15); clear_screen(); Property changes on: head/comms/linrad/files/patch-help.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/comms/linrad/files/patch-lsettx.c =================================================================== --- head/comms/linrad/files/patch-lsettx.c (nonexistent) +++ head/comms/linrad/files/patch-lsettx.c (revision 200247) @@ -0,0 +1,10 @@ +--- lsettx.c.orig Thu Sep 27 21:53:04 2007 ++++ lsettx.c Thu Sep 27 21:53:16 2007 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #include "globdef.h" + #include "uidef.h" Property changes on: head/comms/linrad/files/patch-lsettx.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/comms/linrad/files/patch-lxsys.c =================================================================== --- head/comms/linrad/files/patch-lxsys.c (revision 200246) +++ head/comms/linrad/files/patch-lxsys.c (revision 200247) @@ -1,81 +1,81 @@ ---- lxsys.c.orig Tue Apr 10 14:08:58 2007 -+++ lxsys.c Sat Apr 21 23:31:47 2007 +--- lxsys.c.orig Tue Sep 4 18:14:34 2007 ++++ lxsys.c Thu Sep 27 21:08:42 2007 @@ -1,12 +1,14 @@ - -#include +#include +#include +#include +#include #include #include +#include #include #include #include #include -#include #include #include #include "thrdef.h" @@ -18,8 +20,9 @@ #include "hwaredef.h" struct termios old_options; -char serport_name[]="/dev/ttyS?"; +char serport_name[]="/dev/ttyd?"; +extern int saved_euid; + void lir_mutex_init(void) + { +@@ -173,15 +176,13 @@ - void lirerr(int errcod) -@@ -152,15 +155,13 @@ - int lir_parport_permission(void) { -int i; +int i=0; // 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) { -@@ -305,11 +306,9 @@ +@@ -330,11 +331,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; -@@ -322,11 +321,9 @@ +@@ -347,11 +346,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); Property changes on: head/comms/linrad/files/patch-lxsys.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/comms/linrad/files/patch-uidef.h =================================================================== --- head/comms/linrad/files/patch-uidef.h (revision 200246) +++ head/comms/linrad/files/patch-uidef.h (revision 200247) @@ -1,11 +1,11 @@ ---- uidef.h.orig Wed Feb 14 04:37:46 2007 -+++ uidef.h Thu Feb 22 18:44:17 2007 +--- uidef.h.orig Tue Sep 4 18:14:34 2007 ++++ uidef.h Thu Sep 27 21:09:46 2007 @@ -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 Property changes on: head/comms/linrad/files/patch-uidef.h ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/comms/linrad/files/patch-xmain.c =================================================================== --- head/comms/linrad/files/patch-xmain.c (revision 200246) +++ head/comms/linrad/files/patch-xmain.c (revision 200247) @@ -1,19 +1,19 @@ ---- xmain.c.orig Wed Feb 14 04:37:46 2007 -+++ xmain.c Thu Feb 22 20:00:30 2007 +--- xmain.c.orig Tue Sep 4 18:14:34 2007 ++++ xmain.c Thu Sep 27 21:09:15 2007 @@ -39,6 +39,7 @@ float total; }PIXINFO; +int saved_euid=-1; int main(int argc, char **argv) @@ -58,6 +59,8 @@ XTextProperty window_title_property; unsigned short int *ipalette; XColor xco; +saved_euid=geteuid(); +setuid(getuid()); /* XXX drop perms! */ for(i=0; i