pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Link to the correct path for access to libusb



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Thu Mar 29 23:27:30 2018 +0200
Changeset:	ac56bab73e68f193a21e7e2b53184c0e7a31b0a6

Modified Files:
	avrdude/Makefile
	gnokii/buildlink3.mk
	gnokii/options.mk
	kodi/Makefile
	libdjconsole/Makefile
	libdjconsole/buildlink3.mk
	libftdi1/Makefile
	libftdi1/buildlink3.mk
	oww-nox11/Makefile
	p2kmoto/Makefile
	p2kmoto/buildlink3.mk

Log Message:
Link to the correct path for access to libusb

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ac56bab73e68f193a21e7e2b53184c0e7a31b0a6

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

diffstat:
 avrdude/Makefile           | 2 +-
 gnokii/buildlink3.mk       | 2 +-
 gnokii/options.mk          | 2 +-
 kodi/Makefile              | 2 +-
 libdjconsole/Makefile      | 2 +-
 libdjconsole/buildlink3.mk | 2 +-
 libftdi1/Makefile          | 2 +-
 libftdi1/buildlink3.mk     | 2 +-
 oww-nox11/Makefile         | 2 +-
 p2kmoto/Makefile           | 2 +-
 p2kmoto/buildlink3.mk      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diffs:
diff --git a/avrdude/Makefile b/avrdude/Makefile
index 2d4f4a9347..2f21fd049f 100644
--- a/avrdude/Makefile
+++ b/avrdude/Makefile
@@ -44,7 +44,7 @@ BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 .include "../../devel/libftdi/buildlink3.mk"
 .include "../../devel/libhid/buildlink3.mk"
 .include "../../wip/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/gnokii/buildlink3.mk b/gnokii/buildlink3.mk
index 7ae9fb6c98..88b154ee06 100644
--- a/gnokii/buildlink3.mk
+++ b/gnokii/buildlink3.mk
@@ -16,7 +16,7 @@ pkgbase := gnokii
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.gnokii:Mlibusb)
-.include "../mk/libusb.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.gnokii:Mmysql)
diff --git a/gnokii/options.mk b/gnokii/options.mk
index 31eaf2422b..7f11358bf8 100644
--- a/gnokii/options.mk
+++ b/gnokii/options.mk
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--disable-libical
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibusb)
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-libusb
 .endif
diff --git a/kodi/Makefile b/kodi/Makefile
index f49a4eef76..bea18a50e1 100644
--- a/kodi/Makefile
+++ b/kodi/Makefile
@@ -69,7 +69,7 @@ do-build:
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../wip/crossguid/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/swig2/buildlink3.mk"
 .include "../../devel/yajl/buildlink3.mk"
diff --git a/libdjconsole/Makefile b/libdjconsole/Makefile
index 9df3bbac5a..46f26d3190 100644
--- a/libdjconsole/Makefile
+++ b/libdjconsole/Makefile
@@ -24,5 +24,5 @@ INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/udev/rules.d/ ${EGDIR}
 
 
 BUILDLINK_ABI_DEPENDS.libusb+=	libusb>=0.1.11
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libdjconsole/buildlink3.mk b/libdjconsole/buildlink3.mk
index a5f3717053..704ec939d7 100644
--- a/libdjconsole/buildlink3.mk
+++ b/libdjconsole/buildlink3.mk
@@ -8,7 +8,7 @@ LIBDJCONSOLE_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libdjconsole+=	libdjconsole>=0.1.3nb1
 BUILDLINK_PKGSRCDIR.libdjconsole?=	../../wip/libdjconsole
 
-.include "../mk/libusb.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif	# LIBDJCONSOLE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libdjconsole
diff --git a/libftdi1/Makefile b/libftdi1/Makefile
index 69f369a7d0..3683d7867b 100644
--- a/libftdi1/Makefile
+++ b/libftdi1/Makefile
@@ -43,7 +43,7 @@ REPLACE_PYTHON=		python/examples/*.py
 .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/application.mk"
diff --git a/libftdi1/buildlink3.mk b/libftdi1/buildlink3.mk
index ab7e030537..2e4f0a38f9 100644
--- a/libftdi1/buildlink3.mk
+++ b/libftdi1/buildlink3.mk
@@ -8,7 +8,7 @@ LIBFTDI1_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libftdi1+=	libftdi1>=1.2
 BUILDLINK_PKGSRCDIR.libftdi1?=		../../wip/libftdi1
 
-.include "../mk/libusb.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif	# LIBFTDI1_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libftdi1
diff --git a/oww-nox11/Makefile b/oww-nox11/Makefile
index f6e962a19a..5fdaa9c515 100644
--- a/oww-nox11/Makefile
+++ b/oww-nox11/Makefile
@@ -28,6 +28,6 @@ do-install:
 	cd ${WRKSRC}/src && gmake install
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p2kmoto/Makefile b/p2kmoto/Makefile
index f918c6f3fa..2d38bfc116 100644
--- a/p2kmoto/Makefile
+++ b/p2kmoto/Makefile
@@ -15,5 +15,5 @@ WRKSRC=			${WRKDIR}/p2kmoto-0.1
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/p2kmoto/buildlink3.mk b/p2kmoto/buildlink3.mk
index 6a3e287a49..cb93434b96 100644
--- a/p2kmoto/buildlink3.mk
+++ b/p2kmoto/buildlink3.mk
@@ -8,7 +8,7 @@ P2KMOTO_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.p2kmoto+=	p2kmoto>=0.1rc1
 BUILDLINK_PKGSRCDIR.p2kmoto?=	../../wip/p2kmoto
 
-.include "../mk/libusb.mk"
+.include "../../mk/libusb.buildlink3.mk"
 .endif # P2KMOTO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-p2kmoto


Home | Main Index | Thread Index | Old Index