- Update to 2.48

8 files changed, 65 insertions, 55 deletions

diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index 27eb29770eb5..fad5f2f66879 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	linrad
-PORTVERSION=	2.43
+PORTVERSION=	2.48
 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-43
+DISTNAME=	lir02-48
 EXTRACT_SUFX=	.tbz
 DIST_SUBDIR=	${PORTNAME}
 
@@ -30,7 +30,6 @@ USE_BZIP2=	yes
 ALL_TARGET=	xlinrad
 USE_XORG=	x11
 ONLY_FOR_ARCHS=	i386
-X11_PATCHFILES=	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 \
@@ -42,9 +41,6 @@ post-patch:
 	-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|${LOCALBASE}|g' ${WRKSRC}/${f}
-.endfor
 
 do-install:
 	${MKDIR} ${DATADIR}
diff --git a/comms/linrad/distinfo b/comms/linrad/distinfo
index ea6e2ecb6108..df2f0ded88f2 100644
--- a/comms/linrad/distinfo
+++ b/comms/linrad/distinfo
@@ -1,3 +1,3 @@
-MD5 (linrad/lir02-43.tbz) = 93d11da00e0085cceed265af35081ca7
-SHA256 (linrad/lir02-43.tbz) = bd1c67ee3f181ae435700146ecec5974fbe51e571fd196f639a45d03845c3fb6
-SIZE (linrad/lir02-43.tbz) = 489770
+MD5 (linrad/lir02-48.tbz) = ed63828a215a8953be86bcb89bf728bb
+SHA256 (linrad/lir02-48.tbz) = 58f78d992dbfff468c6a72a8dc659a29c73efd574ccb0a180c883bacbac2a288
+SIZE (linrad/lir02-48.tbz) = 506308
diff --git a/comms/linrad/files/patch-Makefile.in b/comms/linrad/files/patch-Makefile.in
index a5813ab6c9f8..efd89e84ce7a 100644
--- a/comms/linrad/files/patch-Makefile.in
+++ b/comms/linrad/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2008-01-24 23:49:58.000000000 -0500
-+++ Makefile.in	2008-03-18 11:53:07.000000000 -0400
+--- Makefile.in.orig	2008-06-25 19:17:06.000000000 -0400
++++ Makefile.in	2008-07-18 20:57:17.000000000 -0400
 @@ -4,7 +4,7 @@
  # Name the output files *.ol instead of *.o 
  # so we definitely know it is for Linux. 
@@ -17,25 +17,16 @@
 -@MEM@ -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
 --Wparentheses -Wstrict-prototypes -Werror -ffast-math \
 --fomit-frame-pointer -c -o
-+CFL	= ${CFLAGS} -DOSNUM=1 -I${LOCALBASE}/include -c -o
++CFL	= ${CFLAGS} -DOSNUM=1 -I%%LOCALBASE%%/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 \
-@@ -636,7 +633,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 \
-@@ -683,7 +680,7 @@
+@@ -682,7 +679,7 @@
  
  
  
--	gcc @MEM@ -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \
-+	$(LCC) @MEM@ -oxlinrad -L${LOCALBASE}/lib -lX11 -pthread -lm \
+-	gcc @MEM@ -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm @ALSALIB@ \
++	gcc @MEM@ -oxlinrad -L%%LOCALBASE%%/lib -lX11 -lpthread -lm @ALSALIB@ \
  -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 \
