Updated ham/gmfsk to 0.6nb7: Fixed build problem caused by definition of

log2() function in misc.c and several compiler warnings.

7 files changed, 100 insertions, 4 deletions

diff --git a/doc/CHANGES-2006 b/doc/CHANGES-2006
index bed34a04363..512dac1a166 100644
--- a/doc/CHANGES-2006
+++ b/doc/CHANGES-2006
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2006,v 1.60 2006/04/25 14:17:43 salo Exp $
+$NetBSD: CHANGES-2006,v 1.61 2006/04/26 01:55:07 wulf Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -2260,3 +2260,4 @@ Changes to the packages collection and infrastructure in 2006:
 	Updated time/p5-DateTime-TimeZone to 0.44 [hiramatsu 2006-04-25]
 	Updated time/p5-DateTime-Locale to 0.22 [hiramatsu 2006-04-25]
 	Updated www/paros to 3.2.10 [salo 2006-04-25]
+	Updated ham/gmfsk to 0.6nb7 [wulf 2006-04-25]
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile
index 6c14afdde52..1c9791bcf95 100644
--- a/ham/gmfsk/Makefile
+++ b/ham/gmfsk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/26 01:48:50 wulf Exp $
 #
 
 DISTNAME=	gmfsk-0.6
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	ham
 MASTER_SITES=	http://gmfsk.connect.fi/
 
diff --git a/ham/gmfsk/distinfo b/ham/gmfsk/distinfo
index 1ae6c0fe920..d4b24c4a606 100644
--- a/ham/gmfsk/distinfo
+++ b/ham/gmfsk/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/22 21:06:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/04/26 01:48:50 wulf Exp $
 
 SHA1 (gmfsk-0.6.tar.gz) = 2738bc2b83eb8f2001ed2503c466123ce4b258a5
 RMD160 (gmfsk-0.6.tar.gz) = 532d2454ccc7fab36e707002c6fda7f9e2ec14cd
 Size (gmfsk-0.6.tar.gz) = 540765 bytes
+SHA1 (patch-aa) = 49720c6bb4689768ce14e76aae39fd155739ca31
+SHA1 (patch-ab) = a40132dddf93e88b166a4d9a5428e1e15dee3ccd
+SHA1 (patch-ac) = a936811e68d84ddb286f568519006521c4c5be89
+SHA1 (patch-ad) = dbdb75d3c1d617ead1903d6645dd83c930a37a7b
diff --git a/ham/gmfsk/patches/patch-aa b/ham/gmfsk/patches/patch-aa
new file mode 100644
index 00000000000..aefd1db523b
--- /dev/null
+++ b/ham/gmfsk/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1 2006/04/26 01:52:18 wulf Exp $
+
+--- src/misc/misc.h.orig	2006-04-26 10:32:02.000000000 +0930
++++ src/misc/misc.h	2006-04-26 10:31:20.000000000 +0930
+@@ -104,25 +104,6 @@
+ /* ---------------------------------------------------------------------- */
+ 
+ /*
+- * Integer base-2 logarithm
+- */
+-extern inline int log2(unsigned int x)
+-{
+-	int y = 0;
+-
+-	x >>= 1;
+-
+-	while (x) {
+-		x >>= 1;
+-		y++;
+-	}
+-
+-	return y;
+-}
+-
+-/* ---------------------------------------------------------------------- */
+-
+-/*
+  * Gray encoding and decoding (8 bit)
+  */
+ extern inline unsigned char grayencode(unsigned char data)
diff --git a/ham/gmfsk/patches/patch-ab b/ham/gmfsk/patches/patch-ab
new file mode 100644
index 00000000000..d49b9bd620a
--- /dev/null
+++ b/ham/gmfsk/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2006/04/26 01:52:18 wulf Exp $
+
+--- src/misc/misc.c.orig	2006-04-26 10:31:03.000000000 +0930
++++ src/misc/misc.c	2006-04-26 10:31:31.000000000 +0930
+@@ -102,23 +102,6 @@
+ 
+ /* ---------------------------------------------------------------------- */
+ 
+-/*
+- * Integer base-2 logarithm
+- */
+-int log2(unsigned int x)
+-{
+-	int y = 0;
+-
+-	x >>= 1;
+-
+-	while (x) {
+-		x >>= 1;
+-		y++;
+-	}
+-
+-	return y;
+-}
+-
+ /* ---------------------------------------------------------------------- */
+ 
+ /*
diff --git a/ham/gmfsk/patches/patch-ac b/ham/gmfsk/patches/patch-ac
new file mode 100644
index 00000000000..6252dd93395
--- /dev/null
+++ b/ham/gmfsk/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/04/26 01:52:18 wulf Exp $
+
+--- src/macro.c.orig	2006-04-26 10:38:46.000000000 +0930
++++ src/macro.c	2006-04-26 10:39:00.000000000 +0930
+@@ -287,7 +287,7 @@
+ 		p++;
+ 		break;
+ 	default:
+-		for (p = *ptr; *p && isalnum(*p); p++)
++		for (p = *ptr; *p && isalnum((u_char) *p); p++)
+ 			;
+ 		break;
+ 	}
diff --git a/ham/gmfsk/patches/patch-ad b/ham/gmfsk/patches/patch-ad
new file mode 100644
index 00000000000..b40bd9f213e
--- /dev/null
+++ b/ham/gmfsk/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2006/04/26 01:52:18 wulf Exp $
+
+--- src/picture.c.orig	2006-04-26 10:39:13.000000000 +0930
++++ src/picture.c	2006-04-26 10:39:36.000000000 +0930
+@@ -48,13 +48,13 @@
+ 
+ 	p += 4;
+ 
+-	while (isdigit(*p))
++	while (isdigit((u_char) *p))
+ 		*w = (*w * 10) + (*p++ - '0');
+ 
+ 	if (*p++ != 'x')
+ 		return FALSE;
+ 
+-	while (isdigit(*p))
++	while (isdigit((u_char) *p))
+ 		*h = (*h * 10) + (*p++ - '0');
+ 
+ 	if (*p == 'C') {