Update to 2.5.8:

libgphoto2 2.5.8 release

all:
* Missing COPYRIGHT headers added.
* Bug fixes for issues detected by Coverity.

ptp2:
* Canon Powershot/IXUS CHDK support
  Install the CHDK firmware and then use "gphoto2 --set-config chdk=On" to enable.
* Canon EOS: Implemented new capture method for new Canon EOS to avoid hangs.
* Canon EOS: New configuration variable: continuousaf
* Canon EOS: event output for focusinfo / focusmask
* Nikon DSLR: New configuration variables: movieiso, movieshutterspeed, moviehighisonr
* Nikon Coolpix A: also manually add override opcodes for capture (please report if it works)
* New USB ids:
  Sony: DSC-HX60V, Alpha-A7S, Alpha-A77 M2, Alpha A5100
  Panasonic: DMC-LS2
  Canon EOS 7D Mark II, Canon EOS M3
  Canon Powershot SX520 HS
  Fuji Fujifilm X-E2
  Samsung NX1
* Media Player IDs synced with the libmtp ID database.
* Lots of bugfixes.

libgphoto2_port/libusb1:
* Prefer libusb1 over libusb0 if both are present.
* Asynchronous interrupt handling, to avoid losing usb interrupts during other
  operations.

------------------------------------------------------------------------------
libgphoto2 2.5.7 release

ptp2:
* Canon EOS focusinfo crash fixed (affected all config operations)
* wait_for_event sleep backoff increased (50 - 100 - 150 - 200ms)
* Nikon: fixes to make Nikon Coolpix S9700 over PTPIP work better
* Nikon: WLAN GUID setting
* Sony: tighten event loop to avoid loss of objectadded events
* New USB ids: Nikon Coolpix 9400, Nikon S9700, Pentax K3 (in PTP).

pentax:
* added Pentax K100Ds
* added raw capture support

packaging:
* fixed missing libexif in pkgconfig

translations:
* updated ukrainian, vietnamese, french, polish
------------------------------------------------------------------------------
libgphoto2 2.5.6 release

ptp2:
* Nikon D3000/D3100/D3200: It hides the "good" capture opcodes from the
  DeviceInfo. Override and add them. If you see capture bugs, please report
  with debuglogfile.
* "exposurecompensation" now in correct size (-3.0 <-> 3.0 usually)
* Canon EOS: decode and report "focusinfo" variable that outputs the focus information of the camera.
* Canon EOS: autofocusdrive=0 and cancelautofocus=1 added to cancel autofocusing,
  to avoid blocking the camera.
* Canon EOS: "eosviewfinder" renamed to "viewfinder"
* Sony SLT: Make property setting work for "iso", "exposurecompensation",
  "f-number", "shutterspeed"
* Canon EOS: crash on 700D fixed
* Nikon DSLR: race condition on object addition handled better
* Nikon DSLR: make sure we make a pause a bit during polling after capture.
* IDs added:
  Nikon: Coolpix P7800, S1, J4
  Nikon: D3300, D610, D4s, D810, D750
  Canon: IXUS 125HS, PowerShot Elph340HS
  Leica M9
* various bugfixes

libgphoto2_port/usb1:
* fixed a memory leak
* api changed for gp_log_data to make smaller debuglogs possible

------------------------------------------------------------------------------
libgphoto2 2.5.5.1 release

This is a regression fix release.

ptp2:
* fixed all Nikon S* coolpix that are not Nikon 1
* Nikon: exit from potential endless loop on trigger capture

canon:
* On EOS/Rebel DSLR do not query or set "zoom" as its manual always

translations:
* updated polish, ukrainian, vietnamese

------------------------------------------------------------------------------
libgphoto2 2.5.5 release

ptp2:
* Nikon 1 support. Final fix to get it running by Raj Kumar of archive.org.
* Nikon: liveview capture without autofocus enhanced, now also for card
* Nikon: restart liveview after capture
* Canon EOS: New property reporting method (OLC Info) implemented.
* Print read-only values in configuration table lookup (for Canon EOS mostly)
* Sony: Fixed Sony SLT-A900v capture
* Fixed the various "datetime" hooks for PTP generic, Canon Powershot and Canon EOS
  to hopefully work better. --set-config datetime=now sets the camera to the current time.
