Index: head/devel/openocd/Makefile
===================================================================
--- head/devel/openocd/Makefile	(revision 419557)
+++ head/devel/openocd/Makefile	(revision 419558)
@@ -1,295 +1,296 @@
 # Created by: Tomasz "CeDeROM" CEDRO (http://www.tomek.cedro.info)
 # $FreeBSD$
 
 PORTNAME=	openocd
 PORTVERSION=	0.9.0
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Open On-Chip Debugger
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-werror
 CONFIGURE_ENV=	MAKEINFO=${LOCALBASE}/bin/makeinfo
 
-BROKEN_FreeBSD_9=	libusb does not install pkgconfig files
-
 OPTIONS_DEFINE=	DOC JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \
 	USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
 	ARMJTAGEW BUSPIRATE TIICDI STLINK OSBDM OPENDOUS SYSFSGPIO RMTBITBANG \
 	MINIDRIVER CMSISDAP
 OPTIONS_DEFAULT=DOC JIMTCL PARPORT DUMMY FT2232 FTDI USBBLASTER EP93XX \
 	AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK ARMJTAGEW \
 	BUSPIRATE STLINK OSBDM OPENDOUS RMTBITBANG
 
 DOC_DESC=	Build HTML and PDF documentation with Doxygen
 JIMTCL_DESC=	Build with internal JimTCL interpreter
 VERBOSE_DESC=	Enable verbose JTAG I/O messages
 JTAG_IO_DESC=	Enable verbose JTAG I/O messages
 USB_IO_DESC=	Enable verbose USB I/O messages
 PARPORT_DESC=	Support Parallel Port based drivers
 DUMMY_DESC=	Support Dummy Driver
 FT2232_DESC=	Support FT2232 based USB devices (using libftdi)
 FTDI_DESC=	Support experimental FTDI+MPSSE+libusb-1.0 async.
 USBBLASTER_DESC=Support USB-Blaster Programmer (using libftdi)
 EP93XX_DESC=	Support EP93xx based SBCs
 AT91RM9200_DESC=Support AT91RM9200 based SBCs
 PRESTO_DESC=	Support ASIX Presto Programmer (using libftdi)
 USBPROG_DESC=	Support USB-Prog JTAG Programmer
 JLINK_DESC=	Support Segger J-Link JTAG Programmer
 VSLLINK_DESC=	Support Versaloon-Link JTAG Programmer
 RLINK_DESC=	Support Raisonance RLink JTAG Programmer
 ULINK_DESC=	Support Keil ULINK-JTAG Programmer
 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
 SYSFSGPIO=	Support Programming via sysfs GPIOs
 RMTBITBANG_DESC=Support Remote-Bitbang Driver
 MINIDRIVER_DESC=Dummy minidriver only (will exclude others!)
 CMSISDAP_DESC=Support for CMSIS-DAP Compliant Debugger
 
 USES=		gmake libtool pkgconfig tar:bzip2
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 INFO=		openocd
+
+post-patch:
+	chmod +x ${WRKSRC}/libusb_finder
 
 # IMPORTANT INFORMATION FOR DEVELOPERS:
 # Some Interfaces and Options are not on the list because they break a build.
 # If you need them working on FreeeBSD, code, patches are welcome :-)
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOC}
 CONFIGURE_ARGS+=	--enable-doxygen-pdf
 WITH_DOXYGEN=		yes
 .else
 CONFIGURE_ARGS+=	--disable-doxygen-pdf --disable-doxygen-html
 .endif
 
 .if ${PORT_OPTIONS:MJIMTCL}
 CONFIGURE_ARGS+=	--enable-internal-jimtcl
 .else
 CONFIGURE_ARGS+=	--disable-internal-jimtcl
 .endif
 
 .if ${PORT_OPTIONS:MVERBOSE}
 CONFIGURE_ARGS+=	--enable-verbose
 .else
 CONFIGURE_ARGS+=	--disable-verbose
 .endif
 
 .if ${PORT_OPTIONS:MJTAG_IO}
 CONFIGURE_ARGS+=	--enable-verbose-jtag-io
 .else
 CONFIGURE_ARGS+=	--disable-verbose-jtag-io
 .endif
 
 .if ${PORT_OPTIONS:MUSB_IO}
 CONFIGURE_ARGS+=	--enable-verbose-usb-io
 .else
 CONFIGURE_ARGS+=	--disable-verbose-usb-io
 .endif
 
 .if ${PORT_OPTIONS:MUSB_COMMS}
 CONFIGURE_ARGS+=	--enable-verbose-usb-comms
 .else
 CONFIGURE_ARGS+=	--disable-verbose-usb-comms
 .endif
 
 .if ${PORT_OPTIONS:MMALLOC}
 CONFIGURE_ARGS+=	--enable-malloc-logging
 .else
 CONFIGURE_ARGS+=	--disable-malloc-logging
 .endif
 
 .if ${PORT_OPTIONS:MPARPORT}
 CONFIGURE_ARGS+=	--enable-parport
 .else
 CONFIGURE_ARGS+=	--disable-parport
 .endif
 
 .if ${PORT_OPTIONS:MDUMMY}
 CONFIGURE_ARGS+=	--enable-dummy
 .else
 CONFIGURE_ARGS+=	--disable-dummy
 .endif
 
 .if ${PORT_OPTIONS:MFT2232}
 CONFIGURE_ARGS+=	--enable-legacy-ft2232_libftdi
 WITH_LIBFTDI=		yes
 .else
 CONFIGURE_ARGS+=	--disable-legacy-ft2232_libftdi
 .endif
 
 .if ${PORT_OPTIONS:MFTDI}
 CONFIGURE_ARGS+=	--enable-ftdi
 WITH_LIBFTDI=		yes
 .else
 CONFIGURE_ARGS+=	--disable-ftdi
 .endif
 
 .if ${PORT_OPTIONS:MUSBBLASTER}
 CONFIGURE_ARGS+=	--enable-usb_blaster_libftdi
 .else
 CONFIGURE_ARGS+=	--disable-usb_blaster_libftdi
 .endif
 
 .if ${PORT_OPTIONS:MAMTJTAGACCEL}
 CONFIGURE_ARGS+=	--enable-amtjtagaccel
 .else
 CONFIGURE_ARGS+=	--disable-amtjtagaccel
 .endif
 
 .if ${PORT_OPTIONS:MZY1000}
 CONFIGURE_ARGS+=	--enable-zy1000
 .else
 CONFIGURE_ARGS+=	--disable-zy1000
 .endif
 
 .if ${PORT_OPTIONS:MIOUTIL}
 CONFIGURE_ARGS+=	--enable-ioutil
 .else
 CONFIGURE_ARGS+=	--disable-ioutil
 .endif
 
 .if ${PORT_OPTIONS:MEP93XX}
 CONFIGURE_ARGS+=	--enable-ep93xx
 .else
 CONFIGURE_ARGS+=	--disable-ep93xx
 .endif
 
 .if ${PORT_OPTIONS:MAT91RM9200}
 CONFIGURE_ARGS+=	--enable-at91rm9200
 .else
 CONFIGURE_ARGS+=	--disable-at91rm9200
 .endif
 
 .if ${PORT_OPTIONS:MGW16012}
 CONFIGURE_ARGS+=	--enable-gw16012
 .else
 CONFIGURE_ARGS+=	--disable-gw16012
 .endif
 
 .if ${PORT_OPTIONS:MPRESTO}
 CONFIGURE_ARGS+=	--enable-presto_libftdi
 WITH_LIBFTDI=		yes
 .else
 CONFIGURE_ARGS+=	--disable-presto_libftdi
 .endif
 
 .if ${PORT_OPTIONS:MUSBPROG}
 CONFIGURE_ARGS+=	--enable-usbprog
 WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-usbprog
 .endif
 
 .if ${PORT_OPTIONS:MOOCDTRACE}
 CONFIGURE_ARGS+=	--enable-oocd_trace
 .else
 CONFIGURE_ARGS+=	--disable-oocd_trace
 .endif
 
 .if ${PORT_OPTIONS:MJLINK}
 CONFIGURE_ARGS+=	--enable-jlink
 WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-jlink
 .endif
 
 .if ${PORT_OPTIONS:MVSLLINK}
 CONFIGURE_ARGS+=	--enable-vsllink
 WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-vsllink
 .endif
 
 .if ${PORT_OPTIONS:MRLINK}
 CONFIGURE_ARGS+=	--enable-rlink
 WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-rlink
 .endif
 
 .if ${PORT_OPTIONS:MULINK}
 CONFIGURE_ARGS+=	--enable-ulink
 .else
 CONFIGURE_ARGS+=	--disable-ulink
 .endif
 
 .if ${PORT_OPTIONS:MARMJTAGEW}
 CONFIGURE_ARGS+=	--enable-arm-jtag-ew
 WITH_LIBUSB=		yes
 .else
 CONFIGURE_ARGS+=	--disable-arm-jtag-ew
 .endif
 
 .if ${PORT_OPTIONS:MBUSPIRATE}
 CONFIGURE_ARGS+=	--enable-buspirate
 .else
 CONFIGURE_ARGS+=	--disable-buspirate
 .endif
 
 .if ${PORT_OPTIONS:MSTLINK}
 CONFIGURE_ARGS+=	--enable-stlink
 .else
 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
 CONFIGURE_ARGS+=	--disable-osbdm
 .endif
 
 .if ${PORT_OPTIONS:MOPENDOUS}
 CONFIGURE_ARGS+=	--enable-opendous
 .else
 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
 CONFIGURE_ARGS+=	--disable-remote-bitbang
 .endif
 
 .if ${PORT_OPTIONS:MMINIDRIVER}
 CONFIGURE_ARGS+=	--enable-minidriver-dummy
 .else
 CONFIGURE_ARGS+=	--disable-minidriver-dummy
 .endif
 
 .if ${PORT_OPTIONS:MCMSISDAP}
 CONFIGURE_ARGS+=	--enable-cmsis-dap
 LIB_DEPENDS+=		libhidapi.so:comms/hidapi
 .else
 CONFIGURE_ARGS+=	--disable-cmsis-dap
 .endif
 
 .if defined(WITH_LIBFTDI)
 LIB_DEPENDS+=		libftdi.so:devel/libftdi
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 BUILD_DEPENDS+=		doxygen:devel/doxygen
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/openocd/files/patch-configure
===================================================================
--- head/devel/openocd/files/patch-configure	(revision 419557)
+++ head/devel/openocd/files/patch-configure	(revision 419558)
@@ -1,32 +1,101 @@
---- configure.orig	2015-05-17 21:09:56.000000000 +0000
-+++ configure	2015-10-17 23:52:10.459092000 +0000
-@@ -15226,11 +15226,11 @@
+--- configure.orig	2015-05-17 21:09:56 UTC
++++ configure
+@@ -15124,12 +15124,12 @@ if test -n "$LIBUSB1_CFLAGS"; then
+     pkg_cv_LIBUSB1_CFLAGS="$LIBUSB1_CFLAGS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb-1.0\""; } >&5
++  (./libusb_finder --exists --print-errors "libusb-1.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBUSB1_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null`
++  pkg_cv_LIBUSB1_CFLAGS=`./libusb_finder --cflags "libusb-1.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15141,12 +15141,12 @@ if test -n "$LIBUSB1_LIBS"; then
+     pkg_cv_LIBUSB1_LIBS="$LIBUSB1_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb-1.0\""; } >&5
++  (./libusb_finder --exists --print-errors "libusb-1.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBUSB1_LIBS=`$PKG_CONFIG --libs "libusb-1.0" 2>/dev/null`
++  pkg_cv_LIBUSB1_LIBS=`./libusb_finder --libs "libusb-1.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15167,9 +15167,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBUSB1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb-1.0" 2>&1`
++	        LIBUSB1_PKG_ERRORS=`./libusb_finder --short-errors --print-errors --cflags --libs "libusb-1.0" 2>&1`
+         else
+-	        LIBUSB1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb-1.0" 2>&1`
++	        LIBUSB1_PKG_ERRORS=`./libusb_finder --print-errors --cflags --libs "libusb-1.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBUSB1_PKG_ERRORS" >&5
+@@ -15198,8 +15198,8 @@ $as_echo "yes" >&6; }
+ $as_echo "#define HAVE_LIBUSB1 1" >>confdefs.h
+ 
+ 	if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0 >= 1.0.9\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libusb-1.0 >= 1.0.9") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb-1.0 >= 1.0.9\""; } >&5
++  (./libusb_finder --exists --print-errors "libusb-1.0 >= 1.0.9") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+@@ -15225,12 +15225,12 @@ if test -n "$LIBUSB0_CFLAGS"; then
+     pkg_cv_LIBUSB0_CFLAGS="$LIBUSB0_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5
 -  ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+  ($PKG_CONFIG --exists --print-errors "libusb-0.1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb\""; } >&5
++  (./libusb_finder --exists --print-errors "libusb-0.1") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
 -  pkg_cv_LIBUSB0_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null`
-+  pkg_cv_LIBUSB0_CFLAGS=`$PKG_CONFIG --cflags "libusb-0.1" 2>/dev/null`
++  pkg_cv_LIBUSB0_CFLAGS=`./libusb_finder --cflags "libusb-0.1" 2>/dev/null`
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
-@@ -15242,12 +15242,12 @@
+@@ -15242,12 +15242,12 @@ if test -n "$LIBUSB0_LIBS"; then
      pkg_cv_LIBUSB0_LIBS="$LIBUSB0_LIBS"
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb\""; } >&5
 -  ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-0.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libusb-0.1") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: ./libusb_finder --exists --print-errors \"libusb-0.1\""; } >&5
