Update to 0.10.0

* Fix the hardcoded pathes and the flag for libhidapi option
* Tested with STM32F4Discovery board

Changelog:
Highlights of the changes made in the OpenOCD source archive release

JTAG Layer:

    New driver for J-Link adapters based on libjaylink
      (including support for FPGA configuration, SWO and EMUCOM)
    FTDI improvements to work at 30MHz clock
    BCM2835 native driver SWD and Raspberry Pi2 support
    BCM2835 is set to 4ma drive, slow slew rate
    ixo-usb-jtag (emulation of an Altera Bus Blaster I on Cypress FX2 IC)
      support
    JTAG pass-through mode for CMSIS-DAP (including support for FPGA
      configuration)
    OpenJTAG support for Cypress CY7C65215
    connect_assert_srst support for SWD
    Xilinx Virtex-II Series7 bitstream loading support
    Use JEP106 data to decode IDs
    Deprecated “ft2232″ driver removed (use “ftdi” instead)
    GPL-incompatible FTDI D2XX library support dropped (Presto, OpenJTAG and
      USB-Blaster I are using libftdi only now)
    ZY1000 support dropped (unmaintained since long)
    oocd_trace support dropped

Target Layer:

    ARMv7-A, Cortex-M, Cortex-A/R important fixes and improvements (allowing
      e.g. simultaneous debugging of A8 and M3 cores, JTAG WAIT support etc.)
    ARM Cortex-A,R allow interrupt disable during single-step (maskisr command)
    Semihosting support for ARMv7-A
    ARM Cortex-M7 support
    Intel Quark mcu D2000 support
    Freescale LS102x SAP support
    ThreadX RTOS support on ARM926E-JS
    Cortex-M RTOS stack alignment fixes
    FreeRTOS FPU support
    uC/OS-III RTOS support
    bridging semihosting to GDB’s File-I/O support
    -defer-examine option added to target create command
    verify_image_checksum command added

Flash Layer:

    Atmel SAM4S, SAM4N, SAM4C support
    Atmel SAMV, SAMS, SAME (Cortex-M7) support
    Atmel AT91SAMD handle reset run/halt in DSU, other fixes
    Atmel AT91SAML21, SAML22, SAMC20/SAMC21, SAMD09 support
    ST STM32F4x support
    ST STM32F74x/76x/77x, STM32L4 support
    ST STM32L0 categories 1, 2 and 5 support
    Kinetis K02, K21, K22, K24, K26, K63, K64, K66 support
    Kinetis KE, KVx, K8x families support
    Kinetis FlexNVM handling
    Kinetis flash protection, security, mass_erase improvements
    Infineon XMC4xxx family support
    Infineon XMC1000 flash driver
    Energy Micro EFM32 Happy Gecko support
    Energy Micro EFM32 debug interface lock support
    Analog Devices ADuCM360 support
    Unified Nuvoton NuMicro flash driver
    NIIET K1921VK01T (Cortex-M4) support
    Nordic Semiconductor nRF51 improvements
    Spansion FM4 flash (including MB9BFx64/x65, S6E2DH) driver
    Ambiq Micro Apollo flash driver
    PIC32MX new device IDs, 17x/27x flash support
    read_bank() and verify_bank() NOR flash internal API to allow reading
      (and verifying) non-memory-mapped devices
    JTAGSPI driver to access SPI NOR flashes via a trivial FPGA proxy
    Milandr read/verify for Info memory support
    Various discrete SPI NOR flashes support
    CFI 16-bit flash reversed endianness support