* CHDK: some changes
* New ids:
  Nikon DSC D3x, D5300
  Nikon Coolpix P330
  Canon PowerShot S95, S120, SX260HS, SX280HS, SX160IS, A2500, A2600, Elph135, IXUS 300HS, IXUS 255HS
  Canon EOS 1200D
  Sony DSC-A900, Alpha 6000, DSC-HX5V
  Casio EX-ZR700,
  Fuji FinePix AV-150, T200
* Massive logging and error handling cleanup by Axel Waggershauser
* cleanup of the USB data handling
* Bugfixes

st2205:
* add support for a new type of 240x320 picture frames

all:
* Massive logging and error handling cleanup by Axel Waggershauser.
* Various cleanups from David Berrange for mingw32 builds.
* fixed libgd detection and linking.

print-camera-list
* add a mode to print udev rules for the non-standard USB support (usbscsi/usbdisk),
  needed additional to HWDB databases.

translations:
* updated ukrainian, vietnamese, polish, french, finish, chinese, danish, dutch,
------------------------------------------------------------------------------
libgphoto2 2.5.4 release

ptp2:
* Sony SLT DSLR support: SDRAM capture, Tethering, Triggering movie capture, property reading
* Nikon DSLR: bulb mode implemented in newer DSLRs (D600/D7100/D5200 and later)
* Nikon capture adjustments (always set controlmode before capture).
* Nikon capture in "live view mode" no longer does autofocus, use "autofocusdrive".
* Nikon "applicationmode" setting added.
* Nikon Coolpix capture failure on empty cards fixed.
* Some Canon EOS 5D Mark III config adjustments/additions.
* Canon EOS: enable trigger capture
* Olympus E-series capture: some improvements.
* ptp2: implemented device property description caching
* New IDs
  - Sony DSC-W510, SLT-A58 (control)
  - Nikon P80 v1.1
  - Canon A3500IS, A1400, SX170IS, SX510HS, A2200
  - Fuji FinePix S4850, JX370, S4850
  - Apple iPhone 5

ax203:
* support for picture frame with id 1.

sierra:
* Reimplemented a libusb based mass storage tunneling driver to support
  non-Linux systems (e.g. Mac OS X).

libusb1:
* fixed timeout detection for USB interrupts

all:
* Lots of small fixes to build with mingw32.

Translations updates:
* Danish, Spanish, French, Dutch, Polish, Russian, Serbian, Ukrainian,
  Vietnamese

------------------------------------------------------------------------------
libgphoto2 2.5.3.1 release

packaging:
* "print-camera-list hwdb" output mode added for udev versions >= 201.

  Put this to /usr/lib/udev/hwdb/20-gphoto.hwdb (your udev hwdb directory might be different)

  Added a missing "i" in the PTP matcher.

------------------------------------------------------------------------------
libgphoto2 2.5.3 release

packaging:
* "print-camera-list hwdb" output mode added for udev versions >= 201.

  Put this to /usr/lib/udev/hwdb/20-gphoto.hwdb (your udev hwdb directory might be different)

* "print-camera-list html" output mode added for http://gphoto.org/proj/libgphoto2/support.php

all:
* Lots of Coverity fixes merged

ptp2:
* Nikon: added a new PTP capture opcode function, allows capture to card during liveview
* Nikon: rewrote some of the wait logic in the capture routines
* Nikon: enable --trigger-capture support
* Nikon: hook up some more configuration variables (funcbutton, previewbutton, menusandplayback, changeafarea)
* canon: hook up configuration variables (colortemperature)
* ptpip: several contributed bugfixes, and event handling
* panasonic: allow deleting files by setting MTP Responder code.
* new ids:
  * Kodak Z8612 IS
  * Sony DSC-S780, SLT-A57, SLT-A58, SLT-A99v, DSC-RX100M2, Alpha A3000, NEX 6
  * Nikon Coolpix S3200, DSLR D3200, J3, V2, S02, 2200v1.1, S4300, S2700, L27, S02, V2, J3
  * Panasonic TZ-8
  * Olympus E-M5
  * Canon Rebel G15, EOS 70D, A1000IS, SX150IS, A810
  * Canon Rebel T3, EOS 1Dx, EOS 70D
  * Fuji FinePix SL1000, S2980
