Date: Tue, 14 Mar 2006 00:59:48 GMT From: "Pedro F. Giffuni" <giffunip@asme.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/94429: Update libgphoto2 to version 2.1.99 Message-ID: <200603140059.k2E0xmsc075522@www.freebsd.org> Resent-Message-ID: <200603140100.k2E10W6T016216@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94429
>Category: ports
>Synopsis: Update libgphoto2 to version 2.1.99
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 14 01:00:32 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Pedro F. Giffuni
>Release: 6.0-Release
>Organization:
>Environment:
FreeBSD etoile.cable.net.co 6.0-RELEASE FreeBSD 6.0-RELEASE #12: Sat Feb 11 13:45:47 COT 2006 root@etoile.cable.net.co:/usr/src/sys/amd64/compile/DIMENSION amd64
>Description:
Use BZIP2, added a fix from the CVS version, the pkg-plist has changed so there's a good chance that programs depending on this will have to be updated too. (gphoto2 update coming soon).
>How-To-Repeat:
>Fix:
diff -ruN libgphoto2.orig/Makefile libgphoto2/Makefile
--- libgphoto2.orig/Makefile Mon Mar 13 15:35:49 2006
+++ libgphoto2/Makefile Mon Mar 13 16:31:57 2006
@@ -6,8 +6,7 @@
#
PORTNAME= libgphoto2
-PORTVERSION= 2.1.6
-PORTREVISION= 3
+PORTVERSION= 2.1.99
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gphoto
@@ -18,20 +17,20 @@
LIB_DEPENDS= usb:${PORTSDIR}/devel/libusb \
exif:${PORTSDIR}/graphics/libexif
+USE_BZIP2= yes
USE_GNOME= gnometarget pkgconfig
USE_GETOPT_LONG= yes
-USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
LIBTOOLFILES= configure libgphoto2_port/configure
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= LIBUSB_CFLAGS="${LIBUSB_CFLAGS}" LIBUSB_LIBS="${LIBUSB_LIBS}"
INSTALLS_SHLIB= yes
PLIST_SUB= VERSION="${PORTVERSION}"
MAN3= libgphoto2.3 libgphoto2_port.3
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+LIBUSB_CFLAGS= -I${LOCALBASE}/include
+LIBUSB_LIBS= -L${LOCALBASE}/lib
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
diff -ruN libgphoto2.orig/distinfo libgphoto2/distinfo
--- libgphoto2.orig/distinfo Mon Mar 13 15:35:49 2006
+++ libgphoto2/distinfo Mon Mar 13 15:43:12 2006
@@ -1,3 +1,3 @@
-MD5 (libgphoto2-2.1.6.tar.gz) = 1938cbd9718595fd419907bf2f7c3195
-SHA256 (libgphoto2-2.1.6.tar.gz) = f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80
-SIZE (libgphoto2-2.1.6.tar.gz) = 3205731
+MD5 (libgphoto2-2.1.99.tar.bz2) = 3c6d9cb65661915e07491a6f9215d5a9
+SHA256 (libgphoto2-2.1.99.tar.bz2) = 91e4ea98487907fe687aaf540a9022207baaafd76f0d64b1f8d1fdb67ecfee75
+SIZE (libgphoto2-2.1.99.tar.bz2) = 2696897
diff -ruN libgphoto2.orig/files/patch-cache libgphoto2/files/patch-cache
--- libgphoto2.orig/files/patch-cache Mon Mar 13 15:35:49 2006
+++ libgphoto2/files/patch-cache Wed Dec 31 19:00:00 1969
@@ -1,241 +0,0 @@
-http://sourceforge.net/tracker/?func=detail&atid=108874&aid=1098166&group_id=8874
-===================================================================
-RCS file: /cvsroot/gphoto/libgphoto2/libgphoto2/gphoto2-filesys.c,v
-retrieving revision 1.76
-retrieving revision 1.78
-diff -u -r1.76 -r1.78
---- libgphoto2/gphoto2-filesys.c 2005/04/25 09:14:18 1.76
-+++ libgphoto2/gphoto2-filesys.c 2005/08/25 20:58:03 1.78
-@@ -32,23 +32,8 @@
- #include "gphoto2-result.h"
- #include "gphoto2-file.h"
- #include "gphoto2-port-log.h"
-+#include "gphoto2-setting.h"
-
--#ifdef HAVE_PROCMEMINFO
--# include <fcntl.h>
--#elif (defined(sun) || defined(__sun__)) && defined(__svr4__)
--# include <sys/stat.h>
--# include <sys/swap.h>
--# include <sys/fcntl.h>
--#endif
--
--#ifdef HAVE_SYSCTL
--# if __FreeBSD__
--# include <sys/types.h>
--# elif (__NetBSD__ || __OpenBSD__)
--# include <sys/param.h>
--# endif
--# include <sys/sysctl.h>
--#endif
- #include <limits.h>
-
- #ifdef HAVE_LIBEXIF
-@@ -97,6 +82,9 @@
- CameraFilesystemFile *file;
- } CameraFilesystemFolder;
-
-+#define PICTURES_TO_KEEP 2
-+static int pictures_to_keep = -1;
-+
- #ifdef HAVE_EXIF
-
- static int gp_filesystem_get_file_impl (CameraFilesystem *, const char *,
-@@ -291,7 +279,7 @@
- if (bufsize <= string_len) { \
- GP_DEBUG ("%s: strlen(...) = %d " \
- ">= sizeof(buffer) = %d", \
-- msg, string_len, bufsize \
-+ msg, (int)string_len, (int)bufsize \
- ); \
- gp_context_error (context, "preventing buffer overflow"); \
- return GP_ERROR; \
-@@ -1907,119 +1895,22 @@
- return (GP_OK);
- }
-
--/**
-- * gp_get_free_memory:
-- * @context: a #GPContext
-- * @free:
-- *
-- * Reads the amount of free kB:
-- * - free memory + free swap for Linux
-- * XXX - free memory for BSD (need a way to find free swap)
-- *
-- * Return value: a gphoto2 error code.
-- **/
- static int
--gp_get_free_memory (GPContext *context, unsigned *free)
-+gp_filesystem_lru_count (CameraFilesystem *fs)
- {
--#ifdef HAVE_PROCMEMINFO
--
-- char buf[1024], *head, *tail, *tmp;
-- int n, fd = -1;
-- *free=0;
--
-- if ((fd = open ("/proc/meminfo", O_RDONLY)) == -1) {
-- gp_context_error (context, _("Could not open '/proc/meminfo' "
-- "for reading ('%m'). Make sure the proc filesystem "
-- "is mounted."));
-- return (GP_ERROR);
-- }
--
-- lseek (fd, 0L, SEEK_SET);
-- if ((n = read (fd, buf, sizeof (buf) - 1)) < 0) {
-- gp_context_error (context, _("An error occured while "
-- "reading '/proc/meminfo' ('%m')."));
-- return (GP_ERROR);
-- }
-- buf[n] = '\0';
-- n = 0;
-- head = buf;
-- do {
-- tail = strchr (head, ':');
-- if (!tail)
-- break;
-- *tail = '\0';
-- tmp = head;
-- head = tail + 1;
-- if (!strcmp (tmp, "MemFree")) {
-- *free += strtoul (head, NULL, 10);
-- n++;
-- } else if (!strcmp (tmp, "SwapFree")) {
-- *free += strtoul (head, NULL, 10);
-- n++;
-- }
-- tail = strchr (head, '\n');
-- if (!tail)
-- break;
-- head = tail + 1;
-- } while (n != 2);
-- return (GP_OK);
--
--#elif HAVE_SYSCTL && (__FreeBSD__ || __NetBSD__ || __OpenBSD__ || __APPLE__ )
-+ CameraFilesystemFile *ptr;
-+ int count = 0;
-
-- int mib[2] = { CTL_HW, HW_PHYSMEM };
-- unsigned long value;
-- size_t valuelen = sizeof(value);
-- *free=0;
-- if (sysctl(mib, 2 , &value, &valuelen, NULL, 0) == -1) {
-- gp_context_error (context, _("sysctl call failed ('%m')."));
-- return (GP_ERROR);
-+ if (!fs) return 0;
-+ ptr = fs->lru_first;
-+ while (ptr) {
-+ if (ptr->normal || ptr->raw || ptr->audio)
-+ count++;
-+ ptr = ptr->lru_next;
- }
-- *free=value;
-- return (GP_OK);
--
--#elif (defined(sun) || defined(__sun__)) && defined(__svr4__)
--
-- long freemem=0;
-- long freeswap=0;
-- int page_size;
-- static struct anoninfo anon;
--
-- *free = 0;
--
-- page_size = getpagesize();
-- if ( (freemem = sysconf(_SC_AVPHYS_PAGES)) == -1 )
-- {
-- gp_context_error (context, _("sysconf call failed ('%m')."));
-- return (GP_ERROR);
-- }
--
-- freemem *= page_size;
--
-- if (swapctl(SC_AINFO, &anon) == -1)
-- {
-- gp_context_error (context, _("swapctl call failed ('%m')."));
-- return (GP_ERROR);
-- }
--
-- freeswap = anon.ani_max - anon.ani_resv;
-- freeswap *= page_size;
--
-- printf("Free Memory : %ld Swap %ld\n",freemem,freeswap);
--
-- *free = freemem + freeswap;
-- return (GP_OK);
--
--#else
--
-- /* No way to know the free memory on this system */
-- *free = UINT_MAX;
-- return (GP_OK);
--
--#endif
--
-+ return count;
- }
-
--
- static int
- gp_filesystem_lru_update (CameraFilesystem *fs, const char *folder,
- CameraFile *file, GPContext *context)
-@@ -2029,7 +1920,7 @@
- const char *filename;
- unsigned long int size;
- int x, y;
-- unsigned int free;
-+ char cached_images[1024];
-
- CHECK_NULL (fs && folder && file);
-
-@@ -2038,25 +1929,34 @@
- CR (gp_file_get_data_and_size (file, NULL, &size));
-
- /*
-- * The following is a simple case which is used to test the LRU.
-- * I need to implement a way to pass a limit and then use it instead
-- * of 600000. If the limit is not defined use the gp_get_free_memory
-+ * The following is a very simple case which is used to prune
-+ * the LRU. We keep PICTURES_TO_KEEP pictures in the LRU.
-+ *
-+ * We have 2 main scenarios:
-+ * - query all thumbnails (repeatedly) ... they are cached and
-+ * are not pruned by lru free.
-+ * - download all images, linear. no real need for caching.
-+ * - skip back 1 image (in viewers) (really? I don't know.)
-+ *
-+ * So lets just keep 2 pictures in memory.
- */
--#if 0
-- while (fs->lru_size + size > 600000) {
-- GP_DEBUG ("Freeing cached data before adding new data "
-- "(cache=%ld, new=%ld)", fs->lru_size, size);
-- CR (gp_filesystem_lru_free (fs));
-+ if (pictures_to_keep == -1) {
-+ if (gp_setting_get ("libgphoto", "cached-images", cached_images) == GP_OK) {
-+ pictures_to_keep = atoi(cached_images);
-+ } else {
-+ /* store a default setting */
-+ sprintf (cached_images, "%d", PICTURES_TO_KEEP);
-+ gp_setting_set ("libgphoto", "cached-images", cached_images);
-+ }
- }
--#endif
-
-- CR (gp_get_free_memory (context, &free));
-- while (free < (size / 1024 + 1024)) {
-- GP_DEBUG ("Freeing cached data before adding new data "
-- "(cache=%ldB, new=%ldB, free=%dkB)",
-- fs->lru_size, size, free);
-+ if (pictures_to_keep < 0) /* also sanity check, but no upper limit. */
-+ pictures_to_keep = PICTURES_TO_KEEP;
-+
-+ x = gp_filesystem_lru_count (fs);
-+ while (x > pictures_to_keep) {
- CR (gp_filesystem_lru_free (fs));
-- CR (gp_get_free_memory (context, &free));
-+ x = gp_filesystem_lru_count (fs);
- }
-
- GP_DEBUG ("Adding file '%s' from folder '%s' to the fscache LRU list "
diff -ruN libgphoto2.orig/files/patch-libgphoto2-serial-disk.c libgphoto2/files/patch-libgphoto2-serial-disk.c
--- libgphoto2.orig/files/patch-libgphoto2-serial-disk.c Wed Dec 31 19:00:00 1969
+++ libgphoto2/files/patch-libgphoto2-serial-disk.c Mon Mar 13 17:46:54 2006
@@ -0,0 +1,47 @@
+===================================================================
+RCS file: /cvsroot/gphoto/libgphoto2/libgphoto2_port/disk/disk.c,v
+retrieving revision 1.4
+retrieving revision 1.7
+diff -u -r1.4 -r1.7
+--- libgphoto2_port/disk/disk.c 2005/08/14 14:01:38 1.4
++++ libgphoto2_port/disk/disk.c 2006/02/19 10:48:10 1.7
+@@ -33,7 +33,9 @@
+ #include <sys/param.h>
+ #include <dirent.h>
+ #include <string.h>
+-#include <mntent.h>
++#ifdef HAVE_MNTENT_H
++# include <mntent.h>
++#endif
+
+ #ifdef HAVE_HAL
+ #include <hal/libhal.h>
+@@ -172,10 +174,11 @@
+ }
+
+ libhal_free_string_array (volumes);
+- libhal_ctx_free(ctx);
+-
+- dbus_connection_unref(dbus_connection);
++ libhal_ctx_free (ctx);
++ dbus_connection_disconnect (dbus_connection);
++ dbus_connection_unref (dbus_connection);
+ #else
++# ifdef HAVE_MNTENT_H
+ FILE *mnt;
+ struct mntent *mntent;
+ char path[1024];
+@@ -226,7 +229,13 @@
+ CHECK (gp_port_info_list_append (list, info));
+ }
+ endmntent(mnt);
++# endif
+ #endif
++ /* generic disk:/xxx/ matcher */
++ info.type = GP_PORT_DISK;
++ memset (info.name, 0, sizeof(info.name));
++ snprintf (info.path, sizeof(info.path), "^disk:");
++ CHECK (gp_port_info_list_append (list, info));
+ return GP_OK;
+ }
+
diff -ruN libgphoto2.orig/files/patch-libgphoto2_port-serial-unix.c libgphoto2/files/patch-libgphoto2_port-serial-unix.c
--- libgphoto2.orig/files/patch-libgphoto2_port-serial-unix.c Mon Mar 13 15:35:49 2006
+++ libgphoto2/files/patch-libgphoto2_port-serial-unix.c Mon Mar 13 16:36:23 2006
@@ -1,9 +1,9 @@
---- libgphoto2_port/serial/unix.c.orig Wed Jan 18 18:06:35 2006
-+++ libgphoto2_port/serial/unix.c Wed Jan 18 18:08:39 2006
+--- libgphoto2_port/serial/unix.c.orig Mon May 2 14:36:52 2005
++++ libgphoto2_port/serial/unix.c Mon Mar 13 16:35:59 2006
@@ -108,7 +108,11 @@
/* FreeBSD */
- #if defined(__FreeBSD__)
+ #ifdef __FreeBSD__
+#if __FreeBSD_version < 600000
#define GP_PORT_SERIAL_PREFIX "/dev/cuaa%x"
+#else
diff -ruN libgphoto2.orig/pkg-plist libgphoto2/pkg-plist
--- libgphoto2.orig/pkg-plist Mon Mar 13 15:35:49 2006
+++ libgphoto2/pkg-plist Mon Mar 13 19:33:40 2006
@@ -18,171 +18,186 @@
include/gphoto2/gphoto2-version.h
include/gphoto2/gphoto2-widget.h
include/gphoto2/gphoto2.h
-lib/gphoto2/%%VERSION%%/libgphoto2_adc65.a
-lib/gphoto2/%%VERSION%%/libgphoto2_adc65.la
-lib/gphoto2/%%VERSION%%/libgphoto2_adc65.so
-lib/gphoto2/%%VERSION%%/libgphoto2_agfa_cl20.a
-lib/gphoto2/%%VERSION%%/libgphoto2_agfa_cl20.la
-lib/gphoto2/%%VERSION%%/libgphoto2_agfa_cl20.so
-lib/gphoto2/%%VERSION%%/libgphoto2_aox.a
-lib/gphoto2/%%VERSION%%/libgphoto2_aox.la
-lib/gphoto2/%%VERSION%%/libgphoto2_aox.so
-lib/gphoto2/%%VERSION%%/libgphoto2_barbie.a
-lib/gphoto2/%%VERSION%%/libgphoto2_barbie.la
-lib/gphoto2/%%VERSION%%/libgphoto2_barbie.so
-lib/gphoto2/%%VERSION%%/libgphoto2_canon.a
-lib/gphoto2/%%VERSION%%/libgphoto2_canon.la
-lib/gphoto2/%%VERSION%%/libgphoto2_canon.so
-lib/gphoto2/%%VERSION%%/libgphoto2_casio_qv.a
-lib/gphoto2/%%VERSION%%/libgphoto2_casio_qv.la
-lib/gphoto2/%%VERSION%%/libgphoto2_casio_qv.so
-lib/gphoto2/%%VERSION%%/libgphoto2_digita.a
-lib/gphoto2/%%VERSION%%/libgphoto2_digita.la
-lib/gphoto2/%%VERSION%%/libgphoto2_digita.so
-lib/gphoto2/%%VERSION%%/libgphoto2_dimagev.a
-lib/gphoto2/%%VERSION%%/libgphoto2_dimagev.la
-lib/gphoto2/%%VERSION%%/libgphoto2_dimagev.so
-lib/gphoto2/%%VERSION%%/libgphoto2_dimera3500.a
-lib/gphoto2/%%VERSION%%/libgphoto2_dimera3500.la
-lib/gphoto2/%%VERSION%%/libgphoto2_dimera3500.so
-lib/gphoto2/%%VERSION%%/libgphoto2_directory.a
-lib/gphoto2/%%VERSION%%/libgphoto2_directory.la
-lib/gphoto2/%%VERSION%%/libgphoto2_directory.so
-lib/gphoto2/%%VERSION%%/libgphoto2_enigma13.a
-lib/gphoto2/%%VERSION%%/libgphoto2_enigma13.la
-lib/gphoto2/%%VERSION%%/libgphoto2_enigma13.so
-lib/gphoto2/%%VERSION%%/libgphoto2_ez200.a
-lib/gphoto2/%%VERSION%%/libgphoto2_ez200.la
-lib/gphoto2/%%VERSION%%/libgphoto2_ez200.so
-lib/gphoto2/%%VERSION%%/libgphoto2_fuji.a
-lib/gphoto2/%%VERSION%%/libgphoto2_fuji.la
-lib/gphoto2/%%VERSION%%/libgphoto2_fuji.so
-lib/gphoto2/%%VERSION%%/libgphoto2_gsmart300.a
-lib/gphoto2/%%VERSION%%/libgphoto2_gsmart300.la
-lib/gphoto2/%%VERSION%%/libgphoto2_gsmart300.so
-lib/gphoto2/%%VERSION%%/libgphoto2_iclick.a
-lib/gphoto2/%%VERSION%%/libgphoto2_iclick.la
-lib/gphoto2/%%VERSION%%/libgphoto2_iclick.so
-lib/gphoto2/%%VERSION%%/libgphoto2_jamcam.a
-lib/gphoto2/%%VERSION%%/libgphoto2_jamcam.la
-lib/gphoto2/%%VERSION%%/libgphoto2_jamcam.so
-lib/gphoto2/%%VERSION%%/libgphoto2_jd11.a
-lib/gphoto2/%%VERSION%%/libgphoto2_jd11.la
-lib/gphoto2/%%VERSION%%/libgphoto2_jd11.so
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc120.a
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc120.la
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc120.so
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc210.a
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc210.la
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc210.so
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc240.a
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc240.la
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc240.so
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc3200.a
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc3200.la
-lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc3200.so
-lib/gphoto2/%%VERSION%%/libgphoto2_konica.a
-lib/gphoto2/%%VERSION%%/libgphoto2_konica.la
-lib/gphoto2/%%VERSION%%/libgphoto2_konica.so
-lib/gphoto2/%%VERSION%%/libgphoto2_konica_qm150.a
-lib/gphoto2/%%VERSION%%/libgphoto2_konica_qm150.la
-lib/gphoto2/%%VERSION%%/libgphoto2_konica_qm150.so
-lib/gphoto2/%%VERSION%%/libgphoto2_largan.a
-lib/gphoto2/%%VERSION%%/libgphoto2_largan.la
-lib/gphoto2/%%VERSION%%/libgphoto2_largan.so
-lib/gphoto2/%%VERSION%%/libgphoto2_mars.a
-lib/gphoto2/%%VERSION%%/libgphoto2_mars.la
-lib/gphoto2/%%VERSION%%/libgphoto2_mars.so
-lib/gphoto2/%%VERSION%%/libgphoto2_mustek.a
-lib/gphoto2/%%VERSION%%/libgphoto2_mustek.la
-lib/gphoto2/%%VERSION%%/libgphoto2_mustek.so
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_coolshot.a
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_coolshot.la
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_coolshot.so
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1000.a
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1000.la
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1000.so
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1580.a
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1580.la
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1580.so
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_l859.a
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_l859.la
-lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_l859.so
-lib/gphoto2/%%VERSION%%/libgphoto2_pccam300.a
-lib/gphoto2/%%VERSION%%/libgphoto2_pccam300.la
-lib/gphoto2/%%VERSION%%/libgphoto2_pccam300.so
-lib/gphoto2/%%VERSION%%/libgphoto2_pccam600.a
-lib/gphoto2/%%VERSION%%/libgphoto2_pccam600.la
-lib/gphoto2/%%VERSION%%/libgphoto2_pccam600.so
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc320.a
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc320.la
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc320.so
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc640.a
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc640.la
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc640.so
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc700.a
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc700.la
-lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc700.so
-lib/gphoto2/%%VERSION%%/libgphoto2_ptp2.a
-lib/gphoto2/%%VERSION%%/libgphoto2_ptp2.la
-lib/gphoto2/%%VERSION%%/libgphoto2_ptp2.so
-lib/gphoto2/%%VERSION%%/libgphoto2_ricoh.a
-lib/gphoto2/%%VERSION%%/libgphoto2_ricoh.la
-lib/gphoto2/%%VERSION%%/libgphoto2_ricoh.so
-lib/gphoto2/%%VERSION%%/libgphoto2_ricoh_g3.a
-lib/gphoto2/%%VERSION%%/libgphoto2_ricoh_g3.la
-lib/gphoto2/%%VERSION%%/libgphoto2_ricoh_g3.so
-lib/gphoto2/%%VERSION%%/libgphoto2_samsung.a
-lib/gphoto2/%%VERSION%%/libgphoto2_samsung.la
-lib/gphoto2/%%VERSION%%/libgphoto2_samsung.so
-lib/gphoto2/%%VERSION%%/libgphoto2_sierra.a
-lib/gphoto2/%%VERSION%%/libgphoto2_sierra.la
-lib/gphoto2/%%VERSION%%/libgphoto2_sierra.so
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink.a
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink.la
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink.so
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink2.a
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink2.la
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink2.so
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_web2.a
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_web2.la
-lib/gphoto2/%%VERSION%%/libgphoto2_sipix_web2.so
-lib/gphoto2/%%VERSION%%/libgphoto2_smal.a
-lib/gphoto2/%%VERSION%%/libgphoto2_smal.la
-lib/gphoto2/%%VERSION%%/libgphoto2_smal.so
-lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf1.a
-lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf1.la
-lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf1.so
-lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf55.a
-lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf55.la
-lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf55.so
-lib/gphoto2/%%VERSION%%/libgphoto2_soundvision.a
-lib/gphoto2/%%VERSION%%/libgphoto2_soundvision.la
-lib/gphoto2/%%VERSION%%/libgphoto2_soundvision.so
-lib/gphoto2/%%VERSION%%/libgphoto2_spca50x.a
-lib/gphoto2/%%VERSION%%/libgphoto2_spca50x.la
-lib/gphoto2/%%VERSION%%/libgphoto2_spca50x.so
-lib/gphoto2/%%VERSION%%/libgphoto2_sq905.a
-lib/gphoto2/%%VERSION%%/libgphoto2_sq905.la
-lib/gphoto2/%%VERSION%%/libgphoto2_sq905.so
-lib/gphoto2/%%VERSION%%/libgphoto2_stv0674.a
-lib/gphoto2/%%VERSION%%/libgphoto2_stv0674.la
-lib/gphoto2/%%VERSION%%/libgphoto2_stv0674.so
-lib/gphoto2/%%VERSION%%/libgphoto2_stv0680.a
-lib/gphoto2/%%VERSION%%/libgphoto2_stv0680.la
-lib/gphoto2/%%VERSION%%/libgphoto2_stv0680.so
-lib/gphoto2/%%VERSION%%/libgphoto2_sx330z.a
-lib/gphoto2/%%VERSION%%/libgphoto2_sx330z.la
-lib/gphoto2/%%VERSION%%/libgphoto2_sx330z.so
-lib/gphoto2/%%VERSION%%/libgphoto2_toshiba_pdrm11.a
-lib/gphoto2/%%VERSION%%/libgphoto2_toshiba_pdrm11.la
-lib/gphoto2/%%VERSION%%/libgphoto2_toshiba_pdrm11.so
-lib/gphoto2_port/0.5.1/libgphoto2_port_serial.a
-lib/gphoto2_port/0.5.1/libgphoto2_port_serial.la
-lib/gphoto2_port/0.5.1/libgphoto2_port_serial.so
-lib/gphoto2_port/0.5.1/libgphoto2_port_usb.a
-lib/gphoto2_port/0.5.1/libgphoto2_port_usb.la
-lib/gphoto2_port/0.5.1/libgphoto2_port_usb.so
+lib/libgphoto2/%%VERSION%%/adc65.a
+lib/libgphoto2/%%VERSION%%/adc65.la
+lib/libgphoto2/%%VERSION%%/adc65.so
+lib/libgphoto2/%%VERSION%%/agfa_cl20.a
+lib/libgphoto2/%%VERSION%%/agfa_cl20.la
+lib/libgphoto2/%%VERSION%%/agfa_cl20.so
+lib/libgphoto2/%%VERSION%%/aox.a
+lib/libgphoto2/%%VERSION%%/aox.la
+lib/libgphoto2/%%VERSION%%/aox.so
+lib/libgphoto2/%%VERSION%%/barbie.a
+lib/libgphoto2/%%VERSION%%/barbie.la
+lib/libgphoto2/%%VERSION%%/barbie.so
+lib/libgphoto2/%%VERSION%%/canon.a
+lib/libgphoto2/%%VERSION%%/canon.la
+lib/libgphoto2/%%VERSION%%/canon.so
+lib/libgphoto2/%%VERSION%%/casio_qv.a
+lib/libgphoto2/%%VERSION%%/casio_qv.la
+lib/libgphoto2/%%VERSION%%/casio_qv.so
+lib/libgphoto2/%%VERSION%%/digita.a
+lib/libgphoto2/%%VERSION%%/digita.la
+lib/libgphoto2/%%VERSION%%/digita.so
+lib/libgphoto2/%%VERSION%%/dimagev.a
+lib/libgphoto2/%%VERSION%%/dimagev.la
+lib/libgphoto2/%%VERSION%%/dimagev.so
+lib/libgphoto2/%%VERSION%%/dimera3500.a
+lib/libgphoto2/%%VERSION%%/dimera3500.la
+lib/libgphoto2/%%VERSION%%/dimera3500.so
+lib/libgphoto2/%%VERSION%%/directory.a
+lib/libgphoto2/%%VERSION%%/directory.la
+lib/libgphoto2/%%VERSION%%/directory.so
+lib/libgphoto2/%%VERSION%%/digigr8.a
+lib/libgphoto2/%%VERSION%%/digigr8.la
+lib/libgphoto2/%%VERSION%%/digigr8.so
+lib/libgphoto2/%%VERSION%%/enigma13.a
+lib/libgphoto2/%%VERSION%%/enigma13.la
+lib/libgphoto2/%%VERSION%%/enigma13.so
+lib/libgphoto2/%%VERSION%%/fuji.a
+lib/libgphoto2/%%VERSION%%/fuji.la
+lib/libgphoto2/%%VERSION%%/fuji.so
+lib/libgphoto2/%%VERSION%%/gsmart300.a
+lib/libgphoto2/%%VERSION%%/gsmart300.la
+lib/libgphoto2/%%VERSION%%/gsmart300.so
+lib/libgphoto2/%%VERSION%%/hp215.a
+lib/libgphoto2/%%VERSION%%/hp215.la
+lib/libgphoto2/%%VERSION%%/hp215.so
+lib/libgphoto2/%%VERSION%%/iclick.a
+lib/libgphoto2/%%VERSION%%/iclick.la
+lib/libgphoto2/%%VERSION%%/iclick.so
+lib/libgphoto2/%%VERSION%%/jamcam.a
+lib/libgphoto2/%%VERSION%%/jamcam.la
+lib/libgphoto2/%%VERSION%%/jamcam.so
+lib/libgphoto2/%%VERSION%%/jd11.a
+lib/libgphoto2/%%VERSION%%/jd11.la
+lib/libgphoto2/%%VERSION%%/jd11.so
+lib/libgphoto2/%%VERSION%%/kodak_dc120.a
+lib/libgphoto2/%%VERSION%%/kodak_dc120.la
+lib/libgphoto2/%%VERSION%%/kodak_dc120.so
+lib/libgphoto2/%%VERSION%%/kodak_dc210.a
+lib/libgphoto2/%%VERSION%%/kodak_dc210.la
+lib/libgphoto2/%%VERSION%%/kodak_dc210.so
+lib/libgphoto2/%%VERSION%%/kodak_dc240.a
+lib/libgphoto2/%%VERSION%%/kodak_dc240.la
+lib/libgphoto2/%%VERSION%%/kodak_dc240.so
+lib/libgphoto2/%%VERSION%%/kodak_dc3200.a
+lib/libgphoto2/%%VERSION%%/kodak_dc3200.la
+lib/libgphoto2/%%VERSION%%/kodak_dc3200.so
+lib/libgphoto2/%%VERSION%%/kodak_ez200.a
+lib/libgphoto2/%%VERSION%%/kodak_ez200.la
+lib/libgphoto2/%%VERSION%%/kodak_ez200.so
+lib/libgphoto2/%%VERSION%%/konica.a
+lib/libgphoto2/%%VERSION%%/konica.la
+lib/libgphoto2/%%VERSION%%/konica.so
+lib/libgphoto2/%%VERSION%%/konica_qm150.a
+lib/libgphoto2/%%VERSION%%/konica_qm150.la
+lib/libgphoto2/%%VERSION%%/konica_qm150.so
+lib/libgphoto2/%%VERSION%%/largan.a
+lib/libgphoto2/%%VERSION%%/largan.la
+lib/libgphoto2/%%VERSION%%/largan.so
+lib/libgphoto2/%%VERSION%%/lg_gsm.a
+lib/libgphoto2/%%VERSION%%/lg_gsm.la
+lib/libgphoto2/%%VERSION%%/lg_gsm.so
+lib/libgphoto2/%%VERSION%%/mars.a
+lib/libgphoto2/%%VERSION%%/mars.la
+lib/libgphoto2/%%VERSION%%/mars.so
+lib/libgphoto2/%%VERSION%%/mustek.a
+lib/libgphoto2/%%VERSION%%/mustek.la
+lib/libgphoto2/%%VERSION%%/mustek.so
+lib/libgphoto2/%%VERSION%%/panasonic_coolshot.a
+lib/libgphoto2/%%VERSION%%/panasonic_coolshot.la
+lib/libgphoto2/%%VERSION%%/panasonic_coolshot.so
+lib/libgphoto2/%%VERSION%%/panasonic_dc1000.a
+lib/libgphoto2/%%VERSION%%/panasonic_dc1000.la
+lib/libgphoto2/%%VERSION%%/panasonic_dc1000.so
+lib/libgphoto2/%%VERSION%%/panasonic_dc1580.a
+lib/libgphoto2/%%VERSION%%/panasonic_dc1580.la
+lib/libgphoto2/%%VERSION%%/panasonic_dc1580.so
+lib/libgphoto2/%%VERSION%%/panasonic_l859.a
+lib/libgphoto2/%%VERSION%%/panasonic_l859.la
+lib/libgphoto2/%%VERSION%%/panasonic_l859.so
+lib/libgphoto2/%%VERSION%%/pccam300.a
+lib/libgphoto2/%%VERSION%%/pccam300.la
+lib/libgphoto2/%%VERSION%%/pccam300.so
+lib/libgphoto2/%%VERSION%%/pccam600.a
+lib/libgphoto2/%%VERSION%%/pccam600.la
+lib/libgphoto2/%%VERSION%%/pccam600.so
+lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
+lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
+lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
+lib/libgphoto2/%%VERSION%%/polaroid_pdc640.a
+lib/libgphoto2/%%VERSION%%/polaroid_pdc640.la
+lib/libgphoto2/%%VERSION%%/polaroid_pdc640.so
+lib/libgphoto2/%%VERSION%%/polaroid_pdc700.a
+lib/libgphoto2/%%VERSION%%/polaroid_pdc700.la
+lib/libgphoto2/%%VERSION%%/polaroid_pdc700.so
+lib/libgphoto2/%%VERSION%%/ptp2.a
+lib/libgphoto2/%%VERSION%%/ptp2.la
+lib/libgphoto2/%%VERSION%%/ptp2.so
+lib/libgphoto2/%%VERSION%%/ricoh.a
+lib/libgphoto2/%%VERSION%%/ricoh.la
+lib/libgphoto2/%%VERSION%%/ricoh.so
+lib/libgphoto2/%%VERSION%%/ricoh_g3.a
+lib/libgphoto2/%%VERSION%%/ricoh_g3.la
+lib/libgphoto2/%%VERSION%%/ricoh_g3.so
+lib/libgphoto2/%%VERSION%%/samsung.a
+lib/libgphoto2/%%VERSION%%/samsung.la
+lib/libgphoto2/%%VERSION%%/samsung.so
+lib/libgphoto2/%%VERSION%%/sierra.a
+lib/libgphoto2/%%VERSION%%/sierra.la
+lib/libgphoto2/%%VERSION%%/sierra.so
+lib/libgphoto2/%%VERSION%%/sipix_blink.a
+lib/libgphoto2/%%VERSION%%/sipix_blink.la
+lib/libgphoto2/%%VERSION%%/sipix_blink.so
+lib/libgphoto2/%%VERSION%%/sipix_blink2.a
+lib/libgphoto2/%%VERSION%%/sipix_blink2.la
+lib/libgphoto2/%%VERSION%%/sipix_blink2.so
+lib/libgphoto2/%%VERSION%%/sipix_web2.a
+lib/libgphoto2/%%VERSION%%/sipix_web2.la
+lib/libgphoto2/%%VERSION%%/sipix_web2.so
+lib/libgphoto2/%%VERSION%%/smal.a
+lib/libgphoto2/%%VERSION%%/smal.la
+lib/libgphoto2/%%VERSION%%/smal.so
+lib/libgphoto2/%%VERSION%%/sonix.a
+lib/libgphoto2/%%VERSION%%/sonix.la
+lib/libgphoto2/%%VERSION%%/sonix.so
+lib/libgphoto2/%%VERSION%%/sony_dscf1.a
+lib/libgphoto2/%%VERSION%%/sony_dscf1.la
+lib/libgphoto2/%%VERSION%%/sony_dscf1.so
+lib/libgphoto2/%%VERSION%%/sony_dscf55.a
+lib/libgphoto2/%%VERSION%%/sony_dscf55.la
+lib/libgphoto2/%%VERSION%%/sony_dscf55.so
+lib/libgphoto2/%%VERSION%%/soundvision.a
+lib/libgphoto2/%%VERSION%%/soundvision.la
+lib/libgphoto2/%%VERSION%%/soundvision.so
+lib/libgphoto2/%%VERSION%%/spca50x.a
+lib/libgphoto2/%%VERSION%%/spca50x.la
+lib/libgphoto2/%%VERSION%%/spca50x.so
+lib/libgphoto2/%%VERSION%%/sq905.a
+lib/libgphoto2/%%VERSION%%/sq905.la
+lib/libgphoto2/%%VERSION%%/sq905.so
+lib/libgphoto2/%%VERSION%%/stv0674.a
+lib/libgphoto2/%%VERSION%%/stv0674.la
+lib/libgphoto2/%%VERSION%%/stv0674.so
+lib/libgphoto2/%%VERSION%%/stv0680.a
+lib/libgphoto2/%%VERSION%%/stv0680.la
+lib/libgphoto2/%%VERSION%%/stv0680.so
+lib/libgphoto2/%%VERSION%%/sx330z.a
+lib/libgphoto2/%%VERSION%%/sx330z.la
+lib/libgphoto2/%%VERSION%%/sx330z.so
+lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.a
+lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.la
+lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.so
+lib/libgphoto2_port/0.5.2/disk.a
+lib/libgphoto2_port/0.5.2/disk.la
+lib/libgphoto2_port/0.5.2/disk.so
+lib/libgphoto2_port/0.5.2/serial.a
+lib/libgphoto2_port/0.5.2/serial.la
+lib/libgphoto2_port/0.5.2/serial.so
+lib/libgphoto2_port/0.5.2/usb.a
+lib/libgphoto2_port/0.5.2/usb.la
+lib/libgphoto2_port/0.5.2/usb.so
lib/libgphoto2.a
lib/libgphoto2.la
lib/libgphoto2.so
@@ -204,42 +219,27 @@
%%DATADIR%%/%%VERSION%%/konica/japanese
%%DATADIR%%/%%VERSION%%/konica/korean
%%DATADIR%%/%%VERSION%%/konica/spanish
-%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-2.mo
%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2_port-0.mo
-%%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/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
-%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo
@dirrm %%DATADIR%%/%%VERSION%%/konica
@dirrm %%DATADIR%%/%%VERSION%%
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/gphoto2_port/0.5.1
-@dirrm lib/gphoto2_port
-@dirrm lib/gphoto2/%%VERSION%%
-@dirrm lib/gphoto2
+@dirrm lib/libgphoto2_port/0.5.2
+@dirrm lib/libgphoto2_port
+@dirrm lib/libgphoto2/%%VERSION%%
+@dirrm lib/libgphoto2
@dirrm include/gphoto2
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603140059.k2E0xmsc075522>