diff options
| author | hans <hans@pkgsrc.org> | 2011-04-28 11:16:35 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2011-04-28 11:16:35 +0000 |
| commit | 2b9fa83a8cb1ea8788b1bf35668600bc107c0f53 (patch) | |
| tree | 04d4924eaf8e8c34f5fd73abfa1921f9f6a5d2f0 /devel | |
| parent | 454790acdfe9f2dd5030bc432898b30f4ca8c06b (diff) | |
| download | pkgsrc-2b9fa83a8cb1ea8788b1bf35668600bc107c0f53.tar.gz | |
Fix build on OpenIndiana and probably other SunOS variants. Recent SunOS
has a native libusb, so enable the USB backend.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libgphoto2/Makefile | 8 | ||||
| -rw-r--r-- | devel/libgphoto2/PLIST.common | 4 | ||||
| -rw-r--r-- | devel/libgphoto2/buildlink3.mk | 5 |
3 files changed, 4 insertions, 13 deletions
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index 61a096c6e99..45af8df9937 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -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 @@ USE_PKGLOCALEDIR= yes 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 --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common index e08dd17f13b..b8d189fa041 100644 --- a/devel/libgphoto2/PLIST.common +++ b/devel/libgphoto2/PLIST.common @@ -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/${PKGVERSION}/toshiba_pdrm11.la 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 --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk index 0ae7bfef580..db92b88025f 100644 --- a/devel/libgphoto2/buildlink3.mk +++ b/devel/libgphoto2/buildlink3.mk @@ -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_ABI_DEPENDS.libgphoto2+= libgphoto2>=2.4.7nb3 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" |