4 files changed, 76 insertions, 40 deletions

diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 69ea260d913d..930e75863b7e 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -1,8 +1,7 @@
 # Created by: Sebastian Yepes <esn@x123.info>
 
 PORTNAME=	hamlib
-PORTVERSION=	3.3
-PORTREVISION=	2
+PORTVERSION=	4.3.1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 
@@ -14,7 +13,7 @@ LICENSE=	LGPL20
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
-USES=		autoreconf gnome libtool:keepla pathfix perl5 pkgconfig python \
+USES=		autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \
 		readline shebangfix tcl
 USE_PYTHON=	py3kplist
 USE_PERL5=	build run
@@ -29,17 +28,16 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl-binding \
 		--with-tcl-binding --with-tcl=${TCL_LIBDIR} \
 		--with-libusb \
-		--with-python-binding --without-rigmatrix
+		--with-python-binding
 CONFIGURE_ENV=	LIBUSB_LIBS="-lusb"
 PLIST_SUB=	VER=${PORTVERSION} TCL_VER=${TCL_VER}
 INSTALL_TARGET=	install-strip
-INFO=		hamlib
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' \
-		${WRKSRC}/bindings/Makefile.am
+	@${REINPLACE_CMD} -e 's|python3-config|${PYTHON_CMD}-config|g' \
+		${WRKSRC}/macros/ax_python_devel.m4
 post-build:
 	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \
 		${STAGEDIR}${WRKSRC}/bindings/Hamlib-pl.mk
@@ -49,8 +47,9 @@ post-install:
 .for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \
 		${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \
 		${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \
-		${WRKSRC}/README.betatester ${WRKSRC}/README.win32 \
-		${WRKSRC}/THANKS
+		${WRKSRC}/README.betatester ${WRKSRC}/README.osx \
+		${WRKSRC}/README.developer ${WRKSRC}/README.freqranges \
+		${WRKSRC}/README.multicast ${WRKSRC}/THANKS
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 
diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo
index e2a13649d1d6..a9cb510661ea 100644
--- a/comms/hamlib/distinfo
+++ b/comms/hamlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551232323
-SHA256 (hamlib-3.3.tar.gz) = c90b53949c767f049733b442cd6e0a48648b55d99d4df5ef3f852d985f45e880
-SIZE (hamlib-3.3.tar.gz) = 2192119
+TIMESTAMP = 1636328018
+SHA256 (hamlib-4.3.1.tar.gz) = 3437386dfdd2314f108cf35f1527b20d784256b76633d216a50de94f4045a730
+SIZE (hamlib-4.3.1.tar.gz) = 2356944
diff --git a/comms/hamlib/files/patch-tests_testlibusb.c b/comms/hamlib/files/patch-tests_testlibusb.c
new file mode 100644
index 000000000000..8926f15ffe7e
--- /dev/null
+++ b/comms/hamlib/files/patch-tests_testlibusb.c
@@ -0,0 +1,29 @@
+--- tests/testlibusb.c	2021-11-30 22:59:53.050103000 -0500
++++ tests/testlibusb.c	2021-11-30 23:03:26.187330000 -0500
+@@ -113,7 +113,9 @@
+     printf("      wSpeedSupported:       %u\n", ss_usb_cap->wSpeedSupported);
+     printf("      bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);
+     printf("      bU1devExitLat:         %u\n", ss_usb_cap->bU1DevExitLat);
++#if !defined(__FreeBSD__)
+     printf("      bU2devExitLat:         %u\n", ss_usb_cap->bU2DevExitLat);
++#endif
+ }
+ 
+ static void print_bos(libusb_device_handle *handle)
+@@ -131,6 +133,7 @@
+ 
+     printf("  Binary Object Store (BOS):\n");
+     printf("    wTotalLength:            %u\n", bos->wTotalLength);
++#if !defined(__FreeBSD__)
+     printf("    bNumDeviceCaps:          %u\n", bos->bNumDeviceCaps);
+ 
+     for (i = 0; i < bos->bNumDeviceCaps; i++)
+@@ -168,7 +171,7 @@
+             libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap);
+         }
+     }
+-
++#endif
+     libusb_free_bos_descriptor(bos);
+ }
+ 
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index 33726f2a8773..4834fef645bb 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -1,10 +1,16 @@
+bin/ampctl
+bin/ampctld
 bin/rigctl
+bin/rigctlcom
 bin/rigctld
 bin/rigmem
 bin/rigsmtr
 bin/rigswr
 bin/rotctl
 bin/rotctld
+include/hamlib/ampclass.h
+include/hamlib/amplifier.h
+include/hamlib/amplist.h
 include/hamlib/rig.h
 include/hamlib/rig_dll.h
 include/hamlib/rigclass.h
@@ -15,29 +21,42 @@ include/hamlib/rotlist.h
 lib/libhamlib++.a
 lib/libhamlib++.la
 lib/libhamlib++.so
-lib/libhamlib++.so.2
-lib/libhamlib++.so.2.1.3
-lib/libhamlib.so.2.1.3
+lib/libhamlib++.so.4
+lib/libhamlib++.so.4.0.3
 lib/libhamlib.a
 lib/libhamlib.la
 lib/libhamlib.so
-lib/libhamlib.so.2
-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
-lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so
-libdata/pkgconfig/hamlib.pc
-share/aclocal/hamlib.m4
+lib/libhamlib.so.4
+lib/libhamlib.so.4.0.3
 %%SITE_ARCH%%/Hamlib.pm
 %%SITE_ARCH%%/auto/Hamlib/Hamlib.so
 %%SITE_ARCH%%/perltest.pl
 %%PYTHON_SITELIBDIR%%/Hamlib.py
-%%PYTHON_SITELIBDIR%%/Hamlib.pyc
-%%PYTHON_SITELIBDIR%%/Hamlib.pyo
 %%PYTHON_SITELIBDIR%%/_Hamlib.a
 %%PYTHON_SITELIBDIR%%/_Hamlib.la
 %%PYTHON_SITELIBDIR%%/_Hamlib.so
+%%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.pyc
+lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.3.so
+lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a
+lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la
+lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so
+lib/tcl%%TCL_VER%%/Hamlib/pkgIndex.tcl
+libdata/pkgconfig/hamlib.pc
+man/man1/ampctl.1.gz
+man/man1/ampctld.1.gz
+man/man1/rigctlcom.1.gz
+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/man1/rotctld.1.gz
+man/man7/hamlib-primer.7.gz
+man/man7/hamlib-utilities.7.gz
+man/man7/hamlib.7.gz
+share/aclocal/hamlib.m4
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
@@ -49,21 +68,10 @@ share/aclocal/hamlib.m4
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.betatester
 %%PORTDOCS%%%%DOCSDIR%%/README.developer
-%%PORTDOCS%%%%DOCSDIR%%/README.win32
+%%PORTDOCS%%%%DOCSDIR%%/README.osx
+%%PORTDOCS%%%%DOCSDIR%%/README.freqranges
+%%PORTDOCS%%%%DOCSDIR%%/README.multicast
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PYTHON2%%%%PORTDOCS%%%%DOCSDIR%%/examples/pytest.py
-%%PYTHON3%%%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py
 %%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl
+%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py
 %%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl
-%%PORTDOCS%%%%DOCSDIR%%/html/Hamlib_design.png
-%%PORTDOCS%%%%DOCSDIR%%/html/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/man1/rotctld.1.gz
-man/man7/hamlib-primer.7.gz
-man/man7/hamlib-utilities.7.gz
-man/man7/hamlib.7.gz