openocd: update to 0.11 (March 7th, 2021)

JTAG Layer:
  add debug level 4 for verbose I/O debug
  bitbang, add read buffer to improve performance
  Cadence SystemVerilog Direct Programming Interface (DPI) adapter driver
  CMSIS-DAP v2 (USB bulk based) adapter driver
  Cypress KitProg adapter driver
  FTDI FT232R sync bitbang adapter driver
  Linux GPIOD bitbang adapter driver through libgpiod
  Mellanox rshim USB or PCIe adapter driver
  Nuvoton Nu-Link and Nu-Link2 adapter drivers
  NXP IMX GPIO mmap based adapter driver
  ST-Link consolidate all versions in single config
  ST-Link read properly old USB serial numbers
  STLink/V3 support (for ST devices only !)
  STM8 SWIM transport
  TI XDS110 adapter driver
  Xilinx XVC/PCIe adapter driver

Target Layer:
  64 bit address support
  ARCv2 target support
  ARM Cortex-A hypervisor mode support
  ARM Cortex-M fast PC sampling support for profiling
  ARM generic CTI support
  ARM generic mem-ap target support
  ARMv7-A MMU tools
  ARMv7m traces add TCP stream server
  ARMv8 AARCH64 target support and semihosting support
  ARMv8 AARCH64 disassembler support through capstone library
  ARMv8-M target support
  EnSilica eSi-RISC target support, including instruction tracing eSi-Trace support
  MIPS64 target support
  Motorola SREC S6 record image file support
  RISC-V target support
  SEGGER Real Time Transfer (RTT) initial support (for single target, Cortex-M only)
  ST STM8 target support
  Various MIPS32 target improvements

Flash Layer:
  Atheros (ath79) SPI interface support
  Atmel atmega128rfa1 support
  Atmel SAM D21, D51, DA1, E51, E53, E54, G55, R30 support
  Atmel SAMC2?N* support
  Cypress PSoC5LP, PSoC6 support
  EnSilica eSi-RISC support
  Foshan Synwit Tech SWM050 support
  Maxim Integrated MAX32XXX support
  Nordic Semiconductor nRF51822, nRF52810, nRF52832 support
  NXP Kinetis K27, K28, KE1x, KEAx, KL28, KL8x, KV5x, KWx support
  Renesas RPC HF support
  SH QSPI support
  SiFive Freedom E support
  Silicon Labs EFR-family, EZR32HG support
  ST BlueNRG support
  ST STM32 QUAD/OCTO-SPI interface support for Flash, FRAM and EEPROM
  ST STM32F72x, STM32F4x3, STM32H7xx support
  ST STM32G0xx, STM32G4xx, STM32L4x, STM32WB, STM32WL support
  ST STM32L5x support (non secure mode)
  TI CC13xx, CC26xx, CC32xx support
  TI MSP432 support
  Winner Micro w600 support
  Xilinx XCF platform support
  Various discrete SPI NOR flashes support

Board, Target, and Interface Configuration Scripts:
  8devices LIMA board config
  Achilles Instant-Development Kit Arria 10 board config
  Amazon Kindle 2 and DX board config
  Analog Devices ADSP-SC58x, ADSP-SC584-EZBRD board config
  Andes Technology ADP-XC7KFF676 board config
  Andes Technology Corvette-F1 board config
  ARM Musca A board config
  Arty Spartan 7 FPGA board config
  Atmel SAMD10 Xplained mini board config
  Atmel SAMD11 Xplained Pro board config
  Atmel SAM G55 Xplained Pro board config
  AVNET UltraZED EG StarterKit board config
  Blue Pill STM32F103C8 board config
  DP Busblaster v4.1a board config
  DPTechnics DPT-Board-v1 board config
  Emcraft imx8 SOM BSB board config
  Globalscale ESPRESSObin board config
  Kasli board config
  Kintex Ultrascale XCKU040 board config
  Knovative KC-100 board config
  LeMaker HiKey board config
  Microchip (Atmel) SAME54 Xplained Pro board config
  Microchip (Atmel) SAML11 Xplained Pro board config
  Nordic module NRF52 board config
  Numato Lab Mimas A7 board config
  NXP Freedom FRDM-LS1012A board config
  NXP IMX7SABRE board config
  NXP IMX8MP-EVK board config
  NXP MC-IMX8M-EVK board config
  QuickLogic QuickFeather board config
  Renesas R-Car E2, H2, M2 board config
  Renesas R-Car Salvator-X(S) board config
  Renesas RZ/A1H GR-Peach board config
  Rigado BMD-300 board config
  Sayma AMC board config
  Sifive e31arty, e51arty, hifive1 board config
  ST B-L475E-IOT01A board config
  ST BlueNRG idb007v1, idb008v1, idb011v1 board config
  ST STM32F412g discovery board config
  ST STM32F413h discovery board config
  ST STM32F469i discovery board config
  ST STM32F7 Nucleo board config
  ST STM32F723e discovery board config
  ST STM32F746g discovery board config
  ST STM32F769i discovery board config
  ST STM32H735g discovery board config
  ST STM32H743zi Nucleo board config
  ST STM32H745i discovery board config
  ST STM32H747i discovery board config
  ST STM32H750b discovery board config
  ST STM32H7b3i discovery board config
  ST STM32H7x_dual_qspi board config
  ST STM32H7x3i Eval boards config
  ST STM32L073 Nucleo board config
  ST STM32L476g discovery board config
  ST STM32L496g discovery board config
  ST STM32L4p5g discovery board config
  ST STM32L4r9i discovery board config
  ST STM32L5 Nucleo board config
  ST STM32MP15x DK2 board config
  ST STM32WB Nucleo board config
  ST STM8L152R8 Nucleo board config
  Synopsys DesignWare ARC EM board config
  Synopsys DesignWare ARC HSDK board config
  TI BeagleBone family boards config
  TI CC13xx, CC26xx, CC32xx LaunchPad board config
  TI MSP432 LaunchPad board config
  Tocoding Poplar board config
  TP-Link WDR4300 board config
  Allwinner V3s target config
  Andes Technology NDS V5 target config
  Atmel atmega128rfa1 target config
  ARM corelink SSE-200 target config
  Atheros_ar9344 target config
  Cypress PSoC5LP, PSoC6 target config
  EnSilica eSi-RISC target config
  Foshan Synwit Tech SWM050 target config
  GigaDevice GD32VF103 target config
  Hisilicon Hi3798 target config
  Hisilicon Hi6220 target config
  Infineon TLE987x target config
  Marvell Armada 3700 target config
  Maxim Integrated MAX32XXX target config
  Mellanox BlueField target config
  Microchip (Atmel) SAME5x, SAML1x target config
  NXP IMX6SX, IMX6UL, IMX7, IMX7ULP, IMX8 target config
  NXP Kinetis KE1xZ, KE1xF target config
  NXP LPC84x, LPC8Nxx, LS1012A, NHS31xx target config
  Qualcomm QCA4531 target config
  QuickLogic EOS S3 target config
  Renesas R-Car E2, H2, M2 target config
  Renesas R-Car Gen3 target config
  Renesas RZ/A1H target config
  Rockchip RK3308 target config
  ST BlueNRG target config
  ST STM32G0, STM32G4, STM32H7, STM32L0, STM32L5 target config
  ST STM32MP15x target config
  ST STM32WBx, STM32WLEx target config
  ST STM8L152, S003, S103, S105 target config
  Synopsys DesignWare ARC EM target config
  Synopsys DesignWare ARC HS Development Kit SoC target config
  TI CC13xx, CC26xx, CC32xx target config
  TI TNETC4401 target config
  Xilinx UltraScale+ target config
  Altera 5M570Z (MAXV family) CPLD config
  Xilinx Ultrascale, XCF CPLD config
  Intel (Altera) Arria10 FPGA config
  Cadence SystemVerilog Direct Programming Interface (DPI) interface config
  Cypress KitProg interface config
  Digilent SMT2 NC interface config
  DLN-2 example of Linux GPIOD interface config
  FTDI C232HM interface config
  HIE JTAG Debugger interface config
  In-Circuit’s ICprog interface config
  isodebug isolated JTAG/SWD+UART interface config
  Mellanox rshim USB or PCIe interface config
  Nuvoton Nu-Link interface config
  NXP IMX GPIO mmap based interface config
  Steppenprobe open hardware interface config
  TI XDS110 interface config

