The Hamlib Group is pleased to announce the release of Hamlib 3.0.

This release of Hamlib introduces a change to the version scheme.
Essentially, the leading '1.' characters have been dropped so '3.0' is a
direct follow on from the '1.2.' releases and has been configured to be
ABI compatible with the '1.2.' releases.

Bug fixes to this release will start with '3.0.1' through '3.0.n'.

The next releases will be '3.1' through '3.n' until the next major
release.
Files are hosted at the Hamlib prjoect page at SourceForge.net:

https://sourceforge.net/projects/hamlib/files/hamlib/3.0/

The changes include:

Version 3.0
        2015-09-20
        * Kill RPC backends and rpc.rigd/rpc.rotd
        * Remove -e|--end-marker option from rigctld and rotctld
        * Build system updates--remove obsolete macros, autogen.sh now
                runs autoreconf to invoke Autotools to bootstrap the build
                system, libltdl is installed into the source tree as a part
                of the build system bootstrap and is included in the source
                tarball, ABI version is set to be compatible with the 1.2
                series, all Autotools installed files are copied rather than
                symlinked and put in the build-aux directory, building
                rigmem and rigmatrix are now user selectable at configure
                run time, building static libraries are disabled by default.
                Fixed TCL binding installation, fixed Perl binding build so it
                is not invoked by 'make dist' and clean up build files.  Cleaned
                up bindings builds to occur in alphabetical order.  Use new
                ax_pkg_swig macro and update ax_python_devel macro.  Test for
                presence of pkg-config before testing for pkg-config use.
        * Implement new RIT/XIT activation/deactivation through rig_get/set_func
+()
        * IC-PCR1500/2500 default write_delay to 0, IC-746/756, IC-PCR8500
                fixes, pcr.c, pcr1500.c: Add DSP support.  TNX Paul, KE7ZZ
        * WinRadio G313 updates.  TNX Julian Campbel
        * Readline editing and history support added to rigctl interactive
                mode.  Implement options for reading and writing history file.
        * Readline editing and history support added to rotctl interactive
                mode.  Implement options for reading and writing history file.
        * A new manual draft written in Texinfo added.  Both GNU Info and single
                HTML files are built and distributed, requires makeinfo.
        * Android build system support.  See android/README.android.  Android
                Makefile fragments are included in source tarballs.
        * Monolithic library, thanks to Remi Chateauneu for the majority of
                the work!  This allows enabling of a single static library so
                static libs are enabled by default.  Removes dependency on libltdl.
        * Fixes to easycomm, TNX Steve AI4QR.
        * Fixes to port handling allowing PTT and CAT on the same port.  TNX
                Bill, G4WJS.
        * New Peaberry models V1 and V2 added to kit backend.  TNX ON8VQ
                and R2AEE.
        * New IC-7100 model.  TNX Martin, CT1IQI.
        * Use AC_CHECK_LIB macro to search for libusb rather than rely on
            pkg-config.  Preserve environment variables LIBUSB_CFLAGS and
            LIBUSB_LIBS as user precious variables.  Two features,
            --with-xml-support and --enable-usrp still rely on pkg-config so
            only invoke pkg-config when either or both of these features are
            selected.  Only the Winradio g313 model uses libdl so test for it
            only when Winradio backend is enabled.
        * New IC-M700PRO, IC-M710, IC-M802.
        * New Icom ID-5100 model.
        * New rotor, cnctrk by KI4SBL
        * Many backend fixes and updates from many contributors (see Git
          log for complete details).

10 files changed, 74 insertions, 203 deletions

diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 4746252d5701..db09d097a8aa 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hamlib
-PORTVERSION=	1.2.15.3
-PORTREVISION=	4
+PORTVERSION=	3.0
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 
@@ -15,28 +14,28 @@ LICENSE=	LGPL20
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		libtool:keepla pathfix perl5 pkgconfig python shebangfix tcl
+USES=		autoreconf libtool:keepla pathfix perl5 pkgconfig python shebangfix tcl
 SHEBANG_FILES=	bindings/perltest.pl
 USE_PERL5=	build run
 USE_GNOME=	libxml2
-USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
+# $TCL_INCLUDE_SPEC
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-perl-binding \
-		--enable-tcl-binding --with-tcl=${TCL_LIBDIR} \
+CONFIGURE_ARGS= --with-perl-binding \
+		--with-tcl-binding --with-tcl=${TCL_LIBDIR} \
 		--with-python-binding --without-rigmatrix
 PLIST_SUB=	VER=${PORTVERSION} TCL_VER=${TCL_VER}
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \
-		-e 's|%%TCL_LIBDIR%%|${TCL_LIBDIR}/hamlib|g' \
-		${WRKSRC}/bindings/Makefile.in
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \
+		-e 's|%%TCL_LIBDIR%%|${TCL_LIBDIR}|g' \
+		${WRKSRC}/bindings/Makefile.am
+	@${REINPLACE_CMD} -e 's|%%TCLSH%%|${TCLSH}|g' \
+		${WRKSRC}/bindings/tcltest.tcl
 post-build:
 	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \
 		${STAGEDIR}${WRKSRC}/bindings/Hamlib-pl.mk
diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo
index 0b6d14432331..f3854dab5cd7 100644
--- a/comms/hamlib/distinfo
+++ b/comms/hamlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hamlib-1.2.15.3.tar.gz) = a2ca4549e4fd99d6e5600e354ebcb57502611aa63c6921c1b8a825289833f75e
-SIZE (hamlib-1.2.15.3.tar.gz) = 1675879
+SHA256 (hamlib-3.0.tar.gz) = bc16546161a47e21a44a710a40aeb0bce478f112bffcc4f253eb27e150f1c21e
+SIZE (hamlib-3.0.tar.gz) = 2074188
diff --git a/comms/hamlib/files/patch-Makefile.am b/comms/hamlib/files/patch-Makefile.am
new file mode 100644
index 000000000000..85ed5161ec6b
--- /dev/null
+++ b/comms/hamlib/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2015-09-19 12:08:54 UTC
++++ Makefile.am
+@@ -3,7 +3,7 @@
+ aclocaldir = $(datadir)/aclocal
+ aclocal_DATA = hamlib.m4
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = hamlib.pc
+ 
+ EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in README.developer \
diff --git a/comms/hamlib/files/patch-bindings_Makefile.am b/comms/hamlib/files/patch-bindings_Makefile.am
new file mode 100644
index 000000000000..fb78f63c0dfa
--- /dev/null
+++ b/comms/hamlib/files/patch-bindings_Makefile.am
@@ -0,0 +1,11 @@
+--- bindings/Makefile.am.orig	2015-09-25 20:06:24 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
+ 
+ PKG_VER=@ABI_VERSION@.@ABI_REVISION@
+ DLL=hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
diff --git a/comms/hamlib/files/patch-bindings_Makefile.in b/comms/hamlib/files/patch-bindings_Makefile.in
deleted file mode 100644
index 72c4aca8755b..000000000000
--- a/comms/hamlib/files/patch-bindings_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- bindings/Makefile.in.orig	2012-11-01 16:28:09.000000000 -0500
-+++ bindings/Makefile.in	2012-11-02 18:27:34.000000000 -0500
-@@ -327,7 +327,7 @@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
- pyexecdir = @pyexecdir@
--pythondir = @pythondir@
-+pythondir = %%PYTHON_SITELIBDIR%%
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-@@ -347,7 +347,7 @@
- 	hamlibperl_wrap.c Hamlib.pm Hamlib.bs
- AM_CFLAGS = -fno-strict-aliasing
- @ENABLE_TCL_TRUE@tcl_ltlib = hamlibtcl.la
--@ENABLE_TCL_TRUE@tcldir = $(prefix)/lib/tcl
-+@ENABLE_TCL_TRUE@tcldir = %%TCL_LIBDIR%%
- @ENABLE_TCL_TRUE@PKG_VER = 1.0
- @ENABLE_TCL_TRUE@DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
- @ENABLE_TCL_TRUE@nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
diff --git a/comms/hamlib/files/patch-bindings_rotator.swg b/comms/hamlib/files/patch-bindings_rotator.swg
new file mode 100644
index 000000000000..334784a668e4
--- /dev/null
+++ b/comms/hamlib/files/patch-bindings_rotator.swg
@@ -0,0 +1,11 @@
+--- 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-configure.ac b/comms/hamlib/files/patch-configure.ac
deleted file mode 100644
index b661a8a5dcd7..000000000000
--- a/comms/hamlib/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2015-01-25 12:10:35 UTC
-+++ configure.ac
-@@ -278,7 +278,7 @@ BINDING_LIB_TARGETS=""
- dnl Check if cxx-binding not wanted, default is to build it
- 
- # TODO: check whether CXX is functional
--AC_CHECK_PROG(cf_with_cxx, "${CXX}", [yes], [no])
-+AC_PATH_PROG(cf_with_cxx, "${CXX}", [yes], [no])
- 
- AC_MSG_CHECKING(whether to build C++ binding and demo)
- AC_ARG_WITH(cxx-binding,
diff --git a/comms/hamlib/files/patch-hamlib.pc.in b/comms/hamlib/files/patch-hamlib.pc.in
new file mode 100644
index 000000000000..a71df65875a1
--- /dev/null
+++ b/comms/hamlib/files/patch-hamlib.pc.in
@@ -0,0 +1,10 @@
+--- hamlib.pc.in.orig	2015-10-02 13:17:24 UTC
++++ hamlib.pc.in
+@@ -7,7 +7,6 @@ Name: @PACKAGE_NAME@
+ Description: Library to control radio and rotator equipment.
+ URL: @PACKAGE_URL@
+ Version: @PACKAGE_VERSION@
+-Requires.private: @LIBUSB@
+ Cflags: -I${includedir} @PTHREAD_CFLAGS@
+ Libs: -L${libdir} -lhamlib
+ Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
diff --git a/comms/hamlib/files/patch-src_Makefile.in b/comms/hamlib/files/patch-src_Makefile.in
deleted file mode 100644
index a43c47667439..000000000000
--- a/comms/hamlib/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig	2012-08-05 09:10:08.000000000 -0500
-+++ src/Makefile.in	2012-08-07 06:59:39.000000000 -0500
-@@ -103,7 +103,7 @@
- libhamlib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhamlib_la_CFLAGS) \
- 	$(CFLAGS) $(libhamlib_la_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -I/usr/local/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
-@@ -193,7 +193,7 @@
- LDFLAGS = @LDFLAGS@
- LIBLTDL = @LIBLTDL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = -L%%LOCALBASE%%/lib
- LIBTOOL = @LIBTOOL@
- LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
- LIBUSB_LIBS = @LIBUSB_LIBS@
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index 929453b099ce..b02432bce53e 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -12,151 +12,31 @@ include/hamlib/riglist.h
 include/hamlib/rotator.h
 include/hamlib/rotclass.h
 include/hamlib/rotlist.h
-lib/hamlib/hamlib-adat.a
-lib/hamlib/hamlib-adat.la
-lib/hamlib/hamlib-adat.so
-lib/hamlib/hamlib-alinco.a
-lib/hamlib/hamlib-alinco.la
-lib/hamlib/hamlib-alinco.so
-lib/hamlib/hamlib-aor.a
-lib/hamlib/hamlib-aor.la
-lib/hamlib/hamlib-aor.so
-lib/hamlib/hamlib-amsat.a
-lib/hamlib/hamlib-amsat.la
-lib/hamlib/hamlib-amsat.so
-lib/hamlib/hamlib-ars.a
-lib/hamlib/hamlib-ars.la
-lib/hamlib/hamlib-ars.so
-lib/hamlib/hamlib-celestron.a
-lib/hamlib/hamlib-celestron.la
-lib/hamlib/hamlib-celestron.so
-lib/hamlib/hamlib-drake.a
-lib/hamlib/hamlib-drake.la
-lib/hamlib/hamlib-drake.so
-lib/hamlib/hamlib-dummy.a
-lib/hamlib/hamlib-dummy.la
-lib/hamlib/hamlib-dummy.so
-lib/hamlib/hamlib-easycomm.a
-lib/hamlib/hamlib-easycomm.la
-lib/hamlib/hamlib-easycomm.so
-lib/hamlib/hamlib-flexradio.a
-lib/hamlib/hamlib-flexradio.la
-lib/hamlib/hamlib-flexradio.so
-lib/hamlib/hamlib-fodtrack.a
-lib/hamlib/hamlib-fodtrack.la
-lib/hamlib/hamlib-fodtrack.so
-lib/hamlib/hamlib-gs232a.so
-lib/hamlib/hamlib-gs232a.la
-lib/hamlib/hamlib-gs232a.a
-lib/hamlib/hamlib-heathkit.so
-lib/hamlib/hamlib-heathkit.la
-lib/hamlib/hamlib-heathkit.a
-lib/hamlib/hamlib-icom.a
-lib/hamlib/hamlib-icom.la
-lib/hamlib/hamlib-icom.so
-lib/hamlib/hamlib-jrc.a
-lib/hamlib/hamlib-jrc.la
-lib/hamlib/hamlib-jrc.so
-lib/hamlib/hamlib-kachina.a
-lib/hamlib/hamlib-kachina.la
-lib/hamlib/hamlib-kachina.so
-lib/hamlib/hamlib-kenwood.a
-lib/hamlib/hamlib-kenwood.la
-lib/hamlib/hamlib-kenwood.so
-lib/hamlib/hamlib-kit.a
-lib/hamlib/hamlib-kit.la
-lib/hamlib/hamlib-kit.so
-lib/hamlib/hamlib-lowe.a
-lib/hamlib/hamlib-lowe.la
-lib/hamlib/hamlib-lowe.so
-lib/hamlib/hamlib-m2.a
-lib/hamlib/hamlib-m2.la
-lib/hamlib/hamlib-m2.so
-lib/hamlib/hamlib-pcr.a
-lib/hamlib/hamlib-pcr.la
-lib/hamlib/hamlib-pcr.so
-lib/hamlib/hamlib-prm80.a
-lib/hamlib/hamlib-prm80.la
-lib/hamlib/hamlib-prm80.so
-lib/hamlib/hamlib-racal.a
-lib/hamlib/hamlib-racal.la
-lib/hamlib/hamlib-racal.so
-lib/hamlib/hamlib-rft.a
-lib/hamlib/hamlib-rft.la
-lib/hamlib/hamlib-rft.so
-lib/hamlib/hamlib-rotorez.a
-lib/hamlib/hamlib-rotorez.la
-lib/hamlib/hamlib-rotorez.so
-lib/hamlib/hamlib-rpcrig.a
-lib/hamlib/hamlib-rpcrig.la
-lib/hamlib/hamlib-rpcrig.so
-lib/hamlib/hamlib-rpcrot.a
-lib/hamlib/hamlib-rpcrot.la
-lib/hamlib/hamlib-rpcrot.so
-lib/hamlib/hamlib-rs.a
-lib/hamlib/hamlib-rs.la
-lib/hamlib/hamlib-rs.so
-lib/hamlib/hamlib-sartek.a
-lib/hamlib/hamlib-sartek.la
-lib/hamlib/hamlib-sartek.so
-lib/hamlib/hamlib-skanti.a
-lib/hamlib/hamlib-skanti.la
-lib/hamlib/hamlib-skanti.so
-lib/hamlib/hamlib-spid.a
-lib/hamlib/hamlib-spid.la
-lib/hamlib/hamlib-spid.so
-lib/hamlib/hamlib-tapr.a
-lib/hamlib/hamlib-tapr.la
-lib/hamlib/hamlib-tapr.so
-lib/hamlib/hamlib-tentec.a
-lib/hamlib/hamlib-tentec.la
-lib/hamlib/hamlib-tentec.so
-lib/hamlib/hamlib-ts7400.a
-lib/hamlib/hamlib-ts7400.la
-lib/hamlib/hamlib-ts7400.so
-lib/hamlib/hamlib-tuner.a
-lib/hamlib/hamlib-tuner.la
-lib/hamlib/hamlib-tuner.so
-lib/hamlib/hamlib-uniden.a
-lib/hamlib/hamlib-uniden.la
-lib/hamlib/hamlib-uniden.so
-lib/hamlib/hamlib-winradio.a
-lib/hamlib/hamlib-winradio.la
-lib/hamlib/hamlib-winradio.so
-lib/hamlib/hamlib-wj.a
-lib/hamlib/hamlib-wj.la
-lib/hamlib/hamlib-wj.so
-lib/hamlib/hamlib-yaesu.a
-lib/hamlib/hamlib-yaesu.la
-lib/hamlib/hamlib-yaesu.so
-lib/hamlibtcl-1.0.so
-lib/hamlibtcl.a
-lib/hamlibtcl.la
-lib/hamlibtcl.so
-lib/tcl%%TCL_VER%%/hamlib/pkgIndex.tcl
-lib/libhamlib++.so
-lib/libhamlib++.so.2
-lib/libhamlib++.so.2.0.16
+info/hamlib.info
 lib/libhamlib++.a
 lib/libhamlib++.la
-lib/libhamlib.so
-lib/libhamlib.so.2
-lib/libhamlib.so.2.0.16
+lib/libhamlib++.so
+lib/libhamlib++.so.2
+lib/libhamlib++.so.2.1.0
+lib/libhamlib.so.2.1.0
 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.la
+lib/tcl%%TCL_VER%%/Hamlib/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a
+lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so
 libdata/pkgconfig/hamlib.pc
-sbin/rpc.rigd
-sbin/rpc.rotd
 share/aclocal/hamlib.m4
-%%SITE_ARCH%%/auto/Hamlib/Hamlib.so
 %%SITE_ARCH%%/Hamlib.pm
+%%SITE_ARCH%%/auto/Hamlib/Hamlib.so
 %%SITE_ARCH%%/perltest.pl
-%%PYTHON_SITELIBDIR%%/_Hamlib.so
-%%PYTHON_SITELIBDIR%%/_Hamlib.la
-%%PYTHON_SITELIBDIR%%/_Hamlib.a
 %%PYTHON_SITELIBDIR%%/Hamlib.py
-%%PYTHON_SITELIBDIR%%/Hamlib.pyc
-%%PYTHON_SITELIBDIR%%/Hamlib.pyo
+%%PYTHON_SITELIBDIR%%/_Hamlib.a
+%%PYTHON_SITELIBDIR%%/_Hamlib.la
+%%PYTHON_SITELIBDIR%%/_Hamlib.so
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
@@ -169,12 +49,12 @@ share/aclocal/hamlib.m4
 %%PORTDOCS%%%%DOCSDIR%%/README.betatester
 %%PORTDOCS%%%%DOCSDIR%%/README.win32
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/Hamlib_design.png
+%%PORTDOCS%%%%DOCSDIR%%/hamlib.html
 man/man1/rigctl.1.gz
 man/man1/rigmem.1.gz
+man/man1/rigsmtr.1.gz
 man/man1/rigswr.1.gz
 man/man1/rotctl.1.gz
-man/man1/rigsmtr.1.gz
-man/man8/rpc.rigd.8.gz
-man/man8/rpc.rotd.8.gz
 man/man8/rigctld.8.gz
 man/man8/rotctld.8.gz