diff --git a/comms/linrad/files/patch-lsetad.c b/comms/linrad/files/patch-lsetad.c
new file mode 100644
index 000000000000..29b2111bcc44
--- /dev/null
+++ b/comms/linrad/files/patch-lsetad.c
@@ -0,0 +1,46 @@
+--- lsetad.c.orig	2008-07-18 20:59:42.000000000 -0400
++++ lsetad.c	2008-07-18 21:02:51.000000000 -0400
+@@ -1234,8 +1234,10 @@
+ {
+ unsigned int val;
+ int ad_bytes_per_sample;
++#ifdef ALSA_PRESENT
+ static snd_pcm_format_t format;
+ snd_pcm_hw_params_t *hw_ad_params;
++#endif
+ char ss[sizeof(DEVNAME_BASE)+2];
+ int i, j, err, frag, resample;
+ float t1;
+@@ -1480,8 +1482,10 @@
+ {
+ char *buf;
+ unsigned int val;
++#ifdef ALSA_PRESENT
+ static snd_pcm_format_t format;
+ snd_pcm_hw_params_t *hw_da_params;
++#endif
+ int i, j, dir, err, frag, resample;
+ char ss[sizeof(DEVNAME_BASE)+2];
+ float t1;
+@@ -1815,8 +1819,10 @@
+ {
+ int ad_bytes_per_sample;
+ unsigned int val;
++#ifdef ALSA_PRESENT
+ static snd_pcm_format_t format;
+ snd_pcm_hw_params_t *hw_ad_params;
++#endif
+ char ss[sizeof(DEVNAME_BASE)+2];
+ float t1;
+ int i, j, err, frag, resample;
+@@ -2123,8 +2129,10 @@
+ void open_rx_sndout(void)
+ {
+ unsigned int val;
++#ifdef ALSA_PRESENT
+ static snd_pcm_format_t format;
+ snd_pcm_hw_params_t *hw_da_params;
++#endif
+ char ss[sizeof(DEVNAME_BASE)+2];
+ int i, j, dir, err, resample;
+ int old_disksave_flag, old_mode, old_chan, old_speed;
diff --git a/comms/linrad/files/patch-lsettx.c b/comms/linrad/files/patch-lsettx.c
deleted file mode 100644
index 3afb7f8f5a63..000000000000
--- a/comms/linrad/files/patch-lsettx.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 a28e70e784cd..060fca6ecaf2 100644
--- a/comms/linrad/files/patch-lxsys.c
+++ b/comms/linrad/files/patch-lxsys.c
@@ -1,5 +1,5 @@
---- lxsys.c.orig	2007-11-05 15:40:27.000000000 -0500
-+++ lxsys.c	2007-12-18 15:46:41.000000000 -0500
+--- lxsys.c.orig	2008-06-25 19:17:06.000000000 -0400
++++ lxsys.c	2008-07-18 20:15:10.000000000 -0400
 @@ -1,12 +1,14 @@
 -
 -#include <sys/io.h>
@@ -18,18 +18,17 @@
  #include <fcntl.h>
  #include <termios.h>
  #include "thrdef.h"
-@@ -18,8 +20,9 @@
+@@ -18,7 +20,8 @@
  #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 perseus_input(void){};
+ 
+@@ -190,15 +193,13 @@
  
  int lir_parport_permission(void)
  {
@@ -49,7 +48,7 @@
    }
  if(i != 0)
    {
-@@ -331,11 +332,9 @@
+@@ -355,11 +356,9 @@
  int i;
  if(ui.parport < 0x400-4)
    {
@@ -64,7 +63,7 @@
    }
  if(i!=0)lirerr(764921);
  i=1000;
-@@ -348,11 +347,9 @@
+@@ -372,11 +371,9 @@
  int i;
  if(ui.parport < 0x400-4)
    {
diff --git a/comms/linrad/files/patch-uidef.h b/comms/linrad/files/patch-uidef.h
deleted file mode 100644
index 8944304d4874..000000000000
--- a/comms/linrad/files/patch-uidef.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
diff --git a/comms/linrad/pkg-descr b/comms/linrad/pkg-descr
index a7e3ee7e6b10..49ac65b99278 100644
--- a/comms/linrad/pkg-descr
+++ b/comms/linrad/pkg-descr
@@ -6,5 +6,4 @@ boards sampling directly at RF frequencies will be available.
 
 WWW: http://www.nitehawk.com/sm5bsz/linuxdsp/linrad.htm
 
-- Diane Bruce, VA3DB
 db@db.net