Update hamlib to 1.2.0: Support for additional radios and many bug fixes

5 files changed, 35 insertions, 47 deletions

diff --git a/ham/hamlib/Makefile b/ham/hamlib/Makefile
index 8169733e2ad..d393c690a8d 100644
--- a/ham/hamlib/Makefile
+++ b/ham/hamlib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/18 04:00:44 wulf Exp $
 #
 
-DISTNAME=	hamlib-1.1.4
+DISTNAME=	hamlib-1.2.0
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hamlib/}
+#EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	wulf@NetBSD.org
 HOMEPAGE=	http://hamlib.sourceforge/net/
diff --git a/ham/hamlib/PLIST b/ham/hamlib/PLIST
index 88862d23d91..a81d6bcfcbc 100644
--- a/ham/hamlib/PLIST
+++ b/ham/hamlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:06 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/18 04:00:44 wulf Exp $
 include/hamlib/rig.h
 include/hamlib/riglist.h
 include/hamlib/rig_dll.h
@@ -6,8 +6,8 @@ include/hamlib/rotator.h
 include/hamlib/rotlist.h
 include/hamlib/rigclass.h
 include/hamlib/rotclass.h
-lib/libhamlib-1.1.4.so.1.0
-lib/libhamlib-1.1.4.so.1
+lib/libhamlib-1.2.0.so.2.0
+lib/libhamlib-1.2.0.so.2
 lib/libhamlib.la
 lib/libhamlib.so
 lib/libhamlib.a
@@ -53,14 +53,38 @@ lib/hamlib-dummy.a
 lib/hamlib-easycomm.la
 lib/hamlib-easycomm.so
 lib/hamlib-easycomm.a
+lib/hamlib-flexradio.la
+lib/hamlib-flexradio.so
+lib/hamlib-flexradio.a
+lib/hamlib-fodtrack.la
+lib/hamlib-fodtrack.so
+lib/hamlib-fodtrack.a
+lib/hamlib-lowe.la
+lib/hamlib-lowe.so
+lib/hamlib-lowe.a
+lib/hamlib-microtune.la
+lib/hamlib-microtune.so
+lib/hamlib-microtune.a
+lib/hamlib-rft.la
+lib/hamlib-rft.so
+lib/hamlib-rft.a
+lib/hamlib-rpcrot.la
+lib/hamlib-rpcrot.so
+lib/hamlib-rpcrot.a
+lib/hamlib-sartek.la
+lib/hamlib-sartek.so
+lib/hamlib-sartek.a
+lib/hamlib-tapr.la
+lib/hamlib-tapr.so
+lib/hamlib-tapr.a
 lib/hamlib-rotorez.la
 lib/hamlib-rotorez.so
 lib/hamlib-rotorez.a
 lib/libhamlib++.la
 lib/libhamlib++.so
 lib/libhamlib++.a
-lib/libhamlib++-1.1.4.so.1
-lib/libhamlib++-1.1.4.so.1.0
+lib/libhamlib++-1.2.0.so.2
+lib/libhamlib++-1.2.0.so.2.0
 bin/rigctl
 bin/rotctl
 sbin/rpc.rigd
diff --git a/ham/hamlib/distinfo b/ham/hamlib/distinfo
index 7db9aa6553f..dbd6bd9b538 100644
--- a/ham/hamlib/distinfo
+++ b/ham/hamlib/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/07/24 06:40:54 jmc Exp $
+$NetBSD: distinfo,v 1.3 2004/02/18 04:00:44 wulf Exp $
 
-SHA1 (hamlib-1.1.4.tar.gz) = da9184d78c97cf6a9f290a0f439ae46feabb1d82
-Size (hamlib-1.1.4.tar.gz) = 1246501 bytes
-SHA1 (patch-aa) = 4f36fc87cf71213c142d6504afef64155a5b7d50
-SHA1 (patch-ab) = f689591ff1be703929af03cec6b513d6bfa328d4
+SHA1 (hamlib-1.2.0.tar.gz) = 88b58bee9e65a2030961fe8f7f4a8dbb28689d61
+Size (hamlib-1.2.0.tar.gz) = 1300085 bytes
 SHA1 (patch-ac) = e4e9497186d5d8803a0fdb9993ec8ef664836abc
 SHA1 (patch-ad) = d94a0b7eaed4130a9513431bbadb4274429ad313
diff --git a/ham/hamlib/patches/patch-aa b/ham/hamlib/patches/patch-aa
deleted file mode 100644
index b28bc87b85d..00000000000
--- a/ham/hamlib/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/26 22:42:23 wulf Exp $
-
---- src/event.c.orig	2003-06-22 16:01:28.000000000 +0930
-+++ src/event.c	2003-06-22 16:04:30.000000000 +0930
-@@ -74,7 +74,7 @@
- 
- 	sigemptyset(&act.sa_mask);
- 
--#ifdef HAVE_SIGINFO_T
-+#if defined(HAVE_SIGINFO_T) && defined(SA_SIGINFO)
- 	act.sa_flags = SA_SIGINFO;
- #else
- 	act.sa_flags = 0;
diff --git a/ham/hamlib/patches/patch-ab b/ham/hamlib/patches/patch-ab
deleted file mode 100644
index 0d26a2dab38..00000000000
--- a/ham/hamlib/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/26 22:42:23 wulf Exp $
-
---- rpcrig/rpcrig.x.orig	2003-06-26 21:44:28.000000000 +0930
-+++ rpcrig/rpcrig.x	2003-06-26 21:44:58.000000000 +0930
-@@ -31,7 +31,7 @@
- 
- typedef unsigned int model_x;
- typedef int vfo_x;
--typedef hyper freq_x;
-+typedef longlong_t freq_x;
- typedef unsigned int rmode_x;
- typedef int pbwidth_x;
- typedef unsigned long split_x;
-@@ -39,7 +39,7 @@
- typedef int dcd_x;
- typedef long vfo_op_x;
- typedef long shortfreq_x;
--typedef unsigned hyper setting_x;
-+typedef u_longlong_t setting_x;
- typedef long ant_x;
- typedef long ann_x;
- typedef int rptr_shift_x;