Hi guys,

Updated diff for 0.4.0, the latest version of devel/openocd. OK from
maintainer.

If you put this in, please also take a look at the devel/libftdi update:
http://marc.info/?l=openbsd-ports&m=128564664420893&w=2

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/openocd/Makefile,v
retrieving revision 1.1.1.1
diff -N -u -p Makefile
--- Makefile    17 Sep 2009 21:59:46 -0000      1.1.1.1
+++ Makefile    8 Oct 2010 20:07:28 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      Open On-Chip Debugging
 
-DISTNAME =     openocd-0.2.0
+DISTNAME =     openocd-0.4.0
 CATEGORIES =   devel
 
 SHARED_LIBS +=  openocd                0.0 # .0.0
@@ -10,6 +10,8 @@ SHARED_LIBS +=  openocd               0.0 # .0.0
 HOMEPAGE =     http://openocd.berlios.de/
 
 MAINTAINER =   Sylvestre Gallon <ccna....@gmail.com>
+
+USE_GMAKE =    Yes
 
 # GPL
 PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/openocd/distinfo,v
retrieving revision 1.1.1.1
diff -N -u -p distinfo
--- distinfo    17 Sep 2009 21:59:46 -0000      1.1.1.1
+++ distinfo    8 Oct 2010 20:07:28 -0000
@@ -1,5 +1,5 @@
-MD5 (openocd-0.2.0.tar.bz2) = FM1Hf2XMc4vpVKRU8Vk4eQ==
-RMD160 (openocd-0.2.0.tar.bz2) = ArN387w8VCewJZwTeLIy/1oR+Pw=
-SHA1 (openocd-0.2.0.tar.bz2) = nVugx7EkBZdU3kE3/yrwOb4ZRp4=
-SHA256 (openocd-0.2.0.tar.bz2) = pOgrR9TGToVEg5lidcIBywRXt+w2UTF+P4DCXoUStOE=
-SIZE (openocd-0.2.0.tar.bz2) = 1240487
+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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/openocd/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -N -u -p pkg/PLIST
--- pkg/PLIST   17 Sep 2009 21:59:46 -0000      1.1.1.1
+++ pkg/PLIST   8 Oct 2010 20:07:28 -0000
@@ -7,8 +7,6 @@ lib/libopenocd.la
 lib/openocd/
 lib/openocd/ecos/
 lib/openocd/ecos/at91eb40a.elf
-lib/openocd/xscale/
-lib/openocd/xscale/debug_handler.bin
 @man man/man1/openocd.1
 share/openocd/
 share/openocd/contrib/
@@ -22,40 +20,64 @@ share/openocd/scripts/
 share/openocd/scripts/bitsbytes.tcl
 share/openocd/scripts/board/
 share/openocd/scripts/board/arm_evaluator7t.cfg
+share/openocd/scripts/board/at91eb40a.cfg
 share/openocd/scripts/board/at91rm9200-dk.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_sam3u_ek.cfg
+share/openocd/scripts/board/balloon3-cpu.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/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/eir.cfg
+share/openocd/scripts/board/ek-lm3s1968.cfg
 share/openocd/scripts/board/ek-lm3s3748.cfg
+share/openocd/scripts/board/ek-lm3s811.cfg
 share/openocd/scripts/board/ek-lm3s9b9x.cfg
+share/openocd/scripts/board/ethernut3.cfg
 share/openocd/scripts/board/hammer.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_str912_sk.cfg
 share/openocd/scripts/board/imx27ads.cfg
 share/openocd/scripts/board/imx27lnst.cfg
 share/openocd/scripts/board/imx31pdk.cfg
+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/logicpd_imx27.cfg
+share/openocd/scripts/board/lubbock.cfg
+share/openocd/scripts/board/mini2440.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/omap2420_h4.cfg
+share/openocd/scripts/board/open-bldc.cfg
+share/openocd/scripts/board/openrd.cfg
 share/openocd/scripts/board/osk5912.cfg
+share/openocd/scripts/board/phytec_lpc3250.cfg
 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/sheevaplug.cfg
 share/openocd/scripts/board/stm3210e_eval.cfg
 share/openocd/scripts/board/stm32f10x_128k_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/unknown-board-atmel-at91sam9260.cfg
+share/openocd/scripts/board/topas910.cfg
+share/openocd/scripts/board/topasa900.cfg
+share/openocd/scripts/board/unknown_at91sam9260.cfg
 share/openocd/scripts/board/x300t.cfg
 share/openocd/scripts/board/zy1000.cfg
 share/openocd/scripts/chip/
