Updated yaesu to 0.13:

6 files changed, 48 insertions, 63 deletions

diff --git a/ham/yaesu/Makefile b/ham/yaesu/Makefile
index 671c81f41b3..ebf73d8a44c 100644
--- a/ham/yaesu/Makefile
+++ b/ham/yaesu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:59 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/14 11:45:46 wulf Exp $
 #
 
-DISTNAME=	yaesu-0.12
+DISTNAME=	yaesu-0.13
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/ham/}
 
diff --git a/ham/yaesu/distinfo b/ham/yaesu/distinfo
index 7b44815dab9..891df1fc8ed 100644
--- a/ham/yaesu/distinfo
+++ b/ham/yaesu/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2005/02/22 21:06:07 agc Exp $
+$NetBSD: distinfo,v 1.9 2006/01/14 11:45:46 wulf Exp $
 
-SHA1 (yaesu-0.12.tar.gz) = a073e78f0635c84222176941e39cc62dca92f00d
-RMD160 (yaesu-0.12.tar.gz) = 45d1c2294632f774d006134c0b7c2cbb6999f1ef
-Size (yaesu-0.12.tar.gz) = 24694 bytes
-SHA1 (patch-aa) = 9fc04c222e7ed26c8e73449e475ff639d7ced051
-SHA1 (patch-ab) = 0a96f808929b7d1f1d4363e57c24dd33142e5f4e
+SHA1 (yaesu-0.13.tar.gz) = 188cd4f472bc191c0467f09cfd5d7df79a7b280b
+RMD160 (yaesu-0.13.tar.gz) = 779c982112255c72f4fb1d95d8921714aa266bb8
+Size (yaesu-0.13.tar.gz) = 26388 bytes
+SHA1 (patch-aa) = 3b0181d8989dd6f69eb4e9f486a552d17f301908
+SHA1 (patch-ab) = d51cb63253878428c9b751d64a138c7a0e54cbba
 SHA1 (patch-ac) = cd5ee0384a53f436e07b4cec904c3a2176a40cdf
-SHA1 (patch-ad) = 6addd200e55af284e81df4e30643cd48577e7840
-SHA1 (patch-ae) = 3c62fd9177588adea935223b4aab098d1b4a6253
+SHA1 (patch-ad) = bc2029bf88a8b55e9484f27ec36bcc64dc68cc5a
+SHA1 (patch-ae) = e88f6f0742414abc1b5c533b88f94dd6e5fa2c48
diff --git a/ham/yaesu/patches/patch-aa b/ham/yaesu/patches/patch-aa
index 1eb0acb2448..37fd8b7f833 100644
--- a/ham/yaesu/patches/patch-aa
+++ b/ham/yaesu/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2002/06/07 10:38:45 cjep Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/14 11:45:46 wulf Exp $
 
---- Makefile.orig	Mon Aug 21 00:25:07 1995
-+++ Makefile
+--- Makefile.orig	2004-07-27 11:53:25.000000000 +0930
++++ Makefile	2006-01-14 22:52:28.000000000 +1030
 @@ -1,6 +1,7 @@
- INCDIR = ./
+ INCDIR = ./ -I/usr/lib -I/usr/X11R6/lib
  CC = gcc
--FLAGS = -m486 -funsigned-char
-+#FLAGS = -m486 -funsigned-char
+-FLAGS = -mcpu=athlon-xp -march=athlon-xp -funsigned-char
++#FLAGS = -mcpu=athlon-xp -march=athlon-xp -funsigned-char
 +FLAGS = -funsigned-char
  OBJS = aux.o bright.o clar.o ctcss.o freq_out.o ham_gen.o lock.o main.o mem_hide.o mem_2vfo.o mem_scsk.o meter_rd.o mode.o outport.o pacing.o ptt.o rd_flags.o mem_rec.o rptr_off.o save_mem.o splt_tog.o strt_tun.o stat_upd.o stat_out.o step.o tuner10.o vfo_ab.o vfo_2mem.o repeater.o vfo_a2b.o wwv_find.o yaesu.o
  all:	program
diff --git a/ham/yaesu/patches/patch-ab b/ham/yaesu/patches/patch-ab
index 29ae17a2310..d58a9471afa 100644
--- a/ham/yaesu/patches/patch-ab
+++ b/ham/yaesu/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2002/06/15 21:57:53 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.4 2006/01/14 11:45:46 wulf Exp $
 
---- README.orig	Sun Sep 20 11:34:46 1998
-+++ README
-@@ -34,13 +34,20 @@
+--- README.orig	2005-09-02 05:10:57.000000000 +0930
++++ README	2006-01-14 22:47:23.000000000 +1030
+@@ -37,13 +37,20 @@
  to make a note of it.  Off to usage...
  
  Using my program is very simple, to execute it you must provide the com port
diff --git a/ham/yaesu/patches/patch-ad b/ham/yaesu/patches/patch-ad
index 7fa88e526ce..9045f79fab2 100644
--- a/ham/yaesu/patches/patch-ad
+++ b/ham/yaesu/patches/patch-ad
@@ -1,10 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2004/07/10 17:08:53 kristerw Exp $
+$NetBSD: patch-ad,v 1.7 2006/01/14 11:45:46 wulf Exp $
 
