From nobody Sun Jan 9 16:00:57 2022 X-Original-To: dev-commits-ports-all@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 603BA194C05C; Sun, 9 Jan 2022 16:00:58 +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 4JX1s60tSBz4YxQ; Sun, 9 Jan 2022 16:00:58 +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 F269114AF5; Sun, 9 Jan 2022 16:00:57 +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 209G0vFs073487; Sun, 9 Jan 2022 16:00:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 209G0vRo073486; Sun, 9 Jan 2022 16:00:57 GMT (envelope-from git) Date: Sun, 9 Jan 2022 16:00:57 GMT Message-Id: <202201091600.209G0vRo073486@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: 4c67f395d99d - main - comms/gnuradio: Fix plist problem List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 4c67f395d99df44eeaf43f8fd841b9ff1970fef3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641744058; 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=SKCNX7NiRnS0Bf516N8+pU+19ZhveBNi9x/0tHYgAAs=; b=JBJ2+pAPgJ6068tRrcq4dYoV2+tjubIZyQi5pflxjpBZDRezGVy1F1needPYl4OR8oDCTa 1o0wY/g9qVO79jl4cYtC08jNQJbUsli9X1OhBUHID41Y+wj7S5wl0NDmjUoU4X2f07x7Pz Zw5mEhXwna4nZCVRmrc18+Pk+QxF8u1SK4f1i7y2BaAalFUtT3gpEwCJQUOGEeIoqQ0qBI xtLCYX6shthMh2H0737Ik/az6ULApCP+cRrjMa2Qz0IxwXushEFQdYnWbK6qfpYlWm+35t rswB1L9myU5WBCnFV0Yhomh+kmHaptTk8yWSMaG6aaDMihYnq7RavErH/leBPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641744058; a=rsa-sha256; cv=none; b=W7pbAafKDF9l7btix2aHhKAZmmJnDsLJjzRX+AirzIBDFf2ZtaVWLeG9E1VEc2IJt+/8CG UtqB+y6nch5F4WF+jy0/Qe5NK7ZtFjsIpc/S5Nh2D8yQHtR1d4/utrCPpwpLClR3S5E2NB hxuZI1XDnCtIF0lMYY8jiPkTe18P7GvHLzb/vpaUBH3fwT8v99pBZJrBuf+Cx4rE3PZPNj 7EvseZpFSjbi0hXvb/eCcZjUK+a3EGbM106w1t4P7LBCUTkYM3zQEh4l/o8cDUKr6OJMBl kHeb+RaoMkc81zKKNcE/OKo3mETpAra209COjYS+lESTYZw1mjuTz5dDRiAb9g== 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=4c67f395d99df44eeaf43f8fd841b9ff1970fef3 commit 4c67f395d99df44eeaf43f8fd841b9ff1970fef3 Author: Diane Bruce AuthorDate: 2022-01-09 15:49:55 +0000 Commit: Diane Bruce CommitDate: 2022-01-09 16:00:17 +0000 comms/gnuradio: Fix plist problem fix plist when PYTHON_VERSION != 3.8 PR: ports/261060 Reported by: eric@camachat.org --- comms/gnuradio/Makefile | 2 +- comms/gnuradio/pkg-plist | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 22967aa40534..5d027bd7b3b9 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -82,7 +82,7 @@ OPTIONS_SUB= yes UHD_DESC= Include UHD support from Ettus TESTING_DESC= Include testing support -PLIST_SUB+= PORTVERSION=${PORTVERSION} +PLIST_SUB+= PORTVERSION=${PORTVERSION} PORTMAINVER=${PORTVERSION:C|^([1-9]+)\.([0-9]+)\.([0-9]+).*|\1.\2.\3|} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \ diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist index a8cd105b792b..f4c7536ae506 100644 --- a/comms/gnuradio/pkg-plist +++ b/comms/gnuradio/pkg-plist @@ -854,58 +854,58 @@ lib/cmake/gnuradio/gnuradio-zeromqTargets.cmake lib/cmake/gnuradio/runtime_swigTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/gnuradio/runtime_swigTargets.cmake lib/libgnuradio-analog.so -lib/libgnuradio-analog.so.%%PYTHON_VER%%.4 +lib/libgnuradio-analog.so.%%PORTMAINVER%% lib/libgnuradio-analog.so.%%PORTVERSION%% lib/libgnuradio-audio.so -lib/libgnuradio-audio.so.%%PYTHON_VER%%.4 +lib/libgnuradio-audio.so.%%PORTMAINVER%% lib/libgnuradio-audio.so.%%PORTVERSION%% lib/libgnuradio-blocks.so -lib/libgnuradio-blocks.so.%%PYTHON_VER%%.4 +lib/libgnuradio-blocks.so.%%PORTMAINVER%% lib/libgnuradio-blocks.so.%%PORTVERSION%% lib/libgnuradio-channels.so -lib/libgnuradio-channels.so.%%PYTHON_VER%%.4 +lib/libgnuradio-channels.so.%%PORTMAINVER%% lib/libgnuradio-channels.so.%%PORTVERSION%% lib/libgnuradio-digital.so -lib/libgnuradio-digital.so.%%PYTHON_VER%%.4 +lib/libgnuradio-digital.so.%%PORTMAINVER%% lib/libgnuradio-digital.so.%%PORTVERSION%% lib/libgnuradio-dtv.so -lib/libgnuradio-dtv.so.%%PYTHON_VER%%.4 +lib/libgnuradio-dtv.so.%%PORTMAINVER%% lib/libgnuradio-dtv.so.%%PORTVERSION%% lib/libgnuradio-fec.so -lib/libgnuradio-fec.so.%%PYTHON_VER%%.4 +lib/libgnuradio-fec.so.%%PORTMAINVER%% lib/libgnuradio-fec.so.%%PORTVERSION%% lib/libgnuradio-fft.so -lib/libgnuradio-fft.so.%%PYTHON_VER%%.4 +lib/libgnuradio-fft.so.%%PORTMAINVER%% lib/libgnuradio-fft.so.%%PORTVERSION%% lib/libgnuradio-filter.so -lib/libgnuradio-filter.so.%%PYTHON_VER%%.4 +lib/libgnuradio-filter.so.%%PORTMAINVER%% lib/libgnuradio-filter.so.%%PORTVERSION%% lib/libgnuradio-pmt.so -lib/libgnuradio-pmt.so.%%PYTHON_VER%%.4 +lib/libgnuradio-pmt.so.%%PORTMAINVER%% lib/libgnuradio-pmt.so.%%PORTVERSION%% lib/libgnuradio-qtgui.so -lib/libgnuradio-qtgui.so.%%PYTHON_VER%%.4 +lib/libgnuradio-qtgui.so.%%PORTMAINVER%% lib/libgnuradio-qtgui.so.%%PORTVERSION%% lib/libgnuradio-runtime.so -lib/libgnuradio-runtime.so.%%PYTHON_VER%%.4 +lib/libgnuradio-runtime.so.%%PORTMAINVER%% lib/libgnuradio-runtime.so.%%PORTVERSION%% lib/libgnuradio-trellis.so -lib/libgnuradio-trellis.so.%%PYTHON_VER%%.4 +lib/libgnuradio-trellis.so.%%PORTMAINVER%% lib/libgnuradio-trellis.so.%%PORTVERSION%% %%UHD%%lib/libgnuradio-uhd.so -%%UHD%%lib/libgnuradio-uhd.so.%%PYTHON_VER%%.4 +%%UHD%%lib/libgnuradio-uhd.so.%%PORTMAINVER%% %%UHD%%lib/libgnuradio-uhd.so.%%PORTVERSION%% lib/libgnuradio-video-sdl.so -lib/libgnuradio-video-sdl.so.%%PYTHON_VER%%.4 +lib/libgnuradio-video-sdl.so.%%PORTMAINVER%% lib/libgnuradio-video-sdl.so.%%PORTVERSION%% lib/libgnuradio-vocoder.so -lib/libgnuradio-vocoder.so.%%PYTHON_VER%%.4 +lib/libgnuradio-vocoder.so.%%PORTMAINVER%% lib/libgnuradio-vocoder.so.%%PORTVERSION%% lib/libgnuradio-wavelet.so -lib/libgnuradio-wavelet.so.%%PYTHON_VER%%.4 +lib/libgnuradio-wavelet.so.%%PORTMAINVER%% lib/libgnuradio-wavelet.so.%%PORTVERSION%% lib/libgnuradio-zeromq.so -lib/libgnuradio-zeromq.so.%%PYTHON_VER%%.4 +lib/libgnuradio-zeromq.so.%%PORTMAINVER%% lib/libgnuradio-zeromq.so.%%PORTVERSION%% %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc