Update libgphoto2 to 2.4.6.

------------------------------------------------------------------------
libgphoto2 2.4.6

This is a 2.4 release branch update.

PTP2 driver:
   * Fixed Nikon DSLR capture in LiveView mode (like gtkam uses).
   * More Canon EOS stuff decoded, added experimental "capturetarget" support
     for EOS.
   * Canon EOS LiveView support (experimental, reported working for EOS 1000D).
   * Added new USB ids:
        - Kodak V803, M1063
        - Canon PowerShot A650IS, SD990 (aka IXUS 980IS), SD880IS, A480
        - Canon EOS 50D
        - Fuji FinePix S1000fd
   * Retrieve filedates again from PTP objects.
   * speedup: Do not list files on / (there aren't any).
   * Bugfixes.

Canon driver:
   * Support Exposure Bias setting.
   * More shutterspeeds.

libgphoto2:
   * Fixed a problem during file retrieval which causes Canon Normal
     --capture-image-and-download errors, handle CR2 and CRW mimetypes.
   * Fixed ordering of filelists again that broke the digigr8 driver.
   * Translation updates.

digigr8:
   * Added a new version of the disney pix micro.

------------------------------------------------------------------------
libgphoto2 2.4.5

This is a 2.4 release branch update.

PTP2 driver:
   * Increased timeout for Canon Viewfinder enable.
   * Fixed intial Canon timeout (0.5 -> 1.5 seconds), was too small
     for some Canons.
   * Canon EOS capture mode and tethered mode bugfixes.
   * Nikon DSLR LiveView support, with Autofocus and ManualFocus Drive possibili
ty.
   * Nikon tethered capture fixes.
   * New cameras listed:
                Nikon CoolPix P50, S60
                Canon Digital IXUS 85
                Canon PowerShot A740, G10,
                Canon EOS 5D Mark II
   * Merged new IDs of Music Players from libmtp.
   * Lots of bugfixes.

KODAK DC240:
   * Made driver work again.
   * Cleanups

libgphoto2:
   * rewrote gphoto2-filesys.c to be dynamic and fix LRU problems.
     (backport from TRUNK)
   * Translation updates.

libgphoto2_port:
   * added --enable/--disable configure options for: disk, serial, ptpip
   * added --with/--without configure options for: bonjour, hal
   * backported Gentoo "if just canon driver selected, auto-select ptp2 driver"
     usability fix.
   * Translation updates.

3 files changed, 8 insertions, 12 deletions

diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index ed61dfe4e0e..5c95454b33b 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2009/01/26 15:43:09 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2009/05/19 07:50:13 obache Exp $
 
-DISTNAME=	libgphoto2-2.4.4
+DISTNAME=	libgphoto2-2.4.6
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		ac_cv_path_DOXYGEN=false
-PKGCONFIG_OVERRIDE+=	libgphoto2/libgphoto2.pc.in
+PKGCONFIG_OVERRIDE+=	libgphoto2.pc.in libgphoto2_port/libgphoto2_port.pc.in
 PLIST_VARS+=		libusb
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common
index 05f1d9e037f..e08dd17f13b 100644
--- a/devel/libgphoto2/PLIST.common
+++ b/devel/libgphoto2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.15 2009/01/26 15:43:09 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.16 2009/05/19 07:50:13 obache Exp $
 bin/gphoto2-config
 bin/gphoto2-port-config
 include/gphoto2/gphoto2-abilities-list.h
@@ -155,8 +155,6 @@ 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/nb/LC_MESSAGES/libgphoto2-2.mo
-share/locale/nb/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
@@ -165,8 +163,6 @@ 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/sl/LC_MESSAGES/libgphoto2-2.mo
-share/locale/sl/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
diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo
index 9a072229fa5..95625ff9763 100644
--- a/devel/libgphoto2/distinfo
+++ b/devel/libgphoto2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2009/01/26 15:43:09 drochner Exp $
+$NetBSD: distinfo,v 1.20 2009/05/19 07:50:13 obache Exp $
 
-SHA1 (libgphoto2-2.4.4.tar.bz2) = a1d881e27231037bb860b952560cec36ce6a8988
-RMD160 (libgphoto2-2.4.4.tar.bz2) = bdb26313f1b5b2b425a7ed13bfe10a3f04488209
-Size (libgphoto2-2.4.4.tar.bz2) = 5252280 bytes
+SHA1 (libgphoto2-2.4.6.tar.bz2) = f9fd10495ababce3cf992b36f3a29359e598aea7
+RMD160 (libgphoto2-2.4.6.tar.bz2) = cca194a6db6658887b1b997838c7d6a5af9e2609
+Size (libgphoto2-2.4.6.tar.bz2) = 5268340 bytes
 SHA1 (patch-ab) = 921eea83471110dd85197a7171278c7d0556536b
 SHA1 (patch-aj) = 111b26861d59dddf7a8d0998cb7ae6513114fe38
 SHA1 (patch-ak) = b1e9243cf4d4c78995184b357ba36bdfb0471d76