[pkgsrc/trunk]: pkgsrc/devel/libgphoto2 Fix build on OpenIndiana and probably...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ef411a8f2f9
branches:  trunk
changeset: 588107:6ef411a8f2f9
user:      hans <hans%pkgsrc.org@localhost>
date:      Thu Apr 28 11:16:35 2011 +0000

description:
Fix build on OpenIndiana and probably other SunOS variants. Recent SunOS
has a native libusb, so enable the USB backend.

diffstat:

 devel/libgphoto2/Makefile      |  8 +-------
 devel/libgphoto2/PLIST.common  |  4 ++--
 devel/libgphoto2/buildlink3.mk |  5 +----
 3 files changed, 4 insertions(+), 13 deletions(-)

diffs (62 lines):

diff -r ff66335b5860 -r 6ef411a8f2f9 devel/libgphoto2/Makefile
--- a/devel/libgphoto2/Makefile Thu Apr 28 10:55:32 2011 +0000
+++ b/devel/libgphoto2/Makefile Thu Apr 28 11:16:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2011/04/22 13:42:02 obache Exp $
+# $NetBSD: Makefile,v 1.53 2011/04/28 11:16:35 hans Exp $
 
 DISTNAME=      libgphoto2-2.4.7
 PKGREVISION=   3
@@ -20,14 +20,8 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                ac_cv_path_DOXYGEN=false
 PKGCONFIG_OVERRIDE+=   libgphoto2.pc.in libgphoto2_port/libgphoto2_port.pc.in
-PLIST_VARS+=           libusb
 
 .include "../../mk/bsd.prefs.mk"
-# Keep this in sync with libusb/buildlink3.mk!
-.if ${OPSYS} != "SunOS"
-.  include "../../devel/libusb/buildlink3.mk"
-PLIST.libusb=          yes
-.endif
 
 # remove symbolic link
 post-install:
diff -r ff66335b5860 -r 6ef411a8f2f9 devel/libgphoto2/PLIST.common
--- a/devel/libgphoto2/PLIST.common     Thu Apr 28 10:55:32 2011 +0000
+++ b/devel/libgphoto2/PLIST.common     Thu Apr 28 11:16:35 2011 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.16 2009/05/19 07:50:13 obache Exp $
+@comment $NetBSD: PLIST.common,v 1.17 2011/04/28 11:16:35 hans Exp $
 bin/gphoto2-config
 bin/gphoto2-port-config
 include/gphoto2/gphoto2-abilities-list.h
@@ -84,7 +84,7 @@
 lib/libgphoto2_port/0.8.0/disk.la
 lib/libgphoto2_port/0.8.0/ptpip.la
 lib/libgphoto2_port/0.8.0/serial.la
-${PLIST.libusb}lib/libgphoto2_port/0.8.0/usb.la
+lib/libgphoto2_port/0.8.0/usb.la
 lib/pkgconfig/libgphoto2.pc
 lib/pkgconfig/libgphoto2_port.pc
 man/man3/libgphoto2.3
diff -r ff66335b5860 -r 6ef411a8f2f9 devel/libgphoto2/buildlink3.mk
--- a/devel/libgphoto2/buildlink3.mk    Thu Apr 28 10:55:32 2011 +0000
+++ b/devel/libgphoto2/buildlink3.mk    Thu Apr 28 11:16:35 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2011/04/22 13:42:02 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2011/04/28 11:16:35 hans Exp $
 
 BUILDLINK_TREE+=       libgphoto2
 
@@ -10,10 +10,7 @@
 BUILDLINK_PKGSRCDIR.libgphoto2?=       ../../devel/libgphoto2
 
 .include "../../mk/bsd.fast.prefs.mk"
-.if ${OPSYS} != "SunOS"
 .include "../../devel/libusb/buildlink3.mk"
-.endif
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"