++  (./libusb_finder --exists --print-errors "libusb-0.1") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
 -  pkg_cv_LIBUSB0_LIBS=`$PKG_CONFIG --libs "libusb" 2>/dev/null`
-+  pkg_cv_LIBUSB0_LIBS=`$PKG_CONFIG --libs "libusb-0.1" 2>/dev/null`
++  pkg_cv_LIBUSB0_LIBS=`./libusb_finder --libs "libusb-0.1" 2>/dev/null`
  		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
+@@ -15268,9 +15268,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBUSB0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb" 2>&1`
++	        LIBUSB0_PKG_ERRORS=`./libusb_finder --short-errors --print-errors --cflags --libs "libusb" 2>&1`
+         else
+-	        LIBUSB0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb" 2>&1`
++	        LIBUSB0_PKG_ERRORS=`./libusb_finder --print-errors --cflags --libs "libusb" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBUSB0_PKG_ERRORS" >&5
Index: head/devel/openocd/files/patch-libusb__finder
===================================================================
--- head/devel/openocd/files/patch-libusb__finder	(nonexistent)
+++ head/devel/openocd/files/patch-libusb__finder	(revision 419558)
@@ -0,0 +1,30 @@
+--- libusb_finder.orig	2016-07-22 13:59:36 UTC
++++ libusb_finder
+@@ -0,0 +1,27 @@
++#!/bin/sh
++
++set -e
++
++case `uname -r` in
++	9.*) ;;
++	*) pkg-config $@ && exit 0;;
++esac
++
++if [ ! -e /usr/lib/libusb.so ]; then
++	echo "$0: libusb does not seem to be available" > /dev/stderr
++	exit 1
++fi
++
++for param in $@; do
++	case $param in
++		"--exists") ;;
++		"--cflags") ;;
++                "--libs") echo "-lusb" ;;
++		"--short-errors") ;;
++		"--print-errors") ;;
++		libusb*) ;;
++		*)
++			echo "$0: Unhandled parameters: $@" > /dev/stderr
++			exit 1 ;;
++	esac
++done

Property changes on: head/devel/openocd/files/patch-libusb__finder
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property