Server Layer:
  64 bit address support
  default bind to IPv4 localhost
  gdb: allow multiple connections
  gdb: architecture element support
  gdb: vCont, vRun support
  telnet: handle Ctrl+A, Ctrl+E and Ctrl+K

RTOS:
  Chromium-EC rtos support
  hwthread pseudo rtos support
  NuttX rtos support
  RIOT rtos support

Documentation:
  Improve STM32 flash driver
  Various typo fix and improvements

5 files changed, 226 insertions, 35 deletions

diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile
index fe6d8e4c0b5..42d50d25c8e 100644
--- a/devel/openocd/Makefile
+++ b/devel/openocd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2019/07/08 16:27:13 martin Exp $
+# $NetBSD: Makefile,v 1.7 2021/05/06 15:31:13 tnn Exp $
 
-DISTNAME=	openocd-0.10.0
-PKGREVISION=	1
+DISTNAME=	openocd-0.11.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openocd/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,14 +14,14 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config
-MAKE_JOBS_SAFE=	no
 INFO_FILES=	yes
 
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
+CONFIGURE_ARGS+=	--disable-internal-jimtcl
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
 .include "options.mk"
 
-.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/jimtcl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/openocd/PLIST b/devel/openocd/PLIST
index bea265007d9..05895f3f81a 100644
--- a/devel/openocd/PLIST
+++ b/devel/openocd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/02/11 00:55:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/05/06 15:31:13 tnn Exp $
 bin/openocd
 info/openocd.info
 man/man1/openocd.1
@@ -9,12 +9,16 @@ share/openocd/contrib/libdcc/dcc_stdio.c
 share/openocd/contrib/libdcc/dcc_stdio.h
 share/openocd/contrib/libdcc/example.c
 share/openocd/scripts/bitsbytes.tcl
+share/openocd/scripts/board/8devices-lima.cfg
 share/openocd/scripts/board/actux3.cfg
 share/openocd/scripts/board/adapteva_parallella1.cfg
+share/openocd/scripts/board/adsp-sc584-ezbrd.cfg
 share/openocd/scripts/board/alphascale_asm9260_ek.cfg
 share/openocd/scripts/board/altera_sockit.cfg
 share/openocd/scripts/board/am3517evm.cfg
 share/openocd/scripts/board/arm_evaluator7t.cfg
+share/openocd/scripts/board/arm_musca_a.cfg
+share/openocd/scripts/board/arty_s7.cfg
 share/openocd/scripts/board/asus-rt-n16.cfg
 share/openocd/scripts/board/asus-rt-n66u.cfg
 share/openocd/scripts/board/at91cap7a-stk-sdram.cfg
@@ -37,15 +41,20 @@ share/openocd/scripts/board/atmel_sam4s_ek.cfg
 share/openocd/scripts/board/atmel_sam4s_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samc20_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samc21_xplained_pro.cfg
+share/openocd/scripts/board/atmel_samd10_xplained_mini.cfg
+share/openocd/scripts/board/atmel_samd11_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samd20_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samd21_xplained_pro.cfg
 share/openocd/scripts/board/atmel_same70_xplained.cfg
 share/openocd/scripts/board/atmel_samg53_xplained_pro.cfg
+share/openocd/scripts/board/atmel_samg55_xplained_pro.cfg
 share/openocd/scripts/board/atmel_saml21_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samr21_xplained_pro.cfg
 share/openocd/scripts/board/atmel_samv71_xplained_ultra.cfg
+share/openocd/scripts/board/avnet_ultrazed-eg.cfg
 share/openocd/scripts/board/balloon3-cpu.cfg
 share/openocd/scripts/board/bcm28155_ap.cfg
+share/openocd/scripts/board/bluefield.cfg
 share/openocd/scripts/board/bt-homehubv1.cfg
 share/openocd/scripts/board/colibri.cfg
 share/openocd/scripts/board/crossbow_tech_imote2.cfg
@@ -63,6 +72,8 @@ share/openocd/scripts/board/dm355evm.cfg
 share/openocd/scripts/board/dm365evm.cfg
 share/openocd/scripts/board/dm6446evm.cfg
 share/openocd/scripts/board/dp_busblaster_v3.cfg
+share/openocd/scripts/board/dp_busblaster_v4.cfg
+share/openocd/scripts/board/dptechnics_dpt-board-v1.cfg
 share/openocd/scripts/board/efikamx.cfg
 share/openocd/scripts/board/efm32.cfg
 share/openocd/scripts/board/eir.cfg
@@ -79,6 +90,7 @@ share/openocd/scripts/board/ek-lm4f232.cfg
 share/openocd/scripts/board/ek-tm4c123gxl.cfg
 share/openocd/scripts/board/ek-tm4c1294xl.cfg
 share/openocd/scripts/board/embedded-artists_lpc2478-32.cfg
