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

--- pkgsrc/ham/uhd/Makefile	2015/01/31 00:58:06	1.7
+++ pkgsrc/ham/uhd/Makefile	2016/06/08 07:26:59	1.19
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2015/01/31 00:58:06 mef Exp $
+# $NetBSD: Makefile,v 1.19 2016/06/08 07:26:59 wiz Exp $
 
-DISTNAME=		uhd-release_003_007_002
-PKGNAME=		uhd-3.7.2
+DISTNAME=		uhd-3.9.4
 PKGREVISION=		1
 CATEGORIES=		ham
-MASTER_SITES=		-https://github.com/EttusResearch/uhd/archive/${DISTNAME:S/uhd-//}${EXTRACT_SUFX}
-EXTRACT_SUFX=		.zip
+MASTER_SITES=           ${MASTER_SITE_GITHUB:=EttusResearch/}
+#                                                                     3.9.1 -> 003_009_001
+GITHUB_TAG=		release_${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/00\1_00\2_00\3/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://code.ettus.com/redmine/ettus/projects/uhd/wiki
@@ -13,54 +13,32 @@ COMMENT=		USRP (Universal Software Radio
 LICENSE=		gnu-gpl-v2
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
+BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+BUILD_DEPENDS+=		${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+
+CMAKE_ARGS+=		-DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
+CMAKE_ARGS+=		-Wno-dev
 
 USE_LANGUAGES=		c c++
 USE_TOOLS=		cmake pkg-config
 USE_CMAKE=		yes
+# extra pax_global_header exists, and to avoid that:
+EXTRACT_USING=		gtar
+#EXTRACT_ELEMENTS=	uhd-${GITHUB_TAG}
 
 # Please note distribution has many stuff under uhd/, but build itself
 # needs under host/ only.  Those uhd/ stuff will be handled post-{patch,install}:
-WRKSRC=			${WRKDIR}/${DISTNAME}/host
+WRKSRC=			${WRKDIR}/uhd-${GITHUB_TAG}/host
 
 # The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
 REPLACE_PYTHON=	\
+	utils/latency/graph.py \
+	utils/latency/run_tests.py \
 	utils/uhd_images_downloader.py.in \
 	utils/usrp2_card_burner.py \
 	utils/usrp2_card_burner_gui.py \
 	utils/usrp_n2xx_net_burner.py \
-	utils/usrp_n2xx_net_burner_gui.py \
-	uhd-firmware/fx2/utils/build_eeprom.py \
-	uhd-firmware/fx2/utils/edit-gpif-b100.py \
-	uhd-firmware/fx2/utils/edit-gpif.py \
-	uhd-firmware/fx2/utils/generate_regs.py \
-        uhd-firmware/x300/bin_to_coe.py \
-	uhd-firmware/zpu/bin/bin_to_mif.py \
-	uhd-firmware/zpu/bin/bin_to_ram_macro_init.py \
-	uhd-firmware/zpu/bin/divisors.py \
-	uhd-firmware/zpu/bin/elf_to_sbf \
-	uhd-firmware/zpu/bin/serial_loader \
-	uhd-firmware/zpu/bin/uart_ihex_flash_loader.py \
-	uhd-firmware/zpu/bin/uart_ihex_ram_loader.py \
-	uhd-fpga/usrp1/gen_makefile_extra.py \
-	uhd-fpga/usrp1/sdr_lib/gen_cordic_consts.py \
-	uhd-fpga/usrp1/tb/makesine.pl \
-	uhd-fpga/usrp1/toplevel/mrfm/mrfm.py \
-	uhd-fpga/usrp1/toplevel/mrfm/mrfm_fft.py \
-	uhd-fpga/usrp2/sdr_lib/gen_cordic_consts.py \
-	uhd-fpga/usrp2/top/extract_usage.py \
-	uhd-fpga/usrp2/top/python/check_inout.py \
-	uhd-fpga/usrp2/top/python/check_timing.py \
-	uhd-fpga/usrp3/top/python/bit_to_zynq_bin.py \
-	uhd-fpga/usrp3/top/python/check_inout.py \
-	uhd-fpga/usrp3/top/python/check_timing.py \
-        uhd-fpga/usrp3/lib/io_port2/create-lvbitx.py
-
-REPLACE_PERL=	uhd-fpga/usrp1/tb/makesine.pl
-
-REPLACE_BASH=	\
-	uhd-fpga/usrp2/top/impactor.sh \
-	uhd-fpga/usrp3/top/impactor.sh \
-        uhd-fpga/usrp3/top/python/batch-build
+	utils/usrp_n2xx_net_burner_gui.py
 
 INSTALLATION_DIRS+=	share/uhd
 INSTALLATION_DIRS+=	share/uhd/firmware
@@ -78,27 +56,6 @@ SUBST_SED.man=		-e '/UHD_INSTALL/s,$${PK
 PLIST_SRC=	${PKGDIR}/PLIST
 .include "options.mk"
 
-# Copy (beyond) upper directory files (which should be handled at post-install)
-# to receive REPLACE_PYTHON conversion ( otherwise above the range )
-post-patch:
-	(cd ${WRKDIR}; \
-	for i in firmware fpga images ; do \
-	  ${MKDIR} ${WRKSRC}/uhd-$$i ;\
-	${CP} -r ${WRKDIR}/${DISTNAME}/$$i/* ${WRKSRC}/uhd-$$i ;\
-	done)
-
-# (1) move back the files to original location after REPLACE_PYTHON handled
-# (2) suppress warning at intallation, "non executable files get +x bit set".
-#
-#  Converting ${CP} into ${INTALL_DATA_DIR} and ${INSTALL_DATA} as pkglint
-#  flags are NOT easy, sorry for that.
-post-install:
-	for i in firmware fpga images ; do \
-	  ${CP} -r ${WRKSRC}/uhd-$$i/* ${DESTDIR}${PREFIX}/share/uhd/$$i/;\
-	  ${FIND} ${DESTDIR}${PREFIX}/share/uhd/$$i -type f -exec \
-	          ${CHMOD} -x '{}' \; ;\
-		done
-
 .include "../../lang/python/application.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"