- update to latest

- clean up DOCS install

Approved:       ehaupt (mentor)

8 files changed, 45 insertions, 48 deletions

diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index c386696edfda..ce86e5af777a 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	linrad
-PORTVERSION=	2.20
+PORTVERSION=	2.23
 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-20
+DISTNAME=	lir02-23
 EXTRACT_SUFX=	.tbz
 DIST_SUBDIR=	${PORTNAME}
 
@@ -20,7 +20,7 @@ COMMENT=	Amateur Radio DSP utility (SDR)
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-02.20
+WRKSRC=		${WRKDIR}/${PORTNAME}-02.23
 
 USE_AUTOTOOLS=	autoconf:253
 GNU_CONFIGURE=	yes
@@ -30,8 +30,14 @@ ALL_TARGET=	xlinrad
 USE_X_PREFIX=	yes
 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
 
 .include <bsd.port.pre.mk>
+
 .if ${OSVERSION} < 500000
 BROKEN=		Does not compile on FreeBSD 4.x
 .endif
@@ -55,17 +61,9 @@ do-install:
 	${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
-	${INSTALL_DATA} ${WRKSRC}/z_BUFFERS.txt ${DOCSDIR}/z_BUFFERS.txt
-	${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_MOUSE.txt ${DOCSDIR}/z_MOUSE.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
+.for f in ${LINRAD_DOCFILES}
+	@${INSTALL_DATA}  ${WRKSRC}/$f ${DOCSDIR}/$f
+.endfor
 	@${ECHO} ""
 	@${ECHO} "linrad docs installed in ${DOCSDIR}"
 	@${ECHO} ""
diff --git a/comms/linrad/distinfo b/comms/linrad/distinfo
index 9e235ca81d11..26efa48d607a 100644
--- a/comms/linrad/distinfo
+++ b/comms/linrad/distinfo
@@ -1,3 +1,3 @@
-MD5 (linrad/lir02-20.tbz) = 00a7e94eb52ce4941004e7ca96243c84
-SHA256 (linrad/lir02-20.tbz) = 91b91128ff441d6807fd7ea4957fb159748b24dc1d44c6203ac01f296711fde8
-SIZE (linrad/lir02-20.tbz) = 445625
+MD5 (linrad/lir02-23.tbz) = 234c10cf3dc313edb6601b75375fc6d8
+SHA256 (linrad/lir02-23.tbz) = c1cd8609d419faa3e7678c4821b27e177f4c449653c6bca94a8b9b835ee12078
+SIZE (linrad/lir02-23.tbz) = 455056
diff --git a/comms/linrad/files/patch-Makefile.in b/comms/linrad/files/patch-Makefile.in
index 93f41f495a5e..d9f82126a4e0 100644
--- a/comms/linrad/files/patch-Makefile.in
+++ b/comms/linrad/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue Nov  7 13:45:32 2006
-+++ Makefile.in	Sun Dec  3 15:06:40 2006
+--- Makefile.in.orig	Wed Feb 14 04:37:46 2007
++++ Makefile.in	Thu Feb 22 19:52:33 2007
 @@ -4,17 +4,14 @@
  # 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	= $(CC)
  # Use the mingw cross compiler for Windows
  # Name the output files *.ow instead of *.o 
  # so we definitely know it is for Windows.
@@ -13,28 +13,28 @@
  WCC	= /usr/bin/i586-mingw32msvc-gcc
  # Always use the same flags.
 -CFL	= -g -O -DOSNUM=1 -W -Wimplicit -Wreturn-type -Wformat \
---Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
+--m32 -Wunused -Wcomment -Wchar-subscripts -Wshadow -Wuninitialized \
 --Wparentheses -Wstrict-prototypes -Werror -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 
++CFL	= ${CFLAGS} -I/usr/X11R6/include -DOSNUM=1 -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 @@
+@@ -387,7 +384,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 \
++	$(CC) -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 \
+ 	membeg.ol 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 \
-@@ -432,7 +429,7 @@
+@@ -434,7 +431,7 @@
  
  
  
 -	gcc -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \
-+	gcc -oxlinrad -L/usr/X11R6/lib -lX11 -pthread -lm \
++	$(CC) -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 \
+ membeg.ol 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-help.c b/comms/linrad/files/patch-help.c
index 12e7d91652ef..5a1b66159307 100644
--- a/comms/linrad/files/patch-help.c
+++ b/comms/linrad/files/patch-help.c
@@ -1,5 +1,5 @@
---- help.c.orig	Tue Nov  7 13:45:32 2006
-+++ help.c	Fri Nov 24 18:02:31 2006
+--- help.c.orig	Wed Feb 14 04:37:46 2007
++++ help.c	Thu Feb 22 18:44:17 2007
 @@ -352,7 +352,7 @@
    printf("\n%s",s);
    DEB"\n%s",s);
diff --git a/comms/linrad/files/patch-lxsys.c b/comms/linrad/files/patch-lxsys.c
index dc32623d4de4..b66cfe99c508 100644
--- a/comms/linrad/files/patch-lxsys.c
+++ b/comms/linrad/files/patch-lxsys.c
@@ -1,5 +1,5 @@
---- lxsys.c.orig	Tue Nov  7 13:45:32 2006
-+++ lxsys.c	Fri Nov 24 18:02:31 2006
+--- lxsys.c.orig	Wed Feb 14 04:37:46 2007
++++ lxsys.c	Thu Feb 22 18:44:17 2007
 @@ -1,12 +1,14 @@
 -
 -#include <sys/io.h>
@@ -19,7 +19,7 @@
  #include <termios.h>
  #include "thrdef.h"
 @@ -17,6 +19,7 @@
- #include "lindef.h"
+ #include "ldef.h"
  #include "hwaredef.h"
  
 +extern int saved_euid;
@@ -41,7 +41,7 @@
    }
  if(i != 0)
    {
-@@ -208,11 +209,9 @@
+@@ -209,11 +210,9 @@
  int i;
  if(ui.parport < 0x400-4)
    {
@@ -56,7 +56,7 @@
    }
  if(i!=0)lirerr(764921);
  i=1000;
-@@ -225,11 +224,9 @@
+@@ -226,11 +225,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 71b9d3ef1102..a7b7e830a74c 100644
--- a/comms/linrad/files/patch-uidef.h
+++ b/comms/linrad/files/patch-uidef.h
@@ -1,5 +1,5 @@
---- uidef.h.orig	Tue Nov  7 13:45:32 2006
-+++ uidef.h	Fri Nov 24 18:02:31 2006
+--- uidef.h.orig	Wed Feb 14 04:37:46 2007
++++ uidef.h	Thu Feb 22 18:44:17 2007
 @@ -5,7 +5,7 @@
  
  
diff --git a/comms/linrad/files/patch-xmain.c b/comms/linrad/files/patch-xmain.c
index 432ac399caa8..0e1127a9fc99 100644
--- a/comms/linrad/files/patch-xmain.c
+++ b/comms/linrad/files/patch-xmain.c
@@ -1,20 +1,19 @@
---- xmain.c.orig	Tue Nov  7 13:45:33 2006
-+++ xmain.c	Fri Nov 24 18:02:31 2006
-@@ -40,7 +40,7 @@
+--- xmain.c.orig	Wed Feb 14 04:37:46 2007
++++ xmain.c	Thu Feb 22 20:00:30 2007
+@@ -39,6 +39,7 @@
  float total;
  }PIXINFO;
  
