diff options
| -rw-r--r-- | devel/libgphoto2/Makefile | 9 | ||||
| -rw-r--r-- | devel/libgphoto2/PLIST.common | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index e5977c759d4..c8c0c286dbb 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -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 @@ PKGCONFIG_OVERRIDE+= libgphoto2/libgphoto2.pc.in 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 --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common index 6e88d58d13f..1d546e70ff2 100644 --- a/devel/libgphoto2/PLIST.common +++ b/devel/libgphoto2/PLIST.common @@ -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_stv0680.la 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 |