diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2006-12-28 22:14:53 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-12-28 22:14:53 +0000 |
| commit | 0cdc7572b3a9d20afa12f866240046990e2e3749 (patch) | |
| tree | 5c5c68b40751d46716d080f9ce115008b1ae8d7f /graphics/libgphoto2 | |
| parent | 376d8c06b0234cb607828c5070349e4387005693 (diff) | |
Notes
Diffstat (limited to 'graphics/libgphoto2')
| -rw-r--r-- | graphics/libgphoto2/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libgphoto2/distinfo | 6 | ||||
| -rw-r--r-- | graphics/libgphoto2/files/patch-camlibs_canon-usb.c | 19 | ||||
| -rw-r--r-- | graphics/libgphoto2/files/patch-camlibs_ptp2-config.c | 20 | ||||
| -rw-r--r-- | graphics/libgphoto2/pkg-plist | 2 |
5 files changed, 7 insertions, 44 deletions
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index c9f2f5902fd2..9114e131636a 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libgphoto2 -PORTVERSION= 2.3.0 +PORTVERSION= 2.3.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto @@ -25,7 +25,7 @@ USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --mandir=${PREFIX}/man LIBTOOLFILES= configure libgphoto2_port/configure USE_LDCONFIG= yes -PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.7.0 +PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.7.1 MAN3= libgphoto2.3 libgphoto2_port.3 diff --git a/graphics/libgphoto2/distinfo b/graphics/libgphoto2/distinfo index e7d3a79c88a8..8edae252c87f 100644 --- a/graphics/libgphoto2/distinfo +++ b/graphics/libgphoto2/distinfo @@ -1,3 +1,3 @@ -MD5 (libgphoto2-2.3.0.tar.bz2) = 05bc0199e77ea3434fbe934f792ddeee -SHA256 (libgphoto2-2.3.0.tar.bz2) = b3524805e793606dbad2407e85974eaaea052df60b86191abe1e55520665f99c -SIZE (libgphoto2-2.3.0.tar.bz2) = 3226923 +MD5 (libgphoto2-2.3.1.tar.bz2) = 37f85e34e5b6031ddf6cac8b8782ac4f +SHA256 (libgphoto2-2.3.1.tar.bz2) = b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727 +SIZE (libgphoto2-2.3.1.tar.bz2) = 3230934 diff --git a/graphics/libgphoto2/files/patch-camlibs_canon-usb.c b/graphics/libgphoto2/files/patch-camlibs_canon-usb.c deleted file mode 100644 index 6a74220cfb88..000000000000 --- a/graphics/libgphoto2/files/patch-camlibs_canon-usb.c +++ /dev/null @@ -1,19 +0,0 @@ ---- camlibs/canon/usb.c.orig Sat Nov 25 15:47:24 2006 -+++ camlibs/canon/usb.c Wed Dec 13 09:28:25 2006 -@@ -1308,6 +1308,7 @@ - int j, canon_subfunc = 0; - char subcmd = 0, *subfunct_descr = ""; - int additional_read_bytes = 0; -+ char *msg; - - /* clear this to indicate that no data is there if we abort */ - if (return_length) -@@ -1546,7 +1547,7 @@ - } - } - -- char *msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) ); -+ msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) ); - if ( msg != NULL ) { - GP_DEBUG ( "canon_usb_dialogue_full: camera status \"%s\"" - " in response to command 0x%x 0x%x 0x%x (%s)", diff --git a/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c b/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c index 8b68428b415e..d9636d61fd6a 100644 --- a/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c +++ b/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c @@ -9,23 +9,3 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -@@ -1739,15 +1741,14 @@ - static int - _get_nikon_list_wifi_profiles (CONFIG_GET_ARGS) - { -- gp_widget_new (GP_WIDGET_SECTION, _(menu->label), widget); -- gp_widget_set_name (*widget, menu->name); -- -- CameraWidget *child; -- - int ret; - char buffer[4096]; - int i; -+ CameraWidget *child; - PTPParams *params = &(camera->pl->params); -+ -+ gp_widget_new (GP_WIDGET_SECTION, _(menu->label), widget); -+ gp_widget_set_name (*widget, menu->name); - - if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_NIKON) - return (GP_ERROR_NOT_SUPPORTED); diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist index 5bef9fcf358a..49cb2db164f9 100644 --- a/graphics/libgphoto2/pkg-plist +++ b/graphics/libgphoto2/pkg-plist @@ -211,6 +211,7 @@ lib/libgphoto2_port.a lib/libgphoto2_port.la lib/libgphoto2_port.so lib/libgphoto2_port.so.0 +lib/udev/check-ptp-camera libdata/pkgconfig/libgphoto2.pc libdata/pkgconfig/libgphoto2_port.pc %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -298,6 +299,7 @@ libdata/pkgconfig/libgphoto2_port.pc %%PORTDOCS%%@dirrm share/doc/libgphoto2_port %%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry lib/udev @dirrm lib/libgphoto2_port/%%VERSION_PORT%% @dirrm lib/libgphoto2_port @dirrm lib/libgphoto2/%%VERSION%% |