Remove an i386 specific compilation flag. Also merge two patches to main.c.

5 files changed, 24 insertions, 22 deletions

diff --git a/ham/yaesu/distinfo b/ham/yaesu/distinfo
index a05340db479..4a0ac1c55d2 100644
--- a/ham/yaesu/distinfo
+++ b/ham/yaesu/distinfo
@@ -1,7 +1,8 @@
 
+
 SHA1 (yaesu-0.12.tar.gz) = a073e78f0635c84222176941e39cc62dca92f00d
 Size (yaesu-0.12.tar.gz) = 24694 bytes
-SHA1 (patch-aa) = 45e9d3ad4f1078314c7d511b30b361ca3e1296dd
-SHA1 (patch-ab) = 8cbb28d281b0155fac1eb38f9e83ba764adc4f46
-SHA1 (patch-ac) = 8445a04d1d341410d23f533ca34ea3a4841af400
-SHA1 (patch-ad) = 758bf2c35422c7ba410a65e25ea87965ce206b4f
+SHA1 (patch-aa) = 9fc04c222e7ed26c8e73449e475ff639d7ced051
+SHA1 (patch-ab) = 309c2caccceef1ebccbcaa3ed3bcf50b14073450
+SHA1 (patch-ac) = cd5ee0384a53f436e07b4cec904c3a2176a40cdf
+SHA1 (patch-ad) = aa7289a481f0a04b71e1798b3cfd983c29a48c3f
diff --git a/ham/yaesu/patches/patch-aa b/ham/yaesu/patches/patch-aa
index ca9772672c6..1eb0acb2448 100644
--- a/ham/yaesu/patches/patch-aa
+++ b/ham/yaesu/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/07 10:38:45 cjep Exp $
 
---- main.c.orig	Sat Apr 13 21:01:49 2002
-+++ main.c
-@@ -5,7 +5,6 @@
- #include <stdlib.h>
- #include <termios.h>
- #include <signal.h>
--#include <asm/io.h>
- #include <config.h>
- float freq_to_change_to;
- char flag_data_return[5];
+--- Makefile.orig	Mon Aug 21 00:25:07 1995
++++ Makefile
+@@ -1,6 +1,7 @@
+ INCDIR = ./
+ CC = gcc
+-FLAGS = -m486 -funsigned-char
++#FLAGS = -m486 -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 46dff3a5f72..760e1eb1c4b 100644
--- a/ham/yaesu/patches/patch-ab
+++ b/ham/yaesu/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2002/06/07 10:38:45 cjep Exp $
 
---- README.orig	Sat Apr 13 21:05:20 2002
+--- README.orig	Sun Sep 20 16:34:46 1998
 +++ README
 @@ -34,8 +34,8 @@
  to make a note of it.  Off to usage...
diff --git a/ham/yaesu/patches/patch-ac b/ham/yaesu/patches/patch-ac
index 2c7a8fe8597..c3efd80f000 100644
--- a/ham/yaesu/patches/patch-ac
+++ b/ham/yaesu/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/08 00:02:39 hubertf Exp $
+$NetBSD: patch-ac,v 1.2 2002/06/07 10:38:45 cjep Exp $
 
---- config.h.orig	Sat Apr 13 21:06:53 2002
+--- config.h.orig	Mon Aug 21 00:25:07 1995
 +++ config.h
 @@ -1,10 +1,10 @@
  /*
diff --git a/ham/yaesu/patches/patch-ad b/ham/yaesu/patches/patch-ad
index f5782774c80..67914347cf9 100644
--- a/ham/yaesu/patches/patch-ad
+++ b/ham/yaesu/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2002/05/10 00:18:21 hubertf Exp $
+$NetBSD: patch-ad,v 1.3 2002/06/07 10:38:45 cjep Exp $
 
---- main.c.orig	Sat Apr 13 21:07:41 2002
+--- main.c.orig	Fri Jun  7 11:27:57 2002
 +++ main.c
-@@ -100,29 +100,29 @@
+@@ -99,29 +99,29 @@
      if (argc == 2) {
         switch(argv[1][0]) {
               case '0':