+share/openocd/scripts/board/emcraft_imx8m-som-bsb.cfg
 share/openocd/scripts/board/emcraft_twr-vf6-som-bsb.cfg
 share/openocd/scripts/board/emcraft_vf6-som.cfg
 share/openocd/scripts/board/ethernut3.cfg
@@ -86,6 +98,7 @@ share/openocd/scripts/board/frdm-kl25z.cfg
 share/openocd/scripts/board/frdm-kl46z.cfg
 share/openocd/scripts/board/fsl_imx6q_sabresd.cfg
 share/openocd/scripts/board/glyn_tonga2.cfg
+share/openocd/scripts/board/gti/espressobin.cfg
 share/openocd/scripts/board/gumstix-aerocore.cfg
 share/openocd/scripts/board/hammer.cfg
 share/openocd/scripts/board/hilscher_nxdb500sys.cfg
@@ -109,12 +122,18 @@ share/openocd/scripts/board/imx31pdk.cfg
 share/openocd/scripts/board/imx35pdk.cfg
 share/openocd/scripts/board/imx53-m53evk.cfg
 share/openocd/scripts/board/imx53loco.cfg
+share/openocd/scripts/board/imx8mp-evk.cfg
 share/openocd/scripts/board/insignal_arndale.cfg
+share/openocd/scripts/board/kasli.cfg
+share/openocd/scripts/board/kc100.cfg
 share/openocd/scripts/board/kc705.cfg
+share/openocd/scripts/board/kcu105.cfg
 share/openocd/scripts/board/keil_mcb1700.cfg
 share/openocd/scripts/board/keil_mcb2140.cfg
+share/openocd/scripts/board/kindle2.cfg
 share/openocd/scripts/board/kwikstik.cfg
 share/openocd/scripts/board/la_fonera-fon2200.cfg
+share/openocd/scripts/board/lemaker_hikey.cfg
 share/openocd/scripts/board/linksys-wag200g.cfg
 share/openocd/scripts/board/linksys-wrt54gl.cfg
 share/openocd/scripts/board/linksys_nslu2.cfg
@@ -130,18 +149,27 @@ share/openocd/scripts/board/mbed-lpc11u24.cfg
 share/openocd/scripts/board/mbed-lpc1768.cfg
 share/openocd/scripts/board/mcb1700.cfg
 share/openocd/scripts/board/microchip_explorer16.cfg
+share/openocd/scripts/board/microchip_same54_xplained_pro.cfg
+share/openocd/scripts/board/microchip_saml11_xplained_pro.cfg
 share/openocd/scripts/board/mini2440.cfg
 share/openocd/scripts/board/mini6410.cfg
 share/openocd/scripts/board/minispartan6.cfg
+share/openocd/scripts/board/nds32_corvettef1.cfg
 share/openocd/scripts/board/nds32_xc5.cfg
+share/openocd/scripts/board/nds32_xc7.cfg
 share/openocd/scripts/board/netgear-dg834v3.cfg
 share/openocd/scripts/board/netgear-wg102.cfg
 share/openocd/scripts/board/nordic_nrf51822_mkit.cfg
 share/openocd/scripts/board/nordic_nrf51_dk.cfg
 share/openocd/scripts/board/nordic_nrf52_dk.cfg
+share/openocd/scripts/board/nordic_nrf52_ftx232.cfg
 share/openocd/scripts/board/novena-internal-fpga.cfg
+share/openocd/scripts/board/numato_mimas_a7.cfg
 share/openocd/scripts/board/numato_opsis.cfg
+share/openocd/scripts/board/nxp_frdm-ls1012a.cfg
+share/openocd/scripts/board/nxp_imx7sabre.cfg
 share/openocd/scripts/board/nxp_lpc-link2.cfg
+share/openocd/scripts/board/nxp_mcimx8m-evk.cfg
 share/openocd/scripts/board/olimex_LPC2378STK.cfg
 share/openocd/scripts/board/olimex_lpc_h2148.cfg
 share/openocd/scripts/board/olimex_sam7_ex256.cfg
@@ -151,7 +179,6 @@ share/openocd/scripts/board/olimex_stm32_h103.cfg
 share/openocd/scripts/board/olimex_stm32_h107.cfg
 share/openocd/scripts/board/olimex_stm32_p107.cfg
 share/openocd/scripts/board/omap2420_h4.cfg
-share/openocd/scripts/board/open-bldc.cfg
 share/openocd/scripts/board/openrd.cfg
 share/openocd/scripts/board/or1k_generic.cfg
 share/openocd/scripts/board/osk5912.cfg
@@ -163,11 +190,29 @@ share/openocd/scripts/board/propox_mmnet1001.cfg
 share/openocd/scripts/board/pxa255_sst.cfg
 share/openocd/scripts/board/quark_d2000_refboard.cfg
 share/openocd/scripts/board/quark_x10xx_board.cfg
+share/openocd/scripts/board/quicklogic_quickfeather.cfg
 share/openocd/scripts/board/redbee.cfg
+share/openocd/scripts/board/reflexces_achilles_i-dev_kit_arria10.cfg
 share/openocd/scripts/board/renesas_dk-s7g2.cfg
+share/openocd/scripts/board/renesas_gr_peach.cfg
+share/openocd/scripts/board/renesas_porter.cfg
+share/openocd/scripts/board/renesas_salvator-xs.cfg
+share/openocd/scripts/board/renesas_silk.cfg
+share/openocd/scripts/board/renesas_stout.cfg
+share/openocd/scripts/board/rigado_bmd300_ek.cfg
 share/openocd/scripts/board/rsc-w910.cfg
+share/openocd/scripts/board/sayma_amc.cfg
 share/openocd/scripts/board/sheevaplug.cfg
+share/openocd/scripts/board/sifive-e31arty.cfg
+share/openocd/scripts/board/sifive-e51arty.cfg
+share/openocd/scripts/board/sifive-hifive1-revb.cfg
+share/openocd/scripts/board/sifive-hifive1.cfg
 share/openocd/scripts/board/smdk6410.cfg
+share/openocd/scripts/board/snps_em_sk.cfg
+share/openocd/scripts/board/snps_em_sk_v1.cfg
+share/openocd/scripts/board/snps_em_sk_v2.1.cfg
+share/openocd/scripts/board/snps_em_sk_v2.2.cfg
+share/openocd/scripts/board/snps_hsdk.cfg
 share/openocd/scripts/board/spansion_sk-fm4-176l-s6e2cc.cfg
 share/openocd/scripts/board/spansion_sk-fm4-u120-9b560.cfg
 share/openocd/scripts/board/spear300evb.cfg
