CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Pierre Pronchery" <khorben%netbsd.org@localhost>
Date: Sat, 10 Feb 2018 13:53:49 +0000

Module Name:    pkgsrc
Committed By:   khorben
Date:           Sat Feb 10 13:53:49 UTC 2018

Modified Files:
        pkgsrc/audio/ifp-line: Makefile
        pkgsrc/audio/libifp: Makefile buildlink3.mk
        pkgsrc/audio/rioutil: Makefile
        pkgsrc/comms/libticables2: buildlink3.mk options.mk
        pkgsrc/comms/lirc: Makefile
        pkgsrc/comms/obexftp: Makefile buildlink3.mk
        pkgsrc/comms/openobex: Makefile buildlink3.mk
        pkgsrc/cross/avrdude: Makefile
        pkgsrc/cross/dfu-programmer: Makefile
        pkgsrc/devel/SDL2: Makefile
        pkgsrc/devel/libftdi: Makefile buildlink3.mk
        pkgsrc/devel/libftdi1: Makefile buildlink3.mk
        pkgsrc/devel/libgphoto2: Makefile buildlink3.mk
        pkgsrc/devel/libhid: Makefile
        pkgsrc/devel/libnfc: Makefile buildlink3.mk
        pkgsrc/devel/libnjb: Makefile buildlink3.mk
        pkgsrc/devel/openocd: options.mk
        pkgsrc/devel/py-usb: Makefile
        pkgsrc/emulators/snes9x: Makefile
        pkgsrc/emulators/ucon64: options.mk
        pkgsrc/geography/garmintools: Makefile
        pkgsrc/geography/gpsbabel: Makefile
        pkgsrc/geography/qlandkartegt-garmindev: Makefile
        pkgsrc/graphics/s10sh: Makefile
        pkgsrc/misc/calibre: Makefile
        pkgsrc/misc/urjtag: Makefile
        pkgsrc/security/openct: buildlink3.mk options.mk
        pkgsrc/sysutils/ups-nut-usb: Makefile
        pkgsrc/x11/kde-workspace4: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/ifp-line/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/libifp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/libifp/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/rioutil/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/libticables2/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/libticables2/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/comms/lirc/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/comms/obexftp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/obexftp/buildlink3.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/comms/openobex/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/comms/openobex/buildlink3.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/cross/avrdude/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cross/dfu-programmer/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libftdi/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libftdi/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/libftdi1/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libftdi1/buildlink3.mk
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/libgphoto2/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/libgphoto2/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libhid/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libnfc/Makefile \
    pkgsrc/devel/libnfc/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libnjb/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libnjb/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/openocd/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-usb/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/emulators/snes9x/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/emulators/ucon64/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/geography/garmintools/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/geography/gpsbabel/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/geography/qlandkartegt-garmindev/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/s10sh/Makefile
cvs rdiff -u -r1.193 -r1.194 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/urjtag/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/openct/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/security/openct/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/ups-nut-usb/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/x11/kde-workspace4/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/ifp-line/Makefile
diff -u pkgsrc/audio/ifp-line/Makefile:1.15 pkgsrc/audio/ifp-line/Makefile:1.16
--- pkgsrc/audio/ifp-line/Makefile:1.15 Wed Apr 20 12:10:27 2016
+++ pkgsrc/audio/ifp-line/Makefile      Sat Feb 10 13:53:46 2018
@@ -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 @@ GNU_CONFIGURE=                yes
 USE_FEATURES+=         fts_open
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/libifp/Makefile
diff -u pkgsrc/audio/libifp/Makefile:1.4 pkgsrc/audio/libifp/Makefile:1.5
--- pkgsrc/audio/libifp/Makefile:1.4    Fri May 12 11:49:30 2017
+++ pkgsrc/audio/libifp/Makefile        Sat Feb 10 13:53:46 2018
@@ -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 @@ CFLAGS.SunOS+=        -fPIC
 LIBS.SunOS+=   -liconv
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/libifp/buildlink3.mk
diff -u pkgsrc/audio/libifp/buildlink3.mk:1.2 pkgsrc/audio/libifp/buildlink3.mk:1.3
--- pkgsrc/audio/libifp/buildlink3.mk:1.2       Tue Feb 16 08:57:48 2010
+++ pkgsrc/audio/libifp/buildlink3.mk   Sat Feb 10 13:53:46 2018
@@ -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 @@ LIBIFP_BUILDLINK3_MK:=
 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

