pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Import global switch for libusb's implementation [2/2]
details: https://anonhg.NetBSD.org/pkgsrc/rev/134dc5e02096
branches: trunk
changeset: 375376:134dc5e02096
user: khorben <khorben%pkgsrc.org@localhost>
date: Sat Feb 10 13:53:46 2018 +0000
description:
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.
diffstat:
audio/ifp-line/Makefile | 4 ++--
audio/libifp/Makefile | 4 ++--
audio/libifp/buildlink3.mk | 4 ++--
audio/rioutil/Makefile | 4 ++--
comms/libticables2/buildlink3.mk | 4 ++--
comms/libticables2/options.mk | 4 ++--
comms/lirc/Makefile | 4 ++--
comms/obexftp/Makefile | 4 ++--
comms/obexftp/buildlink3.mk | 4 ++--
comms/openobex/Makefile | 4 ++--
comms/openobex/buildlink3.mk | 4 ++--
cross/avrdude/Makefile | 4 ++--
cross/dfu-programmer/Makefile | 4 ++--
devel/SDL2/Makefile | 4 ++--
devel/libftdi/Makefile | 4 ++--
devel/libftdi/buildlink3.mk | 4 ++--
devel/libftdi1/Makefile | 4 ++--
devel/libftdi1/buildlink3.mk | 4 ++--
devel/libgphoto2/Makefile | 4 ++--
devel/libgphoto2/buildlink3.mk | 4 ++--
devel/libhid/Makefile | 4 ++--
devel/libnfc/Makefile | 4 ++--
devel/libnfc/buildlink3.mk | 4 ++--
devel/libnjb/Makefile | 4 ++--
devel/libnjb/buildlink3.mk | 4 ++--
devel/openocd/options.mk | 4 ++--
devel/py-usb/Makefile | 4 ++--
emulators/snes9x/Makefile | 4 ++--
emulators/ucon64/options.mk | 4 ++--
geography/garmintools/Makefile | 4 ++--
geography/gpsbabel/Makefile | 4 ++--
geography/qlandkartegt-garmindev/Makefile | 4 ++--
graphics/s10sh/Makefile | 4 ++--
misc/calibre/Makefile | 4 ++--
misc/urjtag/Makefile | 4 ++--
security/openct/buildlink3.mk | 4 ++--
security/openct/options.mk | 4 ++--
sysutils/ups-nut-usb/Makefile | 4 ++--
x11/kde-workspace4/Makefile | 4 ++--
39 files changed, 78 insertions(+), 78 deletions(-)
diffs (truncated from 674 to 300 lines):
diff -r b60f49e5f3ae -r 134dc5e02096 audio/ifp-line/Makefile
--- a/audio/ifp-line/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/audio/ifp-line/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/04/20 12:10:27 nros Exp $
+# $NetBSD: Makefile,v 1.16 2018/02/10 13:53:46 khorben Exp $
DISTNAME= ifp-line-0.3
CATEGORIES= audio
@@ -17,5 +17,5 @@
USE_FEATURES+= fts_open
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b60f49e5f3ae -r 134dc5e02096 audio/libifp/Makefile
--- a/audio/libifp/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/audio/libifp/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/05/12 11:49:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2018/02/10 13:53:46 khorben Exp $
#
DISTNAME= libifp-1.0.0.2
@@ -20,5 +20,5 @@
LIBS.SunOS+= -liconv
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b60f49e5f3ae -r 134dc5e02096 audio/libifp/buildlink3.mk
--- a/audio/libifp/buildlink3.mk Sat Feb 10 13:45:45 2018 +0000
+++ b/audio/libifp/buildlink3.mk Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/02/16 08:57:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/02/10 13:53:46 khorben Exp $
BUILDLINK_TREE+= libifp
@@ -8,7 +8,7 @@
BUILDLINK_API_DEPENDS.libifp+= libifp>=1.0.0.2
BUILDLINK_PKGSRCDIR.libifp?= ../../audio/libifp
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.endif # LIBIFP_BUILDLINK3_MK
BUILDLINK_TREE+= -libifp
diff -r b60f49e5f3ae -r 134dc5e02096 audio/rioutil/Makefile
--- a/audio/rioutil/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/audio/rioutil/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/04/20 12:10:31 nros Exp $
+# $NetBSD: Makefile,v 1.25 2018/02/10 13:53:46 khorben Exp $
#
DISTNAME= rioutil-1.5.0
@@ -20,5 +20,5 @@
ONLY_FOR_PLATFORM+= DragonFly-*-* FreeBSD-*-* OpenBSD-*-*
.include "../../audio/id3lib/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b60f49e5f3ae -r 134dc5e02096 comms/libticables2/buildlink3.mk
--- a/comms/libticables2/buildlink3.mk Sat Feb 10 13:45:45 2018 +0000
+++ b/comms/libticables2/buildlink3.mk Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:57 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/02/10 13:53:46 khorben Exp $
BUILDLINK_TREE+= libticables2
@@ -14,7 +14,7 @@
.if !empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb)
. if empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb1)
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
. endif
.endif
diff -r b60f49e5f3ae -r 134dc5e02096 comms/libticables2/options.mk
--- a/comms/libticables2/options.mk Sat Feb 10 13:45:45 2018 +0000
+++ b/comms/libticables2/options.mk Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2013/05/26 22:57:53 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2018/02/10 13:53:46 khorben Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libticables2
PKG_SUPPORTED_OPTIONS= libusb libusb1 nls
@@ -9,7 +9,7 @@
.if !empty(PKG_OPTIONS:Mlibusb)
BUILDLINK_ABI_DEPENDS.libusb+= libusb>=0.1.12
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mlibusb1)
diff -r b60f49e5f3ae -r 134dc5e02096 comms/lirc/Makefile
--- a/comms/lirc/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/comms/lirc/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/04/11 04:22:33 dbj Exp $
+# $NetBSD: Makefile,v 1.6 2018/02/10 13:53:46 khorben Exp $
#
DISTNAME= lirc-0.9.0
@@ -43,5 +43,5 @@
.include "options.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b60f49e5f3ae -r 134dc5e02096 comms/obexftp/Makefile
--- a/comms/obexftp/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/comms/obexftp/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/09/03 08:36:51 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/02/10 13:53:47 khorben Exp $
#
DISTNAME= obexftp-0.24-Source
@@ -26,6 +26,6 @@
.include "../../comms/openobex/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.include "../../devel/swig/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b60f49e5f3ae -r 134dc5e02096 comms/obexftp/buildlink3.mk
--- a/comms/obexftp/buildlink3.mk Sat Feb 10 13:45:45 2018 +0000
+++ b/comms/obexftp/buildlink3.mk Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2013/03/15 08:18:43 plunky Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/02/10 13:53:47 khorben Exp $
BUILDLINK_TREE+= obexftp
@@ -10,7 +10,7 @@
.include "../../comms/openobex/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.endif # OBEXFTP_BUILDLINK3_MK
BUILDLINK_TREE+= -obexftp
diff -r b60f49e5f3ae -r 134dc5e02096 comms/openobex/Makefile
--- a/comms/openobex/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/comms/openobex/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/09/03 08:36:51 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2018/02/10 13:53:47 khorben Exp $
DISTNAME= openobex-1.7.1-Source
PKGNAME= ${DISTNAME:C/-Source//}
@@ -35,5 +35,5 @@
${DESTDIR}${PREFIX}/${EGDIR}/60-openobex.rules
.endif
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b60f49e5f3ae -r 134dc5e02096 comms/openobex/buildlink3.mk
--- a/comms/openobex/buildlink3.mk Sat Feb 10 13:45:45 2018 +0000
+++ b/comms/openobex/buildlink3.mk Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:03:58 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/02/10 13:53:47 khorben Exp $
BUILDLINK_TREE+= openobex
@@ -8,7 +8,7 @@
BUILDLINK_API_DEPENDS.openobex+= openobex>=1.7
BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.endif # OPENOBEX_BUILDLINK3_MK
BUILDLINK_TREE+= -openobex
diff -r b60f49e5f3ae -r 134dc5e02096 cross/avrdude/Makefile
--- a/cross/avrdude/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/cross/avrdude/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2017/02/21 16:05:53 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2018/02/10 13:53:47 khorben Exp $
DISTNAME= avrdude-6.3
CATEGORIES= cross
@@ -45,7 +45,7 @@
.include "../../devel/libftdi/buildlink3.mk"
.include "../../devel/libhid/buildlink3.mk"
.include "../../devel/libftdi1/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.include "../../devel/libusb1/buildlink3.mk"
# elf_getshdrstrndx
.include "../../devel/libelf/buildlink3.mk"
diff -r b60f49e5f3ae -r 134dc5e02096 cross/dfu-programmer/Makefile
--- a/cross/dfu-programmer/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/cross/dfu-programmer/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/09/24 17:17:47 jakllsch Exp $
+# $NetBSD: Makefile,v 1.5 2018/02/10 13:53:47 khorben Exp $
#
DISTNAME= dfu-programmer-0.7.2
@@ -13,5 +13,5 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-libusb_1_0
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b60f49e5f3ae -r 134dc5e02096 devel/SDL2/Makefile
--- a/devel/SDL2/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/devel/SDL2/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -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 @@
.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 -r b60f49e5f3ae -r 134dc5e02096 devel/libftdi/Makefile
--- a/devel/libftdi/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/devel/libftdi/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -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 @@
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 -r b60f49e5f3ae -r 134dc5e02096 devel/libftdi/buildlink3.mk
--- a/devel/libftdi/buildlink3.mk Sat Feb 10 13:45:45 2018 +0000
+++ b/devel/libftdi/buildlink3.mk Sat Feb 10 13:53:46 2018 +0000
@@ -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 @@
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 -r b60f49e5f3ae -r 134dc5e02096 devel/libftdi1/Makefile
--- a/devel/libftdi1/Makefile Sat Feb 10 13:45:45 2018 +0000
+++ b/devel/libftdi1/Makefile Sat Feb 10 13:53:46 2018 +0000
@@ -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 @@
.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 -r b60f49e5f3ae -r 134dc5e02096 devel/libftdi1/buildlink3.mk
--- a/devel/libftdi1/buildlink3.mk Sat Feb 10 13:45:45 2018 +0000
+++ b/devel/libftdi1/buildlink3.mk Sat Feb 10 13:53:46 2018 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index