Import global switch for libusb's implementation [2/2]

This switch is meant to be used by packages requiring an implementation of the
former libusb (as in devel/libusb). The original implementation can be
chosen by setting LIBUSB_TYPE to "native".

The alternative implementation libusb-compat (as in devel/libusb-compat) wraps
libusb1 (in devel/libusb1). This implementation can be chosen by setting
LIBUSB_TYPE to "compat". On NetBSD, it has the advantage of not requiring root
privileges to locate and use USB devices without a kernel driver.

This second part switches packages using libusb to this framework. It does not
change compilation options or dependencies at this point.

Compile-tested on most packages affected and available on NetBSD/amd64.

14 files changed, 28 insertions, 28 deletions

diff --git a/devel/SDL2/Makefile b/devel/SDL2/Makefile
index b0108aac30c..d9c3a3898c2 100644
--- a/devel/SDL2/Makefile
+++ b/devel/SDL2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/01/28 20:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2018/02/10 13:53:47 khorben Exp $
 
 DISTNAME=	SDL2-2.0.7
 PKGREVISION=	1
@@ -36,7 +36,7 @@ CFLAGS+=	-DPREFIX=\"${PREFIX}\"
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index bc2410895d4..e763952d50f 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/16 20:21:07 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/02/10 13:53:47 khorben Exp $
 
 DISTNAME=	libftdi-0.20
 CATEGORIES=	devel
@@ -20,5 +20,5 @@ CONFIGURE_ARGS+=	--without-docs
 PKGCONFIG_OVERRIDE+=	libftdi.pc.in
 PKGCONFIG_OVERRIDE+=	libftdipp.pc.in
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libftdi/buildlink3.mk b/devel/libftdi/buildlink3.mk
index e6cd71a5e3d..67298d17e71 100644
--- a/devel/libftdi/buildlink3.mk
+++ b/devel/libftdi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2010/10/23 15:34:34 jakllsch Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/02/10 13:53:47 khorben Exp $
 
 BUILDLINK_TREE+=	libftdi
 
@@ -8,7 +8,7 @@ LIBFTDI_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libftdi+=	libftdi>=0.18
 BUILDLINK_PKGSRCDIR.libftdi?=	../../devel/libftdi
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif	# LIBFTDI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libftdi
diff --git a/devel/libftdi1/Makefile b/devel/libftdi1/Makefile
index 26507a099b0..1875f1c3fc3 100644
--- a/devel/libftdi1/Makefile
+++ b/devel/libftdi1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/01/01 21:18:21 adam Exp $
+# $NetBSD: Makefile,v 1.22 2018/02/10 13:53:47 khorben Exp $
 
 DISTNAME=	libftdi1-1.1
 PKGREVISION=	8
@@ -45,7 +45,7 @@ do-configure:
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/confuse/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/swig/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
diff --git a/devel/libftdi1/buildlink3.mk b/devel/libftdi1/buildlink3.mk
index b74a0777ea7..b5520467ff3 100644
--- a/devel/libftdi1/buildlink3.mk
+++ b/devel/libftdi1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/02/10 13:53:47 khorben Exp $
 
 BUILDLINK_TREE+=	libftdi1
 
@@ -8,7 +8,7 @@ LIBFTDI1_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libftdi1+=	libftdi1>=1.0
 BUILDLINK_PKGSRCDIR.libftdi1?=		../../devel/libftdi1
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif	# LIBFTDI1_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libftdi1
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index 32110ca0ab7..68be068d33f 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2016/02/25 12:12:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.67 2018/02/10 13:53:47 khorben Exp $
 
 DISTNAME=	libgphoto2-2.5.8
 PKGREVISION=	1