* merged ids from libmtp
* lots of bugfixes

canon:
* label PowerShot S110 from 2001 differently than the 2012 PowerShot S110.
* fixed "new / downloaded" logic
* disable unconditional "clear halt" calls as they confuse newer controllers

ax203:
* support Nantronics N25S80 chipset

directory:
* support NRW files

sierra:
* capture fixed for Olympus C-3030

pentax:
* Various fixes from Jiri Pinka

jd11:
* enhanced de-bayering a bit

translations:
* new czech translation by Pavel Borecki.
* updated czech, danish, dutch, polish, russian, seribian, ukrainian,
  french, vietnamese, taiwanese

libgphoto2:
* use generic macros to check for libGD and libxml2 to allow better handling.

libgphoto2_port/disk:
* check the right fstab field for ignoring filesystems (avoids autofs scans)


------------------------------------------------------------------------------
libgphoto2 2.5.2 release

ptp2:
* Fixed Raspberry Pi and USB 3.0 "connect only once" problem.
* Experimental Olympus E-series (not Pen) remote control support. Try in "Control" mode.
* Nikon DSLR: real movie capture! (use --set-config movie=1/0 and --wait-event)
* New ids:
  Sony: DSC-A900, SLT-A350, DSC-RX1, HX300, NEX-3N
  Nikon Coolpix: P80, L820, S9500, S620, P520, S2500, S2600
  Nikon Coolpix A
  Nikon DSLR: D2Xs, D4, D7100
  Nikon J2
  Canon Powershot: S100, A1300IS, A2300IS,
  Canon EOS: 700D, 100D
  Fuji FinePix: H20EXR, X20
  Samsung: NX1000, EK-GC100
  Also various MTP device ids merged from libmtp.
* ptpip: major/minor number was switched in init packet.
* Nikon DSLR: out of focus during capture fixed, various bugfixes
* Nikon "controlmode" config for unlocking the camera.
* Canon DSLR: "keepdeviceon" pinging in get_config, liveview
* Canon thumbnail retrieval fixed.
* Lots of work on getting Olympus E-series DSLRs in Control mode
  to run.

canon:
* wait-for-event: handle when camera goes offline during waiting.
* fixed mtime 0 (Jan 1 1970) issue when downloading files and using --filename

sierra:
* Fixed the Nikon Coolpix 4300 and 2500 USB over SCSI capture mode.
* Ignore register 4 read errors after capture as Nikon does not supply them.
* added commented code on how to switch the Coolpix 2500 to RAW DIAG mode.

libgphoto2_port:
* gp_port_reset functionality to do a port reset.

libgphoto2_port/usbscsi:
* Use timeout supplied by driver, not hardcoded 1.5 seconds (fixes Nikon sierra capture).

translations:
* updated ukrainian, finish, dutch, polish, russian, french, vietnamese, german

build:
* specify lots of _BSD_SOURCE et.al. to make the strict MacOS ports
  build happier. Might break non Linux platforms, please report this.

* libxml2 needed for Olympus E series capture support.

* cleaned up AM_CPPFLAGS/CPPFLAGS usage, do not use both of them together.

------------------------------------------------------------------------------
libgphoto2 2.5.1.1 release

ptp2:
* fixed 32bit architectures
------------------------------------------------------------------------------
libgphoto2 2.5.1 release

translations updates
* lots of translations synced to 2.5.0 release

ptp2:
* Lots of new USB ids added
  - Sony RX100, SLT-A65V, HX200V
  - Nikon Coolpix S01, S3300, P7700, S8200, P510, J1
  - Nikon DSLR D600, D800E, D800, D5200
  - Panasonic DMC LX7
  - Olympus SP-720UZ, E-PL5
  - Canon PowerShot D10, IXUS 310IS, SX220HS, G1 X, SX40HS,
    A4000IS, SX240HS, A2400IS, S110, SX500IS
  - Canon EOS M, EOS 650D, EOS 6D
  - Fuji FinePix S2950, S4300, X-S1, HS30EXR, XF1
