diff options
| -rw-r--r-- | graphics/gphoto2/Makefile | 3 | ||||
| -rw-r--r-- | graphics/gphoto2/distinfo | 6 | ||||
| -rw-r--r-- | graphics/libgphoto2/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libgphoto2/distinfo | 6 | ||||
| -rw-r--r-- | graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c | 14 | ||||
| -rw-r--r-- | graphics/libgphoto2/pkg-plist | 7 |
6 files changed, 13 insertions, 27 deletions
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 26861774dd92..a5593f925015 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gphoto2 -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.4.2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo index 7c9d60bf8fb3..1dc49256a256 100644 --- a/graphics/gphoto2/distinfo +++ b/graphics/gphoto2/distinfo @@ -1,3 +1,3 @@ -MD5 (gphoto2-2.4.1.tar.bz2) = fba6cf5f5d6a23569d97f4f6896d5e09 -SHA256 (gphoto2-2.4.1.tar.bz2) = a9ef2883b09a1b71673dffe5f3216bf47de74184d7490ef5463300d09dec2f29 -SIZE (gphoto2-2.4.1.tar.bz2) = 583845 +MD5 (gphoto2-2.4.2.tar.bz2) = 9c57dd8b89ccfeafdd2037516185f6e9 +SHA256 (gphoto2-2.4.2.tar.bz2) = c9ef8c2f61bbe9978b38341ca2bf09786416ddd82d4708066a26a0483341ca72 +SIZE (gphoto2-2.4.2.tar.bz2) = 586665 diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 61a9d21aa68c..9b02f81b389c 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libgphoto2 -PORTVERSION= 2.4.1 -PORTREVISION= 1 +PORTVERSION= 2.4.2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto @@ -43,6 +42,7 @@ post-patch: 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \ s|-g -O2||g' ${WRKSRC}/${file} .endfor + @${REINPLACE_CMD} -e 's| "$$(DESTDIR)$$(udevscriptdir)"||' ${WRKSRC}/libgphoto2_port/usb/Makefile.in ${WRKSRC}/packaging/generic/Makefile.in @${REINPLACE_CMD} -e 's|linux-hotplug ||' ${WRKSRC}/packaging/Makefile.in @${REINPLACE_CMD} -e 's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' ${WRKSRC}/doc/Makefile.in diff --git a/graphics/libgphoto2/distinfo b/graphics/libgphoto2/distinfo index 4c80c287b1c0..bfa5b59ced9d 100644 --- a/graphics/libgphoto2/distinfo +++ b/graphics/libgphoto2/distinfo @@ -1,3 +1,3 @@ -MD5 (libgphoto2-2.4.1.tar.bz2) = 70c7d2c3e84997f29b4e988e56bd02aa -SHA256 (libgphoto2-2.4.1.tar.bz2) = dbb78d2eaf7c06ada10be244589835e683d3a0b4fb20494bff850a5762286bab -SIZE (libgphoto2-2.4.1.tar.bz2) = 3493514 +MD5 (libgphoto2-2.4.2.tar.bz2) = 714859617c0b616855f6906280010c5d +SHA256 (libgphoto2-2.4.2.tar.bz2) = f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226 +SIZE (libgphoto2-2.4.2.tar.bz2) = 3444898 diff --git a/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c b/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c index e40715e05cea..3c1087368a3f 100644 --- a/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c +++ b/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c @@ -8,17 +8,3 @@ #include <sys/stat.h> #include <sys/types.h> #ifdef HAVE_SYS_TIME_H -@@ -348,11 +349,11 @@ - /* resmgr has its own API, which calls to a server and - * communicates over UNIX domain sockets. - */ -- fd = rsm_open_device(path, O_RDONLY | O_NDELAY); -+ fd = rsm_open_device(path, O_RDONLY | O_NONBLOCK); - /* fall through to standard open if this failed */ - #endif - if (fd == -1) -- fd = open (path, O_RDONLY | O_NDELAY); -+ fd = open (path, O_RDONLY | O_NONBLOCK); - if (fd < 0) { - gp_port_serial_unlock (NULL, path); - continue; diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist index ad8d6937b764..cb6f37558876 100644 --- a/graphics/libgphoto2/pkg-plist +++ b/graphics/libgphoto2/pkg-plist @@ -187,6 +187,9 @@ lib/libgphoto2/%%VERSION%%/stv0680.so lib/libgphoto2/%%VERSION%%/sx330z.a lib/libgphoto2/%%VERSION%%/sx330z.la lib/libgphoto2/%%VERSION%%/sx330z.so +lib/libgphoto2/%%VERSION%%/topfield.a +lib/libgphoto2/%%VERSION%%/topfield.la +lib/libgphoto2/%%VERSION%%/topfield.so lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.a lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.la lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.so @@ -211,8 +214,6 @@ lib/libgphoto2_port.a lib/libgphoto2_port.la lib/libgphoto2_port.so lib/libgphoto2_port.so.0 -lib/udev/check-mtp-device -lib/udev/check-ptp-camera libdata/pkgconfig/libgphoto2.pc libdata/pkgconfig/libgphoto2_port.pc share/doc/libgphoto2/AUTHORS @@ -285,6 +286,7 @@ share/libgphoto2/%%VERSION%%/konica/spanish %%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo %%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-2.mo %%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo +%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-0.mo %%NLS%%share/locale/sl/LC_MESSAGES/libgphoto2-2.mo %%NLS%%share/locale/sl/LC_MESSAGES/libgphoto2_port-0.mo %%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-2.mo @@ -302,7 +304,6 @@ share/libgphoto2/%%VERSION%%/konica/spanish @dirrm share/doc/libgphoto2_port @dirrm share/doc/libgphoto2/camlibs @dirrm share/doc/libgphoto2 -@dirrmtry lib/udev @dirrm lib/libgphoto2_port/%%VERSION_PORT%% @dirrm lib/libgphoto2_port @dirrm lib/libgphoto2/%%VERSION%% |