Index: pkgsrc/audio/rioutil/Makefile
diff -u pkgsrc/audio/rioutil/Makefile:1.24 pkgsrc/audio/rioutil/Makefile:1.25
--- pkgsrc/audio/rioutil/Makefile:1.24  Wed Apr 20 12:10:31 2016
+++ pkgsrc/audio/rioutil/Makefile       Sat Feb 10 13:53:46 2018
@@ -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+=   NetBSD-1.5Z-* NetBSD
 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"

Index: pkgsrc/comms/libticables2/buildlink3.mk
diff -u pkgsrc/comms/libticables2/buildlink3.mk:1.2 pkgsrc/comms/libticables2/buildlink3.mk:1.3
--- pkgsrc/comms/libticables2/buildlink3.mk:1.2 Sun Jan  7 13:03:57 2018
+++ pkgsrc/comms/libticables2/buildlink3.mk     Sat Feb 10 13:53:46 2018
@@ -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 @@ pkgbase := libticables2
 
 .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
 

Index: pkgsrc/comms/libticables2/options.mk
diff -u pkgsrc/comms/libticables2/options.mk:1.1 pkgsrc/comms/libticables2/options.mk:1.2
--- pkgsrc/comms/libticables2/options.mk:1.1    Sun May 26 22:57:53 2013
+++ pkgsrc/comms/libticables2/options.mk        Sat Feb 10 13:53:46 2018
@@ -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 @@ PLIST_VARS+=            nls
 
 .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)

Index: pkgsrc/comms/lirc/Makefile
diff -u pkgsrc/comms/lirc/Makefile:1.5 pkgsrc/comms/lirc/Makefile:1.6
--- pkgsrc/comms/lirc/Makefile:1.5      Mon Apr 11 04:22:33 2016
+++ pkgsrc/comms/lirc/Makefile  Sat Feb 10 13:53:46 2018
@@ -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 @@ PKG_SKIP_REASON+=     "lirc is not available
 
 .include "options.mk"
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/comms/obexftp/Makefile
diff -u pkgsrc/comms/obexftp/Makefile:1.20 pkgsrc/comms/obexftp/Makefile:1.21
--- pkgsrc/comms/obexftp/Makefile:1.20  Sun Sep  3 08:36:51 2017
+++ pkgsrc/comms/obexftp/Makefile       Sat Feb 10 13:53:47 2018
@@ -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 @@ BUILD_TARGET= all doc
 
 .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"

Index: pkgsrc/comms/obexftp/buildlink3.mk
diff -u pkgsrc/comms/obexftp/buildlink3.mk:1.3 pkgsrc/comms/obexftp/buildlink3.mk:1.4
--- pkgsrc/comms/obexftp/buildlink3.mk:1.3      Fri Mar 15 08:18:43 2013
+++ pkgsrc/comms/obexftp/buildlink3.mk  Sat Feb 10 13:53:47 2018
@@ -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 @@ BUILDLINK_PKGSRCDIR.obexftp?= ../../comm
 
 .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

Index: pkgsrc/comms/openobex/Makefile
diff -u pkgsrc/comms/openobex/Makefile:1.31 pkgsrc/comms/openobex/Makefile:1.32
--- pkgsrc/comms/openobex/Makefile:1.31 Sun Sep  3 08:36:51 2017
+++ pkgsrc/comms/openobex/Makefile      Sat Feb 10 13:53:47 2018
@@ -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 @@ post-install:
              ${DESTDIR}${PREFIX}/${EGDIR}/60-openobex.rules
 .endif
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/comms/openobex/buildlink3.mk
diff -u pkgsrc/comms/openobex/buildlink3.mk:1.14 pkgsrc/comms/openobex/buildlink3.mk:1.15
--- pkgsrc/comms/openobex/buildlink3.mk:1.14    Sun Jan  7 13:03:58 2018
+++ pkgsrc/comms/openobex/buildlink3.mk Sat Feb 10 13:53:47 2018
@@ -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 @@ OPENOBEX_BUILDLINK3_MK:=
 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