@@ -176,12 +221,23 @@ share/openocd/scripts/board/spear310evb20.cfg
 share/openocd/scripts/board/spear310evb20_mod.cfg
 share/openocd/scripts/board/spear320cpu.cfg
 share/openocd/scripts/board/spear320cpu_mod.cfg
+share/openocd/scripts/board/st_b-l475e-iot01a.cfg
+share/openocd/scripts/board/st_nucleo_8l152r8.cfg
 share/openocd/scripts/board/st_nucleo_f0.cfg
 share/openocd/scripts/board/st_nucleo_f103rb.cfg
 share/openocd/scripts/board/st_nucleo_f3.cfg
 share/openocd/scripts/board/st_nucleo_f4.cfg
+share/openocd/scripts/board/st_nucleo_f7.cfg
+share/openocd/scripts/board/st_nucleo_h743zi.cfg
+share/openocd/scripts/board/st_nucleo_h745zi.cfg
+share/openocd/scripts/board/st_nucleo_l073rz.cfg
 share/openocd/scripts/board/st_nucleo_l1.cfg
-share/openocd/scripts/board/st_nucleo_l476rg.cfg
+share/openocd/scripts/board/st_nucleo_l4.cfg
+share/openocd/scripts/board/st_nucleo_l5.cfg
+share/openocd/scripts/board/st_nucleo_wb55.cfg
+share/openocd/scripts/board/steval-idb007v1.cfg
+share/openocd/scripts/board/steval-idb008v1.cfg
+share/openocd/scripts/board/steval-idb011v1.cfg
 share/openocd/scripts/board/steval_pcc010.cfg
 share/openocd/scripts/board/stm320518_eval.cfg
 share/openocd/scripts/board/stm320518_eval_stlink.cfg
@@ -199,34 +255,67 @@ share/openocd/scripts/board/stm32439i_eval.cfg
 share/openocd/scripts/board/stm32439i_eval_stlink.cfg
 share/openocd/scripts/board/stm327x6g_eval.cfg
 share/openocd/scripts/board/stm32f0discovery.cfg
+share/openocd/scripts/board/stm32f103c8_blue_pill.cfg
 share/openocd/scripts/board/stm32f334discovery.cfg
 share/openocd/scripts/board/stm32f3discovery.cfg
+share/openocd/scripts/board/stm32f412g-disco.cfg
+share/openocd/scripts/board/stm32f413h-disco.cfg
 share/openocd/scripts/board/stm32f429disc1.cfg
 share/openocd/scripts/board/stm32f429discovery.cfg
 share/openocd/scripts/board/stm32f469discovery.cfg
+share/openocd/scripts/board/stm32f469i-disco.cfg
 share/openocd/scripts/board/stm32f4discovery.cfg
+share/openocd/scripts/board/stm32f723e-disco.cfg
+share/openocd/scripts/board/stm32f746g-disco.cfg
+share/openocd/scripts/board/stm32f769i-disco.cfg
 share/openocd/scripts/board/stm32f7discovery.cfg
+share/openocd/scripts/board/stm32h735g-disco.cfg
+share/openocd/scripts/board/stm32h745i-disco.cfg
+share/openocd/scripts/board/stm32h747i-disco.cfg
+share/openocd/scripts/board/stm32h750b-disco.cfg
+share/openocd/scripts/board/stm32h7b3i-disco.cfg
+share/openocd/scripts/board/stm32h7x3i_eval.cfg
+share/openocd/scripts/board/stm32h7x_dual_qspi.cfg
 share/openocd/scripts/board/stm32l0discovery.cfg
+share/openocd/scripts/board/stm32l476g-disco.cfg
+share/openocd/scripts/board/stm32l496g-disco.cfg
 share/openocd/scripts/board/stm32l4discovery.cfg
+share/openocd/scripts/board/stm32l4p5g-disco.cfg
+share/openocd/scripts/board/stm32l4r9i-disco.cfg
 share/openocd/scripts/board/stm32ldiscovery.cfg
+share/openocd/scripts/board/stm32mp15x_dk2.cfg
 share/openocd/scripts/board/stm32vldiscovery.cfg
 share/openocd/scripts/board/str910-eval.cfg
 share/openocd/scripts/board/telo.cfg
-share/openocd/scripts/board/ti-cc3200-launchxl.cfg
 share/openocd/scripts/board/ti_am335xevm.cfg
 share/openocd/scripts/board/ti_am437x_idk.cfg
 share/openocd/scripts/board/ti_am43xx_evm.cfg
 share/openocd/scripts/board/ti_beagleboard.cfg
 share/openocd/scripts/board/ti_beagleboard_xm.cfg
+share/openocd/scripts/board/ti_beaglebone-base.cfg
 share/openocd/scripts/board/ti_beaglebone.cfg
+share/openocd/scripts/board/ti_beaglebone_black.cfg
 share/openocd/scripts/board/ti_blaze.cfg
+share/openocd/scripts/board/ti_cc13x0_launchpad.cfg
+share/openocd/scripts/board/ti_cc13x2_launchpad.cfg
+share/openocd/scripts/board/ti_cc26x0_launchpad.cfg
+share/openocd/scripts/board/ti_cc26x2_launchpad.cfg
+share/openocd/scripts/board/ti_cc3200_launchxl.cfg
+share/openocd/scripts/board/ti_cc3220sf_launchpad.cfg
+share/openocd/scripts/board/ti_cc32xx_launchpad.cfg
+share/openocd/scripts/board/ti_dk-tm4c129.cfg
+share/openocd/scripts/board/ti_ek-tm4c123gxl.cfg
+share/openocd/scripts/board/ti_ek-tm4c1294xl.cfg
+share/openocd/scripts/board/ti_msp432_launchpad.cfg
 share/openocd/scripts/board/ti_pandaboard.cfg
 share/openocd/scripts/board/ti_pandaboard_es.cfg
 share/openocd/scripts/board/ti_tmdx570ls20susb.cfg
 share/openocd/scripts/board/ti_tmdx570ls31usb.cfg
+share/openocd/scripts/board/tocoding_poplar.cfg
 share/openocd/scripts/board/topas910.cfg
 share/openocd/scripts/board/topasa900.cfg
 share/openocd/scripts/board/tp-link_tl-mr3020.cfg
+share/openocd/scripts/board/tp-link_wdr4300.cfg
 share/openocd/scripts/board/twr-k60f120m.cfg
 share/openocd/scripts/board/twr-k60n512.cfg
 share/openocd/scripts/board/twr-vf65gs10.cfg
@@ -277,12 +366,20 @@ share/openocd/scripts/chip/st/stm32/stm32_rcc.tcl
 share/openocd/scripts/chip/st/stm32/stm32_regs.tcl
 share/openocd/scripts/chip/ti/lm3s/lm3s.tcl
 share/openocd/scripts/chip/ti/lm3s/lm3s_regs.tcl
