6 files changed, 12 insertions, 22 deletions

diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index bbd8df22a70a..1d719e582399 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hamlib
-PORTVERSION=	3.0.1
+PORTVERSION=	3.1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 
diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo
index 9a11dacf681a..46781eb7bcc7 100644
--- a/comms/hamlib/distinfo
+++ b/comms/hamlib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (hamlib-3.0.1.tar.gz) = 3fec97ea326d02aa8f35834c4af34194a3f544e6212f391397d788c566b44e32
-SIZE (hamlib-3.0.1.tar.gz) = 2074254
+TIMESTAMP = 1483233776
+SHA256 (hamlib-3.1.tar.gz) = 682304c3e88ff6ccfd6a5fc28b33bcc95d2d0a54321973fef015ff62570c994e
+SIZE (hamlib-3.1.tar.gz) = 2130615
diff --git a/comms/hamlib/files/patch-bindings_Makefile.am b/comms/hamlib/files/patch-bindings_Makefile.am
index fb78f63c0dfa..1308c30953a6 100644
--- a/comms/hamlib/files/patch-bindings_Makefile.am
+++ b/comms/hamlib/files/patch-bindings_Makefile.am
@@ -1,11 +1,11 @@
---- bindings/Makefile.am.orig	2015-09-25 20:06:24 UTC
+--- bindings/Makefile.am.orig	2017-01-01 01:25:57 UTC
 +++ bindings/Makefile.am
 @@ -120,7 +120,7 @@ MOSTLYCLEANFILES+= hamlibtcl_wrap.c pkgI
  
  tcl_ltlib = hamlibtcl.la
  
 -tcldir = $(libdir)/tcl/Hamlib
-+tcldir = %%TCL_LIBDIR%%/Hamlib
++tcldir = /usr/local/lib/tcl8.6/Hamlib
  
  PKG_VER=@ABI_VERSION@.@ABI_REVISION@
  DLL=hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
diff --git a/comms/hamlib/files/patch-bindings_rotator.swg b/comms/hamlib/files/patch-bindings_rotator.swg
deleted file mode 100644
index 334784a668e4..000000000000
--- a/comms/hamlib/files/patch-bindings_rotator.swg
+++ /dev/null
@@ -1,11 +0,0 @@
---- bindings/rotator.swg.orig	2015-09-19 12:08:54 UTC
-+++ bindings/rotator.swg
-@@ -29,7 +29,7 @@ typedef struct Rot {
- 	int do_exception;
- } Rot;
- 
--typedef const char * const_char_string;
-+//typedef const char * const_char_string;
- 
- %}
- 
diff --git a/comms/hamlib/files/patch-hamlib.pc.in b/comms/hamlib/files/patch-hamlib.pc.in
index a71df65875a1..a5e20151ff44 100644
--- a/comms/hamlib/files/patch-hamlib.pc.in
+++ b/comms/hamlib/files/patch-hamlib.pc.in
@@ -1,4 +1,4 @@
---- hamlib.pc.in.orig	2015-10-02 13:17:24 UTC
+--- hamlib.pc.in.orig	2016-12-31 20:01:25 UTC
 +++ hamlib.pc.in
 @@ -7,7 +7,6 @@ Name: @PACKAGE_NAME@
  Description: Library to control radio and rotator equipment.
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index 20bbda1e51f4..dee4bb96d8ad 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -16,13 +16,13 @@ lib/libhamlib++.a
 lib/libhamlib++.la
 lib/libhamlib++.so
 lib/libhamlib++.so.2
-lib/libhamlib++.so.2.1.0
-lib/libhamlib.so.2.1.0
+lib/libhamlib++.so.2.1.1
+lib/libhamlib.so.2.1.1
 lib/libhamlib.a
 lib/libhamlib.la
 lib/libhamlib.so
 lib/libhamlib.so.2
-lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-3.0.so
+lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-%%VER%%.so
 lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la
 lib/tcl%%TCL_VER%%/Hamlib/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a
@@ -53,9 +53,9 @@ share/aclocal/hamlib.m4
 %%PORTDOCS%%%%DOCSDIR%%/Hamlib_design.png
 %%PORTDOCS%%%%DOCSDIR%%/hamlib.html
 man/man1/rigctl.1.gz
+man/man1/rigctld.1.gz
 man/man1/rigmem.1.gz
 man/man1/rigsmtr.1.gz
 man/man1/rigswr.1.gz
 man/man1/rotctl.1.gz
-man/man8/rigctld.8.gz
-man/man8/rotctld.8.gz
+man/man1/rotctld.1.gz