* wait-for-event also for Canon PowerShot (capture capable ones)
  now waits for "shutter press" signal and triggers a capture.
* Canon Powershot Preview mode fixes
* various Nikon configurations added: angle, flickerreduction,
  rawcompression, remotemode.
* Nikon DSLR to-ram capture fixes
* merged music player ids from libmtp. Includes big Samsung devices rename.
* EOS preview capture bugfixes: some waiting reduced to allow higher
  preview / regular capture speed on Canon EOS, understand newer EOS.
* some more bug fixes

ax203:
* SST25VF080 and SST25VF016 support added.
* ax206 support enhanced.

canon:
* decode "zoom" settings better
* "shootingmode" fix

libgphoto2_port/libusb1:
* bugfixes

examples:
* focus.c, sample-justfocus.c: focusing example added

------------------------------------------------------------------------------
libgphoto2 2.5.0 release

libgphoto2 API:
   * gp_context* functions no longer get varargs, but preprocessed
     strings. This makes hooking them into other language bindings
     easier.

   * gp_file_new_from_handler(): Allow passing data in and out via
     handler functions (to allow streaming). See also CameraFileHandler
     function pointers.

   * CameraFileInfoFile: removed "name" structmember and GP_FILE_INFO_NAME
     flags.
     Use direct passing in of the filename to the API functions.

   * New: gp_camera_autodetect(CameraList *list, GPContext*);

     Simple autodetection function returning all current detected cameras.

   * (TODO: not yet New: gp_camera_open (Camera *camera, const char *name, const char *port, GPContext *context);

     Simple open function without needing to involve libgphoto2_port.
     )

   * gp_file_set_name() and _get_name() passing in is no longer needed
     and the API will go away.

   * New gp_file_get_name_by_type() will convert a regular filename ("normal")
     into one depending on type (e.g. "raw_" prefix) and adjusted suffix
     (like ".ppm" turning into ".pgm" for grayscale previews).

   * gp_file_set_type() and gp_file_get_type() are gone, these functions
     are now implicit passed via arguments to the the put_file and
     set_file_noop() functions.

   * gp_filesystem_set_info_noop(), gp_filesystem_set_file_noop(),
     gp_filesystem_put_file(), gp_camera_folder_put_file():

     Added "filename" argument to pass in the filename. The one
     from CameraFileInfoFile and CameraFile are no longer used.

     Added "type" argument to pass in the filetype (GP_FILE_TYPE_*).

   * Adjusted to new GPPortInfo handling.

   * Rewrote gphoto2-filesys.c to be directory based (in a tree structure).
     Change should not be visibile outside of gphoto2-filesys.c.

libgphoto2_port API:
   * GPPortInfo is now abstracted and internal.

     If you need to retrieve name, path or type, use
	     gp_port_info_get_xx (info, &x);
     to get the value.
     Name and path strings continue to be owned by libgphoto2_port,
     do not modify and do not free.

     You are not supposed to create / append new ones to GPPortInfoList.

   * Disk Settings have been removed from the Settings union. Should
     not affect frontends at all.

   * Started using symbol versions.

PTP2 driver:
   * Lots of improvements.
   * PTP Object management rewritten, able to do "on demand" loading.

Directory driver:
   * Use GPPortInfo instead of settings to pass basepath in.
   * Abstracted common functionality.

Build:
   * Removed dummy README file from SVN.
   * Ship README.packaging in dist tarball for the first time.
   * Allow building "all plus non-default" camlibs.
   * Fix libltdl test compile for cases with LDFLAGS defined.

Documentation:
   * Optionally (--enable-internal-docs) build internal doxygen docs
     with call graphs and all the dirty details.
   * Improved docs on how to selectively build camlibs.

Test cases:
   * Test camlib loading of both uninstalled and installed camlibs.

4 files changed, 59 insertions, 54 deletions

diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index cf826d9cc4c..1dfa030ad48 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2015/05/02 08:45:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.61 2015/08/23 14:17:05 wiz Exp $
 
-DISTNAME=	libgphoto2-2.4.14
-PKGREVISION=	1
+DISTNAME=	libgphoto2-2.5.8
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common
index 4f6d4f1da1e..e685c43c782 100644
--- a/devel/libgphoto2/PLIST.common
+++ b/devel/libgphoto2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.20 2012/07/02 16:08:29 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.21 2015/08/23 14:17:05 wiz Exp $
 bin/gphoto2-config
 bin/gphoto2-port-config
 include/gphoto2/gphoto2-abilities-list.h
@@ -59,6 +59,7 @@ lib/libgphoto2/${PKGVERSION}/panasonic_dc1580.la
 lib/libgphoto2/${PKGVERSION}/panasonic_l859.la
 lib/libgphoto2/${PKGVERSION}/pccam300.la
 lib/libgphoto2/${PKGVERSION}/pccam600.la
+lib/libgphoto2/${PKGVERSION}/pentax.la
 lib/libgphoto2/${PKGVERSION}/polaroid_pdc320.la
 lib/libgphoto2/${PKGVERSION}/polaroid_pdc640.la
 lib/libgphoto2/${PKGVERSION}/polaroid_pdc700.la
@@ -85,12 +86,12 @@ lib/libgphoto2/${PKGVERSION}/toshiba_pdrm11.la
 lib/libgphoto2/${PKGVERSION}/tp6801.la
 lib/libgphoto2/print-camera-list
 lib/libgphoto2_port.la
-lib/libgphoto2_port/0.8.0/disk.la
-lib/libgphoto2_port/0.8.0/ptpip.la
-lib/libgphoto2_port/0.8.0/serial.la
-lib/libgphoto2_port/0.8.0/usb.la
-lib/libgphoto2_port/0.8.0/usbdiskdirect.la
-lib/libgphoto2_port/0.8.0/usbscsi.la
+lib/libgphoto2_port/0.12.0/disk.la
+lib/libgphoto2_port/0.12.0/ptpip.la
+lib/libgphoto2_port/0.12.0/serial.la
+lib/libgphoto2_port/0.12.0/usb.la
+lib/libgphoto2_port/0.12.0/usbdiskdirect.la
+lib/libgphoto2_port/0.12.0/usbscsi.la
 lib/pkgconfig/libgphoto2.pc
 lib/pkgconfig/libgphoto2_port.pc
 man/man3/libgphoto2.3
@@ -102,6 +103,7 @@ share/doc/libgphoto2/ChangeLog
 share/doc/libgphoto2/NEWS
 share/doc/libgphoto2/README
 share/doc/libgphoto2/README.packaging
+share/doc/libgphoto2/camlibs/ChangeLog
 share/doc/libgphoto2/camlibs/README.9050
 share/doc/libgphoto2/camlibs/README.9051
 share/doc/libgphoto2/camlibs/README.9052
@@ -133,6 +135,7 @@ share/doc/libgphoto2/camlibs/README.panasonic-coolshot
 share/doc/libgphoto2/camlibs/README.panasonic-l859
 share/doc/libgphoto2/camlibs/README.pccam300
 share/doc/libgphoto2/camlibs/README.pccam600
+share/doc/libgphoto2/camlibs/README.pentax
 share/doc/libgphoto2/camlibs/README.ptp2
 share/doc/libgphoto2/camlibs/README.smal
 share/doc/libgphoto2/camlibs/README.sonix
@@ -153,36 +156,39 @@ share/libgphoto2/${PKGVERSION}/konica/german
 share/libgphoto2/${PKGVERSION}/konica/japanese
 share/libgphoto2/${PKGVERSION}/konica/korean
 share/libgphoto2/${PKGVERSION}/konica/spanish
