diff options
39 files changed, 78 insertions, 78 deletions
diff --git a/audio/ifp-line/Makefile b/audio/ifp-line/Makefile index 1251289756c..d60cb530ac6 100644 --- a/audio/ifp-line/Makefile +++ b/audio/ifp-line/Makefile @@ -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" diff --git a/audio/libifp/Makefile b/audio/libifp/Makefile index 444eb1e7a21..7a641159ea8 100644 --- a/audio/libifp/Makefile +++ b/audio/libifp/Makefile @@ -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" diff --git a/audio/libifp/buildlink3.mk b/audio/libifp/buildlink3.mk index fdd761178cc..10d02532f5e 100644 --- a/audio/libifp/buildlink3.mk +++ b/audio/libifp/buildlink3.mk @@ -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 diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile index 709a2e24902..e013cd5b385 100644 --- a/audio/rioutil/Makefile +++ b/audio/rioutil/Makefile @@ -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-1.5Z[A-Z]-* 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 --git a/comms/libticables2/buildlink3.mk b/comms/libticables2/buildlink3.mk index c7d9082a5fe..3fb8f1ff76c 100644 --- a/comms/libticables2/buildlink3.mk +++ b/comms/libticables2/buildlink3.mk @@ -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 diff --git a/comms/libticables2/options.mk b/comms/libticables2/options.mk index c25f6a9ad09..e11216a2d46 100644 --- a/comms/libticables2/options.mk +++ b/comms/libticables2/options.mk @@ -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) diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile index 60eec202b7a..368a663f431 100644 --- a/comms/lirc/Makefile +++ b/comms/lirc/Makefile @@ -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 for this platform" .include "options.mk" -.include "../../devel/libusb/buildlink3.mk" +.include "../../mk/libusb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/obexftp/Makefile b/comms/obexftp/Makefile index 4b1ec1b9d98..06caf38459f 100644 --- a/comms/obexftp/Makefile +++ b/comms/obexftp/Makefile @@ -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" diff --git a/comms/obexftp/buildlink3.mk b/comms/obexftp/buildlink3.mk index 505b26f385e..e8190420c0f 100644 --- a/comms/obexftp/buildlink3.mk +++ b/comms/obexftp/buildlink3.mk @@ -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?= ../../comms/obexftp .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 --git a/comms/openobex/Makefile b/comms/openobex/Makefile index c071e1e515b..1622606045a 100644 --- a/comms/openobex/Makefile +++ b/comms/openobex/Makefile @@ -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" diff --git a/comms/openobex/buildlink3.mk b/comms/openobex/buildlink3.mk index 9c2ff4d9410..f581077262e 100644 --- a/comms/openobex/buildlink3.mk +++ b/comms/openobex/buildlink3.mk @@ -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 diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile index b555a677fca..018f4d24ecd 100644 --- a/cross/avrdude/Makefile +++ b/cross/avrdude/Makefile @@ -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]*:../../devel/gtexinfo .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 --git a/cross/dfu-programmer/Makefile b/cross/dfu-programmer/Makefile index e40ab92f13a..6e402e455df 100644 --- a/cross/dfu-programmer/Makefile +++ b/cross/dfu-programmer/Makefile @@ -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" 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" diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index 1a607e93178..e388a0e224c 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -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" diff --git a/emulators/ucon64/options.mk b/emulators/ucon64/options.mk index 4cfda48f557..e9573c8c056 100644 --- a/emulators/ucon64/options.mk +++ b/emulators/ucon64/options.mk @@ -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 diff --git a/geography/garmintools/Makefile b/geography/garmintools/Makefile index 1132b259d8f..c0b75446401 100644 --- a/geography/garmintools/Makefile +++ b/geography/garmintools/Makefile @@ -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" diff --git a/geography/gpsbabel/Makefile b/geography/gpsbabel/Makefile index 6a23ab23ca9..123235713cd 100644 --- a/geography/gpsbabel/Makefile +++ b/geography/gpsbabel/Makefile @@ -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" diff --git a/geography/qlandkartegt-garmindev/Makefile b/geography/qlandkartegt-garmindev/Makefile index 12a02b35b4d..fbf8c4c593f 100644 --- a/geography/qlandkartegt-garmindev/Makefile +++ b/geography/qlandkartegt-garmindev/Makefile @@ -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" diff --git a/graphics/s10sh/Makefile b/graphics/s10sh/Makefile index 78dde3034d8..43e161d5430 100644 --- a/graphics/s10sh/Makefile +++ b/graphics/s10sh/Makefile @@ -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" diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile index 5e48f383c66..02bedd9a139 100644 --- a/misc/calibre/Makefile +++ b/misc/calibre/Makefile @@ -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.40 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" diff --git a/misc/urjtag/Makefile b/misc/urjtag/Makefile index 26bddcfbaf1..7e7d1108aff 100644 --- a/misc/urjtag/Makefile +++ b/misc/urjtag/Makefile @@ -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" diff --git a/security/openct/buildlink3.mk b/security/openct/buildlink3.mk index 6009b104ecc..aa2560f2325 100644 --- a/security/openct/buildlink3.mk +++ b/security/openct/buildlink3.mk @@ -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" diff --git a/security/openct/options.mk b/security/openct/options.mk index 0c23b59b365..4e5ee8d4077 100644 --- a/security/openct/options.mk +++ b/security/openct/options.mk @@ -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 diff --git a/sysutils/ups-nut-usb/Makefile b/sysutils/ups-nut-usb/Makefile index 7d1edf044ba..816c5b0b7a9 100644 --- a/sysutils/ups-nut-usb/Makefile +++ b/sysutils/ups-nut-usb/Makefile @@ -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" diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile index 4bc215ec497..0aa8b8e8d49 100644 --- a/x11/kde-workspace4/Makefile +++ b/x11/kde-workspace4/Makefile @@ -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]) |