5 files changed, 60 insertions, 55 deletions
diff --git a/ham/hamlib/Makefile b/ham/hamlib/Makefile
index cd0e38d2720..3d1e46e7d45 100644
--- a/ham/hamlib/Makefile
+++ b/ham/hamlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2011/02/28 14:52:52 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2012/06/11 00:17:58 gdt Exp $
 #
 
-DISTNAME=	hamlib-1.2.12
+DISTNAME=	hamlib-1.2.15.1
 #PKGREVISION=	1
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hamlib/}
@@ -29,4 +29,5 @@ CONFIGURE_ENV+=	PYTHON=/nonexistent
 
 INSTALLATION_DIRS=	include/hamlib
 
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/hamlib/PLIST b/ham/hamlib/PLIST
index ffcf4833155..2bb8d0cce74 100644
--- a/ham/hamlib/PLIST
+++ b/ham/hamlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2010/11/04 13:34:46 asau Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/06/11 00:17:58 gdt Exp $
 bin/rigctl
 bin/rigctld
 bin/rigmem
@@ -13,40 +13,45 @@ include/hamlib/riglist.h
 include/hamlib/rotator.h
 include/hamlib/rotclass.h
 include/hamlib/rotlist.h
-lib/hamlib-alinco.la
-lib/hamlib-aor.la
-lib/hamlib-ars.la
-lib/hamlib-drake.la
-lib/hamlib-dummy.la
-lib/hamlib-easycomm.la
-lib/hamlib-flexradio.la
-lib/hamlib-fodtrack.la
-lib/hamlib-gs232a.la
-lib/hamlib-heathkit.la
-lib/hamlib-icom.la
-lib/hamlib-jrc.la
-lib/hamlib-kachina.la
-lib/hamlib-kenwood.la
-lib/hamlib-kit.la
-lib/hamlib-lowe.la
-lib/hamlib-m2.la
-lib/hamlib-pcr.la
-lib/hamlib-racal.la
-lib/hamlib-rft.la
-lib/hamlib-rotorez.la
-lib/hamlib-rpcrig.la
-lib/hamlib-rpcrot.la
-lib/hamlib-rs.la
-lib/hamlib-sartek.la
-lib/hamlib-skanti.la
-lib/hamlib-spid.la
-lib/hamlib-tapr.la
-lib/hamlib-tentec.la
-lib/hamlib-tuner.la
-lib/hamlib-uniden.la
-lib/hamlib-winradio.la
-lib/hamlib-wj.la
-lib/hamlib-yaesu.la
+lib/hamlib/hamlib-adat.la
+lib/hamlib/hamlib-alinco.la
+lib/hamlib/hamlib-amsat.la
+lib/hamlib/hamlib-aor.la
+lib/hamlib/hamlib-ars.la
+lib/hamlib/hamlib-celestron.la
+lib/hamlib/hamlib-drake.la
+lib/hamlib/hamlib-dummy.la
+lib/hamlib/hamlib-easycomm.la
+lib/hamlib/hamlib-flexradio.la
+lib/hamlib/hamlib-fodtrack.la
+lib/hamlib/hamlib-gs232a.la
+lib/hamlib/hamlib-heathkit.la
+lib/hamlib/hamlib-icom.la
+lib/hamlib/hamlib-jrc.la
+lib/hamlib/hamlib-kachina.la
+lib/hamlib/hamlib-kenwood.la
+lib/hamlib/hamlib-kit.la
+lib/hamlib/hamlib-lowe.la
+lib/hamlib/hamlib-m2.la
+lib/hamlib/hamlib-pcr.la
+lib/hamlib/hamlib-prm80.la
+lib/hamlib/hamlib-racal.la
+lib/hamlib/hamlib-rft.la
+lib/hamlib/hamlib-rotorez.la
+lib/hamlib/hamlib-rpcrig.la
+lib/hamlib/hamlib-rpcrot.la
+lib/hamlib/hamlib-rs.la
+lib/hamlib/hamlib-sartek.la
+lib/hamlib/hamlib-skanti.la
+lib/hamlib/hamlib-spid.la
+lib/hamlib/hamlib-tapr.la
+lib/hamlib/hamlib-tentec.la
+lib/hamlib/hamlib-ts7400.la
+lib/hamlib/hamlib-tuner.la
+lib/hamlib/hamlib-uniden.la
+lib/hamlib/hamlib-winradio.la
+lib/hamlib/hamlib-wj.la
+lib/hamlib/hamlib-yaesu.la
 lib/libhamlib++.la
 lib/libhamlib.la
 lib/pkgconfig/hamlib.pc