@@ -43,7 +43,7 @@ post-install:
 .include "../../devel/libltdl/buildlink3.mk"
 .if ${OPSYS} != "SunOS"
 PLIST.libusb=	yes
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index 0cb044326ce..9011af981f7 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:06 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/02/10 13:53:47 khorben Exp $
 
 BUILDLINK_TREE+=	libgphoto2
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libgphoto2?=	../../devel/libgphoto2
 
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${OPSYS} != "SunOS"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile
index 4b1407e0ce4..ac9cb97c815 100644
--- a/devel/libhid/Makefile
+++ b/devel/libhid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/12/10 15:46:26 adam Exp $
+# $NetBSD: Makefile,v 1.10 2018/02/10 13:53:47 khorben Exp $
 
 DISTNAME=	libhid-0.2.16
 PKGREVISION=	1
@@ -23,7 +23,7 @@ PY_PATCHPLIST=	yes
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 0.2.16
 
 .include "../../lang/python/extension.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../devel/swig/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile
index 1321195fbfc..6b366ff924d 100644
--- a/devel/libnfc/Makefile
+++ b/devel/libnfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/12/16 08:11:55 manu Exp $
+# $NetBSD: Makefile,v 1.2 2018/02/10 13:53:47 khorben Exp $
 
 DISTNAME=	libnfc-1.7.1
 CATEGORIES=	net
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=--enable-doc
 
 BUILD_DEPENDS+=	doxygen>=1.8.11:../../devel/doxygen
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../security/pcsc-lite/buildlink3.mk"
 
diff --git a/devel/libnfc/buildlink3.mk b/devel/libnfc/buildlink3.mk
index 681c3035eda..b624d7a9467 100644
--- a/devel/libnfc/buildlink3.mk
+++ b/devel/libnfc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/12/16 08:11:55 manu Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/02/10 13:53:47 khorben Exp $
 
 BUILDLINK_TREE+=	libnfc
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libnfc+=	libnfc>=1.7.1
 BUILDLINK_ABI_DEPENDS.libnfc+=	libnfc>=1.7.1
 BUILDLINK_PKGSRCDIR.libnfc?=	../../devel/libnfc
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../security/pcsc-lite/buildlink3.mk"
 .endif # LIBNFC_BUILDLINK3_MK
diff --git a/devel/libnjb/Makefile b/devel/libnjb/Makefile
index a78994e7f00..f88c2738087 100644
--- a/devel/libnjb/Makefile
+++ b/devel/libnjb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/08/18 07:31:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/02/10 13:53:47 khorben Exp $
 #
 
 DISTNAME=		libnjb-2.2.6
@@ -20,5 +20,5 @@ PKGCONFIG_OVERRIDE+=	libnjb.pc.in
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libnjb/buildlink3.mk b/devel/libnjb/buildlink3.mk
index d33da6b0d5d..87f7822e0a4 100644
--- a/devel/libnjb/buildlink3.mk
+++ b/devel/libnjb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/02/15 16:51:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/02/10 13:53:47 khorben Exp $
 
 BUILDLINK_TREE+=	libnjb
 
@@ -8,7 +8,7 @@ LIBNJB_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libnjb+=	libnjb>=2.2.6
 BUILDLINK_PKGSRCDIR.libnjb?=	../../devel/libnjb
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif # LIBNJB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libnjb
diff --git a/devel/openocd/options.mk b/devel/openocd/options.mk
index 00155f3fde8..832dd31af2c 100644
--- a/devel/openocd/options.mk
+++ b/devel/openocd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/04 00:26:42 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2018/02/10 13:53:47 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openocd
 PKG_SUPPORTED_OPTIONS=	libhidapi libusb libusb1
@@ -16,7 +16,7 @@ CONFIGURE_ENV+=		HIDAPI_LIBS=${HIDAPI_LIBS:Q}
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibusb)
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibusb1)
diff --git a/devel/py-usb/Makefile b/devel/py-usb/Makefile
index 89b290b1c3d..a1c1f0c4c2c 100644
--- a/devel/py-usb/Makefile
+++ b/devel/py-usb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/12/24 10:13:22 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/02/10 13:53:48 khorben Exp $
 
 VERSION=	1.0.0
 DISTNAME=	pyusb-${VERSION}
@@ -16,6 +16,6 @@ CFLAGS.SunOS+=	-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.4.2
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"