+share/openocd/scripts/cpld/altera-5m570z-cpld.cfg
 share/openocd/scripts/cpld/altera-epm240.cfg
 share/openocd/scripts/cpld/jtagspi.cfg
 share/openocd/scripts/cpld/lattice-lc4032ze.cfg
 share/openocd/scripts/cpld/xilinx-xc6s.cfg
 share/openocd/scripts/cpld/xilinx-xc7.cfg
+share/openocd/scripts/cpld/xilinx-xcf-p.cfg
+share/openocd/scripts/cpld/xilinx-xcf-s.cfg
 share/openocd/scripts/cpld/xilinx-xcr3256.cfg
+share/openocd/scripts/cpld/xilinx-xcu.cfg
+share/openocd/scripts/cpu/arc/common.tcl
+share/openocd/scripts/cpu/arc/em.tcl
+share/openocd/scripts/cpu/arc/hs.tcl
+share/openocd/scripts/cpu/arc/v2.tcl
 share/openocd/scripts/cpu/arm/arm7tdmi.tcl
 share/openocd/scripts/cpu/arm/arm920.tcl
 share/openocd/scripts/cpu/arm/arm946.tcl
@@ -290,6 +387,8 @@ share/openocd/scripts/cpu/arm/arm966.tcl
 share/openocd/scripts/cpu/arm/cortex_m3.tcl
 share/openocd/scripts/fpga/altera-10m50.cfg
 share/openocd/scripts/fpga/altera-ep3c10.cfg
+share/openocd/scripts/fpga/xilinx-dna.cfg
+share/openocd/scripts/fpga/xilinx-xadc.cfg
 share/openocd/scripts/interface/altera-usb-blaster.cfg
 share/openocd/scripts/interface/altera-usb-blaster2.cfg
 share/openocd/scripts/interface/arm-jtag-ew.cfg
@@ -298,11 +397,14 @@ share/openocd/scripts/interface/buspirate.cfg
 share/openocd/scripts/interface/calao-usb-a9260.cfg
 share/openocd/scripts/interface/chameleon.cfg
 share/openocd/scripts/interface/cmsis-dap.cfg
+share/openocd/scripts/interface/dln-2-gpiod.cfg
 share/openocd/scripts/interface/dummy.cfg
 share/openocd/scripts/interface/estick.cfg
 share/openocd/scripts/interface/flashlink.cfg
+share/openocd/scripts/interface/ft232r.cfg
 share/openocd/scripts/interface/ftdi/100ask-openjtag.cfg
 share/openocd/scripts/interface/ftdi/axm0432.cfg
+share/openocd/scripts/interface/ftdi/c232hm.cfg
 share/openocd/scripts/interface/ftdi/calao-usb-a9260-c01.cfg
 share/openocd/scripts/interface/ftdi/calao-usb-a9260-c02.cfg
 share/openocd/scripts/interface/ftdi/cortino.cfg
@@ -310,6 +412,7 @@ share/openocd/scripts/interface/ftdi/digilent-hs1.cfg
 share/openocd/scripts/interface/ftdi/digilent-hs2.cfg
 share/openocd/scripts/interface/ftdi/digilent_jtag_hs3.cfg
 share/openocd/scripts/interface/ftdi/digilent_jtag_smt2.cfg
+share/openocd/scripts/interface/ftdi/digilent_jtag_smt2_nc.cfg
 share/openocd/scripts/interface/ftdi/dlp-usb1232h.cfg
 share/openocd/scripts/interface/ftdi/dp_busblaster.cfg
 share/openocd/scripts/interface/ftdi/dp_busblaster_kt-link.cfg
@@ -317,7 +420,9 @@ share/openocd/scripts/interface/ftdi/flossjtag-noeeprom.cfg
 share/openocd/scripts/interface/ftdi/flossjtag.cfg
 share/openocd/scripts/interface/ftdi/flyswatter.cfg
 share/openocd/scripts/interface/ftdi/flyswatter2.cfg
+share/openocd/scripts/interface/ftdi/ft232h-module-swd.cfg
 share/openocd/scripts/interface/ftdi/gw16042.cfg
+share/openocd/scripts/interface/ftdi/hie-jtag.cfg
 share/openocd/scripts/interface/ftdi/hilscher_nxhx10_etm.cfg
 share/openocd/scripts/interface/ftdi/hilscher_nxhx500_etm.cfg
 share/openocd/scripts/interface/ftdi/hilscher_nxhx500_re.cfg
@@ -326,7 +431,10 @@ share/openocd/scripts/interface/ftdi/hilscher_nxhx50_re.cfg
 share/openocd/scripts/interface/ftdi/hitex_lpc1768stick.cfg
 share/openocd/scripts/interface/ftdi/hitex_str9-comstick.cfg
 share/openocd/scripts/interface/ftdi/icebear.cfg
+share/openocd/scripts/interface/ftdi/imx8mp-evk.cfg
+share/openocd/scripts/interface/ftdi/incircuit-icprog.cfg
 share/openocd/scripts/interface/ftdi/iotlab-usb.cfg
+share/openocd/scripts/interface/ftdi/isodebug.cfg
 share/openocd/scripts/interface/ftdi/jtag-lock-pick_tiny_2.cfg
 share/openocd/scripts/interface/ftdi/jtagkey.cfg
 share/openocd/scripts/interface/ftdi/jtagkey2.cfg
@@ -338,6 +446,7 @@ share/openocd/scripts/interface/ftdi/luminary-lm3s811.cfg
 share/openocd/scripts/interface/ftdi/luminary.cfg
 share/openocd/scripts/interface/ftdi/m53evk.cfg
 share/openocd/scripts/interface/ftdi/mbftdi.cfg
+share/openocd/scripts/interface/ftdi/minimodule-swd.cfg
 share/openocd/scripts/interface/ftdi/minimodule.cfg
 share/openocd/scripts/interface/ftdi/minispartan6.cfg
 share/openocd/scripts/interface/ftdi/neodb.cfg
@@ -359,6 +468,8 @@ share/openocd/scripts/interface/ftdi/rowley-cc-arm-swd.cfg
 share/openocd/scripts/interface/ftdi/sheevaplug.cfg
 share/openocd/scripts/interface/ftdi/signalyzer-lite.cfg
 share/openocd/scripts/interface/ftdi/signalyzer.cfg
+share/openocd/scripts/interface/ftdi/snps_sdp.cfg
+share/openocd/scripts/interface/ftdi/steppenprobe.cfg
 share/openocd/scripts/interface/ftdi/stm32-stick.cfg
 share/openocd/scripts/interface/ftdi/swd-resistor-hack.cfg
 share/openocd/scripts/interface/ftdi/ti-icdi.cfg
