CVS commit: pkgsrc/devel/libgphoto2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar 31 22:43:01 UTC 2018

Modified Files:
        pkgsrc/devel/libgphoto2: Makefile PLIST.common

Log Message:
libgphoto2: switch to libusb1 and adapt PLIST.

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/devel/libgphoto2/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/libgphoto2/PLIST.common

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

Modified files:

Index: pkgsrc/devel/libgphoto2/Makefile
diff -u pkgsrc/devel/libgphoto2/Makefile:1.68 pkgsrc/devel/libgphoto2/Makefile:1.69
--- pkgsrc/devel/libgphoto2/Makefile:1.68       Tue Feb 27 23:56:08 2018
+++ pkgsrc/devel/libgphoto2/Makefile    Sat Mar 31 22:43:01 2018
@@ -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 @@ post-install:
 .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"

Index: pkgsrc/devel/libgphoto2/PLIST.common
diff -u pkgsrc/devel/libgphoto2/PLIST.common:1.22 pkgsrc/devel/libgphoto2/PLIST.common:1.23
--- pkgsrc/devel/libgphoto2/PLIST.common:1.22   Mon Oct  5 04:47:02 2015
+++ pkgsrc/devel/libgphoto2/PLIST.common        Sat Mar 31 22:43:01 2018
@@ -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.la
 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