Index: pkgsrc/cross/avrdude/Makefile
diff -u pkgsrc/cross/avrdude/Makefile:1.42 pkgsrc/cross/avrdude/Makefile:1.43
--- pkgsrc/cross/avrdude/Makefile:1.42  Tue Feb 21 16:05:53 2017
+++ pkgsrc/cross/avrdude/Makefile       Sat Feb 10 13:53:47 2018
@@ -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 @@ BUILD_DEPENDS+=               gtexinfo-[0-9]*:../../d
 .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"

Index: pkgsrc/cross/dfu-programmer/Makefile
diff -u pkgsrc/cross/dfu-programmer/Makefile:1.4 pkgsrc/cross/dfu-programmer/Makefile:1.5
--- pkgsrc/cross/dfu-programmer/Makefile:1.4    Sat Sep 24 17:17:47 2016
+++ pkgsrc/cross/dfu-programmer/Makefile        Sat Feb 10 13:53:47 2018
@@ -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 @@ LICENSE=      gnu-gpl-v2
 GNU_CONFIGURE= yes
 CONFIGURE_ARGS+= --disable-libusb_1_0
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.26 pkgsrc/devel/SDL2/Makefile:1.27
--- pkgsrc/devel/SDL2/Makefile:1.26     Sun Jan 28 20:10:45 2018
+++ pkgsrc/devel/SDL2/Makefile  Sat Feb 10 13:53:47 2018
@@ -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"

Index: pkgsrc/devel/libftdi/Makefile
diff -u pkgsrc/devel/libftdi/Makefile:1.6 pkgsrc/devel/libftdi/Makefile:1.7
--- pkgsrc/devel/libftdi/Makefile:1.6   Wed Aug 16 20:21:07 2017
+++ pkgsrc/devel/libftdi/Makefile       Sat Feb 10 13:53:47 2018
@@ -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"

Index: pkgsrc/devel/libftdi/buildlink3.mk
diff -u pkgsrc/devel/libftdi/buildlink3.mk:1.1 pkgsrc/devel/libftdi/buildlink3.mk:1.2
--- pkgsrc/devel/libftdi/buildlink3.mk:1.1      Sat Oct 23 15:34:34 2010
+++ pkgsrc/devel/libftdi/buildlink3.mk  Sat Feb 10 13:53:47 2018
@@ -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

Index: pkgsrc/devel/libftdi1/Makefile
diff -u pkgsrc/devel/libftdi1/Makefile:1.21 pkgsrc/devel/libftdi1/Makefile:1.22
--- pkgsrc/devel/libftdi1/Makefile:1.21 Mon Jan  1 21:18:21 2018
+++ pkgsrc/devel/libftdi1/Makefile      Sat Feb 10 13:53:47 2018
@@ -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"

Index: pkgsrc/devel/libftdi1/buildlink3.mk
diff -u pkgsrc/devel/libftdi1/buildlink3.mk:1.2 pkgsrc/devel/libftdi1/buildlink3.mk:1.3
--- pkgsrc/devel/libftdi1/buildlink3.mk:1.2     Sun Jan  7 13:04:05 2018
+++ pkgsrc/devel/libftdi1/buildlink3.mk Sat Feb 10 13:53:47 2018
@@ -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

Index: pkgsrc/devel/libgphoto2/Makefile
diff -u pkgsrc/devel/libgphoto2/Makefile:1.66 pkgsrc/devel/libgphoto2/Makefile:1.67
--- pkgsrc/devel/libgphoto2/Makefile:1.66       Thu Feb 25 12:12:48 2016
+++ pkgsrc/devel/libgphoto2/Makefile    Sat Feb 10 13:53:47 2018
@@ -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"

Index: pkgsrc/devel/libgphoto2/buildlink3.mk
diff -u pkgsrc/devel/libgphoto2/buildlink3.mk:1.20 pkgsrc/devel/libgphoto2/buildlink3.mk:1.21
--- pkgsrc/devel/libgphoto2/buildlink3.mk:1.20  Sun Jan  7 13:04:06 2018
+++ pkgsrc/devel/libgphoto2/buildlink3.mk       Sat Feb 10 13:53:47 2018
@@ -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?=      ../../d
 
 .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"