Board, Target, and Interface Configuration Scripts:

    Digilent JTAG-HS2, JTAG-HS3 interfaces configs
    FTDI UM232H module as JTAG interface config
    100ask’s OpenJTAG interface config
    MBFTDI interface config
    XDS100v3 interface config
    Freescale Vybrid VF6xx target config
    EmCraft VF6 SOM and baseboard configs
    Freescale SabreSD board config
    Freescale VF65GS10 tower board config
    Pipistrello Xilinx Spartan6 LX45 FPGA board config
    miniSpartan6+ board config
    Xilinx Kintex7 Development board config
    Parallella-I board config
    Digilent Atlys and Analog Discovery board configs
    Numato Opsis board config
    Xilinx Spartan 6 FPGA “Device DNA” reading support
    Altera 10M50 FPGA (MAX10 family) target config
    Altera EPM240 CPLD (MAXII family) target config
    Marsohod2, Marsohod3 FPGA, Marsohod CPLD boards configs
    Novena’s integrated FPGA board config
    XMOS XS1-XAU8A-10′s ARM core config
    XMOS xCORE-XA Core Module board config
    Exynos5250 target config
    Arndale board config
    FM4 MB9BFxxx family configs
    Spansion SK-FM4-U120-9B560 board config
    Diolan LPC4357-DB1 board config
    ST STM32F469 discovery board config
    ST STM32F7-DISCO, STM327[4|5]6G-EVAL boards configs
    ST STM32L4 discovery, NUCLEO L476RG, STM32F429I-DISC1 boards configs
    Atheros AR2313, AR2315 targets config
    Netgear WP102 board config
    La Fonera FON2200 board config
    Linksys WAG200G board config
    LPC-Link2 board config
    NXP LPC4370 target config
    Atmel SAMV, SAMS, SAME target configs
    Atmel SAM E70 Xplained, SAM V71 Xplained Ultra boards configs
    Nordic nRF52 target config
    Nordic nRF51-DK, nRF52-DK boards configs
    Infineon XMC4700 Relax Kit, XMC4800 Relax EtherCAT Kit, XMC4300 Relax
      EtherCAT Kit boards configs
    Renesas S7G2 target config
    Renesas DK-S7G2 board config
    Altera EP3C10 FPGA (Cyclone III family) target config
    TI MSP432P4xx target config
    Cypress PSoC 5LP target config
    Analog Devices ADSP-SC58x target config (Cortex-A5 core only)

Server Layer:

    tcl_trace command for async target trace output via Tcl RPC

Build and Release:

    Various fixes thanks to http://coccinellery.org
    libftdi is now autodetected with pkgconfig
    Releases should now support reproducible builds
    Conversion to non-recursive make, requires automake >= 1.14
    Udev rules modified to add uaccess tag and moved to 60-openocd.rules
    Support searching for scripts relative to the openocd binary for all
      major architectures

5 files changed, 97 insertions, 88 deletions

diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile
index 563909998cc..45251df2e03 100644
--- a/devel/openocd/Makefile
+++ b/devel/openocd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2017/09/16 19:26:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/11 00:55:58 ryoon Exp $
 
-DISTNAME=	openocd-0.9.0
+DISTNAME=	openocd-0.10.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openocd/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/openocd/PLIST b/devel/openocd/PLIST
index 5e1b98e2d44..bea265007d9 100644
--- a/devel/openocd/PLIST
+++ b/devel/openocd/PLIST
@@ -1,15 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2015/10/01 23:06:37 rodent Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/02/11 00:55:58 ryoon Exp $
 bin/openocd
 info/openocd.info
 man/man1/openocd.1
 ${PLIST.libusb1}share/openocd/OpenULINK/ulink_firmware.hex
-share/openocd/contrib/99-openocd.rules
+share/openocd/contrib/60-openocd.rules
 share/openocd/contrib/libdcc/README
 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/actux3.cfg
+share/openocd/scripts/board/adapteva_parallella1.cfg
 share/openocd/scripts/board/alphascale_asm9260_ek.cfg
 share/openocd/scripts/board/altera_sockit.cfg
 share/openocd/scripts/board/am3517evm.cfg
@@ -34,11 +35,15 @@ share/openocd/scripts/board/atmel_sam4e_ek.cfg
 share/openocd/scripts/board/atmel_sam4l8_xplained_pro.cfg
 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_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_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/balloon3-cpu.cfg
 share/openocd/scripts/board/bcm28155_ap.cfg
 share/openocd/scripts/board/bt-homehubv1.cfg
@@ -48,8 +53,11 @@ share/openocd/scripts/board/csb337.cfg
 share/openocd/scripts/board/csb732.cfg
 share/openocd/scripts/board/da850evm.cfg
 share/openocd/scripts/board/digi_connectcore_wi-9c.cfg
+share/openocd/scripts/board/digilent_analog_discovery.cfg
+share/openocd/scripts/board/digilent_atlys.cfg
 share/openocd/scripts/board/digilent_zedboard.cfg
 share/openocd/scripts/board/diolan_lpc4350-db1.cfg