@@ -370,9 +481,13 @@ share/openocd/scripts/interface/ftdi/um232h.cfg
 share/openocd/scripts/interface/ftdi/vpaclink.cfg
 share/openocd/scripts/interface/ftdi/xds100v2.cfg
 share/openocd/scripts/interface/ftdi/xds100v3.cfg
+share/openocd/scripts/interface/imx-native.cfg
 share/openocd/scripts/interface/jlink.cfg
+share/openocd/scripts/interface/jtag_dpi.cfg
 share/openocd/scripts/interface/jtag_vpi.cfg
+share/openocd/scripts/interface/kitprog.cfg
 share/openocd/scripts/interface/nds32-aice.cfg
+share/openocd/scripts/interface/nulink.cfg
 share/openocd/scripts/interface/opendous.cfg
 share/openocd/scripts/interface/openjtag.cfg
 share/openocd/scripts/interface/osbdm.cfg
@@ -381,15 +496,19 @@ share/openocd/scripts/interface/parport_dlc5.cfg
 share/openocd/scripts/interface/raspberrypi-native.cfg
 share/openocd/scripts/interface/raspberrypi2-native.cfg
 share/openocd/scripts/interface/rlink.cfg
+share/openocd/scripts/interface/rshim.cfg
+share/openocd/scripts/interface/stlink-dap.cfg
 share/openocd/scripts/interface/stlink-v1.cfg
 share/openocd/scripts/interface/stlink-v2-1.cfg
 share/openocd/scripts/interface/stlink-v2.cfg
+share/openocd/scripts/interface/stlink.cfg
 share/openocd/scripts/interface/sysfsgpio-raspberrypi.cfg
 share/openocd/scripts/interface/ti-icdi.cfg
 share/openocd/scripts/interface/ulink.cfg
 share/openocd/scripts/interface/usb-jtag.cfg
 share/openocd/scripts/interface/usbprog.cfg
 share/openocd/scripts/interface/vsllink.cfg
+share/openocd/scripts/interface/xds110.cfg
 share/openocd/scripts/mem_helper.tcl
 share/openocd/scripts/memory.tcl
 share/openocd/scripts/mmr_helpers.tcl
@@ -397,12 +516,15 @@ share/openocd/scripts/target/1986ве1т.cfg
 share/openocd/scripts/target/adsp-sc58x.cfg
 share/openocd/scripts/target/aduc702x.cfg
 share/openocd/scripts/target/aducm360.cfg
+share/openocd/scripts/target/allwinner_v3s.cfg
 share/openocd/scripts/target/alphascale_asm9260t.cfg
 share/openocd/scripts/target/altera_fpgasoc.cfg
+share/openocd/scripts/target/altera_fpgasoc_arria10.cfg
 share/openocd/scripts/target/am335x.cfg
 share/openocd/scripts/target/am437x.cfg
 share/openocd/scripts/target/amdm37x.cfg
 share/openocd/scripts/target/ar71xx.cfg
+share/openocd/scripts/target/arm_corelink_sse200.cfg
 share/openocd/scripts/target/armada370.cfg
 share/openocd/scripts/target/at32ap7000.cfg
 share/openocd/scripts/target/at91r40008.cfg
@@ -445,7 +567,11 @@ share/openocd/scripts/target/at91samg5x.cfg
 share/openocd/scripts/target/atheros_ar2313.cfg
 share/openocd/scripts/target/atheros_ar2315.cfg
 share/openocd/scripts/target/atheros_ar9331.cfg
+share/openocd/scripts/target/atheros_ar9344.cfg
 share/openocd/scripts/target/atmega128.cfg
+share/openocd/scripts/target/atmega128rfa1.cfg
+share/openocd/scripts/target/atsame5x.cfg
+share/openocd/scripts/target/atsaml1x.cfg
 share/openocd/scripts/target/atsamv.cfg
 share/openocd/scripts/target/avr32.cfg
 share/openocd/scripts/target/bcm281xx.cfg
@@ -454,13 +580,13 @@ share/openocd/scripts/target/bcm4718.cfg
 share/openocd/scripts/target/bcm47xx.cfg
 share/openocd/scripts/target/bcm5352e.cfg
 share/openocd/scripts/target/bcm6348.cfg
+share/openocd/scripts/target/bluefield.cfg
+share/openocd/scripts/target/bluenrg-x.cfg
 share/openocd/scripts/target/c100.cfg
 share/openocd/scripts/target/c100config.tcl
 share/openocd/scripts/target/c100helper.tcl
 share/openocd/scripts/target/c100regs.tcl
 share/openocd/scripts/target/cc2538.cfg
-share/openocd/scripts/target/cc26xx.cfg
-share/openocd/scripts/target/cc32xx.cfg
 share/openocd/scripts/target/cs351x.cfg
 share/openocd/scripts/target/davinci.cfg
 share/openocd/scripts/target/dragonite.cfg
@@ -468,10 +594,11 @@ share/openocd/scripts/target/dsp56321.cfg
 share/openocd/scripts/target/dsp568013.cfg
 share/openocd/scripts/target/dsp568037.cfg
 share/openocd/scripts/target/efm32.cfg
-share/openocd/scripts/target/efm32_stlink.cfg
 share/openocd/scripts/target/em357.cfg
 share/openocd/scripts/target/em358.cfg
+share/openocd/scripts/target/eos_s3.cfg
 share/openocd/scripts/target/epc9301.cfg
+share/openocd/scripts/target/esi32xx.cfg
 share/openocd/scripts/target/exynos5250.cfg
 share/openocd/scripts/target/faux.cfg
 share/openocd/scripts/target/feroceon.cfg
@@ -479,7 +606,10 @@ share/openocd/scripts/target/fm3.cfg
 share/openocd/scripts/target/fm4.cfg
 share/openocd/scripts/target/fm4_mb9bf.cfg
 share/openocd/scripts/target/fm4_s6e2cc.cfg
+share/openocd/scripts/target/gd32vf103.cfg
 share/openocd/scripts/target/gp326xxxa.cfg
+share/openocd/scripts/target/hi3798.cfg
+share/openocd/scripts/target/hi6220.cfg
 share/openocd/scripts/target/hilscher_netx10.cfg
 share/openocd/scripts/target/hilscher_netx50.cfg
 share/openocd/scripts/target/hilscher_netx500.cfg
@@ -494,17 +624,21 @@ share/openocd/scripts/target/imx35.cfg
 share/openocd/scripts/target/imx51.cfg
 share/openocd/scripts/target/imx53.cfg
 share/openocd/scripts/target/imx6.cfg
