From cff86f8bd71854219563f56f40a36c4c014e08fc Mon Sep 17 00:00:00 2001
From: kristerw <kristerw@pkgsrc.org>
Date: Sat, 10 Jul 2004 17:08:53 +0000
Subject: Fix multi-line strings, to make this build when using gcc3.

---
 ham/yaesu/distinfo         |  5 +++--
 ham/yaesu/patches/patch-ad | 41 ++++++++++++++++++++++++++++++++++++++---
 ham/yaesu/patches/patch-ae | 15 +++++++++++++++
 3 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 ham/yaesu/patches/patch-ae

(limited to 'ham')

diff --git a/ham/yaesu/distinfo b/ham/yaesu/distinfo
index d4ddfe135a2..dab6729c386 100644
--- a/ham/yaesu/distinfo
+++ b/ham/yaesu/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/07/02 12:53:32 wiz Exp $
+$NetBSD: distinfo,v 1.7 2004/07/10 17:08:53 kristerw Exp $
 
 SHA1 (yaesu-0.12.tar.gz) = a073e78f0635c84222176941e39cc62dca92f00d
 Size (yaesu-0.12.tar.gz) = 24694 bytes
 SHA1 (patch-aa) = 9fc04c222e7ed26c8e73449e475ff639d7ced051
 SHA1 (patch-ab) = 0a96f808929b7d1f1d4363e57c24dd33142e5f4e
 SHA1 (patch-ac) = cd5ee0384a53f436e07b4cec904c3a2176a40cdf
-SHA1 (patch-ad) = 89bb7dc00a7da82778ed357594cb5d0dfa756f64
+SHA1 (patch-ad) = 6addd200e55af284e81df4e30643cd48577e7840
+SHA1 (patch-ae) = 3c62fd9177588adea935223b4aab098d1b4a6253
diff --git a/ham/yaesu/patches/patch-ad b/ham/yaesu/patches/patch-ad
index 33e72b209ff..7fa88e526ce 100644
--- a/ham/yaesu/patches/patch-ad
+++ b/ham/yaesu/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.5 2002/06/15 21:57:54 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.6 2004/07/10 17:08:53 kristerw Exp $
 
 the addition of the -p flag is required for non-PC machines which
 might use a different serial device.
 
---- main.c.orig	Sat Nov  4 17:48:33 1995
-+++ main.c
+--- main.c.orig	1995-11-04 23:48:33.000000000 +0100
++++ main.c	2004-07-10 19:01:57.000000000 +0200
 @@ -5,7 +5,6 @@
  #include <stdlib.h>
  #include <termios.h>
@@ -67,3 +67,38 @@ might use a different serial device.
      } else {
         printf("usage:  yaesu [port #]\n");
         exit(3);
+@@ -139,20 +147,20 @@
+ 
+ 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\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");
+ 
+ }
diff --git a/ham/yaesu/patches/patch-ae b/ham/yaesu/patches/patch-ae
new file mode 100644
index 00000000000..c90fbb18a10
--- /dev/null
+++ b/ham/yaesu/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2004/07/10 17:08:53 kristerw 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 @@
+     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");
+      } else {
+      printf("\nCurrent meter value is %x. Range is 0..0ffh.\n", meter_value[3]);
+   }
-- 
cgit v1.2.3