diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 9ff693053b2b42cd6a29b886e071ad01acdeefe2 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /devel/libgphoto2 | |
| parent | 4a580ef74536ed1f7c6a7ecd5a26e46a93aec9b3 (diff) | |
| download | pkgsrc-9ff693053b2b42cd6a29b886e071ad01acdeefe2.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'devel/libgphoto2')
| -rw-r--r-- | devel/libgphoto2/Makefile | 13 | ||||
| -rw-r--r-- | devel/libgphoto2/PLIST.common | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index b044079336f..476d89e736c 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2007/05/01 12:03:26 veego Exp $ +# $NetBSD: Makefile,v 1.39 2008/04/12 22:42:59 jlam Exp $ DISTNAME= libgphoto2-2.3.1 PKGREVISION= 4 @@ -18,14 +18,13 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_DOXYGEN=false PKGCONFIG_OVERRIDE+= libgphoto2/libgphoto2.pc.in +PLIST_VARS+= libusb .include "../../mk/bsd.prefs.mk" -# Keep this in sync with buildlink3.mk! -.if ${OPSYS} == "SunOS" -PLIST_SUBST+= HAVE_LIBUSB="@comment " -.else -.include "../../devel/libusb/buildlink3.mk" -PLIST_SUBST+= HAVE_LIBUSB="" +# Keep this in sync with libusb/buildlink3.mk! +.if ${OPSYS} != "SunOS" +. include "../../devel/libusb/buildlink3.mk" +PLIST.libusb= yes .endif # remove symbolic link diff --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common index a2376a08e81..2f8e54defa7 100644 --- a/devel/libgphoto2/PLIST.common +++ b/devel/libgphoto2/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.10 2007/01/03 08:20:18 adam Exp $ +@comment $NetBSD: PLIST.common,v 1.11 2008/04/12 22:42:59 jlam Exp $ bin/gphoto2-config bin/gphoto2-port-config include/gphoto2/gphoto2-abilities-list.h @@ -82,7 +82,7 @@ lib/libgphoto2/${PKGVERSION}/toshiba_pdrm11.la lib/libgphoto2_port/0.7.1/disk.la lib/libgphoto2_port/0.7.1/ptpip.la lib/libgphoto2_port/0.7.1/serial.la -lib/libgphoto2_port/0.7.1/usb.la +${PLIST.libusb}lib/libgphoto2_port/0.7.1/usb.la lib/pkgconfig/libgphoto2.pc lib/pkgconfig/libgphoto2_port.pc lib/udev/check-ptp-camera |