+share/openocd/scripts/board/diolan_lpc4357-db1.cfg
 share/openocd/scripts/board/dk-tm4c129.cfg
 share/openocd/scripts/board/dm355evm.cfg
 share/openocd/scripts/board/dm365evm.cfg
@@ -71,9 +79,12 @@ 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_twr-vf6-som-bsb.cfg
+share/openocd/scripts/board/emcraft_vf6-som.cfg
 share/openocd/scripts/board/ethernut3.cfg
 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/gumstix-aerocore.cfg
 share/openocd/scripts/board/hammer.cfg
@@ -98,9 +109,13 @@ 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/insignal_arndale.cfg
+share/openocd/scripts/board/kc705.cfg
 share/openocd/scripts/board/keil_mcb1700.cfg
 share/openocd/scripts/board/keil_mcb2140.cfg
 share/openocd/scripts/board/kwikstik.cfg
+share/openocd/scripts/board/la_fonera-fon2200.cfg
+share/openocd/scripts/board/linksys-wag200g.cfg
 share/openocd/scripts/board/linksys-wrt54gl.cfg
 share/openocd/scripts/board/linksys_nslu2.cfg
 share/openocd/scripts/board/lisa-l.cfg
@@ -108,15 +123,25 @@ share/openocd/scripts/board/logicpd_imx27.cfg
 share/openocd/scripts/board/lpc1850_spifi_generic.cfg
 share/openocd/scripts/board/lpc4350_spifi_generic.cfg
 share/openocd/scripts/board/lubbock.cfg
+share/openocd/scripts/board/marsohod.cfg
+share/openocd/scripts/board/marsohod2.cfg
+share/openocd/scripts/board/marsohod3.cfg
 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/mini2440.cfg
 share/openocd/scripts/board/mini6410.cfg
+share/openocd/scripts/board/minispartan6.cfg
 share/openocd/scripts/board/nds32_xc5.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/novena-internal-fpga.cfg
+share/openocd/scripts/board/numato_opsis.cfg
+share/openocd/scripts/board/nxp_lpc-link2.cfg
 share/openocd/scripts/board/olimex_LPC2378STK.cfg
 share/openocd/scripts/board/olimex_lpc_h2148.cfg
 share/openocd/scripts/board/olimex_sam7_ex256.cfg
@@ -133,14 +158,18 @@ share/openocd/scripts/board/osk5912.cfg
 share/openocd/scripts/board/phone_se_j100i.cfg
 share/openocd/scripts/board/phytec_lpc3250.cfg
 share/openocd/scripts/board/pic-p32mx.cfg
+share/openocd/scripts/board/pipistrello.cfg
 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/redbee.cfg
+share/openocd/scripts/board/renesas_dk-s7g2.cfg
 share/openocd/scripts/board/rsc-w910.cfg
 share/openocd/scripts/board/sheevaplug.cfg
 share/openocd/scripts/board/smdk6410.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
 share/openocd/scripts/board/spear300evb_mod.cfg
 share/openocd/scripts/board/spear310evb20.cfg
@@ -152,6 +181,7 @@ 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_l1.cfg
+share/openocd/scripts/board/st_nucleo_l476rg.cfg
 share/openocd/scripts/board/steval_pcc010.cfg
 share/openocd/scripts/board/stm320518_eval.cfg
 share/openocd/scripts/board/stm320518_eval_stlink.cfg
@@ -167,12 +197,17 @@ share/openocd/scripts/board/stm32429i_eval.cfg
 share/openocd/scripts/board/stm32429i_eval_stlink.cfg
 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/stm32f334discovery.cfg
 share/openocd/scripts/board/stm32f3discovery.cfg
+share/openocd/scripts/board/stm32f429disc1.cfg
 share/openocd/scripts/board/stm32f429discovery.cfg
+share/openocd/scripts/board/stm32f469discovery.cfg
 share/openocd/scripts/board/stm32f4discovery.cfg
+share/openocd/scripts/board/stm32f7discovery.cfg
 share/openocd/scripts/board/stm32l0discovery.cfg
