From nobody Wed Jan 12 01:13:21 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DEF9F19529E9; Wed, 12 Jan 2022 01:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYV1Y4ZpRz3qL5; Wed, 12 Jan 2022 01:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7DEBC23CC5; Wed, 12 Jan 2022 01:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20C1DLTC088729; Wed, 12 Jan 2022 01:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20C1DLrY088728; Wed, 12 Jan 2022 01:13:21 GMT (envelope-from git) Date: Wed, 12 Jan 2022 01:13:21 GMT Message-Id: <202201120113.20C1DLrY088728@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Diane Bruce Subject: git: 763fc7004cea - main - comms/hamlib: Update to 4.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: db X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 763fc7004ceaf9e837b160271f4491fbe92df031 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641950001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpjHOaWmwrenf07LRE7v7Y6dez9WkeNCE2aiAM9SC2Q=; b=ehn9o61FWWflWjXbdr2nTi/EjIt/4X+aJulT01fcNC6ums/2pr/CoZgXttp4ziRsTw1Pjy arNwj6TDC/Y0SvrVEiJk/DZ+fD/FbttQFlJtHmSG5DsIDKT8C40VgjWPVJ5mtfnOn5j5tT Yv8t+2PiFWPO9x0htueIuct4n90YW2K7pVqMkrwULiDhygMpeLMMDCIEOlzHnE2cyXuAh5 nO43sMo6+sCraQur43YC4/dTyQEupc1fTS7o+a1Pv7YxYvyGFFxO2DzdOYWM9p29+GePvf iuS9sNVyEXsZlRl0XhMjzSOA6GlpQlIYzOIOCeOle5n269FkK4TRUTSKFvXg9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641950001; a=rsa-sha256; cv=none; b=aFyOTHYF2NBSIWQRGdrtH3VBfqToSB10LOg7fijoLYtDfVlXCVN2p484ljn0wUbEtfJ9BC icNUeNRQlQVFJOx0ug6YptDeBp59xS0ULxcisFaYk5SUh/MsXHTqSFLRseyu9kM8uC4QKe sT6ZlNTbYdMqcmkYVd7JwusbYzCkcpmMRq9wkD7DTjU0yrvZVhtzmU5IR1Z3vZ1HIqmPCv CRMqiljjMZm49DEw8y9xDpZypX6qmk9f/hj2Ct27I5rIPP8hZ/M5XYcixEfdIRPKPLUOkc bDeV2MRGbWOfO6JN3VISgB28JyclVNthOSJUJIAvyGgLr39xYl29Pw2ab//sWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=763fc7004ceaf9e837b160271f4491fbe92df031 commit 763fc7004ceaf9e837b160271f4491fbe92df031 Author: Diane Bruce AuthorDate: 2022-01-12 01:06:38 +0000 Commit: Diane Bruce CommitDate: 2022-01-12 01:06:38 +0000 comms/hamlib: Update to 4.4 - Some patches not needed now due to adrian@ patches sent upstream. - Additional changes by @takefu added RIG_FUNC_SEND_VOICE_MEM from git For a complete log of changes to Hamlib, please visit: http://sourceforge.net/p/hamlib/code/commit_browser Major changes in 4.0 affecting usage Most rig model numbers have changed RIG_LEVEL_VOX has been deprecated and replaced by RIG_LEVEL_VOXDELAY rigctl 'f' command now returns VFO argument too rigctl 'y' and 'Y' command now take/show antenna argument and option. range_list items are undergoing changes towards a different model TBD RTS/DTR PTT sharing is off by default now -- use serial_share=1 option to enable PR: ports/261105 Reported by: takefu@airport.gm --- comms/hamlib/Makefile | 14 ++++++-------- comms/hamlib/distinfo | 6 +++--- comms/hamlib/files/patch-configure.ac | 11 ----------- comms/hamlib/files/patch-hamlib.pc.in | 2 +- comms/hamlib/files/patch-tests_testlibusb.c | 29 ----------------------------- comms/hamlib/pkg-plist | 8 +++++--- 6 files changed, 15 insertions(+), 55 deletions(-) diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index 88f9eb9d83fc..a53a00bacfec 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -1,8 +1,7 @@ # Created by: Sebastian Yepes PORTNAME= hamlib -PORTVERSION= 4.3.1 -PORTREVISION= 1 +PORTVERSION= 4.4 CATEGORIES= comms hamradio MASTER_SITES= SF @@ -16,14 +15,12 @@ LIB_DEPENDS= libltdl.so:devel/libltdl USES= autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \ readline shebangfix tcl -USE_PYTHON= py3kplist -USE_PERL5= build run USE_GNOME= libxml2 USE_LDCONFIG= yes +USE_PERL5= build run +USE_PYTHON= py3kplist # $TCL_INCLUDE_SPEC -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib SHEBANG_FILES= bindings/perltest.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-perl-binding \ @@ -31,9 +28,10 @@ CONFIGURE_ARGS= --with-perl-binding \ --with-libusb \ --with-python-binding CONFIGURE_ENV= LIBUSB_LIBS="-lusb" -PLIST_SUB= VER=${PORTVERSION} TCL_VER=${TCL_VER} INSTALL_TARGET= install-strip - +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +PLIST_SUB= VER=${PORTVERSION} TCL_VER=${TCL_VER} OPTIONS_DEFINE= DOCS post-patch: diff --git a/comms/hamlib/distinfo b/comms/hamlib/distinfo index a9cb510661ea..2bd414567697 100644 --- a/comms/hamlib/distinfo +++ b/comms/hamlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636328018 -SHA256 (hamlib-4.3.1.tar.gz) = 3437386dfdd2314f108cf35f1527b20d784256b76633d216a50de94f4045a730 -SIZE (hamlib-4.3.1.tar.gz) = 2356944 +TIMESTAMP = 1641893139 +SHA256 (hamlib-4.4.tar.gz) = 8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487 +SIZE (hamlib-4.4.tar.gz) = 2401399 diff --git a/comms/hamlib/files/patch-configure.ac b/comms/hamlib/files/patch-configure.ac deleted file mode 100644 index 7a9686e2aeb3..000000000000 --- a/comms/hamlib/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2016-12-31 20:01:25 UTC -+++ configure.ac -@@ -87,7 +87,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - - # TODO: check whether CXX is functional --AC_CHECK_PROG([cf_with_cxx], ["${CXX}"], [yes], [no]) -+AC_PATH_PROG([cf_with_cxx], ["${CXX}"], [yes], [no]) - - AM_CONDITIONAL([ENABLE_CXX], [test x"${cf_with_cxx}" = "xyes"]) - diff --git a/comms/hamlib/files/patch-hamlib.pc.in b/comms/hamlib/files/patch-hamlib.pc.in index a5e20151ff44..1d5b0de8a0a7 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 2016-12-31 20:01:25 UTC +--- hamlib.pc.in.orig 2021-12-03 00:09:30 UTC +++ hamlib.pc.in @@ -7,7 +7,6 @@ Name: @PACKAGE_NAME@ Description: Library to control radio and rotator equipment. diff --git a/comms/hamlib/files/patch-tests_testlibusb.c b/comms/hamlib/files/patch-tests_testlibusb.c deleted file mode 100644 index 8926f15ffe7e..000000000000 --- a/comms/hamlib/files/patch-tests_testlibusb.c +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 011248cfc8a2..372b478fd614 100644 --- a/comms/hamlib/pkg-plist +++ b/comms/hamlib/pkg-plist @@ -22,12 +22,12 @@ lib/libhamlib++.a lib/libhamlib++.la lib/libhamlib++.so lib/libhamlib++.so.4 -lib/libhamlib++.so.4.0.3 +lib/libhamlib++.so.4.0.4 lib/libhamlib.a lib/libhamlib.la lib/libhamlib.so lib/libhamlib.so.4 -lib/libhamlib.so.4.0.3 +lib/libhamlib.so.4.0.4 %%SITE_ARCH%%/Hamlib.pm %%SITE_ARCH%%/auto/Hamlib/Hamlib.so %%SITE_ARCH%%/perltest.pl @@ -35,7 +35,9 @@ lib/libhamlib.so.4.0.3 %%PYTHON_SITELIBDIR%%/_Hamlib.a %%PYTHON_SITELIBDIR%%/_Hamlib.la %%PYTHON_SITELIBDIR%%/_Hamlib.so -lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.3.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.a lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so