diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index 488a170cb6ad..30cb3797a8a5 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -1,60 +1,60 @@ PORTNAME= hamlib -DISTVERSION= 4.6.5 +DISTVERSION= 4.7.0 CATEGORIES= comms hamradio MASTER_SITES= SF MAINTAINER= hamradio@FreeBSD.org COMMENT= Shared libraries for Amateur Radio Equipment Control Applications WWW= https://sourceforge.net/projects/hamlib/ LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= swig:devel/swig USES= autoreconf gnome libtool:keepla localbase:ldflags perl5 \ pkgconfig python readline shebangfix tcl USE_LDCONFIG= yes USE_PERL5= build run USE_PYTHON= py3kplist # $TCL_INCLUDE_SPEC SHEBANG_FILES= bindings/perltest.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libusb \ --with-perl-binding \ --with-python-binding \ --with-tcl-binding \ --with-tcl=${TCL_LIBDIR} CONFIGURE_ENV= cf_with_cxx=yes \ LIBUSB_LIBS="-lusb" INSTALL_TARGET= install-strip PLIST_SUB= TCL_VER=${TCL_VER} PORTDOCS= AUTHORS COPYING* ChangeLog INSTALL LICENSE NEWS PLAN README* THANKS OPTIONS_DEFINE= DOCS STATIC OPTIONS_SUB= yes STATIC_CONFIGURE_ENABLE= static post-build: ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \ ${WRKSRC}/bindings/Hamlib-pl.mk post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Hamlib/Hamlib.so post-install-DOCS-on: cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-DOCS-off: # Upstream scripts install some of the ${PORTDOCS} by default, # so we need to remove the whole ${STAGEDIR}${DOCSDIR} explicitly. ${RM} -r ${STAGEDIR}${DOCSDIR} .include diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo index 6d95dd55892e..688e1a90205e 100644 --- a/comms/hamlib/distinfo +++ b/comms/hamlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1758466889 -SHA256 (hamlib-4.6.5.tar.gz) = 90d6f1dba59417c00f8f4545131c7efd31930cd0e178598980a8210425e3852e -SIZE (hamlib-4.6.5.tar.gz) = 2947731 +TIMESTAMP = 1771288035 +SHA256 (hamlib-4.7.0.tar.gz) = 24542b09cb2432458ba239b2ba8f5b7fb67cde64df6553f150e6eb8475a87a23 +SIZE (hamlib-4.7.0.tar.gz) = 3089782 diff --git a/comms/hamlib/files/patch-hamlib.pc.in b/comms/hamlib/files/patch-hamlib.pc.in deleted file mode 100644 index 33cd0596de25..000000000000 --- a/comms/hamlib/files/patch-hamlib.pc.in +++ /dev/null @@ -1,10 +0,0 @@ ---- hamlib.pc.in.orig 2022-10-30 00:06:12 UTC -+++ hamlib.pc.in -@@ -7,7 +7,6 @@ Version: @PACKAGE_VERSION@ - 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-rigs_dummy_rot__pstrotator.c b/comms/hamlib/files/patch-rigs_dummy_rot__pstrotator.c deleted file mode 100644 index 37ed3d2f8469..000000000000 --- a/comms/hamlib/files/patch-rigs_dummy_rot__pstrotator.c +++ /dev/null @@ -1,10 +0,0 @@ ---- rigs/dummy/rot_pstrotator.c.orig 2025-02-09 21:22:13 UTC -+++ rigs/dummy/rot_pstrotator.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "hamlib/rotator.h" - #include "dummy_common.h" diff --git a/comms/hamlib/files/patch-tests_rigtestlibusb.c b/comms/hamlib/files/patch-tests_rigtestlibusb.c deleted file mode 100644 index b653eb405f97..000000000000 --- a/comms/hamlib/files/patch-tests_rigtestlibusb.c +++ /dev/null @@ -1,43 +0,0 @@ ---- tests/rigtestlibusb.c.orig 2025-07-18 18:31:35 UTC -+++ tests/rigtestlibusb.c -@@ -116,8 +116,12 @@ static void print_ss_usb_cap(const struct - printf(" bmAttributes: %02xh\n", ss_usb_cap->bmAttributes); - printf(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported); - printf(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport); -- printf(" bU1devExitLat: %u\n", ss_usb_cap->bU1DevExitLat); -+ printf(" wU1devExitLat: %u\n", ss_usb_cap->bU1DevExitLat); -+#ifdef __FreeBSD__ -+ printf(" wU2devExitLat: %u\n", ss_usb_cap->wU2DevExitLat); -+#else - printf(" bU2devExitLat: %u\n", ss_usb_cap->bU2DevExitLat); -+#endif - } - - static void print_bos(libusb_device_handle *handle) -@@ -133,11 +137,17 @@ static void print_bos(libusb_device_handle *handle) - return; - } - -+ - printf(" Binary Object Store (BOS):\n"); - printf(" wTotalLength: %u\n", bos->wTotalLength); -+#ifdef __FreeBSD__ -+ printf(" bNumDeviceCapabilities: %u\n", bos->bNumDeviceCapabilities); -+ for (i = 0; i < bos->bNumDeviceCapabilities; i++) -+#else - printf(" bNumDeviceCaps: %u\n", bos->bNumDeviceCaps); -- - for (i = 0; i < bos->bNumDeviceCaps; i++) -+#endif -+ - { - struct libusb_bos_dev_capability_descriptor *dev_cap = bos->dev_capability[i]; - -@@ -172,7 +182,6 @@ static void print_bos(libusb_device_handle *handle) - libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap); - } - } -- - libusb_free_bos_descriptor(bos); - } - diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist index 648aab1e9544..2b8b974b7fd9 100644 --- a/comms/hamlib/pkg-plist +++ b/comms/hamlib/pkg-plist @@ -1,71 +1,77 @@ -%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl -%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py -%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl bin/ampctl bin/ampctld bin/rigctl bin/rigctlcom bin/rigctld bin/rigctlsync bin/rigctltcp -bin/rigfreqwalk bin/rigmem bin/rigsmtr bin/rigswr bin/rigtestlibusb bin/rigtestmcast bin/rigtestmcastrx bin/rotctl bin/rotctld +include/hamlib/amp_state.h include/hamlib/ampclass.h include/hamlib/amplifier.h include/hamlib/amplist.h include/hamlib/multicast.h +include/hamlib/port.h include/hamlib/rig.h include/hamlib/rig_dll.h +include/hamlib/rig_state.h include/hamlib/rigclass.h include/hamlib/riglist.h +include/hamlib/rot_state.h include/hamlib/rotator.h include/hamlib/rotclass.h include/hamlib/rotlist.h %%STATIC%%lib/libhamlib++.a lib/libhamlib++.la lib/libhamlib++.so lib/libhamlib++.so.4 -lib/libhamlib++.so.4.0.6 +lib/libhamlib++.so.4.0.7 %%STATIC%%lib/libhamlib.a lib/libhamlib.la lib/libhamlib.so lib/libhamlib.so.4 -lib/libhamlib.so.4.0.6 +lib/libhamlib.so.4.0.7 %%SITE_ARCH%%/Hamlib.pm %%SITE_ARCH%%/auto/Hamlib/Hamlib.so %%SITE_ARCH%%/perltest.pl %%PYTHON_SITELIBDIR%%/Hamlib.py %%STATIC%%%%PYTHON_SITELIBDIR%%/_Hamlib.a %%PYTHON_SITELIBDIR%%/_Hamlib.la %%PYTHON_SITELIBDIR%%/_Hamlib.so %%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_TAG%%.pyc -lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.6.so +lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.7.so %%STATIC%%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 share/aclocal/hamlib.m4 +%%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl +%%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl share/man/man1/ampctl.1.gz share/man/man1/ampctld.1.gz share/man/man1/rigctl.1.gz share/man/man1/rigctlcom.1.gz share/man/man1/rigctld.1.gz share/man/man1/rigctlsync.1.gz +share/man/man1/rigctltcp.1.gz share/man/man1/rigmem.1.gz share/man/man1/rigsmtr.1.gz share/man/man1/rigswr.1.gz +share/man/man1/rigtestlibusb.1.gz +share/man/man1/rigtestmcast.1.gz +share/man/man1/rigtestmcastrx.1.gz share/man/man1/rotctl.1.gz share/man/man1/rotctld.1.gz share/man/man7/hamlib-primer.7.gz share/man/man7/hamlib-utilities.7.gz share/man/man7/hamlib.7.gz