+share/openocd/scripts/board/stm32l4discovery.cfg
 share/openocd/scripts/board/stm32ldiscovery.cfg
 share/openocd/scripts/board/stm32vldiscovery.cfg
 share/openocd/scripts/board/str910-eval.cfg
@@ -194,6 +229,8 @@ share/openocd/scripts/board/topasa900.cfg
 share/openocd/scripts/board/tp-link_tl-mr3020.cfg
 share/openocd/scripts/board/twr-k60f120m.cfg
 share/openocd/scripts/board/twr-k60n512.cfg
+share/openocd/scripts/board/twr-vf65gs10.cfg
+share/openocd/scripts/board/twr-vf65gs10_cmsisdap.cfg
 share/openocd/scripts/board/tx25_stk5.cfg
 share/openocd/scripts/board/tx27_stk5.cfg
 share/openocd/scripts/board/unknown_at91sam9260.cfg
@@ -205,9 +242,13 @@ share/openocd/scripts/board/x300t.cfg
 share/openocd/scripts/board/xmc-2go.cfg
 share/openocd/scripts/board/xmc1100-boot-kit.cfg
 share/openocd/scripts/board/xmc4200-application-kit-actuator.cfg
+share/openocd/scripts/board/xmc4300-relax.cfg
 share/openocd/scripts/board/xmc4500-application-kit-general.cfg
 share/openocd/scripts/board/xmc4500-application-kit-sdram.cfg
 share/openocd/scripts/board/xmc4500-relax.cfg
+share/openocd/scripts/board/xmc4700-relax.cfg
+share/openocd/scripts/board/xmc4800-relax.cfg
+share/openocd/scripts/board/xmos_xk-xac-xa8_arm.cfg
 share/openocd/scripts/board/zy1000.cfg
 share/openocd/scripts/chip/atmel/at91/aic.tcl
 share/openocd/scripts/chip/atmel/at91/at91_pio.cfg
@@ -236,39 +277,38 @@ 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-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-xcr3256.cfg
 share/openocd/scripts/cpu/arm/arm7tdmi.tcl
 share/openocd/scripts/cpu/arm/arm920.tcl
 share/openocd/scripts/cpu/arm/arm946.tcl
 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/interface/altera-usb-blaster.cfg
 share/openocd/scripts/interface/altera-usb-blaster2.cfg
 share/openocd/scripts/interface/arm-jtag-ew.cfg
 share/openocd/scripts/interface/at91rm9200.cfg
-share/openocd/scripts/interface/axm0432.cfg
-share/openocd/scripts/interface/busblaster.cfg
 share/openocd/scripts/interface/buspirate.cfg
-share/openocd/scripts/interface/calao-usb-a9260-c01.cfg
-share/openocd/scripts/interface/calao-usb-a9260-c02.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/cortino.cfg
-share/openocd/scripts/interface/digilent-hs1.cfg
-share/openocd/scripts/interface/dlp-usb1232h.cfg
 share/openocd/scripts/interface/dummy.cfg
 share/openocd/scripts/interface/estick.cfg
 share/openocd/scripts/interface/flashlink.cfg
-share/openocd/scripts/interface/flossjtag-noeeprom.cfg
-share/openocd/scripts/interface/flossjtag.cfg
-share/openocd/scripts/interface/flyswatter.cfg
-share/openocd/scripts/interface/flyswatter2.cfg
+share/openocd/scripts/interface/ftdi/100ask-openjtag.cfg
 share/openocd/scripts/interface/ftdi/axm0432.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
+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/dlp-usb1232h.cfg
 share/openocd/scripts/interface/ftdi/dp_busblaster.cfg
@@ -297,7 +337,9 @@ share/openocd/scripts/interface/ftdi/luminary-icdi.cfg
 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.cfg
+share/openocd/scripts/interface/ftdi/minispartan6.cfg
 share/openocd/scripts/interface/ftdi/neodb.cfg
 share/openocd/scripts/interface/ftdi/ngxtech.cfg
 share/openocd/scripts/interface/ftdi/olimex-arm-jtag-swd.cfg
@@ -310,6 +352,7 @@ share/openocd/scripts/interface/ftdi/opendous_ftdi.cfg
 share/openocd/scripts/interface/ftdi/openocd-usb-hs.cfg
 share/openocd/scripts/interface/ftdi/openocd-usb.cfg
 share/openocd/scripts/interface/ftdi/openrd.cfg
+share/openocd/scripts/interface/ftdi/pipistrello.cfg
 share/openocd/scripts/interface/ftdi/redbee-econotag.cfg
 share/openocd/scripts/interface/ftdi/redbee-usb.cfg
 share/openocd/scripts/interface/ftdi/rowley-cc-arm-swd.cfg
@@ -323,72 +366,37 @@ share/openocd/scripts/interface/ftdi/tumpa-lite.cfg
 share/openocd/scripts/interface/ftdi/tumpa.cfg
 share/openocd/scripts/interface/ftdi/turtelizer2-revB.cfg
 share/openocd/scripts/interface/ftdi/turtelizer2-revC.cfg
+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/hilscher_nxhx10_etm.cfg
-share/openocd/scripts/interface/hilscher_nxhx500_etm.cfg
-share/openocd/scripts/interface/hilscher_nxhx500_re.cfg
-share/openocd/scripts/interface/hilscher_nxhx50_etm.cfg
-share/openocd/scripts/interface/hilscher_nxhx50_re.cfg
-share/openocd/scripts/interface/hitex_str9-comstick.cfg
-share/openocd/scripts/interface/icebear.cfg
+share/openocd/scripts/interface/ftdi/xds100v3.cfg
 share/openocd/scripts/interface/jlink.cfg
-share/openocd/scripts/interface/jtag-lock-pick_tiny_2.cfg
 share/openocd/scripts/interface/jtag_vpi.cfg
-share/openocd/scripts/interface/jtagkey-tiny.cfg
-share/openocd/scripts/interface/jtagkey.cfg
-share/openocd/scripts/interface/jtagkey2.cfg
-share/openocd/scripts/interface/jtagkey2p.cfg
-share/openocd/scripts/interface/kt-link.cfg
-share/openocd/scripts/interface/lisa-l.cfg
-share/openocd/scripts/interface/luminary-icdi.cfg
-share/openocd/scripts/interface/luminary-lm3s811.cfg
-share/openocd/scripts/interface/luminary.cfg
-share/openocd/scripts/interface/minimodule.cfg
 share/openocd/scripts/interface/nds32-aice.cfg
-share/openocd/scripts/interface/neodb.cfg
-share/openocd/scripts/interface/ngxtech.cfg
-share/openocd/scripts/interface/olimex-arm-usb-ocd-h.cfg
-share/openocd/scripts/interface/olimex-arm-usb-ocd.cfg
-share/openocd/scripts/interface/olimex-arm-usb-tiny-h.cfg
-share/openocd/scripts/interface/olimex-jtag-tiny.cfg
-share/openocd/scripts/interface/oocdlink.cfg
 share/openocd/scripts/interface/opendous.cfg
-share/openocd/scripts/interface/opendous_ftdi.cfg
 share/openocd/scripts/interface/openjtag.cfg
-share/openocd/scripts/interface/openocd-usb-hs.cfg
-share/openocd/scripts/interface/openocd-usb.cfg
-share/openocd/scripts/interface/openrd.cfg
 share/openocd/scripts/interface/osbdm.cfg
 share/openocd/scripts/interface/parport.cfg
 share/openocd/scripts/interface/parport_dlc5.cfg
 share/openocd/scripts/interface/raspberrypi-native.cfg
-share/openocd/scripts/interface/redbee-econotag.cfg
-share/openocd/scripts/interface/redbee-usb.cfg
+share/openocd/scripts/interface/raspberrypi2-native.cfg
 share/openocd/scripts/interface/rlink.cfg
-share/openocd/scripts/interface/sheevaplug.cfg
-share/openocd/scripts/interface/signalyzer-h2.cfg
-share/openocd/scripts/interface/signalyzer-h4.cfg
-share/openocd/scripts/interface/signalyzer-lite.cfg
-share/openocd/scripts/interface/signalyzer.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/stm32-stick.cfg
 share/openocd/scripts/interface/sysfsgpio-raspberrypi.cfg
 share/openocd/scripts/interface/ti-icdi.cfg
-share/openocd/scripts/interface/turtelizer2.cfg
 share/openocd/scripts/interface/ulink.cfg
 share/openocd/scripts/interface/usb-jtag.cfg
 share/openocd/scripts/interface/usbprog.cfg
