[pkgsrc/trunk]: pkgsrc Updated ham/gmfsk to 0.6nb7: Fixed build problem cause...

[wulf <wulf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ae0077f22cb
branches:  trunk
changeset: 511908:5ae0077f22cb
user:      wulf <wulf%pkgsrc.org@localhost>
date:      Wed Apr 26 01:48:50 2006 +0000

description:
Updated ham/gmfsk to 0.6nb7: Fixed build problem caused by definition of
log2() function in misc.c and several compiler warnings.

diffstat:

 doc/CHANGES-2006           |   3 ++-
 ham/gmfsk/Makefile         |   4 ++--
 ham/gmfsk/distinfo         |   6 +++++-
 ham/gmfsk/patches/patch-aa |  30 ++++++++++++++++++++++++++++++
 ham/gmfsk/patches/patch-ab |  28 ++++++++++++++++++++++++++++
 ham/gmfsk/patches/patch-ac |  13 +++++++++++++
 ham/gmfsk/patches/patch-ad |  20 ++++++++++++++++++++
 7 files changed, 100 insertions(+), 4 deletions(-)

diffs (149 lines):

diff -r 18ef1c39dcc5 -r 5ae0077f22cb doc/CHANGES-2006
--- a/doc/CHANGES-2006  Tue Apr 25 22:35:46 2006 +0000
+++ b/doc/CHANGES-2006  Wed Apr 26 01:48:50 2006 +0000
@@ -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 @@
        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 -r 18ef1c39dcc5 -r 5ae0077f22cb ham/gmfsk/Makefile
--- a/ham/gmfsk/Makefile        Tue Apr 25 22:35:46 2006 +0000
+++ b/ham/gmfsk/Makefile        Wed Apr 26 01:48:50 2006 +0000
@@ -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 -r 18ef1c39dcc5 -r 5ae0077f22cb ham/gmfsk/distinfo
--- a/ham/gmfsk/distinfo        Tue Apr 25 22:35:46 2006 +0000
+++ b/ham/gmfsk/distinfo        Wed Apr 26 01:48:50 2006 +0000
@@ -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 -r 18ef1c39dcc5 -r 5ae0077f22cb ham/gmfsk/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/gmfsk/patches/patch-aa        Wed Apr 26 01:48:50 2006 +0000
@@ -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 -r 18ef1c39dcc5 -r 5ae0077f22cb ham/gmfsk/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/gmfsk/patches/patch-ab        Wed Apr 26 01:48:50 2006 +0000
@@ -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 -r 18ef1c39dcc5 -r 5ae0077f22cb ham/gmfsk/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/gmfsk/patches/patch-ac        Wed Apr 26 01:48:50 2006 +0000
@@ -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 -r 18ef1c39dcc5 -r 5ae0077f22cb ham/gmfsk/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/gmfsk/patches/patch-ad        Wed Apr 26 01:48:50 2006 +0000
@@ -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') {