+share/openocd/scripts/target/imx6sx.cfg
+share/openocd/scripts/target/imx6ul.cfg
+share/openocd/scripts/target/imx7.cfg
+share/openocd/scripts/target/imx7ulp.cfg
+share/openocd/scripts/target/imx8m.cfg
+share/openocd/scripts/target/infineon/tle987x.cfg
 share/openocd/scripts/target/is5114.cfg
 share/openocd/scripts/target/ixp42x.cfg
 share/openocd/scripts/target/k1921vk01t.cfg
 share/openocd/scripts/target/k40.cfg
 share/openocd/scripts/target/k60.cfg
-share/openocd/scripts/target/ke02.cfg
-share/openocd/scripts/target/ke04.cfg
-share/openocd/scripts/target/ke06.cfg
-share/openocd/scripts/target/kex.cfg
+share/openocd/scripts/target/ke0x.cfg
+share/openocd/scripts/target/ke1xf.cfg
+share/openocd/scripts/target/ke1xz.cfg
 share/openocd/scripts/target/kl25.cfg
-share/openocd/scripts/target/kl25z_hla.cfg
 share/openocd/scripts/target/kl46.cfg
 share/openocd/scripts/target/klx.cfg
 share/openocd/scripts/target/ks869x.cfg
@@ -531,14 +665,24 @@ share/openocd/scripts/target/lpc40xx.cfg
 share/openocd/scripts/target/lpc4350.cfg
 share/openocd/scripts/target/lpc4357.cfg
 share/openocd/scripts/target/lpc4370.cfg
+share/openocd/scripts/target/lpc84x.cfg
+share/openocd/scripts/target/lpc8nxx.cfg
 share/openocd/scripts/target/lpc8xx.cfg
+share/openocd/scripts/target/ls1012a.cfg
+share/openocd/scripts/target/marvell/88f3710.cfg
+share/openocd/scripts/target/marvell/88f3720.cfg
+share/openocd/scripts/target/marvell/88f37x0.cfg
+share/openocd/scripts/target/max32620.cfg
+share/openocd/scripts/target/max32625.cfg
+share/openocd/scripts/target/max3263x.cfg
 share/openocd/scripts/target/mc13224v.cfg
 share/openocd/scripts/target/mdr32f9q2i.cfg
 share/openocd/scripts/target/nds32v2.cfg
 share/openocd/scripts/target/nds32v3.cfg
 share/openocd/scripts/target/nds32v3m.cfg
+share/openocd/scripts/target/nds32v5.cfg
+share/openocd/scripts/target/nhs31xx.cfg
 share/openocd/scripts/target/nrf51.cfg
-share/openocd/scripts/target/nrf51_stlink.tcl
 share/openocd/scripts/target/nrf52.cfg
 share/openocd/scripts/target/nuc910.cfg
 share/openocd/scripts/target/numicro.cfg
@@ -552,13 +696,20 @@ share/openocd/scripts/target/or1k.cfg
 share/openocd/scripts/target/pic32mx.cfg
 share/openocd/scripts/target/psoc4.cfg
 share/openocd/scripts/target/psoc5lp.cfg
+share/openocd/scripts/target/psoc6.cfg
 share/openocd/scripts/target/pxa255.cfg
 share/openocd/scripts/target/pxa270.cfg
 share/openocd/scripts/target/pxa3xx.cfg
+share/openocd/scripts/target/qualcomm_qca4531.cfg
 share/openocd/scripts/target/quark_d20xx.cfg
 share/openocd/scripts/target/quark_x10xx.cfg
 share/openocd/scripts/target/readme.txt
+share/openocd/scripts/target/renesas_r7s72100.cfg
+share/openocd/scripts/target/renesas_rcar_gen2.cfg
+share/openocd/scripts/target/renesas_rcar_gen3.cfg
+share/openocd/scripts/target/renesas_rcar_reset_common.cfg
 share/openocd/scripts/target/renesas_s7g2.cfg
+share/openocd/scripts/target/rk3308.cfg
 share/openocd/scripts/target/samsung_s3c2410.cfg
 share/openocd/scripts/target/samsung_s3c2440.cfg
 share/openocd/scripts/target/samsung_s3c2450.cfg
@@ -567,51 +718,68 @@ share/openocd/scripts/target/samsung_s3c6410.cfg
 share/openocd/scripts/target/sharp_lh79532.cfg
 share/openocd/scripts/target/sim3x.cfg
 share/openocd/scripts/target/smp8634.cfg
+share/openocd/scripts/target/snps_em_sk_fpga.cfg
+share/openocd/scripts/target/snps_hsdk.cfg
 share/openocd/scripts/target/spear3xx.cfg
 share/openocd/scripts/target/stellaris.cfg
-share/openocd/scripts/target/stellaris_icdi.cfg
-share/openocd/scripts/target/stm32_stlink.cfg
 share/openocd/scripts/target/stm32f0x.cfg
-share/openocd/scripts/target/stm32f0x_stlink.cfg
 share/openocd/scripts/target/stm32f1x.cfg
-share/openocd/scripts/target/stm32f1x_stlink.cfg
 share/openocd/scripts/target/stm32f2x.cfg
-share/openocd/scripts/target/stm32f2x_stlink.cfg
 share/openocd/scripts/target/stm32f3x.cfg
-share/openocd/scripts/target/stm32f3x_stlink.cfg
 share/openocd/scripts/target/stm32f4x.cfg
-share/openocd/scripts/target/stm32f4x_stlink.cfg
 share/openocd/scripts/target/stm32f7x.cfg
+share/openocd/scripts/target/stm32g0x.cfg
+share/openocd/scripts/target/stm32g4x.cfg
+share/openocd/scripts/target/stm32h7x.cfg
+share/openocd/scripts/target/stm32h7x_dual_bank.cfg
 share/openocd/scripts/target/stm32l0.cfg
+share/openocd/scripts/target/stm32l0_dual_bank.cfg
 share/openocd/scripts/target/stm32l1.cfg
 share/openocd/scripts/target/stm32l1x_dual_bank.cfg
 share/openocd/scripts/target/stm32l4x.cfg
-share/openocd/scripts/target/stm32lx_stlink.cfg
-share/openocd/scripts/target/stm32w108_stlink.cfg
+share/openocd/scripts/target/stm32l5x.cfg
+share/openocd/scripts/target/stm32mp15x.cfg
 share/openocd/scripts/target/stm32w108xx.cfg
+share/openocd/scripts/target/stm32wbx.cfg
+share/openocd/scripts/target/stm32wlx.cfg
 share/openocd/scripts/target/stm32xl.cfg