Index: pkgsrc/devel/libhid/Makefile
diff -u pkgsrc/devel/libhid/Makefile:1.9 pkgsrc/devel/libhid/Makefile:1.10
--- pkgsrc/devel/libhid/Makefile:1.9    Sun Dec 10 15:46:26 2017
+++ pkgsrc/devel/libhid/Makefile        Sat Feb 10 13:53:47 2018
@@ -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"

Index: pkgsrc/devel/libnfc/Makefile
diff -u pkgsrc/devel/libnfc/Makefile:1.1 pkgsrc/devel/libnfc/Makefile:1.2
--- pkgsrc/devel/libnfc/Makefile:1.1    Fri Dec 16 08:11:55 2016
+++ pkgsrc/devel/libnfc/Makefile        Sat Feb 10 13:53:47 2018
@@ -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"
 
Index: pkgsrc/devel/libnfc/buildlink3.mk
diff -u pkgsrc/devel/libnfc/buildlink3.mk:1.1 pkgsrc/devel/libnfc/buildlink3.mk:1.2
--- pkgsrc/devel/libnfc/buildlink3.mk:1.1       Fri Dec 16 08:11:55 2016
+++ pkgsrc/devel/libnfc/buildlink3.mk   Sat Feb 10 13:53:47 2018
@@ -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
 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

Index: pkgsrc/devel/libnjb/Makefile
diff -u pkgsrc/devel/libnjb/Makefile:1.6 pkgsrc/devel/libnjb/Makefile:1.7
--- pkgsrc/devel/libnjb/Makefile:1.6    Tue Aug 18 07:31:04 2015
+++ pkgsrc/devel/libnjb/Makefile        Sat Feb 10 13:53:47 2018
@@ -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"

Index: pkgsrc/devel/libnjb/buildlink3.mk
diff -u pkgsrc/devel/libnjb/buildlink3.mk:1.2 pkgsrc/devel/libnjb/buildlink3.mk:1.3
--- pkgsrc/devel/libnjb/buildlink3.mk:1.2       Mon Feb 15 16:51:13 2010
+++ pkgsrc/devel/libnjb/buildlink3.mk   Sat Feb 10 13:53:47 2018
@@ -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

Index: pkgsrc/devel/openocd/options.mk
diff -u pkgsrc/devel/openocd/options.mk:1.1 pkgsrc/devel/openocd/options.mk:1.2
--- pkgsrc/devel/openocd/options.mk:1.1 Sat Apr  4 00:26:42 2015
+++ pkgsrc/devel/openocd/options.mk     Sat Feb 10 13:53:47 2018
@@ -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_LI
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibusb)
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibusb1)

Index: pkgsrc/devel/py-usb/Makefile
diff -u pkgsrc/devel/py-usb/Makefile:1.14 pkgsrc/devel/py-usb/Makefile:1.15
--- pkgsrc/devel/py-usb/Makefile:1.14   Sun Dec 24 10:13:22 2017
+++ pkgsrc/devel/py-usb/Makefile        Sat Feb 10 13:53:48 2018
@@ -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_in
 
 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"

Index: pkgsrc/emulators/snes9x/Makefile
diff -u pkgsrc/emulators/snes9x/Makefile:1.54 pkgsrc/emulators/snes9x/Makefile:1.55
--- pkgsrc/emulators/snes9x/Makefile:1.54       Thu Jan 19 18:52:08 2017
+++ pkgsrc/emulators/snes9x/Makefile    Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/01/19 18:52:08 agc Exp $
+# $NetBSD: Makefile,v 1.55 2018/02/10 13:53:48 khorben Exp $
 
 SNESVER=               1.43
 DISTNAME=              snes9x-${SNESVER}-src
@@ -88,7 +88,7 @@ MAKE_ENV+=    USBHID_H=1
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"