-share/openocd/scripts/interface/vpaclink.cfg
 share/openocd/scripts/interface/vsllink.cfg
-share/openocd/scripts/interface/xds100v2.cfg
 share/openocd/scripts/mem_helper.tcl
 share/openocd/scripts/memory.tcl
 share/openocd/scripts/mmr_helpers.tcl
 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/alphascale_asm9260t.cfg
 share/openocd/scripts/target/altera_fpgasoc.cfg
 share/openocd/scripts/target/am335x.cfg
@@ -413,6 +421,8 @@ share/openocd/scripts/target/at91sam3u4c.cfg
 share/openocd/scripts/target/at91sam3u4e.cfg
 share/openocd/scripts/target/at91sam3uxx.cfg
 share/openocd/scripts/target/at91sam4XXX.cfg
+share/openocd/scripts/target/at91sam4c32x.cfg
+share/openocd/scripts/target/at91sam4cXXX.cfg
 share/openocd/scripts/target/at91sam4lXX.cfg
 share/openocd/scripts/target/at91sam4sXX.cfg
 share/openocd/scripts/target/at91sam4sd32x.cfg
@@ -432,8 +442,11 @@ share/openocd/scripts/target/at91sam9g45.cfg
 share/openocd/scripts/target/at91sam9rl.cfg
 share/openocd/scripts/target/at91samdXX.cfg
 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/atmega128.cfg
+share/openocd/scripts/target/atsamv.cfg
 share/openocd/scripts/target/avr32.cfg
 share/openocd/scripts/target/bcm281xx.cfg
 share/openocd/scripts/target/bcm4706.cfg
@@ -459,10 +472,13 @@ share/openocd/scripts/target/efm32_stlink.cfg
 share/openocd/scripts/target/em357.cfg
 share/openocd/scripts/target/em358.cfg
 share/openocd/scripts/target/epc9301.cfg
+share/openocd/scripts/target/exynos5250.cfg
 share/openocd/scripts/target/faux.cfg
 share/openocd/scripts/target/feroceon.cfg
 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/gp326xxxa.cfg
 share/openocd/scripts/target/hilscher_netx10.cfg
 share/openocd/scripts/target/hilscher_netx50.cfg
@@ -480,8 +496,13 @@ share/openocd/scripts/target/imx53.cfg
 share/openocd/scripts/target/imx6.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/kl25.cfg
 share/openocd/scripts/target/kl25z_hla.cfg
 share/openocd/scripts/target/kl46.cfg
@@ -508,8 +529,9 @@ share/openocd/scripts/target/lpc3131.cfg
 share/openocd/scripts/target/lpc3250.cfg
 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/lpc8xx.cfg
-share/openocd/scripts/target/m051.cfg
 share/openocd/scripts/target/mc13224v.cfg
 share/openocd/scripts/target/mdr32f9q2i.cfg
 share/openocd/scripts/target/nds32v2.cfg
@@ -517,7 +539,9 @@ share/openocd/scripts/target/nds32v3.cfg
 share/openocd/scripts/target/nds32v3m.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
 share/openocd/scripts/target/omap2420.cfg
 share/openocd/scripts/target/omap3530.cfg
 share/openocd/scripts/target/omap4430.cfg
@@ -527,11 +551,14 @@ share/openocd/scripts/target/omapl138.cfg
 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/pxa255.cfg
 share/openocd/scripts/target/pxa270.cfg
 share/openocd/scripts/target/pxa3xx.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_s7g2.cfg
 share/openocd/scripts/target/samsung_s3c2410.cfg
 share/openocd/scripts/target/samsung_s3c2440.cfg
 share/openocd/scripts/target/samsung_s3c2450.cfg
@@ -554,9 +581,11 @@ 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/stm32l0.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/stm32w108xx.cfg
@@ -574,6 +603,7 @@ share/openocd/scripts/target/ti_calypso.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_rm4x.cfg
 share/openocd/scripts/target/ti_tms570.cfg
 share/openocd/scripts/target/ti_tms570ls20xxx.cfg
@@ -581,8 +611,10 @@ share/openocd/scripts/target/ti_tms570ls3137.cfg
 share/openocd/scripts/target/tmpa900.cfg
 share/openocd/scripts/target/tmpa910.cfg
 share/openocd/scripts/target/u8500.cfg
+share/openocd/scripts/target/vybrid_vf6xx.cfg
 share/openocd/scripts/target/xmc1xxx.cfg
 share/openocd/scripts/target/xmc4xxx.cfg
+share/openocd/scripts/target/xmos_xs1-xau8a-10_arm.cfg
 share/openocd/scripts/target/zynq_7000.cfg
 share/openocd/scripts/target/к1879xб1я.cfg
 share/openocd/scripts/test/selftest.cfg
diff --git a/devel/openocd/distinfo b/devel/openocd/distinfo
index 8027a633b27..2b5f2723071 100644
--- a/devel/openocd/distinfo
+++ b/devel/openocd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:53 agc Exp $
+$NetBSD: distinfo,v 1.6 2018/02/11 00:55:58 ryoon Exp $
 
-SHA1 (openocd-0.9.0.tar.bz2) = bcf99bb21f09513065b2c9ece148ace7d16cdd0c
-RMD160 (openocd-0.9.0.tar.bz2) = 21b3c2d80fbf8707644f37e61142d7cccaa8fed0
-SHA512 (openocd-0.9.0.tar.bz2) = 8d46137512829a7e6c5f5936d0e58431fcadb8600b0013663eac26caaddd4bd31e5857767d6b3805a120324301df8592123168241d949a39b82fada4d7eeee70
-Size (openocd-0.9.0.tar.bz2) = 3873090 bytes
-SHA1 (patch-src_flash_nor_sim3x.c) = 9c106fabf794196962a29af2196c2354db83ceb5
+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
diff --git a/devel/openocd/options.mk b/devel/openocd/options.mk
index 832dd31af2c..b7088951986 100644
--- a/devel/openocd/options.mk
+++ b/devel/openocd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/02/10 13:53:47 khorben Exp $
+# $NetBSD: options.mk,v 1.3 2018/02/11 00:55:58 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openocd
 PKG_SUPPORTED_OPTIONS=	libhidapi libusb libusb1
@@ -10,7 +10,9 @@ PLIST_VARS+=		libusb1
 .if !empty(PKG_OPTIONS:Mlibhidapi)
 .include "../../comms/libhidapi/buildlink3.mk"
 HIDAPI_CFLAGS=		-I${BUILDLINK_PREFIX.libhidapi}/include/hidapi
-HIDAPI_LIBS=		-L/usr/pkgsrc/pkg/lib -Wl,-R/usr/pkgsrc/pkg/lib -lhidapi
+HIDAPI_LIBS=		-L${BUILDLINK_PREFIX.libhidapi}/lib \
+			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libhidapi}/lib \
+			-lhidapi
 CONFIGURE_ENV+=		HIDAPI_CFLAGS=${HIDAPI_CFLAGS:Q}
 CONFIGURE_ENV+=		HIDAPI_LIBS=${HIDAPI_LIBS:Q}
 .endif
diff --git a/devel/openocd/patches/patch-src_flash_nor_sim3x.c b/devel/openocd/patches/patch-src_flash_nor_sim3x.c
deleted file mode 100644
index 24960989955..00000000000
--- a/devel/openocd/patches/patch-src_flash_nor_sim3x.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_flash_nor_sim3x.c,v 1.1 2015/10/07 23:14:47 joerg Exp $
-
---- src/flash/nor/sim3x.c.orig	2015-10-07 23:01:45.000000000 +0000
-+++ src/flash/nor/sim3x.c
-@@ -864,14 +864,12 @@ static int sim3x_flash_info(struct flash
- 				return ERROR_BUF_TOO_SMALL;
- 
- 			/* Package */
--			if (sim3x_info->device_package) {
--				printed = snprintf(buf, buf_size, "-G%s", sim3x_info->device_package);
--				buf += printed;
--				buf_size -= printed;
-+			printed = snprintf(buf, buf_size, "-G%s", sim3x_info->device_package);
-+			buf += printed;
-+			buf_size -= printed;
- 
--				if (buf_size <= 0)
--					return ERROR_BUF_TOO_SMALL;
--			}
-+			if (buf_size <= 0)
-+				return ERROR_BUF_TOO_SMALL;
- 		}
- 	}
-