-share/locale/cs/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/da/LC_MESSAGES/libgphoto2-2.mo
-share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/de/LC_MESSAGES/libgphoto2-2.mo
-share/locale/de/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/es/LC_MESSAGES/libgphoto2-2.mo
-share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/eu/LC_MESSAGES/libgphoto2-2.mo
-share/locale/eu/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/fr/LC_MESSAGES/libgphoto2-2.mo
-share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/hu/LC_MESSAGES/libgphoto2-2.mo
-share/locale/it/LC_MESSAGES/libgphoto2-2.mo
-share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/ja/LC_MESSAGES/libgphoto2-2.mo
-share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/nl/LC_MESSAGES/libgphoto2-2.mo
-share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
-share/locale/pl/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
-share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/sk/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/sv/LC_MESSAGES/libgphoto2-2.mo
-share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/uk/LC_MESSAGES/libgphoto2-2.mo
-share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/vi/LC_MESSAGES/libgphoto2-2.mo
-share/locale/vi/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
-share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo
-share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
+share/locale/cs/LC_MESSAGES/libgphoto2-6.mo
+share/locale/cs/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/da/LC_MESSAGES/libgphoto2-6.mo
+share/locale/da/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/de/LC_MESSAGES/libgphoto2-6.mo
+share/locale/de/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/es/LC_MESSAGES/libgphoto2-6.mo
+share/locale/es/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
+share/locale/eu/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/fi/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
+share/locale/fr/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
+share/locale/it/LC_MESSAGES/libgphoto2-6.mo
+share/locale/it/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
+share/locale/ja/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
+share/locale/nl/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
+share/locale/pl/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
+share/locale/ru/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/sk/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/sr/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
+share/locale/sv/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
+share/locale/uk/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
+share/locale/vi/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
+share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-12.mo
+share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-12.mo
diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo
index 2cf5b0811cb..fb519531bdf 100644
--- a/devel/libgphoto2/distinfo
+++ b/devel/libgphoto2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2012/07/02 16:08:29 drochner Exp $
+$NetBSD: distinfo,v 1.25 2015/08/23 14:17:05 wiz Exp $
 
-SHA1 (libgphoto2-2.4.14.tar.bz2) = c932f44d51e820245ff3394ee01a5e9df429dfef
-RMD160 (libgphoto2-2.4.14.tar.bz2) = b9fb62e218e9a4a4ab009ada031c3d7c6362ee3d
-Size (libgphoto2-2.4.14.tar.bz2) = 4481384 bytes
+SHA1 (libgphoto2-2.5.8.tar.bz2) = 976feb07d51026e6ca647f9fa333c500c5e0c041
+RMD160 (libgphoto2-2.5.8.tar.bz2) = bbb57fdace9783f9829bafbd89818949f6d0fce3
+Size (libgphoto2-2.5.8.tar.bz2) = 6941251 bytes
 SHA1 (patch-aj) = 111b26861d59dddf7a8d0998cb7ae6513114fe38
-SHA1 (patch-ak) = b1e9243cf4d4c78995184b357ba36bdfb0471d76
+SHA1 (patch-ak) = ecba9efbf66eda280258a504caaaf6fff50657cd
 SHA1 (patch-an) = 60d109d29834c01cdae29bcebde153e35af17884
 SHA1 (patch-ao) = 01e7eea353ef12b97b54aeb34f00abfd1f50c3ff
diff --git a/devel/libgphoto2/patches/patch-ak b/devel/libgphoto2/patches/patch-ak
index b47c5c9a592..603da3924b6 100644
--- a/devel/libgphoto2/patches/patch-ak
+++ b/devel/libgphoto2/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.1 2008/04/29 09:31:09 sborrill Exp $
+$NetBSD: patch-ak,v 1.2 2015/08/23 14:17:06 wiz Exp $
 
---- packaging/generic/check-ptp-camera.orig	2008-04-25 00:01:14.000000000 +0100
-+++ packaging/generic/check-ptp-camera	2008-04-25 00:01:36.000000000 +0100
+--- packaging/generic/check-ptp-camera.orig	2015-02-22 10:08:18.000000000 +0000
++++ packaging/generic/check-ptp-camera
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
-  
- # check if any interface of this device is a PTP camera interface (06)
- INTERFACE="${1:-06/01/01}"
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+ # License as published by the Free Software Foundation; either