Index: pkgsrc/emulators/ucon64/options.mk
diff -u pkgsrc/emulators/ucon64/options.mk:1.1.1.1 pkgsrc/emulators/ucon64/options.mk:1.2
--- pkgsrc/emulators/ucon64/options.mk:1.1.1.1  Tue Jul 26 04:12:22 2005
+++ pkgsrc/emulators/ucon64/options.mk  Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
+# $NetBSD: options.mk,v 1.2 2018/02/10 13:53:48 khorben Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucon64
 PKG_SUPPORTED_OPTIONS= libusb
@@ -13,5 +13,5 @@ CONFIGURE_ARGS+=      --with-libusb
 CPPFLAGS+=             -I${BUILDLINK_PREFIX.libusb}/include
 LDFLAGS+=              -L${BUILDLINK_PREFIX.libusb}/lib
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libusb}/lib
-.  include "../../devel/libusb/buildlink3.mk"
+.  include "../../mk/libusb.buildlink3.mk"
 .endif

Index: pkgsrc/geography/garmintools/Makefile
diff -u pkgsrc/geography/garmintools/Makefile:1.4 pkgsrc/geography/garmintools/Makefile:1.5
--- pkgsrc/geography/garmintools/Makefile:1.4   Tue Aug  1 17:03:25 2017
+++ pkgsrc/geography/garmintools/Makefile       Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/08/01 17:03:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/02/10 13:53:48 khorben Exp $
 
 DISTNAME=              garmintools-0.10
 CATEGORIES=            geography
@@ -17,5 +17,5 @@ INSTALLATION_DIRS=    share/doc/garmintools
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/garmintools/
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/gpsbabel/Makefile
diff -u pkgsrc/geography/gpsbabel/Makefile:1.16 pkgsrc/geography/gpsbabel/Makefile:1.17
--- pkgsrc/geography/gpsbabel/Makefile:1.16     Sat Mar  5 11:28:36 2016
+++ pkgsrc/geography/gpsbabel/Makefile  Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/03/05 11:28:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2018/02/10 13:53:48 khorben Exp $
 #
 
 DISTNAME=      gpsbabel-1.5.2
@@ -23,7 +23,7 @@ LIBS.Darwin+= -lexpat
 
 GNU_CONFIGURE= yes
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"

Index: pkgsrc/geography/qlandkartegt-garmindev/Makefile
diff -u pkgsrc/geography/qlandkartegt-garmindev/Makefile:1.3 pkgsrc/geography/qlandkartegt-garmindev/Makefile:1.4
--- pkgsrc/geography/qlandkartegt-garmindev/Makefile:1.3        Thu Oct  4 09:19:20 2012
+++ pkgsrc/geography/qlandkartegt-garmindev/Makefile    Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/04 09:19:20 asau Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/10 13:53:48 khorben Exp $
 #
 
 DISTNAME=      garmindev-0.3.4
@@ -14,5 +14,5 @@ LICENSE=      gnu-gpl-v2
 USE_LANGUAGES= c c++
 USE_CMAKE=     yes
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/s10sh/Makefile
diff -u pkgsrc/graphics/s10sh/Makefile:1.17 pkgsrc/graphics/s10sh/Makefile:1.18
--- pkgsrc/graphics/s10sh/Makefile:1.17 Sat Feb 10 00:33:26 2018
+++ pkgsrc/graphics/s10sh/Makefile      Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/02/10 00:33:26 khorben Exp $
+# $NetBSD: Makefile,v 1.18 2018/02/10 13:53:48 khorben Exp $
 #
 
 DISTNAME=      s10sh-0.2.0
@@ -22,5 +22,5 @@ do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/s10sh
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/s10sh
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.193 pkgsrc/misc/calibre/Makefile:1.194
--- pkgsrc/misc/calibre/Makefile:1.193  Thu Feb  1 16:05:56 2018
+++ pkgsrc/misc/calibre/Makefile        Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.193 2018/02/01 16:05:56 wiz Exp $
+# $NetBSD: Makefile,v 1.194 2018/02/10 13:53:48 khorben Exp $
 
 DISTNAME=      calibre-3.16.0
 CATEGORIES=    misc
@@ -105,7 +105,7 @@ BUILDLINK_API_DEPENDS.chmlib+=      chmlib>=0
 BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5
 .include "../../devel/libmtp/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8
 .include "../../graphics/libwmf/buildlink3.mk"

