Attachment #159031 for bug #201721

Lines 2-9 Link Here

(-)src/openocd-0.9.0/Makefile (-5 / +7 lines)
2	# $FreeBSD: head/devel/openocd/Makefile 385703 2015-05-07 22:36:18Z antoine $	2	# $FreeBSD: head/devel/openocd/Makefile 385703 2015-05-07 22:36:18Z antoine $
3		3
4	PORTNAME= openocd	4	PORTNAME= openocd
5	PORTVERSION= 0.7.0	5	PORTVERSION= 0.9.0
6	PORTREVISION= 3	6	#PORTREVISION= 0
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9
Lines 12-17 COMMENT= Open On-Chip Debugger Link Here
12		12
13	GNU_CONFIGURE= yes	13	GNU_CONFIGURE= yes
14	CONFIGURE_ARGS+= --disable-werror	14	CONFIGURE_ARGS+= --disable-werror
		15	CONFIGURE_ENV+= LIBUSB0_CFLAGS=" " LIBUSB0_LIBS="-lusb"
		16	CONFIGURE_ENV+= LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
15		17
16	OPTIONS_DEFINE= DOC JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \	18	OPTIONS_DEFINE= DOC JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \
17	USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \	19	USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
Lines 28-34 JTAG_IO_DESC= Enable verbose JTAG I/O me Link Here
28	USB_IO_DESC= Enable verbose USB I/O messages	30	USB_IO_DESC= Enable verbose USB I/O messages
29	PARPORT_DESC= Support Parallel Port based drivers	31	PARPORT_DESC= Support Parallel Port based drivers
30	DUMMY_DESC= Support Dummy Driver	32	DUMMY_DESC= Support Dummy Driver
31	FT2232_DESC= Support FT2232 based USB devices (using libftdi)	33	FT2232_DESC= Support FT2232 based USB devices (using libftdi) (deprecated)
32	FTDI_DESC= Support experimental FTDI+MPSSE+libusb-1.0 async.	34	FTDI_DESC= Support experimental FTDI+MPSSE+libusb-1.0 async.
33	USBBLASTER_DESC=Support USB-Blaster Programmer (using libftdi)	35	USBBLASTER_DESC=Support USB-Blaster Programmer (using libftdi)
34	EP93XX_DESC= Support EP93xx based SBCs	36	EP93XX_DESC= Support EP93xx based SBCs
Lines 115-124 CONFIGURE_ARGS+= --disable-dummy Link Here
115	.endif	117	.endif
116		118
117	.if ${PORT_OPTIONS:MFT2232}	119	.if ${PORT_OPTIONS:MFT2232}
118	CONFIGURE_ARGS+= --enable-ft2232_libftdi	120	CONFIGURE_ARGS+= --enable-legacy-ft2232_libftdi
119	WITH_LIBFTDI= yes	121	WITH_LIBFTDI= yes
120	.else	122	.else
121	CONFIGURE_ARGS+= --disable-ft2232_libftdi	123	CONFIGURE_ARGS+= --disable-legacy-ft2232_libftdi
122	.endif	124	.endif
123		125
124	.if ${PORT_OPTIONS:MFTDI}	126	.if ${PORT_OPTIONS:MFTDI}




@@ -1,11 +0,0 @@
---- 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

Lines 1-2 Link Here

(-)src/openocd-0.9.0/distinfo (-2 / +2 lines)
1	SHA256 (openocd-0.7.0.tar.bz2) = 52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63	1	SHA256 (openocd-0.9.0.tar.bz2) = 837042ac9a156b9363cbffa1fcdaf463bfb83a49331addf52e63119642b5f443
2	SIZE (openocd-0.7.0.tar.bz2) = 3493924	2	SIZE (openocd-0.9.0.tar.bz2) = 3873090

Lines 1-11 Link Here

(-)src/openocd-0.9.0/files/patch-src-jtag-drivers-mpsse.c (-11 lines)
1	--- src/jtag/drivers/mpsse.c.orig 2012-09-08 22:22:04.000000000 +0200
2	+++ src/jtag/drivers/mpsse.c 2012-09-08 22:22:14.000000000 +0200
3	@@ -24,7 +24,7 @@
4
5	#include "mpsse.h"
6	#include "helper/log.h"
7	-#include <libusb-1.0/libusb.h>
8	+#include <libusb.h>
9
10	/* Compatibility define for older libusb-1.0 */
11	#ifndef LIBUSB_CALL

Lines 1-11 Link Here

(-)src/openocd-0.9.0/files/patch-src-jtag-drivers-ti_icdi_usb.c (-11 lines)
1	--- src/jtag/drivers/ti_icdi_usb.c.orig 2013-04-28 00:42:17.000000000 -0700
2	+++ src/jtag/drivers/ti_icdi_usb.c 2013-07-18 16:28:11.392443008 -0700
3	@@ -33,7 +33,7 @@
4
5	#include <target/cortex_m.h>
6
7	-#include <libusb-1.0/libusb.h>
8	+#include <libusb.h>
9
10	#define ICDI_WRITE_ENDPOINT 0x02
11	#define ICDI_READ_ENDPOINT 0x83