-the addition of the -p flag is required for non-PC machines which
-might use a different serial device.
-
---- main.c.orig	1995-11-04 23:48:33.000000000 +0100
-+++ main.c	2004-07-10 19:01:57.000000000 +0200
+--- main.c.orig	2004-07-27 11:56:47.000000000 +0930
++++ main.c	2006-01-14 22:59:42.000000000 +1030
 @@ -5,7 +5,6 @@
  #include <stdlib.h>
  #include <termios.h>
@@ -67,38 +64,27 @@ might use a different serial device.
      } else {
         printf("usage:  yaesu [port #]\n");
         exit(3);
-@@ -139,20 +147,20 @@
+@@ -139,8 +147,21 @@
  
  bye_msg() {
  
--printf("\n
--Thank you for using KG0CQ's 'yaesu' program, this is version .1lx.
--You may use this program for as long as you like, it will always  
--be free to use, no matter what version.  You may distribute this  
--program freely so long as it distributed in and with the original 
--zipfile or tar file.  Please do not distribute modifed versions.  
--A nice Windows version, DOS console version, Linux console, and   
--Linux X version should be on their way in the coming months.      
--If you wish to support the author's efforts just say thanks via
--email or packet!
--
--    email:   drranu@holly.ColoState.EDU
--    packet:  KG0CQ@KF0UW.#NECO.USA.NOAM
+-printf("\n Thank you for using KG0CQ's 'yaesu' program, this is version .1lx.  You may use this program for as long as you like, it will always be free to use, no matter what version.  You may distribute this program freely so long as it distributed in and with the original zipfile or tar file.  Please do not distribute modifed versions.  A nice Windows version, DOS console version, Linux console, and Linux X version should be on their way in the coming months.  If you wish to support the author's efforts just say thanks via email or packet!  email:   drranu@holly.ColoState.EDU or packet:  KG0CQ@KF0UW.#NECO.USA.NOAM Having fun hamming, hope to catch you on the air!!!\n\n");
 -
-+printf("\n\n\
-+Thank you for using KG0CQ's 'yaesu' program, this is version .1lx.\n\
-+You may use this program for as long as you like, it will always  \n\
-+be free to use, no matter what version.  You may distribute this  \n\
-+program freely so long as it distributed in and with the original \n\
-+zipfile or tar file.  Please do not distribute modifed versions.  \n\
-+A nice Windows version, DOS console version, Linux console, and   \n\
-+Linux X version should be on their way in the coming months.      \n\
-+If you wish to support the author's efforts just say thanks via\n\
-+email or packet!\n\
-+\n\
-+    email:   drranu@holly.ColoState.EDU\n\
-+    packet:  KG0CQ@KF0UW.#NECO.USA.NOAM\n\
-+\n\
- Having fun hamming, hope to catch you on the air!!!\n\n");
- 
+++printf("\n\n\
++    Thank you for using KG0CQ's 'yaesu' program, this is version .1lx.\n\
++    You may use this program for as long as you like, it will always  \n\
++    be free to use, no matter what version.  You may distribute this  \n\
++    program freely so long as it distributed in and with the original \n\
++    zipfile or tar file.  Please do not distribute modifed versions.  \n\
++    A nice Windows version, DOS console version, Linux console, and   \n\
++    Linux X version should be on their way in the coming months.      \n\
++    If you wish to support the author's efforts just say thanks via\n\
++    email or packet!\n\
++    \n\
++        email:   drranu@holly.ColoState.EDU\n\
++        packet:  KG0CQ@KF0UW.#NECO.USA.NOAM\n\
++    \n\
++    Having fun hamming, hope to catch you on the air!!!\n\n");
  }
+ 
+ void
diff --git a/ham/yaesu/patches/patch-ae b/ham/yaesu/patches/patch-ae
index c90fbb18a10..32f54a23e43 100644
--- a/ham/yaesu/patches/patch-ae
+++ b/ham/yaesu/patches/patch-ae
@@ -1,15 +1,14 @@
-$NetBSD: patch-ae,v 1.1 2004/07/10 17:08:53 kristerw Exp $
+$NetBSD: patch-ae,v 1.2 2006/01/14 11:45:46 wulf Exp $
 
---- meter_rd.c.orig	2004-07-10 19:02:27.000000000 +0200
-+++ meter_rd.c	2004-07-10 19:04:31.000000000 +0200
-@@ -33,8 +33,8 @@
+--- meter_rd.c.orig	2004-07-27 11:57:32.000000000 +0930
++++ meter_rd.c	2006-01-14 23:05:46.000000000 +1030
+@@ -33,7 +33,8 @@
      n = n +1;
    } 
    if (meter_value[5] != 0x0f7) {
--     printf("The dummy byte returned to the meter_rd function is incorrect, possible
--             serial port noise?\n");
+-     printf("The dummy byte returned to the meter_rd function is incorrect, possible serial port noise?\n");
 +     printf("The dummy byte returned to the meter_rd function is incorrect, possible "
-+             "serial port noise?\n");
++            "serial port noise?\n");
       } else {
       printf("\nCurrent meter value is %x. Range is 0..0ffh.\n", meter_value[3]);
    }