 @@ -1,10 +1,40 @@
-$NetBSD: distinfo,v 1.9 2006/01/14 11:45:46 wulf Exp $
+$NetBSD: distinfo,v 1.10 2012/10/24 15:37:58 joerg Exp $
 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) = bc2029bf88a8b55e9484f27ec36bcc64dc68cc5a
+SHA1 (patch-ad) = 9ed611c78cfd5bae2e825a76b2af02eb1d4ddb9d
-SHA1 (patch-ae) = e88f6f0742414abc1b5c533b88f94dd6e5fa2c48
+SHA1 (patch-ae) = bdeb565940a70912bf03a0909eeccdfad30b928e
 SHA1 (patch-aux.c) = c9d4bd5dea9da933e16fcbe773f8b2462dd2c4fd
 SHA1 (patch-bright.c) = 6c4e2d6267b7ad1830894e2a611aa952b54fddb7
 SHA1 (patch-clar.c) = de407eb7614344e7ede24463819745dc3fbabfc6
 SHA1 (patch-ctcss.c) = 36bb06700194972f1f5da5f03a5efd53a2eca404
 SHA1 (patch-freq__out.c) = 8c8c560ff40539bc357048e4907b493438db22e7
 SHA1 (patch-ham__gen.c) = 6364b04ef9e1fb152fe251c3be01ab8bd37ceb52
 SHA1 (patch-lock.c) = c0f48d03973da8bfbca684d71c3c627eed9da626
 SHA1 (patch-mem__2vfo.c) = 0ae9ed46a6385d31f86e30cb27d0625e862c53b5
 SHA1 (patch-mem__hide.c) = ed040280149aa63c007606514ac2f311dd8fb7c5
 SHA1 (patch-mem__rec.c) = d7f28fd113f400054089bf595982a539bffe9e12
 SHA1 (patch-mem__scsk.c) = 1bf11f933a207eb4fc4034a113a93b6d80f5aec4
 SHA1 (patch-mode.c) = df61a11f4c3e678d827b7cc2b7b19829e1ccb5be
 SHA1 (patch-outport.c) = e1c9dc0aea69c745719165d018970c2cbde93f4b
 SHA1 (patch-pacing.c) = 173871b66de7fc2b5d8e2aea7c6558f019674029
 SHA1 (patch-ptt.c) = 567612d9fa0a91dc75c1e618b29ca1d08bfa9ff5
 SHA1 (patch-rd__flags.c) = 508723a7b850511ece4589ca965fb255b6c0fc9d
 SHA1 (patch-repeater.c) = 70176b7b4116ae5180177fa145cc894a6adf3685
 SHA1 (patch-rptr__off.c) = 24a2c2f5954e643d070b318900f0f75a320108a0
 SHA1 (patch-save__mem.c) = 03b0c8d045c5c0f68b9fb852cdaaae03360dcf6d
 SHA1 (patch-splt__tog.c) = 9c72f0e5e490128ef9b89bc8a784c7befdcdc272
 SHA1 (patch-stat__out.c) = 0d37d831af8e9ba93ac9f3fdc1c6de8fed97dc61
 SHA1 (patch-stat__upd.c) = 6fc172ab3cc3ee87d3af642a1391f7c59689693b
 SHA1 (patch-step.c) = 84bba0e93c32eb80a77cc5e57aedf9b681432afb
 SHA1 (patch-strt__tun.c) = 11616e796046869b19962d010062991cdb634a41
 SHA1 (patch-tuner10.c) = 7f90b3efc9e2b30490ff03a7c417efacf156b671
 SHA1 (patch-vfo__2mem.c) = 6ffab76f4940e6b0b8a25301ee8c540cdaf5db1d
 SHA1 (patch-vfo__a2b.c) = 368821a1ff98e401061bcab886c9aa93e5f95fbe
 SHA1 (patch-vfo__ab.c) = 0c8a1c882236004dada2c2ccbba5a9c490bec2e7
 SHA1 (patch-wwv__find.c) = f74d7196362c0bbe8546937004815e119c6f53e5
 SHA1 (patch-yaesu.c) = 37e46559d06c50ba104a49fc5402c142fd2c9aa4

 @@ -1,26 +1,76 @@
-$NetBSD: patch-ad,v 1.7 2006/01/14 11:45:46 wulf Exp $
+$NetBSD: patch-ad,v 1.8 2012/10/24 15:38:00 joerg Exp $
---- main.c.orig	2004-07-27 11:56:47.000000000 +0930
+--- main.c.orig	2004-07-27 02:26:47.000000000 +0000
-+++ main.c	2006-01-14 22:59:42.000000000 +1030
++++ main.c
-@@ -5,7 +5,6 @@
+@@ -5,8 +5,13 @@
  #include <stdlib.h>
  #include <termios.h>
  #include <signal.h>
 -#include <asm/io.h>
- #include <config.h>
+-#include <config.h>
 +#include "config.h"
++
 +#include "yaesu.h"
++
 +static void bye_msg(void);
 +static int port_open(int, char*[]);
++
  float freq_to_change_to;
  char flag_data_return[5];
