ports/71857: Update to include the Canon Powershot A85

[Michael Lestinsky]

>Number:         71857
>Category:       ports
>Synopsis:       Update to include the Canon Powershot A85
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 18 09:30:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Michael Lestinsky
>Release:        FreeBSD 5.3-BETA4 i386
>Organization:
>Environment:
System: FreeBSD mobi 5.3-BETA4 FreeBSD 5.3-BETA4 #14: Thu Sep 16 13:14:33 CEST 2004 michael at mobi:/usr/obj/usr/src/sys/mobi i386


	
>Description:
	Update Patchset against libgphoto2 to include the Canon Powershot A85 digital camera
>How-To-Repeat:
	
>Fix:

Index: graphics/libgphoto2/files/patch-Canon
===================================================================
RCS file: /home/cvs/ports/graphics/libgphoto2/files/patch-Canon,v
retrieving revision 1.1
diff -u -r1.1 patch-Canon
--- graphics/libgphoto2/files/patch-Canon       21 Aug 2004 22:21:48 -0000      1.1
+++ graphics/libgphoto2/files/patch-Canon       16 Sep 2004 21:54:42 -0000
@@ -45,13 +45,14 @@
        {"Canon:Optura 20",             CANON_OPT_20,           0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
        {"Canon:Optura 10",             CANON_OPT_10,           0x04A9, 0x3081, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
  
-@@ -184,6 +187,12 @@
+@@ -184,6 +187,13 @@
        /* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */
        {"Canon:PowerShot G5 (normal mode)",    CANON_PS_G5,    0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
        {"Canon:PowerShot A80 (normal mode)",CANON_PS_A80,      0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 +      {"Canon:PowerShot S60 (normal mode)", CANON_PS_S60,     0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 +      {"Canon:Digital IXUS 500 (normal mode)",CANON_PS_S500,  0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 +       {"Canon:PowerShot A75",        CANON_PS_A75,           0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++       {"Canon:PowerShot A85",        CANON_PS_A75,           0x04A9, 0x30b9, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 +      {"Canon:PowerShot A310",        CANON_PS_A310,          0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, 
 +      {"Canon:PowerShot S410 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 +      {"Canon:Digital IXUS 430 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
@@ -112,12 +113,13 @@
   *
   */
  
-@@ -68,6 +68,7 @@
+@@ -68,6 +68,8 @@
   * @CANON_PS_A50: PowerShot A50
   * @CANON_PS_A60: PowerShot A60
   * @CANON_PS_A70: PowerShot A70
 + * @CANON_PS_A75: PowerShot A75
   * @CANON_PS_A80: PowerShot A80
++ * @CANON_PS_A85: PowerShot A85
   * @CANON_PS_PRO70: PowerShot Pro70
   * @CANON_PS_S10: PowerShot S10
 @@ -91,11 +92,15 @@
@@ -136,12 +138,13 @@
   * @CANON_EOS_10D: EOS 10D
   * @CANON_OPT_10: Optura 10
   * @CANON_OPT_20: Optura 20
-@@ -119,6 +124,7 @@
+@@ -119,6 +124,8 @@
        CANON_PS_A50,
        CANON_PS_A60,
        CANON_PS_A70,
 +      CANON_PS_A75,
        CANON_PS_A80,
++      CANON_PS_A85,
        CANON_PS_S10,
        CANON_PS_S20,
 @@ -141,11 +147,13 @@
>Release-Note:
>Audit-Trail:
>Unformatted: