ports/180645: Update devel/openocd to 0.7.0

Sat Jul 20 21:20:01 UTC 2013

The following reply was made to PR ports/180645; it has been noted by GNATS.

From: Sean Bruno <seanbru at yahoo-inc.com>
To: bug-followup at FreeBSD.org, sbruno at FreeBSD.org
Cc:  
Subject: Re: ports/180645: Update devel/openocd to 0.7.0
Date: Sat, 20 Jul 2013 13:58:49 -0700

 --=-7n4S7D7lGlC+hy0xcIPS
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit

 Unified patch against svn head for all the things.

 -- update to 0.7.0
 -- add support for new drivers
  --enable-sysfsgpio
  --enable-ti-icdi
 -- remove dead drivers
  --enable-ecosboard

 Sean

 --=-7n4S7D7lGlC+hy0xcIPS
 Content-Disposition: attachment; filename="openocd-0.7.0.txt"
 Content-Type: text/plain; name="openocd-0.7.0.txt"; charset="us-ascii"
 Content-Transfer-Encoding: 7bit

 Index: Makefile
 ===================================================================
 --- Makefile	(revision 323357)
 +++ Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$

  PORTNAME=	openocd
 -PORTVERSION=	0.6.1
 +PORTVERSION=	0.7.0
  CATEGORIES=	devel
  MASTER_SITES=	SF

 @@ -13,8 +13,9 @@
  CONFIGURE_ARGS+=	--disable-werror

  OPTIONS_DEFINE=	DOC JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \
 -	USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
 -	ARMJTAGEW BUSPIRATE STLINK OSBDM OPENDOUS RMTBITBANG MINIDRIVER
 +	USBBALSTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
 +	ARMJTAGEW BUSPIRATE TIICDI STLINK OSBDM OPENDOUS SYSFSGPIO RMTBITBANG \
 +	MINIDRIVER
  OPTIONS_DEFAULT=DOC JIMTCL PARPORT DUMMY FT2232 FTDI USBBLASTER EP93XX \
  	AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK ARMJTAGEW \
  	BUSPIRATE STLINK OSBDM OPENDOUS RMTBITBANG
 @@ -40,8 +41,10 @@
  ARMJTAGEW_DESC=	Support Olimex ARM-JTAG-EW Programmer
  BUSPIRATE=	Support BusPirate Programmer
  STLINK_DESC=	Support STLink Programmer
 +TI_ICDI_DESC=	Support TI ICDI JTAG Programmer
  OSBDM_DESC=	Support OSBDM Programmer (JTAG only)
 -OPENDOUS=	Support EStick/OpenDous Programmer
 +OPENDOUS= 	Support EStick/OpenDous Programmer
 +SYSFSGPIO=	Support Programming via sysfs GPIOs
  RMTBITBANG_DESC=Support Remote-Bitbang Driver
  MINIDRIVER_DESC=Dummy minidriver only (will exclude others!)

 @@ -138,12 +141,6 @@
  CONFIGURE_ARGS+=	--disable-amtjtagaccel
  .endif

 -.if ${PORT_OPTIONS:MECOSBOARD}
 -CONFIGURE_ARGS+=	--enable-ecosboard
 -.else
 -CONFIGURE_ARGS+=	--disable-ecosboard
 -.endif
 -
  .if ${PORT_OPTIONS:MZY1000}
  CONFIGURE_ARGS+=	--enable-zy1000
  .else
 @@ -240,6 +237,12 @@
  CONFIGURE_ARGS+=	--disable-stlink
  .endif

 +.if ${PORT_OPTIONS:MTIICDI}
 +CONFIGURE_ARGS+=	--enable-ti-icdi
 +.else
 +CONFIGURE_ARGS+=	--disable-ti-icdi
 +.endif
 +
  .if ${PORT_OPTIONS:MOSBDM}
  CONFIGURE_ARGS+=	--enable-osbdm
  .else
 @@ -252,6 +255,12 @@
  CONFIGURE_ARGS+=	--disable-opendous
  .endif

 +.if ${PORT_OPTIONS:MSYSFSGPIO}
 +CONFIGURE_ARGS+=	--enable-sysfsgpio
 +.else
 +CONFIGURE_ARGS+=	--disable-sysfsgpio
 +.endif
 +
  .if ${PORT_OPTIONS:MRMTBITBANG}
  CONFIGURE_ARGS+=	--enable-remote-bitbang
  .else
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 323357)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (openocd-0.6.1.tar.bz2) = f4c4cc7445ad79cfba1bb24208e79c66edf9dc0c46b3c8fca391f4e41c942f2b
 -SIZE (openocd-0.6.1.tar.bz2) = 3431071
 +SHA256 (openocd-0.7.0.tar.bz2) = 52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63
 +SIZE (openocd-0.7.0.tar.bz2) = 3493924
 Index: files/patch-src-jtag-drivers-ti_icdi_usb.c
 ===================================================================
 --- files/patch-src-jtag-drivers-ti_icdi_usb.c	(revision 0)
 +++ files/patch-src-jtag-drivers-ti_icdi_usb.c	(working copy)
 @@ -0,0 +1,11 @@
 +--- src/jtag/drivers/ti_icdi_usb.c.orig	2013-04-28 00:42:17.000000000 -0700
 ++++ src/jtag/drivers/ti_icdi_usb.c	2013-07-18 16:28:11.392443008 -0700
 +@@ -33,7 +33,7 @@
 + 
 + #include <target/cortex_m.h>
 + 
 +-#include <libusb-1.0/libusb.h>
 ++#include <libusb.h>
 + 
 + #define ICDI_WRITE_ENDPOINT 0x02
 + #define ICDI_READ_ENDPOINT 0x83
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 323357)
 +++ pkg-plist	(working copy)
 @@ -1,7 +1,12 @@
  bin/openocd
 +info/dir
 +info/openocd.info
 +info/openocd.info-1
 +info/openocd.info-2
  lib/libopenocd.a
  lib/libopenocd.la
  lib/openocd/OpenULINK/ulink_firmware.hex
 +man/man1/openocd.1.gz
  share/openocd/contrib/libdcc/README
  share/openocd/contrib/libdcc/dcc_stdio.c
  share/openocd/contrib/libdcc/dcc_stdio.h
 @@ -44,7 +49,10 @@
  share/openocd/scripts/board/ek-lm3s6965.cfg
  share/openocd/scripts/board/ek-lm3s811-revb.cfg
  share/openocd/scripts/board/ek-lm3s811.cfg
 +share/openocd/scripts/board/ek-lm3s8962.cfg
  share/openocd/scripts/board/ek-lm3s9b9x.cfg
 +share/openocd/scripts/board/ek-lm3s9d92.cfg
 +share/openocd/scripts/board/ek-lm4f120xl.cfg
  share/openocd/scripts/board/ek-lm4f232.cfg
  share/openocd/scripts/board/embedded-artists_lpc2478-32.cfg
  share/openocd/scripts/board/ethernut3.cfg
 @@ -76,11 +84,14 @@
  share/openocd/scripts/board/linksys_nslu2.cfg
  share/openocd/scripts/board/lisa-l.cfg
  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/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/netgear-dg834v3.cfg
  share/openocd/scripts/board/olimex_LPC2378STK.cfg
  share/openocd/scripts/board/olimex_lpc_h2148.cfg
  share/openocd/scripts/board/olimex_sam7_ex256.cfg
 @@ -233,6 +244,7 @@
  share/openocd/scripts/interface/ftdi/olimex-arm-usb-tiny-h.cfg
  share/openocd/scripts/interface/ftdi/olimex-jtag-tiny.cfg
  share/openocd/scripts/interface/ftdi/oocdlink.cfg
 +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
 @@ -273,6 +285,7 @@
  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/openocd-usb-hs.cfg
  share/openocd/scripts/interface/openocd-usb.cfg
  share/openocd/scripts/interface/openrd.cfg
 @@ -290,6 +303,8 @@
  share/openocd/scripts/interface/stlink-v1.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
 @@ -322,6 +337,7 @@
  share/openocd/scripts/target/at91sam3uxx.cfg
  share/openocd/scripts/target/at91sam4XXX.cfg
  share/openocd/scripts/target/at91sam4sXX.cfg
 +share/openocd/scripts/target/at91sam4sd32x.cfg
  share/openocd/scripts/target/at91sam7se512.cfg
  share/openocd/scripts/target/at91sam7sx.cfg
  share/openocd/scripts/target/at91sam7x256.cfg
 @@ -347,6 +363,7 @@
  share/openocd/scripts/target/dsp56321.cfg
  share/openocd/scripts/target/dsp568013.cfg
  share/openocd/scripts/target/dsp568037.cfg
 +share/openocd/scripts/target/efm32_stlink.cfg
  share/openocd/scripts/target/epc9301.cfg
  share/openocd/scripts/target/faux.cfg
  share/openocd/scripts/target/feroceon.cfg
 @@ -364,6 +381,7 @@
  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/is5114.cfg
  share/openocd/scripts/target/ixp42x.cfg
  share/openocd/scripts/target/k40.cfg
 @@ -381,7 +399,9 @@
  share/openocd/scripts/target/lpc1767.cfg
  share/openocd/scripts/target/lpc1768.cfg
  share/openocd/scripts/target/lpc1769.cfg
 +share/openocd/scripts/target/lpc1788.cfg
  share/openocd/scripts/target/lpc17xx.cfg
 +share/openocd/scripts/target/lpc1850.cfg
  share/openocd/scripts/target/lpc2103.cfg
  share/openocd/scripts/target/lpc2124.cfg
  share/openocd/scripts/target/lpc2129.cfg
 @@ -417,6 +437,7 @@
  share/openocd/scripts/target/smp8634.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_stlink.cfg
  share/openocd/scripts/target/stm32f1x.cfg
 @@ -428,7 +449,9 @@
  share/openocd/scripts/target/stm32f4x.cfg
  share/openocd/scripts/target/stm32f4x_stlink.cfg
  share/openocd/scripts/target/stm32l.cfg
 +share/openocd/scripts/target/stm32lx_dual_bank.cfg
  share/openocd/scripts/target/stm32lx_stlink.cfg
 +share/openocd/scripts/target/stm32w108_stlink.cfg
  share/openocd/scripts/target/stm32xl.cfg
  share/openocd/scripts/target/str710.cfg
  share/openocd/scripts/target/str730.cfg
 @@ -437,6 +460,7 @@
  share/openocd/scripts/target/swj-dp.tcl
  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_calypso.cfg
  share/openocd/scripts/target/ti_dm355.cfg
  share/openocd/scripts/target/ti_dm365.cfg

 --=-7n4S7D7lGlC+hy0xcIPS--