 @@ -1,48 +1,49 @@
-# $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
 MASTER_SITES=	${MASTER_SITE_GITHUB:=EttusResearch/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/EttusResearch/uhd
 COMMENT=	USRP (Universal Software Radio Peripheral) Hardware Drivers
 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
 .include "../../lang/python/pyversion.mk"
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHONBIN}
 .if !empty(_PYTHON_VERSION:M3*)
 CMAKE_ARGS+=	-DENABLE_PYTHON3=ON
 .endif
 # Upstream says C++11 is required, even though it is not documented.
 # It is documented that gcc 4.8 is required, when using gcc.
 # https://github.com/EttusResearch/uhd/issues/236
+#
 # Upstream does not seem to have any documentation that gnu++11 is
 # required, but it builds with tha and not with c++11 on netbsd-8.  No
 # ticket filed because #236 resulted in in-ticket clarification only
 # (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
 EXTRACT_USING=		gtar
 WRKSRC=			${WRKDIR}/${DISTNAME}/host
 # The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
 REPLACE_PYTHON+=	utils/converter_benchmark.py
 REPLACE_PYTHON+=	utils/latency/graph.py
 REPLACE_PYTHON+=	utils/latency/run_tests.py
 REPLACE_PYTHON+=	utils/uhd_images_downloader.py.in
 REPLACE_PYTHON+=	utils/usrp2_card_burner.py
 REPLACE_PYTHON+=	utils/usrp2_card_burner_gui.py

 @@ -1,14 +1,14 @@
-@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
 bin/uhd_config_info
 bin/uhd_find_devices
 bin/uhd_image_loader
 bin/uhd_usrp_probe
 include/uhd.h
 include/uhd/build_info.hpp
 include/uhd/config.h
 include/uhd/config.hpp
 include/uhd/convert.hpp
 include/uhd/deprecated.hpp
 @@ -130,27 +130,27 @@ include/uhd/utils/safe_call.hpp
 include/uhd/utils/safe_main.hpp
 include/uhd/utils/scope_exit.hpp
 include/uhd/utils/static.hpp
 include/uhd/utils/tasks.hpp
 include/uhd/utils/thread.hpp
 include/uhd/utils/thread_priority.h
 include/uhd/utils/thread_priority.hpp
 include/uhd/version.h
 include/uhd/version.hpp
 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
 lib/uhd/examples/gpio
 lib/uhd/examples/latency_test
 lib/uhd/examples/network_relay
 lib/uhd/examples/replay_samples_from_file
 lib/uhd/examples/rfnoc_nullsource_ce_rx
 lib/uhd/examples/rfnoc_radio_loopback
 lib/uhd/examples/rfnoc_rx_to_file
 lib/uhd/examples/rx_ascii_art_dft
 lib/uhd/examples/rx_multi_samples
 lib/uhd/examples/rx_samples_c

 @@ -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-CMakeLists.txt) = 5691ddd6a98f92e649a184cfc092a4eb721c6fe7
 SHA1 (patch-docs_CMakeLists.txt) = 27b04f5b3ef7b0604b43d50d95dd948535d4b434
 SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7

 @@ -1,18 +1,32 @@
-$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
+Do not use Numpy.
 +++ CMakeLists.txt	2020-04-08 00:03:10.169349083 +0900
-@@ -124,8 +124,9 @@
+--- 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()
 +if(NOT DEFINED PKG_MAN_DIR)
  set(PKG_MAN_DIR share/man/man1)
+-
 +endif()
  ########################################################################
  # 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