+share/openocd/scripts/target/stm8l.cfg
+share/openocd/scripts/target/stm8l152.cfg
+share/openocd/scripts/target/stm8s.cfg
+share/openocd/scripts/target/stm8s003.cfg
+share/openocd/scripts/target/stm8s103.cfg
+share/openocd/scripts/target/stm8s105.cfg
 share/openocd/scripts/target/str710.cfg
 share/openocd/scripts/target/str730.cfg
 share/openocd/scripts/target/str750.cfg
 share/openocd/scripts/target/str912.cfg
 share/openocd/scripts/target/swj-dp.tcl
+share/openocd/scripts/target/swm050.cfg
 share/openocd/scripts/target/test_reset_syntax_error.cfg
 share/openocd/scripts/target/test_syntax_error.cfg
 share/openocd/scripts/target/ti-ar7.cfg
 share/openocd/scripts/target/ti-cjtag.cfg
 share/openocd/scripts/target/ti_calypso.cfg
+share/openocd/scripts/target/ti_cc13x0.cfg
+share/openocd/scripts/target/ti_cc13x2.cfg
+share/openocd/scripts/target/ti_cc26x0.cfg
+share/openocd/scripts/target/ti_cc26x2.cfg
+share/openocd/scripts/target/ti_cc3220sf.cfg
+share/openocd/scripts/target/ti_cc32xx.cfg
 share/openocd/scripts/target/ti_dm355.cfg
 share/openocd/scripts/target/ti_dm365.cfg
 share/openocd/scripts/target/ti_dm6446.cfg
-share/openocd/scripts/target/ti_msp432p4xx.cfg
+share/openocd/scripts/target/ti_msp432.cfg
 share/openocd/scripts/target/ti_rm4x.cfg
 share/openocd/scripts/target/ti_tms570.cfg
 share/openocd/scripts/target/ti_tms570ls20xxx.cfg
 share/openocd/scripts/target/ti_tms570ls3137.cfg
 share/openocd/scripts/target/tmpa900.cfg
 share/openocd/scripts/target/tmpa910.cfg
+share/openocd/scripts/target/tnetc4401.cfg
 share/openocd/scripts/target/u8500.cfg
 share/openocd/scripts/target/vybrid_vf6xx.cfg
+share/openocd/scripts/target/xilinx_zynqmp.cfg
 share/openocd/scripts/target/xmc1xxx.cfg
 share/openocd/scripts/target/xmc4xxx.cfg
 share/openocd/scripts/target/xmos_xs1-xau8a-10_arm.cfg
diff --git a/devel/openocd/distinfo b/devel/openocd/distinfo
index acab4432a48..c5eb6210e60 100644
--- a/devel/openocd/distinfo
+++ b/devel/openocd/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2018/03/13 03:01:15 dholland Exp $
+$NetBSD: distinfo,v 1.8 2021/05/06 15:31:13 tnn Exp $
 
-SHA1 (openocd-0.10.0.tar.bz2) = 3245d43d60a1a93f8b0f6b1ce20b53e38cab7a4a
-RMD160 (openocd-0.10.0.tar.bz2) = c3ae519d50e0f4185768a7642eefbc954c56d84a
-SHA512 (openocd-0.10.0.tar.bz2) = 6c890c86c3339da49bd529e8674ca62bc7fce4a2a17798dcc5d70b4f7628b640d856651170a3f7e2e2a120989066e84d8439b56ff42ff2bd72446f9af0f28ba2
-Size (openocd-0.10.0.tar.bz2) = 4792636 bytes
+SHA1 (openocd-0.11.0.tar.bz2) = 8d454145a8c22eb9d837ab3ba08dcef06cd10473
+RMD160 (openocd-0.11.0.tar.bz2) = d1e09011ef5e9171529b550b0e90468da178425d
+SHA512 (openocd-0.11.0.tar.bz2) = 4c8d880945083a05a3781b3fe2a39e4055df635faab1cacd78ca51ced75c9a478f4e16e6c6fa35ac117e2e4d6453cdd19818f1d27aae6edf1bda8c0e846d0de8
+Size (openocd-0.11.0.tar.bz2) = 5699972 bytes
+SHA1 (patch-Makefile.in) = 4035163eb0563254dc4f1bc4a0abac9fbea633e1
 SHA1 (patch-src_flash_nor_fm4.c) = b14914ebe08a7c7d9f12c3999c5e6edeae2569e0
diff --git a/devel/openocd/options.mk b/devel/openocd/options.mk
index b7088951986..5b8efb1f4cc 100644
--- a/devel/openocd/options.mk
+++ b/devel/openocd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2018/02/11 00:55:58 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2021/05/06 15:31:13 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openocd
-PKG_SUPPORTED_OPTIONS=	libhidapi libusb libusb1
+PKG_SUPPORTED_OPTIONS=	libhidapi libusb libusb1 libftdi1 capstone
 PKG_SUGGESTED_OPTIONS+=	${PKG_SUPPORTED_OPTIONS}
 PLIST_VARS+=		libusb1
 
@@ -25,3 +25,11 @@ CONFIGURE_ENV+=		HIDAPI_LIBS=${HIDAPI_LIBS:Q}
 .include "../../devel/libusb1/buildlink3.mk"
 PLIST.libusb1=		yes
 .endif
+
+.if !empty(PKG_OPTIONS:Mlibftdi1)
+.include "../../devel/libftdi1/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mcapstone)
+.include "../../devel/capstone/buildlink3.mk"
+.endif
diff --git a/devel/openocd/patches/patch-Makefile.in b/devel/openocd/patches/patch-Makefile.in
new file mode 100644
index 00000000000..33001e76fad
--- /dev/null
+++ b/devel/openocd/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/05/06 15:31:13 tnn Exp $
+
+use pkg-config to find libjim.so
+
+--- Makefile.in.orig	2021-03-07 11:02:20.000000000 +0000
++++ Makefile.in
+@@ -97,7 +97,7 @@ bin_PROGRAMS = src/openocd$(EXEEXT)
+ @INTERNAL_JIMTCL_TRUE@			   -I$(top_builddir)/jimtcl
+ 
+ @INTERNAL_JIMTCL_TRUE@am__append_4 = $(top_builddir)/jimtcl/libjim.a
+-@INTERNAL_JIMTCL_FALSE@am__append_5 = -ljim
++@INTERNAL_JIMTCL_FALSE@am__append_5 = $$(pkg-config --libs jimtcl)
+ 
+ # banner output includes RELSTR appended to $VERSION from the configure script
+ # guess-rev.sh returns either a repository version ID or "-snapshot"