Attachment #63280 for bug #94429

View | Details | Raw Unified | Return to bug 94429
Collapse All | Expand All




#

PORTNAME=	libgphoto2
PORTVERSION=	2.1.99
PORTREVISION=	3
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	gphoto

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+=	LIBUSB_CFLAGS="${LIBUSB_CFLAGS}" LIBUSB_LIBS="${LIBUSB_LIBS}"
INSTALLS_SHLIB=	yes
PLIST_SUB=	VERSION="${PORTVERSION}"

MAN3=		libgphoto2.3 libgphoto2_port.3

LIBUSB_CFLAGS=	-I${LOCALBASE}/include
LIBUSB_LIBS=	-L${LOCALBASE}/lib

.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=	--disable-nls

Lines 1-3 Link Here

(-)libgphoto2/distinfo (-3 / +3 lines)
1	MD5 (libgphoto2-2.1.6.tar.gz) = 1938cbd9718595fd419907bf2f7c3195	1	MD5 (libgphoto2-2.1.99.tar.bz2) = 3c6d9cb65661915e07491a6f9215d5a9
2	SHA256 (libgphoto2-2.1.6.tar.gz) = f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80	2	SHA256 (libgphoto2-2.1.99.tar.bz2) = 91e4ea98487907fe687aaf540a9022207baaafd76f0d64b1f8d1fdb67ecfee75
3	SIZE (libgphoto2-2.1.6.tar.gz) = 3205731	3	SIZE (libgphoto2-2.1.99.tar.bz2) = 2696897




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 "




===================================================================
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;
 }
 

Lines 1-9 Link Here

(-)libgphoto2/files/patch-libgphoto2_port-serial-unix.c (-3 / +3 lines)
1	--- libgphoto2_port/serial/unix.c.orig Wed Jan 18 18:06:35 2006	1	--- libgphoto2_port/serial/unix.c.orig Mon May 2 14:36:52 2005
2	+++ libgphoto2_port/serial/unix.c Wed Jan 18 18:08:39 2006	2	+++ libgphoto2_port/serial/unix.c Mon Mar 13 16:35:59 2006
3	@@ -108,7 +108,11 @@	3	@@ -108,7 +108,11 @@
4		4
5	/* FreeBSD */	5	/* FreeBSD */
6	#if defined(__FreeBSD__)	6	#ifdef __FreeBSD__
7	+#if __FreeBSD_version < 600000	7	+#if __FreeBSD_version < 600000
8	#define GP_PORT_SERIAL_PREFIX "/dev/cuaa%x"	8	#define GP_PORT_SERIAL_PREFIX "/dev/cuaa%x"
9	+#else	9	+#else




include/gphoto2/gphoto2-version.h
include/gphoto2/gphoto2-widget.h
include/gphoto2/gphoto2.h
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

%%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/libgphoto2_port/0.5.2
@dirrm lib/libgphoto2_port
@dirrm lib/libgphoto2/%%VERSION%%
@dirrm lib/libgphoto2
@dirrm include/gphoto2

Return to bug 94429

Lines 6-13 Link Here

