- Added a patch for ISO C90 compatibility.

- Fixed all pkglint -Wall warnings.

4 files changed, 35 insertions, 15 deletions

diff --git a/ham/tlf/Makefile b/ham/tlf/Makefile
index 555dc73ea29..fa5c96dbbda 100644
--- a/ham/tlf/Makefile
+++ b/ham/tlf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/01/14 12:06:48 wulf Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/20 13:09:59 rillig Exp $
 #
 
 DISTNAME=	tlf-0.9.27
@@ -18,11 +18,11 @@ PTHREAD_OPTS+=	require
 CONFIGURE_ARGS+=	--enable-hamlib
 
 post-patch:
-	${ECHO} SC_DEVICE=/dev/tty00 >> ${WRKSRC}/share/logcfg.dat
+	${ECHO} SC_DEVICE=/dev/tty00 >> ${WRKSRC:Q}/share/logcfg.dat
 
 .include "../../mk/bsd.prefs.mk"
 
-LIBS+= ${LIBOSSAUDIO}
+LIBS+=		${LIBOSSAUDIO}
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/ham/tlf/PLIST b/ham/tlf/PLIST
index 4667b2dc587..0c628e5615e 100644
--- a/ham/tlf/PLIST
+++ b/ham/tlf/PLIST
@@ -1,5 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/09/24 23:39:03 wulf Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/20 13:09:59 rillig Exp $
+bin/soundlog
+bin/tlf
+man/man1/tlf.1
+share/tlf/arrlsections
+share/tlf/callmaster
+share/tlf/cty.dat
 share/tlf/doc/README
+share/tlf/ea_sections
+share/tlf/logcfg.dat
+share/tlf/paccmults
 share/tlf/rules/arrldx_dx
 share/tlf/rules/arrldx_usa
 share/tlf/rules/arrlfd
@@ -16,17 +25,8 @@ share/tlf/rules/spdx_sp
 share/tlf/rules/ssa_mt
 share/tlf/rules/template
 share/tlf/rules/wpx
-share/tlf/callmaster
-share/tlf/cty.dat
-share/tlf/logcfg.dat
-share/tlf/arrlsections
-share/tlf/ea_sections
-share/tlf/paccmults
 share/tlf/spdxmults
 share/tlf/ssamults
-bin/tlf
-bin/soundlog
-man/man1/tlf.1
-@dirrm share/tlf/doc
 @dirrm share/tlf/rules
+@dirrm share/tlf/doc
 @dirrm share/tlf
diff --git a/ham/tlf/distinfo b/ham/tlf/distinfo
index cba45c87745..023ec56fcfc 100644
--- a/ham/tlf/distinfo
+++ b/ham/tlf/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/01/14 12:06:48 wulf Exp $
+$NetBSD: distinfo,v 1.4 2006/01/20 13:09:59 rillig Exp $
 
 SHA1 (tlf-0.9.27.tar.gz) = c573e2e5699f84753ef9ae606d8b709d373f0216
 RMD160 (tlf-0.9.27.tar.gz) = 8d4bce98f7f4c6993542d23fce4a6abc11a2a5d6
 Size (tlf-0.9.27.tar.gz) = 388997 bytes
+SHA1 (patch-aa) = 0587a3f36bf0a6620c70a5d3290d6d5384c8c092
diff --git a/ham/tlf/patches/patch-aa b/ham/tlf/patches/patch-aa
new file mode 100644
index 00000000000..e52985c4823
--- /dev/null
+++ b/ham/tlf/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2006/01/20 13:09:59 rillig Exp $
+
+readctydata.c:94: warning: ISO C89 forbids mixed declarations and code
+
+--- src/readctydata.c.orig	2005-12-17 15:16:38.000000000 +0100
++++ src/readctydata.c	2006-01-20 11:53:07.000000000 +0100
+@@ -88,10 +88,11 @@
+ 		}
+ 		else			// prefix line
+ 		{
++	  		char *loc = NULL;						//PG4I, 26Jul2005
++
+ 			strncpy(buffer, buf, 79);
+ 			buffer[79] = 0;
+ 
+-	  		char *loc = NULL;						//PG4I, 26Jul2005
+ 	  		if ((loc = strchr(buffer, '\r')))
+ 	   		*loc = '\0';
+