From 2224ba31078dcbdb66d313a2d47aa31ead9f8672 Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Thu, 26 Mar 2009 13:54:46 +0000 Subject: [PATCH] - Update to 3.03 --- comms/linrad/Makefile | 4 ++-- comms/linrad/distinfo | 6 ++--- comms/linrad/files/patch-Makefile.in | 33 ++++++++++++++++++---------- comms/linrad/files/patch-help.c | 12 +++++----- comms/linrad/files/patch-lxsys.c | 12 +++++----- comms/linrad/files/patch-rusage.h.in | 9 ++++++++ comms/linrad/files/patch-xmain.c | 18 +++++++-------- 7 files changed, 56 insertions(+), 38 deletions(-) create mode 100644 comms/linrad/files/patch-rusage.h.in diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile index ff8b228f6069..6171c0fdb9e7 100644 --- a/comms/linrad/Makefile +++ b/comms/linrad/Makefile @@ -6,12 +6,12 @@ # PORTNAME= linrad -PORTVERSION= 2.49 +PORTVERSION= 3.03 CATEGORIES= comms hamradio 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-49 +DISTNAME= lir03-03 EXTRACT_SUFX= .tbz DIST_SUBDIR= ${PORTNAME} diff --git a/comms/linrad/distinfo b/comms/linrad/distinfo index dbb12b2204f6..58773930e46a 100644 --- a/comms/linrad/distinfo +++ b/comms/linrad/distinfo @@ -1,3 +1,3 @@ -MD5 (linrad/lir02-49.tbz) = a763289dd382f861c0b7a75428dc69b6 -SHA256 (linrad/lir02-49.tbz) = 4d524f59307e1fc40e61f300da484a3fbca74a88b19ab70ce0ced9d1faea8d9c -SIZE (linrad/lir02-49.tbz) = 511911 +MD5 (linrad/lir03-03.tbz) = 40000e4e282289638bc8293914ae714a +SHA256 (linrad/lir03-03.tbz) = fb1bd4507de1327d546fdaf2487adcdbeeb6522d8eab9da734df4affa61b071a +SIZE (linrad/lir03-03.tbz) = 543243 diff --git a/comms/linrad/files/patch-Makefile.in b/comms/linrad/files/patch-Makefile.in index 7ec8d153ebbf..7ff865498ae9 100644 --- a/comms/linrad/files/patch-Makefile.in +++ b/comms/linrad/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2008-07-29 12:39:53.000000000 -0400 -+++ Makefile.in 2008-08-04 11:45:19.000000000 -0400 +--- Makefile.in.orig 2009-03-09 17:29:26.000000000 -0400 ++++ Makefile.in 2009-03-22 15:53:31.000000000 -0400 @@ -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} +-LCC = gcc -D_FILE_OFFSET_BITS=64 ++LCC = ${CC} -D_FILE_OFFSET_BITS=64 WCC = /usr/bin/i586-mingw32msvc-gcc WINWCC = C:\mingw\bin\mingw32-gcc NASM = nasm @@ -13,20 +13,29 @@ # 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 \ +-CFL = -g -O -DOSNUM=1 -W -Wall -Wimplicit -Wreturn-type -Wformat \ -@MEM@ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \ ---Wparentheses -Wstrict-prototypes -Werror -ffast-math \ +--Wparentheses -Wstrict-prototypes -Werror -ffast-math -Wundef \ --fomit-frame-pointer -c -o -+CFL = ${CFLAGS} -DOSNUM=1 -I%%LOCALBASE%%/include -c -o - CFW = -g -O -DOSNUM=2 -W -Wimplicit -Wreturn-type -Wformat \ ++CFL = ${CFLAGS} -DOSNUM=1 -I/usr/local/include -c -o + + CFW = -g -O -DOSNUM=2 -W -Wall -Wimplicit -Wreturn-type -Wformat \ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \ - -Wparentheses -Wstrict-prototypes -Werror -ffast-math \ -@@ -683,7 +680,7 @@ +@@ -645,7 +642,7 @@ + meter_graph.ol fonts.ol screensub.ol tx_graph.ol txssb.ol lxsys.ol + + +- gcc @MEM@ -olinrad -lvgagl -lvga -lpthread -lm @ALSALIB@ \ ++ gcc @MEM@ -olinrad -lvgagl -lvga -pthread -lm @ALSALIB@ \ + -Wl,-Map,linrad.lmap,-warn-common \ + lmain.ol lvar.ol ui.ol lsetad.ol fft1.ol buf.ol radar.ol \ + mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \ +@@ -692,7 +689,7 @@ - gcc @MEM@ -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm @ALSALIB@ \ -+ gcc @MEM@ -oxlinrad -L%%LOCALBASE%%/lib -lX11 -lpthread -lm @ALSALIB@ \ ++ ${CC} @MEM@ -oxlinrad -L/usr/local/lib -lX11 -lpthread -lm \ -Wl,-Map,linrad.xmap,-warn-common \ - xmain.ol xvar.ol ui.ol lsetad.ol fft1.ol buf.ol lvar.ol \ + xmain.ol xvar.ol ui.ol lsetad.ol fft1.ol buf.ol lvar.ol radar.ol \ mouse.ol wide_graph.ol getiq.ol fft0.ol adtest.ol hires_graph.ol \ diff --git a/comms/linrad/files/patch-help.c b/comms/linrad/files/patch-help.c index 460c8868ec99..d7ca9c26e938 100644 --- a/comms/linrad/files/patch-help.c +++ b/comms/linrad/files/patch-help.c @@ -1,20 +1,20 @@ ---- help.c.orig Tue Sep 4 18:14:33 2007 -+++ help.c Thu Sep 27 21:08:19 2007 -@@ -381,7 +381,7 @@ +--- help.c.orig 2009-03-09 17:29:26.000000000 -0400 ++++ help.c 2009-03-22 16:09:52.000000000 -0400 +@@ -430,7 +430,7 @@ printf("\n%s",s); DEB"\n%s",s); } -msg_filename="errors.lir"; -+msg_filename="/usr/X11R6/share/linrad/errors.lir"; ++msg_filename="%%DATADIR%%/errors.lir"; line=3; if(screen_mode) { -@@ -396,7 +396,7 @@ +@@ -445,7 +445,7 @@ { int line; if(msg_no < 0)return; -msg_filename="help.lir"; -+msg_filename="/usr/X11R6/share/linrad/help.lir"; ++msg_filename="%%DATADIR%%/help.lir"; line=0; settextcolor(15); clear_screen(); diff --git a/comms/linrad/files/patch-lxsys.c b/comms/linrad/files/patch-lxsys.c index 911e700875bd..470a8790b075 100644 --- a/comms/linrad/files/patch-lxsys.c +++ b/comms/linrad/files/patch-lxsys.c @@ -1,5 +1,5 @@ ---- lxsys.c.orig 2008-07-29 12:39:53.000000000 -0400 -+++ lxsys.c 2008-08-04 11:46:11.000000000 -0400 +--- lxsys.c.orig 2009-03-09 17:29:26.000000000 -0400 ++++ lxsys.c 2009-03-22 15:37:47.000000000 -0400 @@ -1,12 +1,14 @@ - -#include @@ -17,7 +17,7 @@ -#include #include #include - #include "thrdef.h" + #include "globdef.h" @@ -18,7 +20,8 @@ #include "hwaredef.h" @@ -28,7 +28,7 @@ void perseus_input(void){}; -@@ -220,15 +223,13 @@ +@@ -231,15 +234,13 @@ int lir_parport_permission(void) { @@ -48,7 +48,7 @@ } if(i != 0) { -@@ -385,11 +386,9 @@ +@@ -397,11 +398,9 @@ int i; if(ui.parport < 0x400-4) { @@ -63,7 +63,7 @@ } if(i!=0)lirerr(764921); i=1000; -@@ -402,11 +401,9 @@ +@@ -414,11 +413,9 @@ int i; if(ui.parport < 0x400-4) { diff --git a/comms/linrad/files/patch-rusage.h.in b/comms/linrad/files/patch-rusage.h.in new file mode 100644 index 000000000000..2b1a1b50e6eb --- /dev/null +++ b/comms/linrad/files/patch-rusage.h.in @@ -0,0 +1,9 @@ +--- rusage.h.in.orig 2009-01-11 19:50:51.000000000 -0500 ++++ rusage.h.in 2009-01-11 19:51:17.000000000 -0500 +@@ -1,5 +1,5 @@ + #if OSNUM == OS_FLAG_LINUX +-#define RUSAGE_OLD @RUSAGE@ ++#define RUSAGE_OLD 1 + #else + #define RUSAGE_OLD 0 + #endif diff --git a/comms/linrad/files/patch-xmain.c b/comms/linrad/files/patch-xmain.c index 3a08584cf2c8..d724417cb95b 100644 --- a/comms/linrad/files/patch-xmain.c +++ b/comms/linrad/files/patch-xmain.c @@ -1,15 +1,15 @@ ---- 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; +--- xmain.c.orig 2009-03-09 17:29:28.000000000 -0400 ++++ xmain.c 2009-03-22 15:38:09.000000000 -0400 +@@ -29,6 +29,7 @@ + extern Window xwin; + extern Colormap lir_colormap; +int saved_euid=-1; - - int main(int argc, char **argv) -@@ -58,6 +59,8 @@ - XTextProperty window_title_property; + typedef struct { + unsigned short int red; +@@ -54,6 +55,8 @@ + Cursor cross_cursor; unsigned short int *ipalette; XColor xco; +saved_euid=geteuid();