From e1d61eff9f5abedda43f17a342c5d412c01fb084 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sat, 15 Jun 2002 21:27:24 +0000
Subject: Really merge both main.c patches... (hi chris!)

---
 ham/yaesu/distinfo         |  2 +-
 ham/yaesu/patches/patch-ad | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'ham/yaesu')

diff --git a/ham/yaesu/distinfo b/ham/yaesu/distinfo
index 4a0ac1c55d2..4a1cc87f360 100644
--- a/ham/yaesu/distinfo
+++ b/ham/yaesu/distinfo
@@ -5,4 +5,4 @@ Size (yaesu-0.12.tar.gz) = 24694 bytes
 SHA1 (patch-aa) = 9fc04c222e7ed26c8e73449e475ff639d7ced051
 SHA1 (patch-ab) = 309c2caccceef1ebccbcaa3ed3bcf50b14073450
 SHA1 (patch-ac) = cd5ee0384a53f436e07b4cec904c3a2176a40cdf
-SHA1 (patch-ad) = aa7289a481f0a04b71e1798b3cfd983c29a48c3f
+SHA1 (patch-ad) = 3f2d89f5650f5dc4f2dcf16f164840f20e262ac5
diff --git a/ham/yaesu/patches/patch-ad b/ham/yaesu/patches/patch-ad
index 67914347cf9..a3a2ae5303a 100644
--- a/ham/yaesu/patches/patch-ad
+++ b/ham/yaesu/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2002/06/07 10:38:45 cjep Exp $
+$NetBSD: patch-ad,v 1.4 2002/06/15 21:27:25 wiz Exp $
 
---- main.c.orig	Fri Jun  7 11:27:57 2002
+--- main.c.orig	Sat Nov  4 23:48:33 1995
 +++ main.c
-@@ -99,29 +99,29 @@
+@@ -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];
+@@ -100,29 +99,29 @@
      if (argc == 2) {
         switch(argv[1][0]) {
               case '0':
-- 
cgit v1.2.3