diff --git a/ham/hamlib/distinfo b/ham/hamlib/distinfo
index 81b3ba76906..b41763e1ebe 100644
--- a/ham/hamlib/distinfo
+++ b/ham/hamlib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2010/11/04 13:34:46 asau Exp $
+$NetBSD: distinfo,v 1.15 2012/06/11 00:17:58 gdt Exp $
 
-SHA1 (hamlib-1.2.12.tar.gz) = 94115df13eae3e1046911cce585503ff49a8dcbd
-RMD160 (hamlib-1.2.12.tar.gz) = 9216b1801b458968d299d4c4e2141a4b15df04d2
-Size (hamlib-1.2.12.tar.gz) = 1860387 bytes
-SHA1 (patch-ac) = e4e9497186d5d8803a0fdb9993ec8ef664836abc
-SHA1 (patch-ad) = d94a0b7eaed4130a9513431bbadb4274429ad313
+SHA1 (hamlib-1.2.15.1.tar.gz) = eb91fa97b4deef6fb43062ce2838982bcfabbbdd
+RMD160 (hamlib-1.2.15.1.tar.gz) = 9837780f0f9e86cb0fffcab44aa3a89fb45a6ebd
+Size (hamlib-1.2.15.1.tar.gz) = 1674884 bytes
+SHA1 (patch-ac) = 8906067d2fc6fd1f8fc73c08da58d35baea95d94
+SHA1 (patch-ad) = 1b89f0cd4f663df0229d86703d08b5ddce69688c
diff --git a/ham/hamlib/patches/patch-ac b/ham/hamlib/patches/patch-ac
index 1a5bbe37163..a6224c567b9 100644
--- a/ham/hamlib/patches/patch-ac
+++ b/ham/hamlib/patches/patch-ac
@@ -1,12 +1,11 @@
-$NetBSD: patch-ac,v 1.1 2003/07/24 06:40:55 jmc Exp $
+$NetBSD: patch-ac,v 1.2 2012/06/11 00:17:58 gdt Exp $
 
---- rpcrig/rpcrigd.c.orig	Mon Dec 16 22:06:54 2002
-+++ rpcrig/rpcrigd.c	Thu Jul 24 00:55:52 2003
-@@ -45,7 +45,12 @@
+--- rpcrig/rpcrigd.c.orig	2012-01-08 02:53:57.000000000 +0000
++++ rpcrig/rpcrigd.c
+@@ -43,6 +43,12 @@
  
  #include <hamlib/rig.h>
  
--
 +#ifdef __NetBSD__
 +#include <sys/param.h>
 +#if (__NetBSD_Version__ < 106210000)
@@ -14,5 +13,5 @@ $NetBSD: patch-ac,v 1.1 2003/07/24 06:40:55 jmc Exp $
 +#endif
 +#endif
  
- /* 
-  * Prototypes
+ 
+ /*
diff --git a/ham/hamlib/patches/patch-ad b/ham/hamlib/patches/patch-ad
index adbabde68f0..6e280cd036c 100644
--- a/ham/hamlib/patches/patch-ad
+++ b/ham/hamlib/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2003/07/24 06:40:55 jmc Exp $
+$NetBSD: patch-ad,v 1.2 2012/06/11 00:17:58 gdt Exp $
 
---- rpcrot/rpcrotd.c.orig	Thu Jul 24 01:04:54 2003
-+++ rpcrot/rpcrotd.c	Thu Jul 24 01:05:25 2003
-@@ -45,6 +45,12 @@
+--- rpcrot/rpcrotd.c.orig	2012-01-08 02:54:30.000000000 +0000
++++ rpcrot/rpcrotd.c
+@@ -43,6 +43,12 @@
  
  #include <hamlib/rotator.h>
  
@@ -13,5 +13,5 @@ $NetBSD: patch-ad,v 1.1 2003/07/24 06:40:55 jmc Exp $
 +#endif
 +#endif
  
- /* 
+ /*
   * Prototypes