Received: by mail.netbsd.org (Postfix, from userid 605) id 259C684DC0; Thu, 14 Mar 2019 21:17:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A2F1484C2B for ; Thu, 14 Mar 2019 21:17:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id INF0uXdrb7nb for ; Thu, 14 Mar 2019 21:17:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 67F2F84DAF for ; Thu, 14 Mar 2019 21:17:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 62B61FB16; Thu, 14 Mar 2019 21:17:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1552598271223600" MIME-Version: 1.0 Date: Thu, 14 Mar 2019 21:17:51 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/ham/uhd To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20190314211751.62B61FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1552598271223600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Thu Mar 14 21:17:51 UTC 2019 Modified Files: pkgsrc/ham/uhd: PLIST PLIST.doxygen PLIST.manual distinfo options.mk Log Message: Fix PLIST issue with the four combinations of SUGGESTED_OPTIONS To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/ham/uhd/PLIST pkgsrc/ham/uhd/PLIST.doxygen cvs rdiff -u -r1.2 -r1.3 pkgsrc/ham/uhd/PLIST.manual cvs rdiff -u -r1.17 -r1.18 pkgsrc/ham/uhd/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/ham/uhd/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1552598271223600 Content-Disposition: inline Content-Length: 13666 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/ham/uhd/PLIST diff -u pkgsrc/ham/uhd/PLIST:1.11 pkgsrc/ham/uhd/PLIST:1.12 --- pkgsrc/ham/uhd/PLIST:1.11 Sun Mar 3 10:36:14 2019 +++ pkgsrc/ham/uhd/PLIST Thu Mar 14 21:17:51 2019 @@ -214,8 +214,6 @@ lib/uhd/utils/usrp_n2xx_simple_net_burne lib/uhd/utils/usrp_x3xx_fpga_burner share/doc/uhd/LICENSE share/doc/uhd/README.md -share/doc/uhd/doxygen/html/index.js -share/doc/uhd/doxygen/html/Ettus_Logo.png share/uhd/rfnoc/blocks/addsub.xml share/uhd/rfnoc/blocks/block.xml share/uhd/rfnoc/blocks/ddc.xml @@ -239,191 +237,3 @@ share/uhd/rfnoc/blocks/radio_magnesium.x share/uhd/rfnoc/blocks/radio_x300.xml share/uhd/rfnoc/blocks/siggen.xml share/uhd/rfnoc/blocks/window.xml -share/doc/uhd/doxygen/html/N2xx-JTAG.jpg -share/doc/uhd/doxygen/html/N310fp.png -share/doc/uhd/doxygen/html/N310isoExplode.png -share/doc/uhd/doxygen/html/N310rp.png -share/doc/uhd/doxygen/html/TRRS.png -share/doc/uhd/doxygen/html/bc_s.png -share/doc/uhd/doxygen/html/bdwn.png -share/doc/uhd/doxygen/html/closed.png -share/doc/uhd/doxygen/html/dir_000000.html -share/doc/uhd/doxygen/html/doc.png -share/doc/uhd/doxygen/html/doxygen.css -share/doc/uhd/doxygen/html/doxygen.png -share/doc/uhd/doxygen/html/dynsections.js -share/doc/uhd/doxygen/html/e3x0_fp_overlay.png -share/doc/uhd/doxygen/html/e3x0_gpio_conn.png -share/doc/uhd/doxygen/html/e3x0_imu_demo.png -share/doc/uhd/doxygen/html/e3x0_jtag_conn.png -share/doc/uhd/doxygen/html/e3x0_rp_overlay.png -share/doc/uhd/doxygen/html/e3xx_conn_photo.jpg -share/doc/uhd/doxygen/html/folderclosed.png -share/doc/uhd/doxygen/html/folderopen.png -share/doc/uhd/doxygen/html/index.html -share/doc/uhd/doxygen/html/jquery.js -share/doc/uhd/doxygen/html/nav_f.png -share/doc/uhd/doxygen/html/nav_g.png -share/doc/uhd/doxygen/html/nav_h.png -share/doc/uhd/doxygen/html/navtree.css -share/doc/uhd/doxygen/html/navtree.js -share/doc/uhd/doxygen/html/navtreedata.js -share/doc/uhd/doxygen/html/navtreeindex0.js -share/doc/uhd/doxygen/html/navtreeindex1.js -share/doc/uhd/doxygen/html/navtreeindex2.js -share/doc/uhd/doxygen/html/open.png -share/doc/uhd/doxygen/html/page_build_guide.html -share/doc/uhd/doxygen/html/page_c_api.html -share/doc/uhd/doxygen/html/page_calibration.html -share/doc/uhd/doxygen/html/page_coding.html -share/doc/uhd/doxygen/html/page_coding.js -share/doc/uhd/doxygen/html/page_configfiles.html -share/doc/uhd/doxygen/html/page_configuration.html -share/doc/uhd/doxygen/html/page_converters.html -share/doc/uhd/doxygen/html/page_dboards.html -share/doc/uhd/doxygen/html/page_devices.html -share/doc/uhd/doxygen/html/page_devices.js -share/doc/uhd/doxygen/html/page_general.html -share/doc/uhd/doxygen/html/page_gpio_api.html -share/doc/uhd/doxygen/html/page_gpsdo.html -share/doc/uhd/doxygen/html/page_gpsdo_b2x0.html -share/doc/uhd/doxygen/html/page_gpsdo_x3x0.html -share/doc/uhd/doxygen/html/page_identification.html -share/doc/uhd/doxygen/html/page_images.html -share/doc/uhd/doxygen/html/page_install.html -share/doc/uhd/doxygen/html/page_logging.html -share/doc/uhd/doxygen/html/page_mpm.html -share/doc/uhd/doxygen/html/page_multiple.html -share/doc/uhd/doxygen/html/page_ni_rio_kernel.html -share/doc/uhd/doxygen/html/page_octoclock.html -share/doc/uhd/doxygen/html/page_rdtesting.html -share/doc/uhd/doxygen/html/page_rtp.html -share/doc/uhd/doxygen/html/page_semver.html -share/doc/uhd/doxygen/html/page_stream.html -share/doc/uhd/doxygen/html/page_sync.html -share/doc/uhd/doxygen/html/page_transport.html -share/doc/uhd/doxygen/html/page_uhd.html -share/doc/uhd/doxygen/html/page_uhd.js -share/doc/uhd/doxygen/html/page_usrp1.html -share/doc/uhd/doxygen/html/page_usrp2.html -share/doc/uhd/doxygen/html/page_usrp2.js -share/doc/uhd/doxygen/html/page_usrp_b100.html -share/doc/uhd/doxygen/html/page_usrp_b200.html -share/doc/uhd/doxygen/html/page_usrp_b200.js -share/doc/uhd/doxygen/html/page_usrp_e1x0.html -share/doc/uhd/doxygen/html/page_usrp_e1x0.js -share/doc/uhd/doxygen/html/page_usrp_e3x0.html -share/doc/uhd/doxygen/html/page_usrp_n3xx.html -share/doc/uhd/doxygen/html/page_usrp_x3x0.html -share/doc/uhd/doxygen/html/page_usrp_x3x0.js -share/doc/uhd/doxygen/html/page_usrp_x3x0_config.html -share/doc/uhd/doxygen/html/pages.html -share/doc/uhd/doxygen/html/resize.js -share/doc/uhd/doxygen/html/search/all_0.html -share/doc/uhd/doxygen/html/search/all_0.js -share/doc/uhd/doxygen/html/search/all_1.html -share/doc/uhd/doxygen/html/search/all_1.js -share/doc/uhd/doxygen/html/search/all_2.html -share/doc/uhd/doxygen/html/search/all_2.js -share/doc/uhd/doxygen/html/search/all_3.html -share/doc/uhd/doxygen/html/search/all_3.js -share/doc/uhd/doxygen/html/search/all_4.html -share/doc/uhd/doxygen/html/search/all_4.js -share/doc/uhd/doxygen/html/search/all_5.html -share/doc/uhd/doxygen/html/search/all_5.js -share/doc/uhd/doxygen/html/search/all_6.html -share/doc/uhd/doxygen/html/search/all_6.js -share/doc/uhd/doxygen/html/search/all_7.html -share/doc/uhd/doxygen/html/search/all_7.js -share/doc/uhd/doxygen/html/search/all_8.html -share/doc/uhd/doxygen/html/search/all_8.js -share/doc/uhd/doxygen/html/search/all_9.html -share/doc/uhd/doxygen/html/search/all_9.js -share/doc/uhd/doxygen/html/search/all_a.html -share/doc/uhd/doxygen/html/search/all_a.js -share/doc/uhd/doxygen/html/search/all_b.html -share/doc/uhd/doxygen/html/search/all_b.js -share/doc/uhd/doxygen/html/search/all_c.html -share/doc/uhd/doxygen/html/search/all_c.js -share/doc/uhd/doxygen/html/search/all_d.html -share/doc/uhd/doxygen/html/search/all_d.js -share/doc/uhd/doxygen/html/search/all_e.html -share/doc/uhd/doxygen/html/search/all_e.js -share/doc/uhd/doxygen/html/search/all_f.html -share/doc/uhd/doxygen/html/search/all_f.js -share/doc/uhd/doxygen/html/search/close.png -share/doc/uhd/doxygen/html/search/files_0.html -share/doc/uhd/doxygen/html/search/files_0.js -share/doc/uhd/doxygen/html/search/files_1.html -share/doc/uhd/doxygen/html/search/files_1.js -share/doc/uhd/doxygen/html/search/files_2.html -share/doc/uhd/doxygen/html/search/files_2.js -share/doc/uhd/doxygen/html/search/files_3.html -share/doc/uhd/doxygen/html/search/files_3.js -share/doc/uhd/doxygen/html/search/files_4.html -share/doc/uhd/doxygen/html/search/files_4.js -share/doc/uhd/doxygen/html/search/files_5.html -share/doc/uhd/doxygen/html/search/files_5.js -share/doc/uhd/doxygen/html/search/files_6.html -share/doc/uhd/doxygen/html/search/files_6.js -share/doc/uhd/doxygen/html/search/files_7.html -share/doc/uhd/doxygen/html/search/files_7.js -share/doc/uhd/doxygen/html/search/files_8.html -share/doc/uhd/doxygen/html/search/files_8.js -share/doc/uhd/doxygen/html/search/files_9.html -share/doc/uhd/doxygen/html/search/files_9.js -share/doc/uhd/doxygen/html/search/files_a.html -share/doc/uhd/doxygen/html/search/files_a.js -share/doc/uhd/doxygen/html/search/files_b.html -share/doc/uhd/doxygen/html/search/files_b.js -share/doc/uhd/doxygen/html/search/files_c.html -share/doc/uhd/doxygen/html/search/files_c.js -share/doc/uhd/doxygen/html/search/files_d.html -share/doc/uhd/doxygen/html/search/files_d.js -share/doc/uhd/doxygen/html/search/mag_sel.png -share/doc/uhd/doxygen/html/search/nomatches.html -share/doc/uhd/doxygen/html/search/pages_0.html -share/doc/uhd/doxygen/html/search/pages_0.js -share/doc/uhd/doxygen/html/search/pages_1.html -share/doc/uhd/doxygen/html/search/pages_1.js -share/doc/uhd/doxygen/html/search/pages_2.html -share/doc/uhd/doxygen/html/search/pages_2.js -share/doc/uhd/doxygen/html/search/pages_3.html -share/doc/uhd/doxygen/html/search/pages_3.js -share/doc/uhd/doxygen/html/search/pages_4.html -share/doc/uhd/doxygen/html/search/pages_4.js -share/doc/uhd/doxygen/html/search/pages_5.html -share/doc/uhd/doxygen/html/search/pages_5.js -share/doc/uhd/doxygen/html/search/pages_6.html -share/doc/uhd/doxygen/html/search/pages_6.js -share/doc/uhd/doxygen/html/search/pages_7.html -share/doc/uhd/doxygen/html/search/pages_7.js -share/doc/uhd/doxygen/html/search/pages_8.html -share/doc/uhd/doxygen/html/search/pages_8.js -share/doc/uhd/doxygen/html/search/pages_9.html -share/doc/uhd/doxygen/html/search/pages_9.js -share/doc/uhd/doxygen/html/search/pages_a.html -share/doc/uhd/doxygen/html/search/pages_a.js -share/doc/uhd/doxygen/html/search/pages_b.html -share/doc/uhd/doxygen/html/search/pages_b.js -share/doc/uhd/doxygen/html/search/pages_c.html -share/doc/uhd/doxygen/html/search/pages_c.js -share/doc/uhd/doxygen/html/search/pages_d.html -share/doc/uhd/doxygen/html/search/pages_d.js -share/doc/uhd/doxygen/html/search/search.css -share/doc/uhd/doxygen/html/search/search.js -share/doc/uhd/doxygen/html/search/search_l.png -share/doc/uhd/doxygen/html/search/search_m.png -share/doc/uhd/doxygen/html/search/search_r.png -share/doc/uhd/doxygen/html/search/searchdata.js -share/doc/uhd/doxygen/html/splitbar.png -share/doc/uhd/doxygen/html/sync_off.png -share/doc/uhd/doxygen/html/sync_on.png -share/doc/uhd/doxygen/html/tab_a.png -share/doc/uhd/doxygen/html/tab_b.png -share/doc/uhd/doxygen/html/tab_h.png -share/doc/uhd/doxygen/html/tab_s.png -share/doc/uhd/doxygen/html/tabs.css -share/doc/uhd/doxygen/html/x3x0_fp_overlay.png -share/doc/uhd/doxygen/html/x3x0_gpio_conn.png -share/doc/uhd/doxygen/html/x3x0_rp_overlay.png Index: pkgsrc/ham/uhd/PLIST.doxygen diff -u pkgsrc/ham/uhd/PLIST.doxygen:1.11 pkgsrc/ham/uhd/PLIST.doxygen:1.12 --- pkgsrc/ham/uhd/PLIST.doxygen:1.11 Sun Mar 3 10:36:14 2019 +++ pkgsrc/ham/uhd/PLIST.doxygen Thu Mar 14 21:17:51 2019 @@ -1,3 +1,4 @@ +share/doc/uhd/doxygen/html/Ettus_Logo.png share/doc/uhd/doxygen/html/N2xx-JTAG.jpg share/doc/uhd/doxygen/html/N310fp.png share/doc/uhd/doxygen/html/N310isoExplode.png Index: pkgsrc/ham/uhd/PLIST.manual diff -u pkgsrc/ham/uhd/PLIST.manual:1.2 pkgsrc/ham/uhd/PLIST.manual:1.3 --- pkgsrc/ham/uhd/PLIST.manual:1.2 Sun Mar 3 10:36:14 2019 +++ pkgsrc/ham/uhd/PLIST.manual Thu Mar 14 21:17:51 2019 @@ -1,51 +1,4 @@ -@comment $NetBSD: PLIST.manual,v 1.2 2019/03/03 10:36:14 mef Exp $ -share/doc/uhd/manual/html/build.html -share/doc/uhd/manual/html/calibration.html -share/doc/uhd/manual/html/coding.html -share/doc/uhd/manual/html/dboards.html -share/doc/uhd/manual/html/general.html -share/doc/uhd/manual/html/gpio_api.html -share/doc/uhd/manual/html/gpsdo.html -share/doc/uhd/manual/html/gpsdo_b2x0.html -share/doc/uhd/manual/html/gpsdo_x3x0.html -share/doc/uhd/manual/html/identification.html -share/doc/uhd/manual/html/images.html -share/doc/uhd/manual/html/index.html -share/doc/uhd/manual/html/res/x3x0_fp_overlay.png -share/doc/uhd/manual/html/res/x3x0_gpio_conn.png -share/doc/uhd/manual/html/res/x3x0_rp_overlay.png -share/doc/uhd/manual/html/stream.html -share/doc/uhd/manual/html/sync.html -share/doc/uhd/manual/html/transport.html -share/doc/uhd/manual/html/usrp1.html -share/doc/uhd/manual/html/usrp2.html -share/doc/uhd/manual/html/usrp_b100.html -share/doc/uhd/manual/html/usrp_b200.html -share/doc/uhd/manual/html/usrp_e1x0.html -share/doc/uhd/manual/html/usrp_x3x0.html -share/doc/uhd/manual/html/usrp_x3x0_config.html -share/doc/uhd/manual/rst/build.rst -share/doc/uhd/manual/rst/calibration.rst -share/doc/uhd/manual/rst/coding.rst -share/doc/uhd/manual/rst/dboards.rst -share/doc/uhd/manual/rst/general.rst -share/doc/uhd/manual/rst/gpio_api.rst -share/doc/uhd/manual/rst/gpsdo.rst -share/doc/uhd/manual/rst/gpsdo_b2x0.rst -share/doc/uhd/manual/rst/gpsdo_x3x0.rst -share/doc/uhd/manual/rst/identification.rst -share/doc/uhd/manual/rst/images.rst -share/doc/uhd/manual/rst/index.rst -share/doc/uhd/manual/rst/stream.rst -share/doc/uhd/manual/rst/sync.rst -share/doc/uhd/manual/rst/transport.rst -share/doc/uhd/manual/rst/usrp1.rst -share/doc/uhd/manual/rst/usrp2.rst -share/doc/uhd/manual/rst/usrp_b100.rst -share/doc/uhd/manual/rst/usrp_b200.rst -share/doc/uhd/manual/rst/usrp_e1x0.rst -share/doc/uhd/manual/rst/usrp_x3x0.rst -share/doc/uhd/manual/rst/usrp_x3x0_config.rst +@comment $NetBSD: PLIST.manual,v 1.3 2019/03/14 21:17:51 mef Exp $ man/man1/octoclock_firmware_burner.1.gz man/man1/uhd_cal_rx_iq_balance.1.gz man/man1/uhd_cal_tx_dc_offset.1.gz Index: pkgsrc/ham/uhd/distinfo diff -u pkgsrc/ham/uhd/distinfo:1.17 pkgsrc/ham/uhd/distinfo:1.18 --- pkgsrc/ham/uhd/distinfo:1.17 Wed Jan 9 01:28:45 2019 +++ pkgsrc/ham/uhd/distinfo Thu Mar 14 21:17:51 2019 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.17 2019/01/09 01:28:45 gdt Exp $ +$NetBSD: distinfo,v 1.18 2019/03/14 21:17:51 mef Exp $ SHA1 (uhd-3.11.1.0.tar.gz) = 11556dbec1a5d0ddd83906773a206d573ce6d849 RMD160 (uhd-3.11.1.0.tar.gz) = 054a29ed977162557525e8b90d1a25fc31a2465c SHA512 (uhd-3.11.1.0.tar.gz) = a7cd5a3e94b4a71e2e3b26922810c0c11a4c790bd9d279e38d3c7f4c2a39efbf65ea47bff08c9b2720eec3cb42d54fd63f2e3502d5ee500cee4870c7828e2a7e Size (uhd-3.11.1.0.tar.gz) = 9300386 bytes +SHA1 (patch-host_CMakeLists.txt) = 8d76bb150cbea380227a8a82a94daedb5dd619c2 SHA1 (patch-lib_include_uhdlib_experts_expert__nodes.hpp) = b741980f6a1bbeef07903a23de13474abc982f9e Index: pkgsrc/ham/uhd/options.mk diff -u pkgsrc/ham/uhd/options.mk:1.6 pkgsrc/ham/uhd/options.mk:1.7 --- pkgsrc/ham/uhd/options.mk:1.6 Sun Mar 3 10:36:14 2019 +++ pkgsrc/ham/uhd/options.mk Thu Mar 14 21:17:51 2019 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2019/03/03 10:36:14 mef Exp $ +# $NetBSD: options.mk,v 1.7 2019/03/14 21:17:51 mef Exp $ ### Set options PKG_OPTIONS_VAR= PKG_OPTIONS.uhd PKG_SUPPORTED_OPTIONS= doxygen manual @@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= doxygen manual .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdoxygen) -BUILD_DEPENDS+= doxygen>=1.8.12:../../devel/doxygen +BUILD_DEPENDS+= doxygen>=1.8.15:../../devel/doxygen PLIST_SRC+= ${PKGDIR}/PLIST.doxygen CMAKE_ARGS+= -DENABLE_DOXYGEN:BOOL=ON .else --_----------=_1552598271223600--