-@@ -100,29 +99,29 @@
+ char data_array[650];
@@ -24,34 +29,6 @@ int main(int argc, char* argv[]) {
      char flag_data_return[5];
      struct termios termattribs;
      struct termios *defaults_serial;
 -    extern splt_tog();
 -    extern freq_out();
 -    extern mem_rec();
 -    extern vfo_2mem();
 -    extern mem_hide();
 -    extern mem_2vfo();
 -    extern step();
 -    extern lock();
 -    extern vfo_ab();
 -    extern clar();
 -    extern ham_gen();
 -    extern ptt();
 -    extern tuner10();
 -    extern stat_up();
 -    extern bright();
 -    extern mode();
 -    extern strt_tun();
 -    extern meter_rd();
 -    extern rd_flags();
 -    extern rptr_off();
 -    extern reptear();
 -    extern ctcss();
 -    extern stat_out();
 -    extern aux();
 -    extern wwv_find();
 -    extern outport();
 -    void yaesu();
 -    void cleanup();
      signal(SIGINT, cleanup);
      yaesu_return = 1;
@@ -94,35 +71,35 @@ int main(int argc, char* argv[]) {
  /*
   *  This function returns the fd for the serial port.
   */
 -port_open(int argc, char* argv[]) {
 +static int port_open(int argc, char* argv[]) {
      int fdSer;
      if (argc == 2) {
         switch(argv[1][0]) {
               case '0':
 -             if ((fdSer = open("/dev/ttyS0", O_RDWR )) < 0) {
 -                perror("open of /dev/ttyS0 failed!!!\n");
 +             if ((fdSer = open("/dev/tty00", O_RDWR )) < 0) {
 +                perror("open of /dev/tty00 failed!!!\n");
                  exit(3);
+              }
               break;
               case '1':
 -             if ((fdSer = open("/dev/ttyS1", O_RDWR )) < 0) {
 @@ -38,49 +88,52 @@ $NetBSD: patch-ad,v 1.7 2006/01/14 11:45
 +                perror("open of /dev/tty02 failed");
                  exit(3);
+              }
               break;
               case '3':
 -             if ((fdSer = open("/dev/ttyS3", O_RDWR )) < 0) {
 -                perror("open of /dev/ttyS3 failed");
 +             if ((fdSer = open("/dev/tty03", O_RDWR )) < 0) {
 +                perror("open of /dev/tty03 failed");
                  exit(3);
+              }
               break;
-@@ -130,6 +129,15 @@
+@@ -130,6 +107,15 @@ port_open(int argc, char* argv[]) {
               printf("Invalid serial port number!!!\n  Remember:  com1 is 0, com2 is 1, etc.\n");
               return(-1);
+        }
 +    } else if (argc == 3) {
 +	if (strcmp("-p",argv[1]) != 0) {
 +		perror("Invalid flag");
 +		exit(3);
 +	}
 +   	if ((fdSer = open(argv[2], O_RDWR )) < 0) {
 +		perror("open of serial port failed");
 +		exit(3);
 +	}
      } else {
         printf("usage:  yaesu [port #]\n");
         exit(3);
-@@ -139,8 +147,21 @@
+@@ -137,10 +123,23 @@ port_open(int argc, char* argv[]) {
      return(fdSer);
  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 or packet:  KG0CQ@KF0UW.#NECO.USA.NOAM Having fun hamming, hope to catch you on the air!!!\n\n");
+-bye_msg() {
+-
-++printf("\n\n\
+-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");
 +static void bye_msg(void) {
 +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\

 @@ -1,14 +1,36 @@
-$NetBSD: patch-ae,v 1.2 2006/01/14 11:45:46 wulf Exp $
+$NetBSD: patch-ae,v 1.3 2012/10/24 15:38:00 joerg Exp $
---- meter_rd.c.orig	2004-07-27 11:57:32.000000000 +0930
+--- meter_rd.c.orig	2004-07-27 02:27:32.000000000 +0000
-+++ meter_rd.c	2006-01-14 23:05:46.000000000 +1030
++++ meter_rd.c
-@@ -33,7 +33,8 @@
+@@ -1,10 +1,8 @@
 -extern main();
 -extern flag_data_return[];
 -extern outport();
 +#include "yaesu.h"
  int meter_rd(int fdSer) {
    int opcode, tx_status, n;
 -  char meter_value[5];
 +  char meter_value[6];
     opcode = 250;
     rd_flags(fdSer);
@@ -13,7 +11,7 @@ int meter_rd(int fdSer) {
     if (tx_status != 1 && tx_status != 0) {
        printf("The tx_status bit value is incorrect.  Serious program error!!!\n");
 -      return;
 +      return -1;
     } else {
       opcode = 0x0f7;
+    }
@@ -33,7 +31,8 @@ int meter_rd(int fdSer) {
      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 [33m[01m%x. [00mRange is 0..0ffh.\n", meter_value[3]);
+   }

 @@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.8 2012/10/03 13:01:46 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/24 15:37:58 joerg Exp $
+#
 DISTNAME=	yaesu-0.13
 PKGREVISION=	1
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/ham/}
 MAINTAINER=	dawszy@arhea.net
 #HOMEPAGE=	not known
 COMMENT=	Control interface for Yaesu FT-890 HF transceiver
 WRKSRC=		${WRKDIR}/yaesu
 NO_CONFIGURE=	yes
 INSTALLATION_DIRS=	bin share/doc
 do-install: