- Update to 2.38

8 files changed, 35 insertions, 25 deletions

diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index 64c7c2effb78..9957cbe4023b 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -6,12 +6,12 @@
 #
 
 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}
 
diff --git a/comms/linrad/distinfo b/comms/linrad/distinfo
index e63af2b7491d..239af2ab1ba6 100644
--- a/comms/linrad/distinfo
+++ b/comms/linrad/distinfo
@@ -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
diff --git a/comms/linrad/files/patch-Makefile.in b/comms/linrad/files/patch-Makefile.in
index cfeeb4ee2058..4c98da5d3f8d 100644
--- a/comms/linrad/files/patch-Makefile.in
+++ b/comms/linrad/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- 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. 
@@ -21,8 +21,8 @@
  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 \
@@ -30,7 +30,7 @@
  -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 @@
  
  
  
diff --git a/comms/linrad/files/patch-help.c b/comms/linrad/files/patch-help.c
index e6020c4e25aa..460c8868ec99 100644
--- a/comms/linrad/files/patch-help.c
+++ b/comms/linrad/files/patch-help.c
@@ -1,6 +1,6 @@
---- 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);
    }  
@@ -9,7 +9,7 @@
  line=3;
  if(screen_mode)
    {
-@@ -385,7 +385,7 @@
+@@ -396,7 +396,7 @@
  {
  int line;
  if(msg_no < 0)return;
diff --git a/comms/linrad/files/patch-lsettx.c b/comms/linrad/files/patch-lsettx.c
new file mode 100644
index 000000000000..3afb7f8f5a63
--- /dev/null
+++ b/comms/linrad/files/patch-lsettx.c
@@ -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 <ctype.h>
+ #include <math.h>
+ #include <semaphore.h>
++#include <pthread.h>
+ 
+ #include "globdef.h"
+ #include "uidef.h"
diff --git a/comms/linrad/files/patch-lxsys.c b/comms/linrad/files/patch-lxsys.c
index 6d148bbbfd78..9ee6a09c3780 100644
--- a/comms/linrad/files/patch-lxsys.c
+++ b/comms/linrad/files/patch-lxsys.c
@@ -1,5 +1,5 @@
---- 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 <sys/io.h>
@@ -27,9 +27,9 @@
  
 +extern int saved_euid;
  
- 
- void lirerr(int errcod)
-@@ -152,15 +155,13 @@
+ void lir_mutex_init(void)
+ {
+@@ -173,15 +176,13 @@
  
  int lir_parport_permission(void)
  {
@@ -49,7 +49,7 @@
    }
  if(i != 0)
    {
-@@ -305,11 +306,9 @@
+@@ -330,11 +331,9 @@
  int i;
  if(ui.parport < 0x400-4)
    {
@@ -64,7 +64,7 @@
    }
  if(i!=0)lirerr(764921);
  i=1000;
-@@ -322,11 +321,9 @@
+@@ -347,11 +346,9 @@
  int i;
  if(ui.parport < 0x400-4)
    {
diff --git a/comms/linrad/files/patch-uidef.h b/comms/linrad/files/patch-uidef.h
index a7b7e830a74c..8944304d4874 100644
--- a/comms/linrad/files/patch-uidef.h
+++ b/comms/linrad/files/patch-uidef.h
@@ -1,5 +1,5 @@
---- 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 @@
  
  
diff --git a/comms/linrad/files/patch-xmain.c b/comms/linrad/files/patch-xmain.c
index 0e1127a9fc99..3a08584cf2c8 100644
--- a/comms/linrad/files/patch-xmain.c
+++ b/comms/linrad/files/patch-xmain.c
@@ -1,5 +1,5 @@
---- 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;