diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index bc9bc7c18256..eb9e4c6c0bb8 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -1,56 +1,52 @@ PORTNAME= hamlib -PORTVERSION= 4.4 -PORTREVISION= 3 +PORTVERSION= 4.5.3 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= LGPL20 BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libltdl.so:devel/libltdl USES= autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \ readline shebangfix tcl USE_GNOME= libxml2 USE_LDCONFIG= yes USE_PERL5= build run USE_PYTHON= py3kplist # $TCL_INCLUDE_SPEC SHEBANG_FILES= bindings/perltest.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-perl-binding \ --with-tcl-binding --with-tcl=${TCL_LIBDIR} \ --with-libusb \ --with-python-binding -CONFIGURE_ENV= LIBUSB_LIBS="-lusb" +CONFIGURE_ENV= LIBUSB_LIBS="-lusb" cf_with_cxx=yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -PLIST_SUB= VER=${PORTVERSION} TCL_VER=${TCL_VER} +PLIST_SUB= TCL_VER=${TCL_VER} OPTIONS_DEFINE= DOCS -post-patch: - @${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$$//' \ ${WRKSRC}/bindings/Hamlib-pl.mk post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Hamlib/Hamlib.so @${MKDIR} ${STAGEDIR}${DOCSDIR} .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.osx \ ${WRKSRC}/README.developer ${WRKSRC}/README.freqranges \ ${WRKSRC}/README.multicast ${WRKSRC}/THANKS ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor .include diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo index 2bd414567697..6f4f20d2053b 100644 --- a/comms/hamlib/distinfo +++ b/comms/hamlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641893139 -SHA256 (hamlib-4.4.tar.gz) = 8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487 -SIZE (hamlib-4.4.tar.gz) = 2401399 +TIMESTAMP = 1672594651 +SHA256 (hamlib-4.5.3.tar.gz) = e1818e9df0e59023d2dff320c41c5c622b02a0afd3e50c3155694e1a9014f260 +SIZE (hamlib-4.5.3.tar.gz) = 2590200 diff --git a/comms/hamlib/files/patch-hamlib.pc.in b/comms/hamlib/files/patch-hamlib.pc.in index 1d5b0de8a0a7..33cd0596de25 100644 --- a/comms/hamlib/files/patch-hamlib.pc.in +++ b/comms/hamlib/files/patch-hamlib.pc.in @@ -1,10 +1,10 @@ ---- hamlib.pc.in.orig 2021-12-03 00:09:30 UTC +--- hamlib.pc.in.orig 2022-10-30 00:06:12 UTC +++ hamlib.pc.in -@@ -7,7 +7,6 @@ Name: @PACKAGE_NAME@ +@@ -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-include_hamlib_rig.h b/comms/hamlib/files/patch-include_hamlib_rig.h deleted file mode 100644 index 18d835a4fa79..000000000000 --- a/comms/hamlib/files/patch-include_hamlib_rig.h +++ /dev/null @@ -1,21 +0,0 @@ ---- include/hamlib/rig.h.orig 2021-12-03 00:09:30 UTC -+++ include/hamlib/rig.h -@@ -1124,8 +1124,8 @@ typedef uint64_t setting_t; - #define RIG_FUNC_TRANSCEIVE CONSTANT_64BIT_FLAG (42) /*!< \c TRANSCEIVE -- Send radio state changes automatically ON/OFF */ - #define RIG_FUNC_SPECTRUM CONSTANT_64BIT_FLAG (43) /*!< \c SPECTRUM -- Spectrum scope data output ON/OFF */ - #define RIG_FUNC_SPECTRUM_HOLD CONSTANT_64BIT_FLAG (44) /*!< \c SPECTRUM_HOLD -- Pause spectrum scope updates ON/OFF */ --#define RIG_FUNC_BIT45 CONSTANT_64BIT_FLAG (45) /*!< \c available for future RIG_FUNC items */ --#define RIG_FUNC_BIT46 CONSTANT_64BIT_FLAG (46) /*!< \c available for future RIG_FUNC items */ -+#define RIG_FUNC_SEND_MORSE CONSTANT_64BIT_FLAG (45) /*!< \c SEND_MORSE -- Send specified characters using CW */ -+#define RIG_FUNC_SEND_VOICE_MEM CONSTANT_64BIT_FLAG (46) /*!< \c SEND_VOICE_MEM -- Transmit in SSB message stored in memory */ - #define RIG_FUNC_BIT47 CONSTANT_64BIT_FLAG (47) /*!< \c available for future RIG_FUNC items */ - #define RIG_FUNC_BIT48 CONSTANT_64BIT_FLAG (48) /*!< \c available for future RIG_FUNC items */ - #define RIG_FUNC_BIT49 CONSTANT_64BIT_FLAG (49) /*!< \c available for future RIG_FUNC items */ -@@ -2063,6 +2063,7 @@ enum rig_function_e { - RIG_FUNCTION_SEND_MORSE, - RIG_FUNCTION_STOP_MORSE, - RIG_FUNCTION_WAIT_MORSE, -+ RIG_FUNCTION_SEND_VOICE_MEM, - RIG_FUNCTION_SET_BANK, - RIG_FUNCTION_SET_MEM, - RIG_FUNCTION_GET_MEM, diff --git a/comms/hamlib/files/patch-src_misc.c b/comms/hamlib/files/patch-src_misc.c deleted file mode 100644 index fca84506597d..000000000000 --- a/comms/hamlib/files/patch-src_misc.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/misc.c.orig 2021-12-03 00:09:30 UTC -+++ src/misc.c -@@ -884,6 +884,8 @@ static const struct - { RIG_LEVEL_SPECTRUM_AVG, "SPECTRUM_AVG" }, - { RIG_LEVEL_SPECTRUM_ATT, "SPECTRUM_ATT" }, - { RIG_LEVEL_TEMP_METER, "TEMP_METER" }, -+ { RIG_FUNC_SEND_MORSE, "SEND_MORSE" }, -+ { RIG_FUNC_SEND_VOICE_MEM, "SEND_VOICE_MEM" }, - { RIG_LEVEL_NONE, "" }, - }; - -@@ -2254,6 +2256,9 @@ void *HAMLIB_API rig_get_function_ptr(rig_model_t rig_ - - case RIG_FUNCTION_WAIT_MORSE: - return caps->wait_morse; -+ -+ case RIG_FUNCTION_SEND_VOICE_MEM: -+ return caps->send_voice_mem; - - case RIG_FUNCTION_SET_BANK: - return caps->set_bank; diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist index 372b478fd614..f76ccf67e040 100644 --- a/comms/hamlib/pkg-plist +++ b/comms/hamlib/pkg-plist @@ -1,77 +1,78 @@ 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/config.h include/hamlib/rig.h include/hamlib/rig_dll.h include/hamlib/rigclass.h include/hamlib/riglist.h include/hamlib/rotator.h include/hamlib/rotclass.h include/hamlib/rotlist.h lib/libhamlib++.a lib/libhamlib++.la lib/libhamlib++.so lib/libhamlib++.so.4 -lib/libhamlib++.so.4.0.4 +lib/libhamlib++.so.4.0.6 lib/libhamlib.a lib/libhamlib.la lib/libhamlib.so lib/libhamlib.so.4 -lib/libhamlib.so.4.0.4 +lib/libhamlib.so.4.0.6 %%SITE_ARCH%%/Hamlib.pm %%SITE_ARCH%%/auto/Hamlib/Hamlib.so %%SITE_ARCH%%/perltest.pl %%PYTHON_SITELIBDIR%%/Hamlib.py %%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-%%VER%%.so +lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.6.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/rigctlcom.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 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/PLAN %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.betatester %%PORTDOCS%%%%DOCSDIR%%/README.developer %%PORTDOCS%%%%DOCSDIR%%/README.osx %%PORTDOCS%%%%DOCSDIR%%/README.freqranges %%PORTDOCS%%%%DOCSDIR%%/README.multicast %%PORTDOCS%%%%DOCSDIR%%/THANKS %%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl %%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py %%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl