Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1586333238122720"
MIME-Version: 1.0
Date: Wed, 8 Apr 2020 08:07:18 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/ham/uhd
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20200408080718.1B370FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1586333238122720
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Wed Apr  8 08:07:18 UTC 2020

Modified Files:
	pkgsrc/ham/uhd: Makefile PLIST distinfo
	pkgsrc/ham/uhd/patches: patch-CMakeLists.txt
Removed Files:
	pkgsrc/ham/uhd/patches: patch-docs_CMakeLists.txt

Log Message:
uhd: fix building when py-numpy is also installed; docs/CMakeLists.txt is not necessary any more


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/ham/uhd/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/ham/uhd/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/ham/uhd/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r0 pkgsrc/ham/uhd/patches/patch-docs_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1586333238122720
Content-Disposition: inline
Content-Length: 4303
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/ham/uhd/Makefile
diff -u pkgsrc/ham/uhd/Makefile:1.54 pkgsrc/ham/uhd/Makefile:1.55
--- pkgsrc/ham/uhd/Makefile:1.54	Tue Apr  7 15:57:02 2020
+++ pkgsrc/ham/uhd/Makefile	Wed Apr  8 08:07:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2020/04/07 15:57:02 mef Exp $
+# $NetBSD: Makefile,v 1.55 2020/04/08 08:07:17 adam Exp $
 
 DISTNAME=	uhd-3.15.0.0
 CATEGORIES=	ham
@@ -13,6 +13,7 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
 DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 
+CMAKE_ARGS+=	-DENABLE_MAN_PAGE_COMPRESSION=OFF
 CMAKE_ARGS+=	-DPKG_MAN_DIR=${PKGMANDIR}/man1
 CMAKE_ARGS+=	-DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
 CMAKE_ARGS+=	-Wno-dev
@@ -32,7 +33,7 @@ CMAKE_ARGS+=	-DENABLE_PYTHON3=ON
 # (and not a doc edit), and having experimented no clarification is
 # needed.
 USE_CMAKE=		yes
-USE_LANGUAGES=		c gnu++11
+USE_LANGUAGES=		c gnu++14
 USE_TOOLS+=		pkg-config
 GCC_REQD+=		4.8
 # to avoid extra pax_global_header

Index: pkgsrc/ham/uhd/PLIST
diff -u pkgsrc/ham/uhd/PLIST:1.16 pkgsrc/ham/uhd/PLIST:1.17
--- pkgsrc/ham/uhd/PLIST:1.16	Tue Apr  7 15:51:50 2020
+++ pkgsrc/ham/uhd/PLIST	Wed Apr  8 08:07:17 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2020/04/07 15:51:50 mef Exp $
+@comment $NetBSD: PLIST,v 1.17 2020/04/08 08:07:17 adam Exp $
 bin/uhd_cal_rx_iq_balance
 bin/uhd_cal_tx_dc_offset
 bin/uhd_cal_tx_iq_balance
@@ -140,7 +140,7 @@ lib/cmake/uhd/UHDBoost.cmake
 lib/cmake/uhd/UHDConfig.cmake
 lib/cmake/uhd/UHDConfigVersion.cmake
 lib/libuhd.so
-lib/libuhd.so.3.15.0
+lib/libuhd.so.${PKGVERSION}
 lib/pkgconfig/uhd.pc
 lib/uhd/examples/benchmark_rate
 lib/uhd/examples/benchmark_streamer

Index: pkgsrc/ham/uhd/distinfo
diff -u pkgsrc/ham/uhd/distinfo:1.23 pkgsrc/ham/uhd/distinfo:1.24
--- pkgsrc/ham/uhd/distinfo:1.23	Tue Apr  7 15:51:50 2020
+++ pkgsrc/ham/uhd/distinfo	Wed Apr  8 08:07:17 2020
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.23 2020/04/07 15:51:50 mef Exp $
+$NetBSD: distinfo,v 1.24 2020/04/08 08:07:17 adam Exp $
 
 SHA1 (uhd-3.15.0.0.tar.gz) = 17286a52a591038af16e870962c1767c5935ec2f
 RMD160 (uhd-3.15.0.0.tar.gz) = b05282c4b3f25bd201e9b91b3652fba9b150c7ae
 SHA512 (uhd-3.15.0.0.tar.gz) = ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
 Size (uhd-3.15.0.0.tar.gz) = 12895934 bytes
-SHA1 (patch-CMakeLists.txt) = 2ba015aad8e08963a2bba8e1fc421aae53207cc5
-SHA1 (patch-docs_CMakeLists.txt) = 27b04f5b3ef7b0604b43d50d95dd948535d4b434
+SHA1 (patch-CMakeLists.txt) = 5691ddd6a98f92e649a184cfc092a4eb721c6fe7
 SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7

Index: pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
diff -u pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.2 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/ham/uhd/patches/patch-CMakeLists.txt:1.2	Tue Apr  7 15:51:50 2020
+++ pkgsrc/ham/uhd/patches/patch-CMakeLists.txt	Wed Apr  8 08:07:17 2020
@@ -1,11 +1,13 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2020/04/07 15:51:50 mef Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2020/04/08 08:07:17 adam Exp $
 
-Allow overrides on PKG_DOC_DIR and PKG_MAN_DIR.
+Allow overrides on PKG_MAN_DIR.
 https://github.com/EttusResearch/uhd/issues/301
 
---- host/CMakeLists.txt.orig	2020-01-01 13:21:49.000000000 +0900
-+++ CMakeLists.txt	2020-04-08 00:03:10.169349083 +0900
-@@ -124,8 +124,9 @@
+Do not use Numpy.
+
+--- CMakeLists.txt.orig	2020-01-01 04:21:49.000000000 +0000
++++ CMakeLists.txt
+@@ -124,8 +124,9 @@ endif()
  if(NOT DEFINED PKG_DOC_DIR)
      set(PKG_DOC_DIR share/doc/uhd)
  endif()
@@ -16,3 +18,15 @@ https://github.com/EttusResearch/uhd/iss
  ########################################################################
  # UHD config files
  ########################################################################
+@@ -329,11 +330,6 @@ PYTHON_CHECK_MODULE(
+     HAVE_PYTHON_MODULE_REQUESTS
+ )
+ 
+-PYTHON_CHECK_MODULE(
+-    "numpy ${NUMPY_MIN_VERSION} or greater"
+-    "numpy" "LooseVersion(numpy.__version__) >= LooseVersion('${NUMPY_MIN_VERSION}')"
+-    HAVE_PYTHON_MODULE_NUMPY
+-)
+ 
+ ########################################################################
+ # Create Uninstall Target


--_----------=_1586333238122720--