Index: head/comms/linrad/Makefile
===================================================================
--- head/comms/linrad/Makefile	(revision 209301)
+++ head/comms/linrad/Makefile	(revision 209302)
@@ -1,68 +1,68 @@
 # ports collection makefile for:	linrad
 # Date created:		7 July 2004
 # Whom:			db
 #
 # $FreeBSD$
 #
 
 PORTNAME=	linrad
-PORTVERSION=	2.40
+PORTVERSION=	2.43
 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-40
+DISTNAME=	lir02-43
 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
+USE_XORG=	x11
 ONLY_FOR_ARCHS=	i386
-X11_PATCHFILES=	Makefile.in help.c xmain.c
+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 \
 			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 <bsd.port.mk>

Property changes on: head/comms/linrad/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/comms/linrad/distinfo
===================================================================
--- head/comms/linrad/distinfo	(revision 209301)
+++ head/comms/linrad/distinfo	(revision 209302)
@@ -1,3 +1,3 @@
-MD5 (linrad/lir02-40.tbz) = 226368bea125633a97fafef3c8b2df2a
-SHA256 (linrad/lir02-40.tbz) = 37105acb60adeacf2b53bec008aa0b99d722a03e9d05b8d92d53d56304c681a1
-SIZE (linrad/lir02-40.tbz) = 481422
+MD5 (linrad/lir02-43.tbz) = 93d11da00e0085cceed265af35081ca7
+SHA256 (linrad/lir02-43.tbz) = bd1c67ee3f181ae435700146ecec5974fbe51e571fd196f639a45d03845c3fb6
+SIZE (linrad/lir02-43.tbz) = 489770

Property changes on: head/comms/linrad/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/comms/linrad/files/patch-Makefile.in
===================================================================
--- head/comms/linrad/files/patch-Makefile.in	(revision 209301)
+++ head/comms/linrad/files/patch-Makefile.in	(revision 209302)
@@ -1,41 +1,41 @@
---- Makefile.in.orig	2007-11-05 15:40:27.000000000 -0500
-+++ Makefile.in	2007-12-18 15:43:58.000000000 -0500
+--- Makefile.in.orig	2008-01-24 23:49:58.000000000 -0500
++++ Makefile.in	2008-03-18 11:53:07.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}
  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 \
-@@ -634,7 +631,7 @@
+@@ -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 \
-@@ -681,7 +678,7 @@
+@@ -683,7 +680,7 @@
  
  
  
 -	gcc @MEM@ -oxlinrad -L/usr/X11R6/lib -lX11 -lpthread -lm \
-+	gcc @MEM@ -oxlinrad -L/usr/local/lib -lX11 -pthread -lm \
++	$(LCC) @MEM@ -oxlinrad -L${X11BASE}/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.10
\ No newline at end of property
+1.11
\ No newline at end of property