@@ -72,6 +94,8 @@ share/openocd/scripts/chip/st/stm32/
 share/openocd/scripts/chip/st/stm32/stm32.tcl
 share/openocd/scripts/chip/st/stm32/stm32_rcc.tcl
 share/openocd/scripts/chip/st/stm32/stm32_regs.tcl
+share/openocd/scripts/cpld/
+share/openocd/scripts/cpld/xilinx-xcr3256.cfg
 share/openocd/scripts/cpu/
 share/openocd/scripts/cpu/arm/
 share/openocd/scripts/cpu/arm/arm7tdmi.tcl
@@ -80,6 +104,7 @@ 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/interface/
+share/openocd/scripts/interface/altera-usb-blaster.cfg
 share/openocd/scripts/interface/arm-jtag-ew.cfg
 share/openocd/scripts/interface/arm-usb-ocd.cfg
 share/openocd/scripts/interface/at91rm9200.cfg
@@ -90,26 +115,38 @@ share/openocd/scripts/interface/calao-usb-a9260.cfg
 share/openocd/scripts/interface/chameleon.cfg
 share/openocd/scripts/interface/cortino.cfg
 share/openocd/scripts/interface/dummy.cfg
+share/openocd/scripts/interface/flashlink.cfg
+share/openocd/scripts/interface/flossjtag.cfg
 share/openocd/scripts/interface/flyswatter.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/kt-link.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/neodb.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/openocd-usb.cfg
+share/openocd/scripts/interface/openrd.cfg
 share/openocd/scripts/interface/parport.cfg
 share/openocd/scripts/interface/parport_dlc5.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/stm32-stick.cfg
 share/openocd/scripts/interface/turtelizer2.cfg
+share/openocd/scripts/interface/usb-jtag.cfg
 share/openocd/scripts/interface/usbprog.cfg
 share/openocd/scripts/interface/vsllink.cfg
 share/openocd/scripts/memory.tcl
@@ -117,7 +154,7 @@ 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/at91eb40a.cfg
+share/openocd/scripts/target/ar71xx.cfg
 share/openocd/scripts/target/at91r40008.cfg
 share/openocd/scripts/target/at91rm9200.cfg
 share/openocd/scripts/target/at91sam3u1c.cfg
@@ -127,23 +164,35 @@ share/openocd/scripts/target/at91sam3u2e.cfg
 share/openocd/scripts/target/at91sam3u4c.cfg
 share/openocd/scripts/target/at91sam3u4e.cfg
 share/openocd/scripts/target/at91sam3uXX.cfg
+share/openocd/scripts/target/at91sam7sx.cfg
 share/openocd/scripts/target/at91sam9260.cfg
 share/openocd/scripts/target/at91sam9260_ext_RAM_ext_flash.cfg
+share/openocd/scripts/target/at91sam9rl.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/cs351x.cfg
 share/openocd/scripts/target/davinci.cfg
+share/openocd/scripts/target/dragonite.cfg
+share/openocd/scripts/target/dsp56321.cfg
 share/openocd/scripts/target/epc9301.cfg
+share/openocd/scripts/target/faux.cfg
 share/openocd/scripts/target/feroceon.cfg
 share/openocd/scripts/target/icepick.cfg
+share/openocd/scripts/target/imx.cfg
 share/openocd/scripts/target/imx21.cfg
+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/is5114.cfg
 share/openocd/scripts/target/ixp42x.cfg
-share/openocd/scripts/target/lm3s3748.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
 share/openocd/scripts/target/lpc2129.cfg
@@ -151,6 +200,8 @@ share/openocd/scripts/target/lpc2148.cfg
 share/openocd/scripts/target/lpc2294.cfg
 share/openocd/scripts/target/lpc2378.cfg
 share/openocd/scripts/target/lpc2478.cfg
+share/openocd/scripts/target/lpc2900.cfg
+share/openocd/scripts/target/lpc3250.cfg
 share/openocd/scripts/target/mega128.cfg
 share/openocd/scripts/target/netx500.cfg
 share/openocd/scripts/target/omap2420.cfg
@@ -159,25 +210,31 @@ share/openocd/scripts/target/omap5912.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/stellaris.cfg
 share/openocd/scripts/target/stm32.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/test_reset_syntax_error.cfg
 share/openocd/scripts/target/test_syntax_error.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/tmpa900.cfg
+share/openocd/scripts/target/tmpa910.cfg
 share/openocd/scripts/target/xba_revA3.cfg
 share/openocd/scripts/test/
 share/openocd/scripts/test/selftest.cfg

Reply via email to