(-)libgphoto2/Makefile (-6 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= libgphoto2	8	PORTNAME= libgphoto2
9	PORTVERSION= 2.1.6	9	PORTVERSION= 2.1.99
10	PORTREVISION= 3
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= gphoto	12	MASTER_SITE_SUBDIR= gphoto
Lines 18-37 Link Here
18	LIB_DEPENDS= usb:${PORTSDIR}/devel/libusb \	17	LIB_DEPENDS= usb:${PORTSDIR}/devel/libusb \
19	exif:${PORTSDIR}/graphics/libexif	18	exif:${PORTSDIR}/graphics/libexif
20		19
		20	USE_BZIP2= yes
21	USE_GNOME= gnometarget pkgconfig	21	USE_GNOME= gnometarget pkgconfig
22	USE_GETOPT_LONG= yes	22	USE_GETOPT_LONG= yes
23	USE_REINPLACE= yes
24	USE_GMAKE= yes	23	USE_GMAKE= yes
25	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
26	LIBTOOLFILES= configure libgphoto2_port/configure	25	LIBTOOLFILES= configure libgphoto2_port/configure
27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	26	CONFIGURE_ENV+= LIBUSB_CFLAGS="${LIBUSB_CFLAGS}" LIBUSB_LIBS="${LIBUSB_LIBS}"
28	INSTALLS_SHLIB= yes	27	INSTALLS_SHLIB= yes
29	PLIST_SUB= VERSION="${PORTVERSION}"	28	PLIST_SUB= VERSION="${PORTVERSION}"
30		29
31	MAN3= libgphoto2.3 libgphoto2_port.3	30	MAN3= libgphoto2.3 libgphoto2_port.3
32		31
33	CPPFLAGS= -I${LOCALBASE}/include	32	LIBUSB_CFLAGS= -I${LOCALBASE}/include
34	LDFLAGS= -L${LOCALBASE}/lib	33	LIBUSB_LIBS= -L${LOCALBASE}/lib
35		34
36	.if defined(WITHOUT_NLS)	35	.if defined(WITHOUT_NLS)
37	CONFIGURE_ARGS+= --disable-nls	36	CONFIGURE_ARGS+= --disable-nls

Lines 1-241 Link Here

(-)libgphoto2/files/patch-cache (-241 lines)
1	http://sourceforge.net/tracker/?func=detail&atid=108874&aid=1098166&group_id=8874
2	===================================================================
3	RCS file: /cvsroot/gphoto/libgphoto2/libgphoto2/gphoto2-filesys.c,v
4	retrieving revision 1.76
5	retrieving revision 1.78
6	diff -u -r1.76 -r1.78
7	--- libgphoto2/gphoto2-filesys.c 2005/04/25 09:14:18 1.76
8	+++ libgphoto2/gphoto2-filesys.c 2005/08/25 20:58:03 1.78
9	@@ -32,23 +32,8 @@
10	#include "gphoto2-result.h"
11	#include "gphoto2-file.h"
12	#include "gphoto2-port-log.h"
13	+#include "gphoto2-setting.h"
14
15	-#ifdef HAVE_PROCMEMINFO
16	-# include <fcntl.h>
17	-#elif (defined(sun) \|\| defined(__sun__)) && defined(__svr4__)
18	-# include <sys/stat.h>
19	-# include <sys/swap.h>
20	-# include <sys/fcntl.h>
21	-#endif
22	-
23	-#ifdef HAVE_SYSCTL
24	-# if __FreeBSD__
25	-# include <sys/types.h>
26	-# elif (__NetBSD__ \|\| __OpenBSD__)
27	-# include <sys/param.h>
28	-# endif
29	-# include <sys/sysctl.h>
30	-#endif
31	#include <limits.h>
32
33	#ifdef HAVE_LIBEXIF
34	@@ -97,6 +82,9 @@
35	CameraFilesystemFile *file;
36	} CameraFilesystemFolder;
37
38	+#define PICTURES_TO_KEEP 2
39	+static int pictures_to_keep = -1;
40	+
41	#ifdef HAVE_EXIF
42
43	static int gp_filesystem_get_file_impl (CameraFilesystem , const char ,
44	@@ -291,7 +279,7 @@
45	if (bufsize <= string_len) { \
46	GP_DEBUG ("%s: strlen(...) = %d " \
47	">= sizeof(buffer) = %d", \
48	- msg, string_len, bufsize \
49	+ msg, (int)string_len, (int)bufsize \
50	); \
51	gp_context_error (context, "preventing buffer overflow"); \
52	return GP_ERROR; \
53	@@ -1907,119 +1895,22 @@
54	return (GP_OK);
55	}
56
57	-/**
58	- * gp_get_free_memory:
59	- * @context: a #GPContext
60	- * @free:
61	- *
62	- * Reads the amount of free kB:
63	- * - free memory + free swap for Linux
64	- * XXX - free memory for BSD (need a way to find free swap)
65	- *
66	- * Return value: a gphoto2 error code.
67	- **/
68	static int
69	-gp_get_free_memory (GPContext context, unsigned free)
70	+gp_filesystem_lru_count (CameraFilesystem *fs)
71	{
72	-#ifdef HAVE_PROCMEMINFO
73	-
74	- char buf[1024], head, tail, *tmp;
75	- int n, fd = -1;
76	- *free=0;
77	-
78	- if ((fd = open ("/proc/meminfo", O_RDONLY)) == -1) {
79	- gp_context_error (context, _("Could not open '/proc/meminfo' "
80	- "for reading ('%m'). Make sure the proc filesystem "
81	- "is mounted."));
82	- return (GP_ERROR);
83	- }
84	-
85	- lseek (fd, 0L, SEEK_SET);
86	- if ((n = read (fd, buf, sizeof (buf) - 1)) < 0) {
87	- gp_context_error (context, _("An error occured while "
88	- "reading '/proc/meminfo' ('%m')."));
89	- return (GP_ERROR);
90	- }
91	- buf[n] = '\0';
92	- n = 0;
93	- head = buf;
94	- do {
95	- tail = strchr (head, ':');
96	- if (!tail)
97	- break;
98	- *tail = '\0';
99	- tmp = head;
100	- head = tail + 1;
101	- if (!strcmp (tmp, "MemFree")) {
102	- *free += strtoul (head, NULL, 10);
103	- n++;
104	- } else if (!strcmp (tmp, "SwapFree")) {
105	- *free += strtoul (head, NULL, 10);
106	- n++;
107	- }
108	- tail = strchr (head, '\n');
109	- if (!tail)
110	- break;
111	- head = tail + 1;
112	- } while (n != 2);
113	- return (GP_OK);
114	-
115	-#elif HAVE_SYSCTL && (__FreeBSD__ \|\| __NetBSD__ \|\| __OpenBSD__ \|\| __APPLE__ )
116	+ CameraFilesystemFile *ptr;
117	+ int count = 0;
118
119	- int mib[2] = { CTL_HW, HW_PHYSMEM };
120	- unsigned long value;
121	- size_t valuelen = sizeof(value);
122	- *free=0;
123	- if (sysctl(mib, 2 , &value, &valuelen, NULL, 0) == -1) {
124	- gp_context_error (context, _("sysctl call failed ('%m')."));
125	- return (GP_ERROR);
126	+ if (!fs) return 0;
127	+ ptr = fs->lru_first;
128	+ while (ptr) {
129	+ if (ptr->normal \|\| ptr->raw \|\| ptr->audio)
130	+ count++;
131	+ ptr = ptr->lru_next;
132	}
133	- *free=value;
134	- return (GP_OK);
135	-
136	-#elif (defined(sun) \|\| defined(__sun__)) && defined(__svr4__)
137	-
138	- long freemem=0;
139	- long freeswap=0;
140	- int page_size;
141	- static struct anoninfo anon;
142	-
143	- *free = 0;
144	-
145	- page_size = getpagesize();
146	- if ( (freemem = sysconf(_SC_AVPHYS_PAGES)) == -1 )
147	- {
148	- gp_context_error (context, _("sysconf call failed ('%m')."));
149	- return (GP_ERROR);
150	- }
151	-
152	- freemem *= page_size;
153	-
154	- if (swapctl(SC_AINFO, &anon) == -1)
155	- {
156	- gp_context_error (context, _("swapctl call failed ('%m')."));
157	- return (GP_ERROR);
158	- }
159	-
160	- freeswap = anon.ani_max - anon.ani_resv;
161	- freeswap *= page_size;
162	-
163	- printf("Free Memory : %ld Swap %ld\n",freemem,freeswap);
164	-
165	- *free = freemem + freeswap;
166	- return (GP_OK);
167	-
168	-#else
169	-
170	- /* No way to know the free memory on this system */
171	- *free = UINT_MAX;
172	- return (GP_OK);
173	-
174	-#endif
175	-
176	+ return count;
177	}
178
179	-
180	static int
181	gp_filesystem_lru_update (CameraFilesystem fs, const char folder,
182	CameraFile file, GPContext context)
183	@@ -2029,7 +1920,7 @@
184	const char *filename;
185	unsigned long int size;
186	int x, y;
187	- unsigned int free;
188	+ char cached_images[1024];
189
190	CHECK_NULL (fs && folder && file);
191
192	@@ -2038,25 +1929,34 @@
193	CR (gp_file_get_data_and_size (file, NULL, &size));
194
195	/*
196	- * The following is a simple case which is used to test the LRU.
197	- * I need to implement a way to pass a limit and then use it instead
198	- * of 600000. If the limit is not defined use the gp_get_free_memory
199	+ * The following is a very simple case which is used to prune
200	+ * the LRU. We keep PICTURES_TO_KEEP pictures in the LRU.
201	+ *
202	+ * We have 2 main scenarios:
203	+ * - query all thumbnails (repeatedly) ... they are cached and
204	+ * are not pruned by lru free.
205	+ * - download all images, linear. no real need for caching.
206	+ * - skip back 1 image (in viewers) (really? I don't know.)
207	+ *
208	+ * So lets just keep 2 pictures in memory.
209	*/
210	-#if 0
211	- while (fs->lru_size + size > 600000) {
212	- GP_DEBUG ("Freeing cached data before adding new data "
213	- "(cache=%ld, new=%ld)", fs->lru_size, size);
214	- CR (gp_filesystem_lru_free (fs));
215	+ if (pictures_to_keep == -1) {
216	+ if (gp_setting_get ("libgphoto", "cached-images", cached_images) == GP_OK) {
217	+ pictures_to_keep = atoi(cached_images);
218	+ } else {
219	+ /* store a default setting */
220	+ sprintf (cached_images, "%d", PICTURES_TO_KEEP);
221	+ gp_setting_set ("libgphoto", "cached-images", cached_images);
222	+ }
223	}
224	-#endif
225
226	- CR (gp_get_free_memory (context, &free));
227	- while (free < (size / 1024 + 1024)) {
228	- GP_DEBUG ("Freeing cached data before adding new data "
229	- "(cache=%ldB, new=%ldB, free=%dkB)",
230	- fs->lru_size, size, free);
231	+ if (pictures_to_keep < 0) /* also sanity check, but no upper limit. */
232	+ pictures_to_keep = PICTURES_TO_KEEP;
233	+
234	+ x = gp_filesystem_lru_count (fs);
235	+ while (x > pictures_to_keep) {
236	CR (gp_filesystem_lru_free (fs));
237	- CR (gp_get_free_memory (context, &free));
238	+ x = gp_filesystem_lru_count (fs);
239	}
240
241	GP_DEBUG ("Adding file '%s' from folder '%s' to the fscache LRU list "

Line 0 Link Here

(-)libgphoto2/files/patch-libgphoto2-serial-disk.c (+47 lines)
	1	===================================================================
	2	RCS file: /cvsroot/gphoto/libgphoto2/libgphoto2_port/disk/disk.c,v
	3	retrieving revision 1.4
	4	retrieving revision 1.7
	5	diff -u -r1.4 -r1.7
	6	--- libgphoto2_port/disk/disk.c 2005/08/14 14:01:38 1.4
	7	+++ libgphoto2_port/disk/disk.c 2006/02/19 10:48:10 1.7
	8	@@ -33,7 +33,9 @@
	9	#include <sys/param.h>
	10	#include <dirent.h>
	11	#include <string.h>
	12	-#include <mntent.h>
	13	+#ifdef HAVE_MNTENT_H
	14	+# include <mntent.h>
	15	+#endif
	16
	17	#ifdef HAVE_HAL
	18	#include <hal/libhal.h>
	19	@@ -172,10 +174,11 @@
	20	}
	21
	22	libhal_free_string_array (volumes);
	23	- libhal_ctx_free(ctx);
	24	-
	25	- dbus_connection_unref(dbus_connection);
	26	+ libhal_ctx_free (ctx);
	27	+ dbus_connection_disconnect (dbus_connection);
	28	+ dbus_connection_unref (dbus_connection);
	29	#else
	30	+# ifdef HAVE_MNTENT_H
	31	FILE *mnt;
	32	struct mntent *mntent;
	33	char path[1024];
	34	@@ -226,7 +229,13 @@
	35	CHECK (gp_port_info_list_append (list, info));
	36	}
	37	endmntent(mnt);
	38	+# endif
	39	#endif
	40	+ /* generic disk:/xxx/ matcher */
	41	+ info.type = GP_PORT_DISK;
	42	+ memset (info.name, 0, sizeof(info.name));
	43	+ snprintf (info.path, sizeof(info.path), "^disk:");
	44	+ CHECK (gp_port_info_list_append (list, info));
	45	return GP_OK;
	46	}
	47

Lines 18-188 Link Here

(-)libgphoto2/pkg-plist (-184 / +184 lines)
18	include/gphoto2/gphoto2-version.h	18	include/gphoto2/gphoto2-version.h
19	include/gphoto2/gphoto2-widget.h	19	include/gphoto2/gphoto2-widget.h
20	include/gphoto2/gphoto2.h	20	include/gphoto2/gphoto2.h
21	lib/gphoto2/%%VERSION%%/libgphoto2_adc65.a	21	lib/libgphoto2/%%VERSION%%/adc65.a
22	lib/gphoto2/%%VERSION%%/libgphoto2_adc65.la	22	lib/libgphoto2/%%VERSION%%/adc65.la
23	lib/gphoto2/%%VERSION%%/libgphoto2_adc65.so	23	lib/libgphoto2/%%VERSION%%/adc65.so
24	lib/gphoto2/%%VERSION%%/libgphoto2_agfa_cl20.a	24	lib/libgphoto2/%%VERSION%%/agfa_cl20.a
25	lib/gphoto2/%%VERSION%%/libgphoto2_agfa_cl20.la	25	lib/libgphoto2/%%VERSION%%/agfa_cl20.la
26	lib/gphoto2/%%VERSION%%/libgphoto2_agfa_cl20.so	26	lib/libgphoto2/%%VERSION%%/agfa_cl20.so
27	lib/gphoto2/%%VERSION%%/libgphoto2_aox.a	27	lib/libgphoto2/%%VERSION%%/aox.a
28	lib/gphoto2/%%VERSION%%/libgphoto2_aox.la	28	lib/libgphoto2/%%VERSION%%/aox.la
29	lib/gphoto2/%%VERSION%%/libgphoto2_aox.so	29	lib/libgphoto2/%%VERSION%%/aox.so
30	lib/gphoto2/%%VERSION%%/libgphoto2_barbie.a	30	lib/libgphoto2/%%VERSION%%/barbie.a
31	lib/gphoto2/%%VERSION%%/libgphoto2_barbie.la	31	lib/libgphoto2/%%VERSION%%/barbie.la
32	lib/gphoto2/%%VERSION%%/libgphoto2_barbie.so	32	lib/libgphoto2/%%VERSION%%/barbie.so
33	lib/gphoto2/%%VERSION%%/libgphoto2_canon.a	33	lib/libgphoto2/%%VERSION%%/canon.a
34	lib/gphoto2/%%VERSION%%/libgphoto2_canon.la	34	lib/libgphoto2/%%VERSION%%/canon.la
35	lib/gphoto2/%%VERSION%%/libgphoto2_canon.so	35	lib/libgphoto2/%%VERSION%%/canon.so
36	lib/gphoto2/%%VERSION%%/libgphoto2_casio_qv.a	36	lib/libgphoto2/%%VERSION%%/casio_qv.a
37	lib/gphoto2/%%VERSION%%/libgphoto2_casio_qv.la	37	lib/libgphoto2/%%VERSION%%/casio_qv.la
38	lib/gphoto2/%%VERSION%%/libgphoto2_casio_qv.so	38	lib/libgphoto2/%%VERSION%%/casio_qv.so
39	lib/gphoto2/%%VERSION%%/libgphoto2_digita.a	39	lib/libgphoto2/%%VERSION%%/digita.a
40	lib/gphoto2/%%VERSION%%/libgphoto2_digita.la	40	lib/libgphoto2/%%VERSION%%/digita.la
41	lib/gphoto2/%%VERSION%%/libgphoto2_digita.so	41	lib/libgphoto2/%%VERSION%%/digita.so
42	lib/gphoto2/%%VERSION%%/libgphoto2_dimagev.a	42	lib/libgphoto2/%%VERSION%%/dimagev.a
43	lib/gphoto2/%%VERSION%%/libgphoto2_dimagev.la	43	lib/libgphoto2/%%VERSION%%/dimagev.la
44	lib/gphoto2/%%VERSION%%/libgphoto2_dimagev.so	44	lib/libgphoto2/%%VERSION%%/dimagev.so
45	lib/gphoto2/%%VERSION%%/libgphoto2_dimera3500.a	45	lib/libgphoto2/%%VERSION%%/dimera3500.a
46	lib/gphoto2/%%VERSION%%/libgphoto2_dimera3500.la	46	lib/libgphoto2/%%VERSION%%/dimera3500.la
47	lib/gphoto2/%%VERSION%%/libgphoto2_dimera3500.so	47	lib/libgphoto2/%%VERSION%%/dimera3500.so
48	lib/gphoto2/%%VERSION%%/libgphoto2_directory.a	48	lib/libgphoto2/%%VERSION%%/directory.a
49	lib/gphoto2/%%VERSION%%/libgphoto2_directory.la	49	lib/libgphoto2/%%VERSION%%/directory.la
50	lib/gphoto2/%%VERSION%%/libgphoto2_directory.so	50	lib/libgphoto2/%%VERSION%%/directory.so
51	lib/gphoto2/%%VERSION%%/libgphoto2_enigma13.a	51	lib/libgphoto2/%%VERSION%%/digigr8.a
52	lib/gphoto2/%%VERSION%%/libgphoto2_enigma13.la	52	lib/libgphoto2/%%VERSION%%/digigr8.la
53	lib/gphoto2/%%VERSION%%/libgphoto2_enigma13.so	53	lib/libgphoto2/%%VERSION%%/digigr8.so
54	lib/gphoto2/%%VERSION%%/libgphoto2_ez200.a	54	lib/libgphoto2/%%VERSION%%/enigma13.a
55	lib/gphoto2/%%VERSION%%/libgphoto2_ez200.la	55	lib/libgphoto2/%%VERSION%%/enigma13.la
56	lib/gphoto2/%%VERSION%%/libgphoto2_ez200.so	56	lib/libgphoto2/%%VERSION%%/enigma13.so
57	lib/gphoto2/%%VERSION%%/libgphoto2_fuji.a	57	lib/libgphoto2/%%VERSION%%/fuji.a
58	lib/gphoto2/%%VERSION%%/libgphoto2_fuji.la	58	lib/libgphoto2/%%VERSION%%/fuji.la
59	lib/gphoto2/%%VERSION%%/libgphoto2_fuji.so	59	lib/libgphoto2/%%VERSION%%/fuji.so
60	lib/gphoto2/%%VERSION%%/libgphoto2_gsmart300.a	60	lib/libgphoto2/%%VERSION%%/gsmart300.a
61	lib/gphoto2/%%VERSION%%/libgphoto2_gsmart300.la	61	lib/libgphoto2/%%VERSION%%/gsmart300.la
62	lib/gphoto2/%%VERSION%%/libgphoto2_gsmart300.so	62	lib/libgphoto2/%%VERSION%%/gsmart300.so
63	lib/gphoto2/%%VERSION%%/libgphoto2_iclick.a	63	lib/libgphoto2/%%VERSION%%/hp215.a
64	lib/gphoto2/%%VERSION%%/libgphoto2_iclick.la	64	lib/libgphoto2/%%VERSION%%/hp215.la
65	lib/gphoto2/%%VERSION%%/libgphoto2_iclick.so	65	lib/libgphoto2/%%VERSION%%/hp215.so
66	lib/gphoto2/%%VERSION%%/libgphoto2_jamcam.a	66	lib/libgphoto2/%%VERSION%%/iclick.a
67	lib/gphoto2/%%VERSION%%/libgphoto2_jamcam.la	67	lib/libgphoto2/%%VERSION%%/iclick.la
68	lib/gphoto2/%%VERSION%%/libgphoto2_jamcam.so	68	lib/libgphoto2/%%VERSION%%/iclick.so
69	lib/gphoto2/%%VERSION%%/libgphoto2_jd11.a	69	lib/libgphoto2/%%VERSION%%/jamcam.a
70	lib/gphoto2/%%VERSION%%/libgphoto2_jd11.la	70	lib/libgphoto2/%%VERSION%%/jamcam.la
71	lib/gphoto2/%%VERSION%%/libgphoto2_jd11.so	71	lib/libgphoto2/%%VERSION%%/jamcam.so
72	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc120.a	72	lib/libgphoto2/%%VERSION%%/jd11.a
73	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc120.la	73	lib/libgphoto2/%%VERSION%%/jd11.la
74	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc120.so	74	lib/libgphoto2/%%VERSION%%/jd11.so
75	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc210.a	75	lib/libgphoto2/%%VERSION%%/kodak_dc120.a
76	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc210.la	76	lib/libgphoto2/%%VERSION%%/kodak_dc120.la
77	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc210.so	77	lib/libgphoto2/%%VERSION%%/kodak_dc120.so
78	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc240.a	78	lib/libgphoto2/%%VERSION%%/kodak_dc210.a
79	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc240.la	79	lib/libgphoto2/%%VERSION%%/kodak_dc210.la
80	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc240.so	80	lib/libgphoto2/%%VERSION%%/kodak_dc210.so
81	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc3200.a	81	lib/libgphoto2/%%VERSION%%/kodak_dc240.a
82	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc3200.la	82	lib/libgphoto2/%%VERSION%%/kodak_dc240.la
83	lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc3200.so	83	lib/libgphoto2/%%VERSION%%/kodak_dc240.so
84	lib/gphoto2/%%VERSION%%/libgphoto2_konica.a	84	lib/libgphoto2/%%VERSION%%/kodak_dc3200.a
85	lib/gphoto2/%%VERSION%%/libgphoto2_konica.la	85	lib/libgphoto2/%%VERSION%%/kodak_dc3200.la
86	lib/gphoto2/%%VERSION%%/libgphoto2_konica.so	86	lib/libgphoto2/%%VERSION%%/kodak_dc3200.so
87	lib/gphoto2/%%VERSION%%/libgphoto2_konica_qm150.a	87	lib/libgphoto2/%%VERSION%%/kodak_ez200.a
88	lib/gphoto2/%%VERSION%%/libgphoto2_konica_qm150.la	88	lib/libgphoto2/%%VERSION%%/kodak_ez200.la
89	lib/gphoto2/%%VERSION%%/libgphoto2_konica_qm150.so	89	lib/libgphoto2/%%VERSION%%/kodak_ez200.so
90	lib/gphoto2/%%VERSION%%/libgphoto2_largan.a	90	lib/libgphoto2/%%VERSION%%/konica.a
91	lib/gphoto2/%%VERSION%%/libgphoto2_largan.la	91	lib/libgphoto2/%%VERSION%%/konica.la
92	lib/gphoto2/%%VERSION%%/libgphoto2_largan.so	92	lib/libgphoto2/%%VERSION%%/konica.so
93	lib/gphoto2/%%VERSION%%/libgphoto2_mars.a	93	lib/libgphoto2/%%VERSION%%/konica_qm150.a
94	lib/gphoto2/%%VERSION%%/libgphoto2_mars.la	94	lib/libgphoto2/%%VERSION%%/konica_qm150.la
95	lib/gphoto2/%%VERSION%%/libgphoto2_mars.so	95	lib/libgphoto2/%%VERSION%%/konica_qm150.so
96	lib/gphoto2/%%VERSION%%/libgphoto2_mustek.a	96	lib/libgphoto2/%%VERSION%%/largan.a
97	lib/gphoto2/%%VERSION%%/libgphoto2_mustek.la	97	lib/libgphoto2/%%VERSION%%/largan.la
98	lib/gphoto2/%%VERSION%%/libgphoto2_mustek.so	98	lib/libgphoto2/%%VERSION%%/largan.so
99	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_coolshot.a	99	lib/libgphoto2/%%VERSION%%/lg_gsm.a
100	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_coolshot.la	100	lib/libgphoto2/%%VERSION%%/lg_gsm.la
101	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_coolshot.so	101	lib/libgphoto2/%%VERSION%%/lg_gsm.so
102	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1000.a	102	lib/libgphoto2/%%VERSION%%/mars.a
103	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1000.la	103	lib/libgphoto2/%%VERSION%%/mars.la
104	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1000.so	104	lib/libgphoto2/%%VERSION%%/mars.so
105	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1580.a	105	lib/libgphoto2/%%VERSION%%/mustek.a
106	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1580.la	106	lib/libgphoto2/%%VERSION%%/mustek.la
107	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1580.so	107	lib/libgphoto2/%%VERSION%%/mustek.so
108	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_l859.a	108	lib/libgphoto2/%%VERSION%%/panasonic_coolshot.a
109	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_l859.la	109	lib/libgphoto2/%%VERSION%%/panasonic_coolshot.la
110	lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_l859.so	110	lib/libgphoto2/%%VERSION%%/panasonic_coolshot.so
111	lib/gphoto2/%%VERSION%%/libgphoto2_pccam300.a	111	lib/libgphoto2/%%VERSION%%/panasonic_dc1000.a
112	lib/gphoto2/%%VERSION%%/libgphoto2_pccam300.la	112	lib/libgphoto2/%%VERSION%%/panasonic_dc1000.la
113	lib/gphoto2/%%VERSION%%/libgphoto2_pccam300.so	113	lib/libgphoto2/%%VERSION%%/panasonic_dc1000.so
114	lib/gphoto2/%%VERSION%%/libgphoto2_pccam600.a	114	lib/libgphoto2/%%VERSION%%/panasonic_dc1580.a
115	lib/gphoto2/%%VERSION%%/libgphoto2_pccam600.la	115	lib/libgphoto2/%%VERSION%%/panasonic_dc1580.la
116	lib/gphoto2/%%VERSION%%/libgphoto2_pccam600.so	116	lib/libgphoto2/%%VERSION%%/panasonic_dc1580.so
117	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc320.a	117	lib/libgphoto2/%%VERSION%%/panasonic_l859.a
118	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc320.la	118	lib/libgphoto2/%%VERSION%%/panasonic_l859.la
119	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc320.so	119	lib/libgphoto2/%%VERSION%%/panasonic_l859.so
120	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc640.a	120	lib/libgphoto2/%%VERSION%%/pccam300.a
121	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc640.la	121	lib/libgphoto2/%%VERSION%%/pccam300.la
122	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc640.so	122	lib/libgphoto2/%%VERSION%%/pccam300.so
123	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc700.a	123	lib/libgphoto2/%%VERSION%%/pccam600.a
124	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc700.la	124	lib/libgphoto2/%%VERSION%%/pccam600.la
125	lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc700.so	125	lib/libgphoto2/%%VERSION%%/pccam600.so
126	lib/gphoto2/%%VERSION%%/libgphoto2_ptp2.a	126	lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
127	lib/gphoto2/%%VERSION%%/libgphoto2_ptp2.la	127	lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
128	lib/gphoto2/%%VERSION%%/libgphoto2_ptp2.so	128	lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
129	lib/gphoto2/%%VERSION%%/libgphoto2_ricoh.a	129	lib/libgphoto2/%%VERSION%%/polaroid_pdc640.a
130	lib/gphoto2/%%VERSION%%/libgphoto2_ricoh.la	130	lib/libgphoto2/%%VERSION%%/polaroid_pdc640.la
131	lib/gphoto2/%%VERSION%%/libgphoto2_ricoh.so	131	lib/libgphoto2/%%VERSION%%/polaroid_pdc640.so
132	lib/gphoto2/%%VERSION%%/libgphoto2_ricoh_g3.a	132	lib/libgphoto2/%%VERSION%%/polaroid_pdc700.a
133	lib/gphoto2/%%VERSION%%/libgphoto2_ricoh_g3.la	133	lib/libgphoto2/%%VERSION%%/polaroid_pdc700.la
134	lib/gphoto2/%%VERSION%%/libgphoto2_ricoh_g3.so	134	lib/libgphoto2/%%VERSION%%/polaroid_pdc700.so
135	lib/gphoto2/%%VERSION%%/libgphoto2_samsung.a	135	lib/libgphoto2/%%VERSION%%/ptp2.a
136	lib/gphoto2/%%VERSION%%/libgphoto2_samsung.la	136	lib/libgphoto2/%%VERSION%%/ptp2.la
137	lib/gphoto2/%%VERSION%%/libgphoto2_samsung.so	137	lib/libgphoto2/%%VERSION%%/ptp2.so
138	lib/gphoto2/%%VERSION%%/libgphoto2_sierra.a	138	lib/libgphoto2/%%VERSION%%/ricoh.a
139	lib/gphoto2/%%VERSION%%/libgphoto2_sierra.la	139	lib/libgphoto2/%%VERSION%%/ricoh.la
140	lib/gphoto2/%%VERSION%%/libgphoto2_sierra.so	140	lib/libgphoto2/%%VERSION%%/ricoh.so
141	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink.a	141	lib/libgphoto2/%%VERSION%%/ricoh_g3.a
142	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink.la	142	lib/libgphoto2/%%VERSION%%/ricoh_g3.la
143	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink.so	143	lib/libgphoto2/%%VERSION%%/ricoh_g3.so
144	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink2.a	144	lib/libgphoto2/%%VERSION%%/samsung.a
145	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink2.la	145	lib/libgphoto2/%%VERSION%%/samsung.la
146	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink2.so	146	lib/libgphoto2/%%VERSION%%/samsung.so
147	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_web2.a	147	lib/libgphoto2/%%VERSION%%/sierra.a
148	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_web2.la	148	lib/libgphoto2/%%VERSION%%/sierra.la
149	lib/gphoto2/%%VERSION%%/libgphoto2_sipix_web2.so	149	lib/libgphoto2/%%VERSION%%/sierra.so
150	lib/gphoto2/%%VERSION%%/libgphoto2_smal.a	150	lib/libgphoto2/%%VERSION%%/sipix_blink.a
151	lib/gphoto2/%%VERSION%%/libgphoto2_smal.la	151	lib/libgphoto2/%%VERSION%%/sipix_blink.la
152	lib/gphoto2/%%VERSION%%/libgphoto2_smal.so	152	lib/libgphoto2/%%VERSION%%/sipix_blink.so
153	lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf1.a	153	lib/libgphoto2/%%VERSION%%/sipix_blink2.a
154	lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf1.la	154	lib/libgphoto2/%%VERSION%%/sipix_blink2.la
155	lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf1.so	155	lib/libgphoto2/%%VERSION%%/sipix_blink2.so
156	lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf55.a	156	lib/libgphoto2/%%VERSION%%/sipix_web2.a
157	lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf55.la	157	lib/libgphoto2/%%VERSION%%/sipix_web2.la
158	lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf55.so	158	lib/libgphoto2/%%VERSION%%/sipix_web2.so
159	lib/gphoto2/%%VERSION%%/libgphoto2_soundvision.a	159	lib/libgphoto2/%%VERSION%%/smal.a
160	lib/gphoto2/%%VERSION%%/libgphoto2_soundvision.la	160	lib/libgphoto2/%%VERSION%%/smal.la
161	lib/gphoto2/%%VERSION%%/libgphoto2_soundvision.so	161	lib/libgphoto2/%%VERSION%%/smal.so
162	lib/gphoto2/%%VERSION%%/libgphoto2_spca50x.a	162	lib/libgphoto2/%%VERSION%%/sonix.a
163	lib/gphoto2/%%VERSION%%/libgphoto2_spca50x.la	163	lib/libgphoto2/%%VERSION%%/sonix.la
164	lib/gphoto2/%%VERSION%%/libgphoto2_spca50x.so	164	lib/libgphoto2/%%VERSION%%/sonix.so
165	lib/gphoto2/%%VERSION%%/libgphoto2_sq905.a	165	lib/libgphoto2/%%VERSION%%/sony_dscf1.a
166	lib/gphoto2/%%VERSION%%/libgphoto2_sq905.la	166	lib/libgphoto2/%%VERSION%%/sony_dscf1.la
167	lib/gphoto2/%%VERSION%%/libgphoto2_sq905.so	167	lib/libgphoto2/%%VERSION%%/sony_dscf1.so
168	lib/gphoto2/%%VERSION%%/libgphoto2_stv0674.a	168	lib/libgphoto2/%%VERSION%%/sony_dscf55.a
169	lib/gphoto2/%%VERSION%%/libgphoto2_stv0674.la	169	lib/libgphoto2/%%VERSION%%/sony_dscf55.la
170	lib/gphoto2/%%VERSION%%/libgphoto2_stv0674.so	170	lib/libgphoto2/%%VERSION%%/sony_dscf55.so
171	lib/gphoto2/%%VERSION%%/libgphoto2_stv0680.a	171	lib/libgphoto2/%%VERSION%%/soundvision.a
172	lib/gphoto2/%%VERSION%%/libgphoto2_stv0680.la	172	lib/libgphoto2/%%VERSION%%/soundvision.la
173	lib/gphoto2/%%VERSION%%/libgphoto2_stv0680.so	173	lib/libgphoto2/%%VERSION%%/soundvision.so
174	lib/gphoto2/%%VERSION%%/libgphoto2_sx330z.a	174	lib/libgphoto2/%%VERSION%%/spca50x.a
175	lib/gphoto2/%%VERSION%%/libgphoto2_sx330z.la	175	lib/libgphoto2/%%VERSION%%/spca50x.la
176	lib/gphoto2/%%VERSION%%/libgphoto2_sx330z.so	176	lib/libgphoto2/%%VERSION%%/spca50x.so
177	lib/gphoto2/%%VERSION%%/libgphoto2_toshiba_pdrm11.a	177	lib/libgphoto2/%%VERSION%%/sq905.a
178	lib/gphoto2/%%VERSION%%/libgphoto2_toshiba_pdrm11.la	178	lib/libgphoto2/%%VERSION%%/sq905.la
179	lib/gphoto2/%%VERSION%%/libgphoto2_toshiba_pdrm11.so	179	lib/libgphoto2/%%VERSION%%/sq905.so
180	lib/gphoto2_port/0.5.1/libgphoto2_port_serial.a	180	lib/libgphoto2/%%VERSION%%/stv0674.a
181	lib/gphoto2_port/0.5.1/libgphoto2_port_serial.la	181	lib/libgphoto2/%%VERSION%%/stv0674.la
182	lib/gphoto2_port/0.5.1/libgphoto2_port_serial.so	182	lib/libgphoto2/%%VERSION%%/stv0674.so
183	lib/gphoto2_port/0.5.1/libgphoto2_port_usb.a	183	lib/libgphoto2/%%VERSION%%/stv0680.a
184	lib/gphoto2_port/0.5.1/libgphoto2_port_usb.la	184	lib/libgphoto2/%%VERSION%%/stv0680.la
185	lib/gphoto2_port/0.5.1/libgphoto2_port_usb.so	185	lib/libgphoto2/%%VERSION%%/stv0680.so
		186	lib/libgphoto2/%%VERSION%%/sx330z.a
		187	lib/libgphoto2/%%VERSION%%/sx330z.la
		188	lib/libgphoto2/%%VERSION%%/sx330z.so
		189	lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.a
		190	lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.la
		191	lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.so
		192	lib/libgphoto2_port/0.5.2/disk.a
		193	lib/libgphoto2_port/0.5.2/disk.la
		194	lib/libgphoto2_port/0.5.2/disk.so
		195	lib/libgphoto2_port/0.5.2/serial.a
		196	lib/libgphoto2_port/0.5.2/serial.la
		197	lib/libgphoto2_port/0.5.2/serial.so
		198	lib/libgphoto2_port/0.5.2/usb.a
		199	lib/libgphoto2_port/0.5.2/usb.la
		200	lib/libgphoto2_port/0.5.2/usb.so
186	lib/libgphoto2.a	201	lib/libgphoto2.a
187	lib/libgphoto2.la	202	lib/libgphoto2.la
188	lib/libgphoto2.so	203	lib/libgphoto2.so
Lines 204-245 Link Here
204	%%DATADIR%%/%%VERSION%%/konica/japanese	219	%%DATADIR%%/%%VERSION%%/konica/japanese
205	%%DATADIR%%/%%VERSION%%/konica/korean	220	%%DATADIR%%/%%VERSION%%/konica/korean
206	%%DATADIR%%/%%VERSION%%/konica/spanish	221	%%DATADIR%%/%%VERSION%%/konica/spanish
207	%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-0.mo
208	%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-2.mo	222	%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-2.mo
209	%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo
210	%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-2.mo	223	%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-2.mo
211	%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-0.mo
212	%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-2.mo	224	%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-2.mo
213	%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
214	%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-2.mo	225	%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-2.mo
215	%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-0.mo
216	%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-2.mo	226	%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-2.mo
217	%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo
218	%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-2.mo	227	%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-2.mo
219	%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-2.mo	228	%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-2.mo
220	%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
221	%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-2.mo	229	%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-2.mo
222	%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
223	%%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2-2.mo	230	%%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2-2.mo
224	%%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2_port-0.mo
225	%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo
226	%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-2.mo	231	%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
227	%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
228	%%NLS%%share/locale/sl/LC_MESSAGES/libgphoto2-2.mo	232	%%NLS%%share/locale/sl/LC_MESSAGES/libgphoto2-2.mo
229	%%NLS%%share/locale/sl/LC_MESSAGES/libgphoto2_port-0.mo
230	%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-2.mo	233	%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-2.mo
231	%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo
232	%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-2.mo	234	%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-2.mo
233	%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
234	%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo	235	%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
235	%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo
236	@dirrm %%DATADIR%%/%%VERSION%%/konica	236	@dirrm %%DATADIR%%/%%VERSION%%/konica
237	@dirrm %%DATADIR%%/%%VERSION%%	237	@dirrm %%DATADIR%%/%%VERSION%%
238	@dirrm %%DATADIR%%	238	@dirrm %%DATADIR%%
239	%%PORTDOCS%%@dirrm share/doc/libgphoto2_port	239	%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
240	%%PORTDOCS%%@dirrm %%DOCSDIR%%	240	%%PORTDOCS%%@dirrm %%DOCSDIR%%
241	@dirrm lib/gphoto2_port/0.5.1	241	@dirrm lib/libgphoto2_port/0.5.2
242	@dirrm lib/gphoto2_port	242	@dirrm lib/libgphoto2_port
243	@dirrm lib/gphoto2/%%VERSION%%	243	@dirrm lib/libgphoto2/%%VERSION%%
244	@dirrm lib/gphoto2	244	@dirrm lib/libgphoto2
245	@dirrm include/gphoto2	245	@dirrm include/gphoto2