tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: CVS commit: pkgsrc/devel/libusb-compat
Hi tech-pkg@, (leot, wiz, gdt)
On 28/01/2018 12:09, Thomas Klausner wrote:
> On Sun, Jan 28, 2018 at 11:40:33AM +0100, Leonardo Taccari wrote:
>> I think we can first check if LIBUSB_TYPE is defined and initialize it
>> to none if it isn't. In that way we can avoid the nested if-else.
>
> LIBUSB_TYPE?= none
> is the shorter version for that.
Thank you all for your feedback!
I finally found some time to look at this again, and import your
suggestions; my updated patch is attached here.
I am trying to build every existing package depending on devel/libusb
with devel/libusb-compat instead, using "compat" for LIBUSB_TYPE; so far
so good. The default in this patch is still with the native devel/libusb
though.
Let me know if I can commit this.
Cheers,
--
khorben
Index: audio/ifp-line/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/ifp-line/Makefile,v
retrieving revision 1.15
diff -p -u -r1.15 Makefile
--- audio/ifp-line/Makefile 20 Apr 2016 12:10:27 -0000 1.15
+++ audio/ifp-line/Makefile 9 Feb 2018 23:15:14 -0000
@@ -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: audio/libifp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libifp/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- audio/libifp/Makefile 12 May 2017 11:49:30 -0000 1.4
+++ audio/libifp/Makefile 9 Feb 2018 23:15:14 -0000
@@ -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: audio/libifp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libifp/buildlink3.mk,v
retrieving revision 1.2
diff -p -u -r1.2 buildlink3.mk
--- audio/libifp/buildlink3.mk 16 Feb 2010 08:57:48 -0000 1.2
+++ audio/libifp/buildlink3.mk 9 Feb 2018 23:15:14 -0000
@@ -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: audio/rioutil/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/rioutil/Makefile,v
retrieving revision 1.24
diff -p -u -r1.24 Makefile
--- audio/rioutil/Makefile 20 Apr 2016 12:10:31 -0000 1.24
+++ audio/rioutil/Makefile 9 Feb 2018 23:15:15 -0000
@@ -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: comms/libticables2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/libticables2/buildlink3.mk,v
retrieving revision 1.2
diff -p -u -r1.2 buildlink3.mk
--- comms/libticables2/buildlink3.mk 7 Jan 2018 13:03:57 -0000 1.2
+++ comms/libticables2/buildlink3.mk 9 Feb 2018 23:15:19 -0000
@@ -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: comms/libticables2/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/libticables2/options.mk,v
retrieving revision 1.1
diff -p -u -r1.1 options.mk
--- comms/libticables2/options.mk 26 May 2013 22:57:53 -0000 1.1
+++ comms/libticables2/options.mk 9 Feb 2018 23:15:19 -0000
@@ -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: comms/lirc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/lirc/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- comms/lirc/Makefile 11 Apr 2016 04:22:33 -0000 1.5
+++ comms/lirc/Makefile 9 Feb 2018 23:15:19 -0000
@@ -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: comms/obexftp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/obexftp/Makefile,v
retrieving revision 1.20
diff -p -u -r1.20 Makefile
--- comms/obexftp/Makefile 3 Sep 2017 08:36:51 -0000 1.20
+++ comms/obexftp/Makefile 9 Feb 2018 23:15:19 -0000
@@ -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: comms/obexftp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/obexftp/buildlink3.mk,v
retrieving revision 1.3
diff -p -u -r1.3 buildlink3.mk
--- comms/obexftp/buildlink3.mk 15 Mar 2013 08:18:43 -0000 1.3
+++ comms/obexftp/buildlink3.mk 9 Feb 2018 23:15:19 -0000
@@ -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: comms/openobex/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/openobex/Makefile,v
retrieving revision 1.31
diff -p -u -r1.31 Makefile
--- comms/openobex/Makefile 3 Sep 2017 08:36:51 -0000 1.31
+++ comms/openobex/Makefile 9 Feb 2018 23:15:19 -0000
@@ -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: comms/openobex/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/openobex/buildlink3.mk,v
retrieving revision 1.14
diff -p -u -r1.14 buildlink3.mk
--- comms/openobex/buildlink3.mk 7 Jan 2018 13:03:58 -0000 1.14
+++ comms/openobex/buildlink3.mk 9 Feb 2018 23:15:19 -0000
@@ -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: cross/avrdude/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/cross/avrdude/Makefile,v
retrieving revision 1.42
diff -p -u -r1.42 Makefile
--- cross/avrdude/Makefile 21 Feb 2017 16:05:53 -0000 1.42
+++ cross/avrdude/Makefile 9 Feb 2018 23:15:19 -0000
@@ -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: cross/dfu-programmer/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/cross/dfu-programmer/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- cross/dfu-programmer/Makefile 24 Sep 2016 17:17:47 -0000 1.4
+++ cross/dfu-programmer/Makefile 9 Feb 2018 23:15:19 -0000
@@ -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: devel/SDL2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/SDL2/Makefile,v
retrieving revision 1.26
diff -p -u -r1.26 Makefile
--- devel/SDL2/Makefile 28 Jan 2018 20:10:45 -0000 1.26
+++ devel/SDL2/Makefile 9 Feb 2018 23:15:23 -0000
@@ -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: devel/libftdi/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libftdi/Makefile,v
retrieving revision 1.6
diff -p -u -r1.6 Makefile
--- devel/libftdi/Makefile 16 Aug 2017 20:21:07 -0000 1.6
+++ devel/libftdi/Makefile 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libftdi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libftdi/buildlink3.mk,v
retrieving revision 1.1
diff -p -u -r1.1 buildlink3.mk
--- devel/libftdi/buildlink3.mk 23 Oct 2010 15:34:34 -0000 1.1
+++ devel/libftdi/buildlink3.mk 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libftdi1/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libftdi1/Makefile,v
retrieving revision 1.21
diff -p -u -r1.21 Makefile
--- devel/libftdi1/Makefile 1 Jan 2018 21:18:21 -0000 1.21
+++ devel/libftdi1/Makefile 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libftdi1/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libftdi1/buildlink3.mk,v
retrieving revision 1.2
diff -p -u -r1.2 buildlink3.mk
--- devel/libftdi1/buildlink3.mk 7 Jan 2018 13:04:05 -0000 1.2
+++ devel/libftdi1/buildlink3.mk 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libgphoto2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgphoto2/Makefile,v
retrieving revision 1.66
diff -p -u -r1.66 Makefile
--- devel/libgphoto2/Makefile 25 Feb 2016 12:12:48 -0000 1.66
+++ devel/libgphoto2/Makefile 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libgphoto2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgphoto2/buildlink3.mk,v
retrieving revision 1.20
diff -p -u -r1.20 buildlink3.mk
--- devel/libgphoto2/buildlink3.mk 7 Jan 2018 13:04:06 -0000 1.20
+++ devel/libgphoto2/buildlink3.mk 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libhid/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libhid/Makefile,v
retrieving revision 1.9
diff -p -u -r1.9 Makefile
--- devel/libhid/Makefile 10 Dec 2017 15:46:26 -0000 1.9
+++ devel/libhid/Makefile 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libnfc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libnfc/Makefile,v
retrieving revision 1.1
diff -p -u -r1.1 Makefile
--- devel/libnfc/Makefile 16 Dec 2016 08:11:55 -0000 1.1
+++ devel/libnfc/Makefile 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libnfc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libnfc/buildlink3.mk,v
retrieving revision 1.1
diff -p -u -r1.1 buildlink3.mk
--- devel/libnfc/buildlink3.mk 16 Dec 2016 08:11:55 -0000 1.1
+++ devel/libnfc/buildlink3.mk 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libnjb/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libnjb/Makefile,v
retrieving revision 1.6
diff -p -u -r1.6 Makefile
--- devel/libnjb/Makefile 18 Aug 2015 07:31:04 -0000 1.6
+++ devel/libnjb/Makefile 9 Feb 2018 23:15:26 -0000
@@ -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: devel/libnjb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libnjb/buildlink3.mk,v
retrieving revision 1.2
diff -p -u -r1.2 buildlink3.mk
--- devel/libnjb/buildlink3.mk 15 Feb 2010 16:51:13 -0000 1.2
+++ devel/libnjb/buildlink3.mk 9 Feb 2018 23:15:26 -0000
@@ -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: devel/openocd/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/openocd/options.mk,v
retrieving revision 1.1
diff -p -u -r1.1 options.mk
--- devel/openocd/options.mk 4 Apr 2015 00:26:42 -0000 1.1
+++ devel/openocd/options.mk 9 Feb 2018 23:15:27 -0000
@@ -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: devel/py-usb/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-usb/Makefile,v
retrieving revision 1.14
diff -p -u -r1.14 Makefile
--- devel/py-usb/Makefile 24 Dec 2017 10:13:22 -0000 1.14
+++ devel/py-usb/Makefile 9 Feb 2018 23:15:30 -0000
@@ -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: emulators/snes9x/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/snes9x/Makefile,v
retrieving revision 1.54
diff -p -u -r1.54 Makefile
--- emulators/snes9x/Makefile 19 Jan 2017 18:52:08 -0000 1.54
+++ emulators/snes9x/Makefile 9 Feb 2018 23:15:39 -0000
@@ -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: emulators/ucon64/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/ucon64/options.mk,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 options.mk
--- emulators/ucon64/options.mk 26 Jul 2005 04:12:22 -0000 1.1.1.1
+++ emulators/ucon64/options.mk 9 Feb 2018 23:15:40 -0000
@@ -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: geography/garmintools/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/garmintools/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- geography/garmintools/Makefile 1 Aug 2017 17:03:25 -0000 1.4
+++ geography/garmintools/Makefile 9 Feb 2018 23:16:13 -0000
@@ -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: geography/gpsbabel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/gpsbabel/Makefile,v
retrieving revision 1.16
diff -p -u -r1.16 Makefile
--- geography/gpsbabel/Makefile 5 Mar 2016 11:28:36 -0000 1.16
+++ geography/gpsbabel/Makefile 9 Feb 2018 23:16:13 -0000
@@ -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: geography/qlandkartegt-garmindev/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/qlandkartegt-garmindev/Makefile,v
retrieving revision 1.3
diff -p -u -r1.3 Makefile
--- geography/qlandkartegt-garmindev/Makefile 4 Oct 2012 09:19:20 -0000 1.3
+++ geography/qlandkartegt-garmindev/Makefile 9 Feb 2018 23:16:14 -0000
@@ -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: graphics/s10sh/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/s10sh/Makefile,v
retrieving revision 1.16
diff -p -u -r1.16 Makefile
--- graphics/s10sh/Makefile 14 Jan 2018 14:58:40 -0000 1.16
+++ graphics/s10sh/Makefile 9 Feb 2018 23:16:18 -0000
@@ -20,5 +20,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: misc/calibre/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/calibre/Makefile,v
retrieving revision 1.193
diff -p -u -r1.193 Makefile
--- misc/calibre/Makefile 1 Feb 2018 16:05:56 -0000 1.193
+++ misc/calibre/Makefile 9 Feb 2018 23:16:30 -0000
@@ -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: misc/urjtag/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/urjtag/Makefile,v
retrieving revision 1.10
diff -p -u -r1.10 Makefile
--- misc/urjtag/Makefile 29 Oct 2013 11:16:31 -0000 1.10
+++ misc/urjtag/Makefile 9 Feb 2018 23:16:31 -0000
@@ -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: mk/libusb.buildlink3.mk
===================================================================
RCS file: mk/libusb.buildlink3.mk
diff -N mk/libusb.buildlink3.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mk/libusb.buildlink3.mk 9 Feb 2018 23:16:31 -0000
@@ -0,0 +1,36 @@
+# $NetBSD$
+#
+# This Makefile is meant to be included by packages that require an
+# implementation of the former libusb (still found in devel/libusb). The
+# original implementation can be chosen by setting LIBUSB_TYPE to "native".
+#
+# The alternative implementation libusb-compat (found in devel/libusb-compat)
+# wraps libusb1 (in devel/libusb1). This implementation can be chose 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.
+#
+# === User-settable variables ===
+#
+# LIBUSB_TYPE
+# The name of the libusb implementation to default to, native or compat.
+#
+
+MK_LIBUSB_BUILDLINK3_MK:= ${MK_LIBUSB_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if !empty(MK_LIBUSB_BUILDLINK3_MK:M+)
+
+LIBUSB_TYPE?= none
+
+BUILD_DEFS+= LIBUSB_TYPE
+
+. if ${LIBUSB_TYPE} == "native"
+. include "../../devel/libusb/buildlink3.mk"
+. elif ${LIBUSB_TYPE} == "compat"
+. include "../../devel/libusb-compat/buildlink3.mk"
+. else
+PKG_FAIL_REASON+= "[libusb.buildlink3.mk] Invalid value ${LIBUSB_TYPE} for LIBUSB_TYPE."
+. endif
+
+.endif # MK_LIBUSB_BUILDLINK3_MK
Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.290
diff -p -u -r1.290 mk.conf
--- mk/defaults/mk.conf 2 Jan 2018 05:49:44 -0000 1.290
+++ mk/defaults/mk.conf 9 Feb 2018 23:16:32 -0000
@@ -1246,6 +1246,12 @@ JAKARTA_HOME?= ${JAVA_HOME}/jakarta
# Possible: any libdvdcss site
# Default: not defined
+LIBUSB_TYPE?= native
+# Used in packages using libusb (version 0.x) to choose a specific
+# implementation.
+# Possible: compat, native
+# Default: native
+
#LATEX2HTML_ICONPATH=
# Used in the latex2html package to set URL prefix for where to
# find latex2html's icons.
Index: security/openct/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openct/buildlink3.mk,v
retrieving revision 1.3
diff -p -u -r1.3 buildlink3.mk
--- security/openct/buildlink3.mk 15 Dec 2009 22:10:39 -0000 1.3
+++ security/openct/buildlink3.mk 9 Feb 2018 23:16:52 -0000
@@ -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: security/openct/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openct/options.mk,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 options.mk
--- security/openct/options.mk 26 Feb 2009 10:07:49 -0000 1.1.1.1
+++ security/openct/options.mk 9 Feb 2018 23:16:52 -0000
@@ -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: sysutils/ups-nut-usb/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/ups-nut-usb/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- sysutils/ups-nut-usb/Makefile 10 Nov 2015 08:52:38 -0000 1.5
+++ sysutils/ups-nut-usb/Makefile 9 Feb 2018 23:16:55 -0000
@@ -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: x11/kde-workspace4/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kde-workspace4/Makefile,v
retrieving revision 1.65
diff -p -u -r1.65 Makefile
--- x11/kde-workspace4/Makefile 17 Jan 2018 19:10:23 -0000 1.65
+++ x11/kde-workspace4/Makefile 9 Feb 2018 23:17:08 -0000
@@ -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])
Home |
Main Index |
Thread Index |
Old Index