Index: pkgsrc/misc/urjtag/Makefile
diff -u pkgsrc/misc/urjtag/Makefile:1.10 pkgsrc/misc/urjtag/Makefile:1.11
--- pkgsrc/misc/urjtag/Makefile:1.10    Tue Oct 29 11:16:31 2013
+++ pkgsrc/misc/urjtag/Makefile Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/10/29 11:16:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2018/02/10 13:53:48 khorben Exp $
 #
 
 DISTNAME=      urjtag-0.10
@@ -21,7 +21,7 @@ post-extract:
        ${CP} ${FILESDIR}/usbprog.c ${WRKSRC}/src/tap/cable
 
 .include "../../mk/readline.buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../devel/libftdi/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/openct/buildlink3.mk
diff -u pkgsrc/security/openct/buildlink3.mk:1.3 pkgsrc/security/openct/buildlink3.mk:1.4
--- pkgsrc/security/openct/buildlink3.mk:1.3    Tue Dec 15 22:10:39 2009
+++ pkgsrc/security/openct/buildlink3.mk        Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/12/15 22:10:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/02/10 13:53:48 khorben Exp $
 
 BUILDLINK_TREE+=       openct
 
@@ -16,7 +16,7 @@ pkgbase := openct
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.openct:Mlibusb)
-.include "../../devel/libusb/buildlink3.mk"
+.include "../mk/libusb.mk"
 .endif
 
 .include "../../devel/libltdl/buildlink3.mk"

Index: pkgsrc/security/openct/options.mk
diff -u pkgsrc/security/openct/options.mk:1.1.1.1 pkgsrc/security/openct/options.mk:1.2
--- pkgsrc/security/openct/options.mk:1.1.1.1   Thu Feb 26 10:07:49 2009
+++ pkgsrc/security/openct/options.mk   Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/02/26 10:07:49 hasso Exp $
+# $NetBSD: options.mk,v 1.2 2018/02/10 13:53:48 khorben Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openct
 PKG_SUPPORTED_OPTIONS= pcsc-lite libusb
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=      --disable-pcsc
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibusb)
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 CONFIGURE_ARGS+=        --enable-usb
 .else
 CONFIGURE_ARGS+=        --disable-usb

Index: pkgsrc/sysutils/ups-nut-usb/Makefile
diff -u pkgsrc/sysutils/ups-nut-usb/Makefile:1.5 pkgsrc/sysutils/ups-nut-usb/Makefile:1.6
--- pkgsrc/sysutils/ups-nut-usb/Makefile:1.5    Tue Nov 10 08:52:38 2015
+++ pkgsrc/sysutils/ups-nut-usb/Makefile        Sat Feb 10 13:53:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/11/10 08:52:38 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/02/10 13:53:48 khorben Exp $
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
@@ -26,5 +26,5 @@ do-install:
                    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/; \
        done
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/kde-workspace4/Makefile
diff -u pkgsrc/x11/kde-workspace4/Makefile:1.65 pkgsrc/x11/kde-workspace4/Makefile:1.66
--- pkgsrc/x11/kde-workspace4/Makefile:1.65     Wed Jan 17 19:10:23 2018
+++ pkgsrc/x11/kde-workspace4/Makefile  Sat Feb 10 13:53:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2018/01/17 19:10:23 markd Exp $
+# $NetBSD: Makefile,v 1.66 2018/02/10 13:53:49 khorben Exp $
 
 DISTNAME=      kde-workspace-4.11.22
 PKGNAME=       ${DISTNAME:S/-4/4-4/}
@@ -140,7 +140,7 @@ BUILDLINK_DEPMETHOD.qt4-tools=      full
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../devel/qjson/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .if ${X11_TYPE} == "modular" && !empty(MESALIB_SUPPORTS_EGL:M[yY][eE][sS])

Prev by Date: CVS commit: pkgsrc/mk
Next by Date: CVS commit: pkgsrc/net/mikutter
Previous by Thread: CVS commit: pkgsrc/mk
Next by Thread: CVS commit: pkgsrc/net/mikutter
Indexes:

Home | Main Index | Thread Index | Old Index