Hi,

Here's an update to the latest version of openocd; any users of this who could
give it a try? (It supports the bus-pirate now too!).

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/openocd/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile    15 Nov 2010 19:46:01 -0000      1.4
+++ Makefile    16 Sep 2011 16:15:07 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      Open On-Chip Debugging
 
-DISTNAME =     openocd-0.4.0
+DISTNAME =     openocd-0.5.0
 CATEGORIES =   devel
 
 SHARED_LIBS +=  openocd                0.0 # .0.0
@@ -16,12 +16,11 @@ PERMIT_PACKAGE_CDROM =  Yes
 PERMIT_PACKAGE_FTP =   Yes
 PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP =  Yes
-WANTLIB =      c usb ftdi
+WANTLIB =      c m usb ftdi
 
 MASTER_SITES = ${MASTER_SITE_BERLIOS:=openocd/}
 EXTRACT_SUFX = .tar.bz2
 
-USE_GROFF =    Yes
 CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS = --disable-werror \
                --disable-wextra \
@@ -33,12 +32,16 @@ CONFIGURE_ARGS = --disable-werror \
                --enable-presto_libftdi \
                --enable-rlink \
                --enable-usbprog \
-               --enable-vsllink
+               --enable-vsllink \
+               --enable-ulink \
+               --enable-buspirate \
+               --disable-internal-jimtcl
 
 CONFIGURE_ENV =        CPPFLAGS="-I${LOCALBASE}/include " \
                LDFLAGS="-L${LOCALBASE}/lib"
 
-LIB_DEPENDS =  devel/libftdi
+LIB_DEPENDS =  devel/libftdi \
+               lang/jimtcl
 
 USE_GMAKE =    Yes
 USE_LIBTOOL =  Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/openocd/distinfo,v
