[pkgsrc/trunk]: pkgsrc/devel/libgphoto2 libgphoto2: switch to libusb1 and ada...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4bc31788dc16
branches:  trunk
changeset: 378117:4bc31788dc16
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Mar 31 22:43:01 2018 +0000

description:
libgphoto2: switch to libusb1 and adapt PLIST.

Fixes problems on systems where libusb1 was pulled in via mk/libusb.*

Bump PKGREVISION.

diffstat:

 devel/libgphoto2/Makefile     |  6 +++---
 devel/libgphoto2/PLIST.common |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r e99ec42ecbfa -r 4bc31788dc16 devel/libgphoto2/Makefile
--- a/devel/libgphoto2/Makefile Sat Mar 31 22:39:20 2018 +0000
+++ b/devel/libgphoto2/Makefile Sat Mar 31 22:43:01 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2018/02/27 23:56:08 khorben Exp $
+# $NetBSD: Makefile,v 1.69 2018/03/31 22:43:01 wiz Exp $
 
 DISTNAME=      libgphoto2-2.5.8
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=  .tar.bz2
@@ -43,7 +43,7 @@
 .include "../../devel/libltdl/buildlink3.mk"
 .if ${OPSYS} != "SunOS"
 PLIST.libusb=  yes
-.include "../../mk/libusb.buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .endif
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff -r e99ec42ecbfa -r 4bc31788dc16 devel/libgphoto2/PLIST.common
--- a/devel/libgphoto2/PLIST.common     Sat Mar 31 22:39:20 2018 +0000
+++ b/devel/libgphoto2/PLIST.common     Sat Mar 31 22:43:01 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.22 2015/10/05 04:47:02 richard Exp $
+@comment $NetBSD: PLIST.common,v 1.23 2018/03/31 22:43:01 wiz Exp $
 bin/gphoto2-config
 bin/gphoto2-port-config
 include/gphoto2/gphoto2-abilities-list.h
@@ -89,7 +89,7 @@
 lib/libgphoto2_port/0.12.0/disk.la
 lib/libgphoto2_port/0.12.0/ptpip.la
 lib/libgphoto2_port/0.12.0/serial.la
-${PLIST.libusb}lib/libgphoto2_port/0.12.0/usb.la
+${PLIST.libusb}lib/libgphoto2_port/0.12.0/usb1.la
 ${PLIST.libusb}lib/libgphoto2_port/0.12.0/usbdiskdirect.la
 ${PLIST.libusb}lib/libgphoto2_port/0.12.0/usbscsi.la
 lib/pkgconfig/libgphoto2.pc