--
 +int saved_euid=-1;
+ 
   
  int main(int argc, char **argv)
- {
-@@ -60,6 +60,8 @@
+@@ -58,6 +59,8 @@
  XTextProperty window_title_property;
  unsigned short int *ipalette;
  XColor xco;
 +saved_euid=geteuid();
-+setuid(getuid());	/* XXX drop perms! */
- if(UNINIT_MEMDATA != 0)
-   {
-   memptr=(void*)(&uninit_mem_begin);
++setuid(getuid());      /* XXX drop perms! */
+ for(i=0; i<MAX_LIRSEM; i++)lirsem_flag[i]=0;
+ XInitThreads();
+ if(DUMPFILE)
diff --git a/comms/linrad/pkg-plist b/comms/linrad/pkg-plist
index 94df4c3cf771..8d60b7e1dc3e 100644
--- a/comms/linrad/pkg-plist
+++ b/comms/linrad/pkg-plist
@@ -8,10 +8,10 @@ bin/xlinrad
 %%PORTDOCS%%%%DOCSDIR%%/z_COPYRIGHT.txt
 %%PORTDOCS%%%%DOCSDIR%%/z_GIFINFO.txt
 %%PORTDOCS%%%%DOCSDIR%%/z_MOUSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/z_NETWORK.txt
 %%PORTDOCS%%%%DOCSDIR%%/z_PARALLEL_PORT.txt
 %%PORTDOCS%%%%DOCSDIR%%/z_SETTINGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/z_USERS_EXTRA.txt
 %%PORTDOCS%%%%DOCSDIR%%/z_USERS_HWARE.txt
-%%PORTDOCS%%%%DOCSDIR%%/z_USLEEP.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%