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

5 files changed, 26 insertions, 48 deletions

diff --git a/ham/uhd/Makefile b/ham/uhd/Makefile
index 9df301db8d6..8ac10fe5cf6 100644
--- a/ham/uhd/Makefile
+++ b/ham/uhd/Makefile
@@ -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
diff --git a/ham/uhd/PLIST b/ham/uhd/PLIST
index eb3480543d3..d3e43820f97 100644
--- a/ham/uhd/PLIST
+++ b/ham/uhd/PLIST
@@ -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
diff --git a/ham/uhd/distinfo b/ham/uhd/distinfo
index d6867d4d11b..214b7562b04 100644
--- a/ham/uhd/distinfo
+++ b/ham/uhd/distinfo
@@ -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
diff --git a/ham/uhd/patches/patch-CMakeLists.txt b/ham/uhd/patches/patch-CMakeLists.txt
index 3c6527f91dd..f7401de4c41 100644
--- a/ham/uhd/patches/patch-CMakeLists.txt
+++ b/ham/uhd/patches/patch-CMakeLists.txt
@@ -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/issues/301
  ########################################################################
  # 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
diff --git a/ham/uhd/patches/patch-docs_CMakeLists.txt b/ham/uhd/patches/patch-docs_CMakeLists.txt
deleted file mode 100644
index 70bcd1adf3a..00000000000
--- a/ham/uhd/patches/patch-docs_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-docs_CMakeLists.txt,v 1.2 2020/04/07 15:51:50 mef Exp $
-
-Do not compress man pages.
-
---- host/docs/CMakeLists.txt.orig	2020-01-01 13:21:49.000000000 +0900
-+++ docs/CMakeLists.txt	2020-04-08 00:01:23.449612527 +0900
-@@ -178,28 +178,5 @@
- 
- LIBUHD_REGISTER_COMPONENT("Man Pages" ENABLE_MAN_PAGES ON "${MAN_PAGES_DEPS}" OFF OFF)
- if(ENABLE_MAN_PAGES)
--    #Generate man pages; either compressed or not
--    if(ENABLE_MAN_PAGE_COMPRESSION)
--        # compress man pages
--        foreach(manfile ${man_page_sources})
--            #make the gzip file depend on the text file
--            string(REPLACE ".1" "" PROGRAM_NAME "${manfile}")
--            set(gzfile "${CMAKE_CURRENT_BINARY_DIR}/${manfile}.gz")
--            set(manfile "${CMAKE_CURRENT_SOURCE_DIR}/${manfile}")
--            add_custom_command(
--                OUTPUT ${gzfile}
--                DEPENDS ${manfile}
--                COMMAND ${GZIP_EXECUTABLE} -9 -cf ${manfile} > ${gzfile}
--                COMMENT "Generating ${PROGRAM_NAME} man page"
--            )
--            #make the man page target depend on the gz file
--            list(APPEND man_page_gz_files ${gzfile})
--        endforeach(manfile ${man_page_sources})
--        #make the man pages a build-time dependency
--        UHD_INSTALL(FILES ${man_page_gz_files} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
--        add_custom_target(man_page_gzips ALL DEPENDS ${man_page_gz_files})
--    else(ENABLE_MAN_PAGE_COMPRESSION)
--        # uncompressed man pages; just install them
--        UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
--    endif(ENABLE_MAN_PAGE_COMPRESSION)
-+   UHD_INSTALL(FILES ${man_page_sources} DESTINATION ${PKG_MAN_DIR} COMPONENT manpages)
- endif(ENABLE_MAN_PAGES)