retrieving revision 1.2
diff -p -u -r1.2 distinfo
--- distinfo    26 Oct 2010 09:29:32 -0000      1.2
+++ distinfo    16 Sep 2011 16:15:07 -0000
@@ -1,5 +1,5 @@
-MD5 (openocd-0.4.0.tar.bz2) = EagbXyAPsMMY2fSRgrtx1w==
-RMD160 (openocd-0.4.0.tar.bz2) = nfUq1EWYRvmyBWuqqi0XEO0vL3M=
-SHA1 (openocd-0.4.0.tar.bz2) = vakoyc4A+Us0s4jFn2S1tIF8rsE=
-SHA256 (openocd-0.4.0.tar.bz2) = +88TjPDaSbtJAcqDeKOsMtHQpsOUNGv21YU/XIdGMrE=
-SIZE (openocd-0.4.0.tar.bz2) = 1329720
+MD5 (openocd-0.5.0.tar.bz2) = Q0NMK1NTybhTJ4uL/yLLGg==
+RMD160 (openocd-0.5.0.tar.bz2) = +DG1QG5906JeuqLOq7HegNEr188=
+SHA1 (openocd-0.5.0.tar.bz2) = gH5CFLAFAp3M0e2K8284l6XG9Js=
+SHA256 (openocd-0.5.0.tar.bz2) = C8Ei+Yps1oxDkvYmXUgLDodf9UID7AWlpS0jkAkDp40=
+SIZE (openocd-0.5.0.tar.bz2) = 2228655
Index: patches/patch-src_openocd_c
===================================================================
RCS file: patches/patch-src_openocd_c
diff -N patches/patch-src_openocd_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_openocd_c 16 Sep 2011 16:15:07 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Adjust Jim_Interp member name.
+
+--- src/openocd.c.orig Fri Sep 16 18:00:56 2011
++++ src/openocd.c      Fri Sep 16 18:01:22 2011
+@@ -197,7 +197,7 @@ static int jim_stacktrace_command(Jim_Interp *interp, 
+       /* insert actual error site at beginning of list*/
+       Jim_Obj *procname = Jim_NewStringObj(interp, "", -1); /* Uhhh... don't 
know this one. */
+       Jim_ListInsertElements(interp, stacktrace, 0, 1, &procname);
+-      Jim_Obj *filename = Jim_NewStringObj(interp, interp->errorFileName, -1);
++      Jim_Obj *filename = Jim_NewStringObj(interp, interp->errorFileNameObj, 
-1);
+       Jim_ListInsertElements(interp, stacktrace, 1, 1, &filename);
+       Jim_Obj *line = Jim_NewIntObj(interp, interp->errorLine);
+       Jim_ListInsertElements(interp, stacktrace, 2, 1, &line);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/openocd/pkg/PLIST,v
retrieving revision 1.2
diff -p -u -r1.2 PLIST
--- pkg/PLIST   26 Oct 2010 09:29:32 -0000      1.2
+++ pkg/PLIST   16 Sep 2011 16:15:07 -0000
@@ -5,6 +5,8 @@
 lib/libopenocd.a
 lib/libopenocd.la
 lib/openocd/
+lib/openocd/OpenULINK/
+lib/openocd/OpenULINK/ulink_firmware.hex
 lib/openocd/ecos/
 lib/openocd/ecos/at91eb40a.elf
 @man man/man1/openocd.1
@@ -19,32 +21,51 @@ share/openocd/contrib/openocd.udev
 share/openocd/scripts/
 share/openocd/scripts/bitsbytes.tcl
 share/openocd/scripts/board/
+share/openocd/scripts/board/actux3.cfg
+share/openocd/scripts/board/am3517evm.cfg
 share/openocd/scripts/board/arm_evaluator7t.cfg
+share/openocd/scripts/board/at91cap7a-stk-sdram.cfg
 share/openocd/scripts/board/at91eb40a.cfg
 share/openocd/scripts/board/at91rm9200-dk.cfg
+share/openocd/scripts/board/at91rm9200-ek.cfg
+share/openocd/scripts/board/at91sam9261-ek.cfg
+share/openocd/scripts/board/at91sam9263-ek.cfg
 share/openocd/scripts/board/at91sam9g20-ek.cfg
 share/openocd/scripts/board/atmel_at91sam7s-ek.cfg
 share/openocd/scripts/board/atmel_at91sam9260-ek.cfg
 share/openocd/scripts/board/atmel_at91sam9rl-ek.cfg
+share/openocd/scripts/board/atmel_sam3s_ek.cfg
 share/openocd/scripts/board/atmel_sam3u_ek.cfg
 share/openocd/scripts/board/balloon3-cpu.cfg
+share/openocd/scripts/board/colibri.cfg
 share/openocd/scripts/board/crossbow_tech_imote2.cfg
 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/dm355evm.cfg
 share/openocd/scripts/board/dm365evm.cfg
 share/openocd/scripts/board/dm6446evm.cfg
+share/openocd/scripts/board/efikamx.cfg
 share/openocd/scripts/board/eir.cfg
 share/openocd/scripts/board/ek-lm3s1968.cfg
 share/openocd/scripts/board/ek-lm3s3748.cfg
+share/openocd/scripts/board/ek-lm3s6965.cfg
 share/openocd/scripts/board/ek-lm3s811.cfg
 share/openocd/scripts/board/ek-lm3s9b9x.cfg
+share/openocd/scripts/board/embedded-artists_lpc2478-32.cfg
 share/openocd/scripts/board/ethernut3.cfg
 share/openocd/scripts/board/hammer.cfg
+share/openocd/scripts/board/hilscher_nxdb500sys.cfg
+share/openocd/scripts/board/hilscher_nxeb500hmi.cfg
+share/openocd/scripts/board/hilscher_nxhx10.cfg
+share/openocd/scripts/board/hilscher_nxhx50.cfg
+share/openocd/scripts/board/hilscher_nxhx500.cfg
+share/openocd/scripts/board/hilscher_nxsb100.cfg
 share/openocd/scripts/board/hitex_lpc2929.cfg
 share/openocd/scripts/board/hitex_stm32-performancestick.cfg
 share/openocd/scripts/board/hitex_str9-comstick.cfg
+share/openocd/scripts/board/iar_lpc1768.cfg
 share/openocd/scripts/board/iar_str912_sk.cfg
 share/openocd/scripts/board/imx27ads.cfg
 share/openocd/scripts/board/imx27lnst.cfg
@@ -53,14 +74,19 @@ share/openocd/scripts/board/imx35pdk.cfg
 share/openocd/scripts/board/keil_mcb1700.cfg
 share/openocd/scripts/board/keil_mcb2140.cfg
 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/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/olimex_LPC2378STK.cfg
 share/openocd/scripts/board/olimex_lpc_h2148.cfg
 share/openocd/scripts/board/olimex_sam7_ex256.cfg
 share/openocd/scripts/board/olimex_sam9_l9260.cfg
 share/openocd/scripts/board/olimex_stm32_h103.cfg
+share/openocd/scripts/board/olimex_stm32_h107.cfg
 share/openocd/scripts/board/omap2420_h4.cfg
 share/openocd/scripts/board/open-bldc.cfg
 share/openocd/scripts/board/openrd.cfg
@@ -69,27 +95,59 @@ share/openocd/scripts/board/phytec_lpc32
 share/openocd/scripts/board/pic-p32mx.cfg
 share/openocd/scripts/board/propox_mmnet1001.cfg
 share/openocd/scripts/board/pxa255_sst.cfg
+share/openocd/scripts/board/redbee-econotag.cfg
+share/openocd/scripts/board/redbee-usb.cfg
+share/openocd/scripts/board/rsc-w910.cfg
 share/openocd/scripts/board/sheevaplug.cfg
+share/openocd/scripts/board/smdk6410.cfg
+share/openocd/scripts/board/spear310evb20.cfg
+share/openocd/scripts/board/spear310evb20_mod.cfg
+share/openocd/scripts/board/stm32100b_eval.cfg
+share/openocd/scripts/board/stm3210b_eval.cfg
+share/openocd/scripts/board/stm3210c_eval.cfg
 share/openocd/scripts/board/stm3210e_eval.cfg
-share/openocd/scripts/board/stm32f10x_128k_eval.cfg
+share/openocd/scripts/board/stm3220g_eval.cfg
 share/openocd/scripts/board/str910-eval.cfg
 share/openocd/scripts/board/telo.cfg
 share/openocd/scripts/board/ti_beagleboard.cfg
+share/openocd/scripts/board/ti_beagleboard_xm.cfg
+share/openocd/scripts/board/ti_blaze.cfg
+share/openocd/scripts/board/ti_pandaboard.cfg
 share/openocd/scripts/board/topas910.cfg
 share/openocd/scripts/board/topasa900.cfg
 share/openocd/scripts/board/unknown_at91sam9260.cfg
+share/openocd/scripts/board/uptech_2410.cfg
+share/openocd/scripts/board/voipac.cfg
 share/openocd/scripts/board/x300t.cfg
 share/openocd/scripts/board/zy1000.cfg
 share/openocd/scripts/chip/
 share/openocd/scripts/chip/atmel/
 share/openocd/scripts/chip/atmel/at91/
 share/openocd/scripts/chip/atmel/at91/aic.tcl
+share/openocd/scripts/chip/atmel/at91/at91_pio.cfg
+share/openocd/scripts/chip/atmel/at91/at91_pmc.cfg
+share/openocd/scripts/chip/atmel/at91/at91_rstc.cfg
+share/openocd/scripts/chip/atmel/at91/at91_wdt.cfg
 share/openocd/scripts/chip/atmel/at91/at91sam7x128.tcl
 share/openocd/scripts/chip/atmel/at91/at91sam7x256.tcl
+share/openocd/scripts/chip/atmel/at91/at91sam9261.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9261_matrix.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9263.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9263_matrix.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9_init.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9_sdramc.cfg
+share/openocd/scripts/chip/atmel/at91/at91sam9_smc.cfg
+share/openocd/scripts/chip/atmel/at91/hardware.cfg
 share/openocd/scripts/chip/atmel/at91/pmc.tcl
 share/openocd/scripts/chip/atmel/at91/rtt.tcl
+share/openocd/scripts/chip/atmel/at91/sam9_smc.cfg
 share/openocd/scripts/chip/atmel/at91/usarts.tcl
 share/openocd/scripts/chip/st/
+share/openocd/scripts/chip/st/spear/
+share/openocd/scripts/chip/st/spear/quirk_no_srst.tcl
+share/openocd/scripts/chip/st/spear/spear310.tcl
+share/openocd/scripts/chip/st/spear/spear3xx.tcl
+share/openocd/scripts/chip/st/spear/spear3xx_ddr.tcl
 share/openocd/scripts/chip/st/stm32/
 share/openocd/scripts/chip/st/stm32/stm32.tcl
 share/openocd/scripts/chip/st/stm32/stm32_rcc.tcl
@@ -109,6 +167,7 @@ share/openocd/scripts/interface/arm-jtag
 share/openocd/scripts/interface/arm-usb-ocd.cfg
 share/openocd/scripts/interface/at91rm9200.cfg
 share/openocd/scripts/interface/axm0432.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
@@ -116,19 +175,29 @@ share/openocd/scripts/interface/chameleo
 share/openocd/scripts/interface/cortino.cfg
 share/openocd/scripts/interface/dummy.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/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/jlink.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/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
@@ -146,17 +215,24 @@ share/openocd/scripts/interface/signalyz
 share/openocd/scripts/interface/signalyzer.cfg
 share/openocd/scripts/interface/stm32-stick.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/readable.tcl
 share/openocd/scripts/target/
 share/openocd/scripts/target/aduc702x.cfg
+share/openocd/scripts/target/amdm37x.cfg
 share/openocd/scripts/target/ar71xx.cfg
+share/openocd/scripts/target/at32ap7000.cfg
 share/openocd/scripts/target/at91r40008.cfg
 share/openocd/scripts/target/at91rm9200.cfg
+share/openocd/scripts/target/at91sam3XXX.cfg
+share/openocd/scripts/target/at91sam3sXX.cfg
 share/openocd/scripts/target/at91sam3u1c.cfg
 share/openocd/scripts/target/at91sam3u1e.cfg
 share/openocd/scripts/target/at91sam3u2c.cfg
@@ -164,10 +240,20 @@ share/openocd/scripts/target/at91sam3u2e
 share/openocd/scripts/target/at91sam3u4c.cfg
 share/openocd/scripts/target/at91sam3u4e.cfg
 share/openocd/scripts/target/at91sam3uXX.cfg
+share/openocd/scripts/target/at91sam7se512.cfg
 share/openocd/scripts/target/at91sam7sx.cfg
+share/openocd/scripts/target/at91sam7x256.cfg
+share/openocd/scripts/target/at91sam9.cfg
 share/openocd/scripts/target/at91sam9260.cfg
 share/openocd/scripts/target/at91sam9260_ext_RAM_ext_flash.cfg
+share/openocd/scripts/target/at91sam9261.cfg
+share/openocd/scripts/target/at91sam9263.cfg
+share/openocd/scripts/target/at91sam9g10.cfg
+share/openocd/scripts/target/at91sam9g20.cfg
+share/openocd/scripts/target/at91sam9g45.cfg
 share/openocd/scripts/target/at91sam9rl.cfg
+share/openocd/scripts/target/atmega128.cfg
+share/openocd/scripts/target/avr32.cfg
 share/openocd/scripts/target/c100.cfg
 share/openocd/scripts/target/c100config.tcl
 share/openocd/scripts/target/c100helper.tcl
@@ -176,9 +262,15 @@ share/openocd/scripts/target/cs351x.cfg
 share/openocd/scripts/target/davinci.cfg
 share/openocd/scripts/target/dragonite.cfg
 share/openocd/scripts/target/dsp56321.cfg
+share/openocd/scripts/target/dsp568013.cfg
+share/openocd/scripts/target/dsp568037.cfg
 share/openocd/scripts/target/epc9301.cfg
 share/openocd/scripts/target/faux.cfg
 share/openocd/scripts/target/feroceon.cfg
+share/openocd/scripts/target/fm3.cfg
+share/openocd/scripts/target/hilscher_netx10.cfg
+share/openocd/scripts/target/hilscher_netx50.cfg
+share/openocd/scripts/target/hilscher_netx500.cfg
 share/openocd/scripts/target/icepick.cfg
 share/openocd/scripts/target/imx.cfg
 share/openocd/scripts/target/imx21.cfg
@@ -186,12 +278,10 @@ share/openocd/scripts/target/imx25.cfg
 share/openocd/scripts/target/imx27.cfg
 share/openocd/scripts/target/imx31.cfg
 share/openocd/scripts/target/imx35.cfg
+share/openocd/scripts/target/imx51.cfg
+share/openocd/scripts/target/imx53.cfg
 share/openocd/scripts/target/is5114.cfg
 share/openocd/scripts/target/ixp42x.cfg
-share/openocd/scripts/target/lm3s1968.cfg
-share/openocd/scripts/target/lm3s6965.cfg
-share/openocd/scripts/target/lm3s811.cfg
-share/openocd/scripts/target/lm3s9b9x.cfg
 share/openocd/scripts/target/lpc1768.cfg
 share/openocd/scripts/target/lpc2103.cfg
 share/openocd/scripts/target/lpc2124.cfg
@@ -199,35 +289,42 @@ share/openocd/scripts/target/lpc2129.cfg
 share/openocd/scripts/target/lpc2148.cfg
 share/openocd/scripts/target/lpc2294.cfg
 share/openocd/scripts/target/lpc2378.cfg
+share/openocd/scripts/target/lpc2460.cfg
 share/openocd/scripts/target/lpc2478.cfg
 share/openocd/scripts/target/lpc2900.cfg
+share/openocd/scripts/target/lpc2xxx.cfg
+share/openocd/scripts/target/lpc3131.cfg
 share/openocd/scripts/target/lpc3250.cfg
-share/openocd/scripts/target/mega128.cfg
-share/openocd/scripts/target/netx500.cfg
+share/openocd/scripts/target/mc13224v.cfg
+share/openocd/scripts/target/nuc910.cfg
 share/openocd/scripts/target/omap2420.cfg
 share/openocd/scripts/target/omap3530.cfg
+share/openocd/scripts/target/omap4430.cfg
 share/openocd/scripts/target/omap5912.cfg
+share/openocd/scripts/target/omapl138.cfg
 share/openocd/scripts/target/pic32mx.cfg
 share/openocd/scripts/target/pxa255.cfg
 share/openocd/scripts/target/pxa270.cfg
 share/openocd/scripts/target/pxa3xx.cfg
-share/openocd/scripts/target/sam7se512.cfg
-share/openocd/scripts/target/sam7x256.cfg
 share/openocd/scripts/target/samsung_s3c2410.cfg
 share/openocd/scripts/target/samsung_s3c2440.cfg
 share/openocd/scripts/target/samsung_s3c2450.cfg
 share/openocd/scripts/target/samsung_s3c4510.cfg
 share/openocd/scripts/target/samsung_s3c6410.cfg
 share/openocd/scripts/target/sharp_lh79532.cfg
-share/openocd/scripts/target/smdk6410.cfg
 share/openocd/scripts/target/smp8634.cfg
+share/openocd/scripts/target/spear3xx.cfg
 share/openocd/scripts/target/stellaris.cfg
 share/openocd/scripts/target/stm32.cfg
+share/openocd/scripts/target/stm32f1x.cfg
+share/openocd/scripts/target/stm32f2x.cfg
+share/openocd/scripts/target/stm32f2xxx.cfg
+share/openocd/scripts/target/stm32xl.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/telo.cfg
+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_dm355.cfg
@@ -235,7 +332,7 @@ share/openocd/scripts/target/ti_dm365.cf
 share/openocd/scripts/target/ti_dm6446.cfg
 share/openocd/scripts/target/tmpa900.cfg
 share/openocd/scripts/target/tmpa910.cfg
-share/openocd/scripts/target/xba_revA3.cfg
+share/openocd/scripts/target/u8500.cfg
 share/openocd/scripts/test/
 share/openocd/scripts/test/selftest.cfg
 share/openocd/scripts/test/syntax1.cfg

-- 
Cheers,
Jasper

"Capable, generous men do not create victims, they nurture them."

Attachment: jimtcl.tgz
Description: application/tar-gz

Reply via email to