pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/libgphoto2 libusb package is not available on So...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7a478dc0777
branches:  trunk
changeset: 491744:f7a478dc0777
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Mar 29 13:24:11 2005 +0000

description:
libusb package is not available on Solaris so don't depend on it here
if OS = Solaris.

diffstat:

 devel/libgphoto2/Makefile     |  9 ++++++++-
 devel/libgphoto2/PLIST.common |  4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 0833c35b739f -r f7a478dc0777 devel/libgphoto2/Makefile
--- a/devel/libgphoto2/Makefile Tue Mar 29 13:00:26 2005 +0000
+++ b/devel/libgphoto2/Makefile Tue Mar 29 13:24:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/01/05 15:52:52 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2005/03/29 13:24:11 markd Exp $
 #
 
 DISTNAME=      libgphoto2-2.1.5
@@ -17,9 +17,16 @@
 USE_PKGLOCALEDIR=      YES
 GNU_CONFIGURE=         YES
 
+.include "../../mk/bsd.prefs.mk"
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.if ${OPSYS} == "SunOS"
+PLIST_SUBST+=          HAVE_LIBUSB="@comment"
+.else
 .include "../../devel/libusb/buildlink3.mk"
+PLIST_SUBST+=          HAVE_LIBUSB=""
+.endif
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0833c35b739f -r f7a478dc0777 devel/libgphoto2/PLIST.common
--- a/devel/libgphoto2/PLIST.common     Tue Mar 29 13:00:26 2005 +0000
+++ b/devel/libgphoto2/PLIST.common     Tue Mar 29 13:24:11 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2005/01/05 15:52:52 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2005/03/29 13:24:11 markd Exp $
 bin/gphoto2-config
 bin/gphoto2-port-config
 include/gphoto2/gphoto2-abilities-list.h
@@ -72,7 +72,7 @@
 lib/gphoto2/${PKGVERSION}/libgphoto2_sx330z.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_toshiba_pdrm11.la
 lib/gphoto2_port/0.5.1/libgphoto2_port_serial.la
-lib/gphoto2_port/0.5.1/libgphoto2_port_usb.la
+${HAVE_LIBUSB}lib/gphoto2_port/0.5.1/libgphoto2_port_usb.la
 lib/libgphoto2.la
 lib/libgphoto2_port.la
 lib/pkgconfig/libgphoto2.pc



Home | Main Index | Thread Index | Old Index