Return to bug 201721

Lines 1-12 Link Here

(-)src/openocd-0.9.0/Oops.rej (-12 lines)
1	@@ -1,11 +0,0 @@
2	---- src/jtag/drivers/ti_icdi_usb.c.orig 2013-04-28 00:42:17.000000000 -0700
3	-+++ src/jtag/drivers/ti_icdi_usb.c 2013-07-18 16:28:11.392443008 -0700
4	-@@ -33,7 +33,7 @@
5	-
6	- #include <target/cortex_m.h>
7	-
8	--#include <libusb-1.0/libusb.h>
9	-+#include <libusb.h>
10	-
11	- #define ICDI_WRITE_ENDPOINT 0x02
12	- #define ICDI_READ_ENDPOINT 0x83

Lines 1-15 Link Here

(-)src/openocd-0.9.0/pkg-plist (-23 / +139 lines)
1	bin/openocd	1	bin/openocd
2	lib/libopenocd.a
3	lib/openocd/OpenULINK/ulink_firmware.hex
4	share/openocd/contrib/libdcc/README
5	share/openocd/contrib/libdcc/dcc_stdio.c
6	share/openocd/contrib/libdcc/dcc_stdio.h
7	share/openocd/contrib/libdcc/example.c
8	share/openocd/contrib/openocd.udev
9	share/openocd/scripts/bitsbytes.tcl	2	share/openocd/scripts/bitsbytes.tcl
10	share/openocd/scripts/board/actux3.cfg	3	share/openocd/scripts/board/actux3.cfg
		4	share/openocd/scripts/board/alphascale_asm9260_ek.cfg
		5	share/openocd/scripts/board/altera_sockit.cfg
11	share/openocd/scripts/board/am3517evm.cfg	6	share/openocd/scripts/board/am3517evm.cfg
12	share/openocd/scripts/board/arm_evaluator7t.cfg	7	share/openocd/scripts/board/arm_evaluator7t.cfg
		8	share/openocd/scripts/board/asus-rt-n16.cfg
		9	share/openocd/scripts/board/asus-rt-n66u.cfg
13	share/openocd/scripts/board/at91cap7a-stk-sdram.cfg	10	share/openocd/scripts/board/at91cap7a-stk-sdram.cfg
14	share/openocd/scripts/board/at91eb40a.cfg	11	share/openocd/scripts/board/at91eb40a.cfg
15	share/openocd/scripts/board/at91rm9200-dk.cfg	12	share/openocd/scripts/board/at91rm9200-dk.cfg
Lines 24-42 share/openocd/scripts/board/atmel_sam3n_ Link Here
24	share/openocd/scripts/board/atmel_sam3s_ek.cfg	21	share/openocd/scripts/board/atmel_sam3s_ek.cfg
25	share/openocd/scripts/board/atmel_sam3u_ek.cfg	22	share/openocd/scripts/board/atmel_sam3u_ek.cfg
26	share/openocd/scripts/board/atmel_sam3x_ek.cfg	23	share/openocd/scripts/board/atmel_sam3x_ek.cfg
		24	share/openocd/scripts/board/atmel_sam4e_ek.cfg
		25	share/openocd/scripts/board/atmel_sam4l8_xplained_pro.cfg
27	share/openocd/scripts/board/atmel_sam4s_ek.cfg	26	share/openocd/scripts/board/atmel_sam4s_ek.cfg
		27	share/openocd/scripts/board/atmel_sam4s_xplained_pro.cfg
		28	share/openocd/scripts/board/atmel_samd20_xplained_pro.cfg
		29	share/openocd/scripts/board/atmel_samd21_xplained_pro.cfg
		30	share/openocd/scripts/board/atmel_samg53_xplained_pro.cfg
		31	share/openocd/scripts/board/atmel_saml21_xplained_pro.cfg
		32	share/openocd/scripts/board/atmel_samr21_xplained_pro.cfg
28	share/openocd/scripts/board/balloon3-cpu.cfg	33	share/openocd/scripts/board/balloon3-cpu.cfg
		34	share/openocd/scripts/board/bcm28155_ap.cfg
		35	share/openocd/scripts/board/bt-homehubv1.cfg
29	share/openocd/scripts/board/colibri.cfg	36	share/openocd/scripts/board/colibri.cfg
30	share/openocd/scripts/board/crossbow_tech_imote2.cfg	37	share/openocd/scripts/board/crossbow_tech_imote2.cfg
31	share/openocd/scripts/board/csb337.cfg	38	share/openocd/scripts/board/csb337.cfg