From tkato432@yahoo.com  Mon Aug  5 18:01:35 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 2E0F9302
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon,  5 Aug 2013 18:01:35 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from omta01.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17])
	by mx1.freebsd.org (Postfix) with ESMTP id 964B32C5B
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon,  5 Aug 2013 18:01:34 +0000 (UTC)
Received: from localhost.localdomain (ZT034070.ppp.dion.ne.jp [59.128.34.70])
	by omta01.auone-net.jp (au one net mail) with ESMTP id ED5A998011E
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue,  6 Aug 2013 03:01:20 +0900 (JST)
Message-Id: <20130806025424.166fe4c7a43b76c2ec7596ae@yahoo.com>
Date: Tue, 6 Aug 2013 02:54:24 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: graphics/gphoto2: Update to version 2.5.2

>Number:         181073
>Category:       ports
>Synopsis:       graphics/gphoto2: Update to version 2.5.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 05 18:10:06 UTC 2013
>Closed-Date:    Fri Jan 17 16:59:19 UTC 2014
>Last-Modified:  Fri Jan 17 17:00:05 UTC 2014
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update graphics/libgphoto2 to version 2.5.2
- Update graphics/gphoto2 to version 2.5.2
- Update graphics/gtkam to version 2.0
- Update graphics/fusefs-gphotofs to version 0.5

[graphcs/libgphoto2]
New file:
files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h

Remove file:
files/patch-MAX_ENTRIES
files/patch-camlibs-smal-ultrapocket.c
files/patch-libgphoto2_port-serial-unix.c
files/patch-libgphoto2_port-usb-libusb.c

>How-To-Repeat:
>Fix:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	graphics_libgphoto2.diff
#	graphics_gphoto2.diff
#	graphics_gtkam.diff
#	graphics_fusefs-gphotofs.diff
#
echo x - graphics_libgphoto2.diff
sed 's/^X//' >graphics_libgphoto2.diff << 'd64ac200ec15b9bd128819af21875b49'
Xdiff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile
X--- /usr/ports/graphics/libgphoto2/Makefile	2013-07-26 05:22:45.000000000 +0900
X+++ graphics/libgphoto2/Makefile	2013-08-06 00:00:00.000000000 +0900
X@@ -2,8 +2,7 @@
X # $FreeBSD: head/graphics/libgphoto2/Makefile 323662 2013-07-25 18:55:01Z kwm $
X 
X PORTNAME=	libgphoto2
X-PORTVERSION=	2.4.14
X-PORTREVISION=	3
X+PORTVERSION=	2.5.2
X CATEGORIES=	graphics
X MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
X 
X@@ -12,65 +11,106 @@
X 
X LICENSE=	LGPL21
X 
X-LIB_DEPENDS=	exif:${PORTSDIR}/graphics/libexif \
X-		jpeg:${PORTSDIR}/graphics/jpeg
X+OPTIONS_DEFINE=	EXIF GD JPEG XML DOCS NLS
X+OPTIONS_DEFAULT=EXIF GD JPEG XML
X+EXIF_DESC=	EXIF tag support
X 
X-USES=		gmake pkgconfig
X+USES=		gmake iconv pkgconfig
X USE_BZIP2=	yes
X USE_GNOME=	ltverhack
X USE_AUTOTOOLS=	libtool libltdl
X LIBTOOLFILES=	configure libgphoto2_port/configure
X-USE_LDCONFIG=	yes
X CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
X-		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
X+		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
X+		ac_cv_path_DOT=false \
X+		ac_cv_path_DOXYGEN=false \
X+		udevscriptdir=${WRKDIR}
X+USE_LDCONFIG=	yes
X 
X-PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
X+CPPFLAGS+=	-I${LOCALBASE}/include
X+LDFLAGS+=	-L${LOCALBASE}/lib
X+
X+PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.10.0
X 
X MAN3=		libgphoto2.3 libgphoto2_port.3
X 
X .include <bsd.port.options.mk>
X 
X-.if ${OSVERSION} < 1000040
X-CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I/usr/include" \
X-		LIBUSB_LIBS="-lusb"
X+.if ${PORT_OPTIONS:MEXIF}
X+LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif
X+.else
X+CONFIGURE_ARGS+=	--without-libexif
X+.endif
X+
X+.if ${PORT_OPTIONS:MGD}
X+LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
X .else
X-# Safe because it's never used
X-CFLAGS+=	-DENODATA=0
X+CONFIGURE_ARGS+=	--without-gd
X+.endif
X+
X+.if ${PORT_OPTIONS:MJPEG}
X+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
X+.else
X+CONFIGURE_ARGS+=	--without-jpeg
X+.endif
X+
X+.if ${PORT_OPTIONS:MXML}
X+USE_GNOME+=	libxml2
X+CPPFLAGS+=	$$(pkg-config --cflags-only-I libxml-2.0)
X+LDFLAGS+=	$$(pkg-config --libs-only-L libxml-2.0)
X+.else
X+CONFIGURE_ARGS+=	--without-libxml2
X .endif
X 
X .if ${PORT_OPTIONS:MNLS}
X USES+=		gettext
X PLIST_SUB+=	NLS=""
X .else
X-USES+=		iconv
X CONFIGURE_ARGS+=	--disable-nls
X PLIST_SUB+=	NLS="@comment "
X .endif
X 
X+.include <bsd.port.pre.mk>
X+
X+.if ${OSVERSION} < 1000040
X+CONFIGURE_ENV+=	LIBUSB1_CFLAGS="-I/usr/include" \
X+		LIBUSB1_LIBS="-lusb"
X+.endif
X+
X post-patch:
X-.for file in configure libgphoto2_port/configure
X+.for i in configure libgphoto2_port/configure
X 	@${REINPLACE_CMD} -e \
X-		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
X-		 s|-g -O2||g ; \
X+		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
X+		 /FLAGS/s|-g|| ; \
X 		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
X-			${WRKSRC}/${file}
X+		${WRKSRC}/${i}
X .endfor
X-.if ${PORT_OPTIONS:MNLS}
X-	@${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \
X-		${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in
X-.endif
X-	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \
X-		s| "$$(DESTDIR)$$(udevscriptdir)"||' \
X-			${WRKSRC}/libgphoto2_port/usb/Makefile.in \
X-			${WRKSRC}/packaging/generic/Makefile.in
X-	@${REINPLACE_CMD} -e 's|linux-hotplug ||' \
X-		${WRKSRC}/packaging/Makefile.in
X 	@${REINPLACE_CMD} -e \
X-		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
X-			${WRKSRC}/doc/Makefile.in
X-	@${REINPLACE_CMD} -e '/Requires/d' \
X-		${WRKSRC}/libgphoto2_port/libgphoto2_port.pc.in
X-	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
X-		${WRKSRC}/libgphoto2_port/configure
X+		'/^doc_DATA/s|COPYING|| ; \
X+		 /^install-data-am:/s|install-docDATA||' \
X+		${WRKSRC}/Makefile.in
X+	@${REINPLACE_CMD} -e \
X+		'/^install-data-am:/s|install-camlibdocDATA||' \
X+		${WRKSRC}/camlibs/Makefile.in
X+	@${REINPLACE_CMD} -e \
X+		'/^install-data-am:/s|install-docDATA||' \
X+		${WRKSRC}/libgphoto2_port/Makefile.in
X+	@${REINPLACE_CMD} -e \
X+		's|ENODATA|ENOATTR|g' \
X+		${WRKSRC}/libgphoto2_port/libusb1/libusb1.c
X+	@${REINPLACE_CMD} -e \
X+		'/^SUBDIRS/s|linux-hotplug||' \
X+		${WRKSRC}/packaging/Makefile.in
X+
X+post-install:
X+.if ${PORT_OPTIONS:MDOCS}
X+	@${MKDIR} ${DOCSDIR}
X+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
X+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-docDATA)
X+	@(cd ${WRKSRC}/camlibs && ${SETENV} ${MAKE_ENV} ${GMAKE} \
X+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-camlibdocDATA)
X+	@(cd ${WRKSRC}/libgphoto2_port && ${SETENV} ${MAKE_ENV} ${GMAKE} \
X+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-docDATA)
X+.endif
X 
X-.include <bsd.port.mk>
X+.include <bsd.port.post.mk>
Xdiff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo
X--- /usr/ports/graphics/libgphoto2/distinfo	2013-06-21 03:50:16.000000000 +0900
X+++ graphics/libgphoto2/distinfo	2013-08-06 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (libgphoto2-2.4.14.tar.bz2) = 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
X-SIZE (libgphoto2-2.4.14.tar.bz2) = 4481384
X+SHA256 (libgphoto2-2.5.2.tar.bz2) = a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838
X+SIZE (libgphoto2-2.5.2.tar.bz2) = 6446235
Xdiff -urN /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES graphics/libgphoto2/files/patch-MAX_ENTRIES
X--- /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES	2013-06-21 03:50:16.000000000 +0900
X+++ graphics/libgphoto2/files/patch-MAX_ENTRIES	1970-01-01 09:00:00.000000000 +0900
X@@ -1,11 +0,0 @@
X---- libgphoto2/gphoto2-list.c.orig	2007-07-27 07:52:55.000000000 +0200
X-+++ libgphoto2/gphoto2-list.c	2008-11-09 17:04:16.000000000 +0100
X-@@ -72,7 +72,7 @@
X- 
X- #ifdef CAMERALIST_STRUCT_COMPATIBILITY
X- 
X--#define MAX_ENTRIES 1024
X-+#define MAX_ENTRIES 8192
X- #define MAX_LIST_STRING_LENGTH 128
X- struct _CameraList {
X- 	int  count;
Xdiff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c
X--- /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	2013-06-21 03:50:16.000000000 +0900
X+++ graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,10 +0,0 @@
X---- camlibs/smal/ultrapocket.c.orig	2008-10-18 19:55:46.000000000 +0200
X-+++ camlibs/smal/ultrapocket.c	2008-11-12 09:56:52.000000000 +0100
X-@@ -33,6 +33,7 @@
X- 
X- #define GP_MODULE "Smal Ultrapocket"
X- 
X-+#include <locale.h>
X- #ifdef ENABLE_NLS
X- #  include <libintl.h>
X- #  undef _
Xdiff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
X--- /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-06-21 03:50:16.000000000 +0900
X+++ graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-08-06 00:00:00.000000000 +0900
X@@ -1,11 +1,10 @@
X --- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
X +++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
X-@@ -19,6 +19,8 @@
X-  */
X- #include "config.h"
X- 
X-+#include <sys/types.h>
X-+#include <netinet/in.h>
X- #include <stdlib.h>
X+@@ -24,6 +24,7 @@
X  #include <string.h>
X  #include <stdio.h>
X+ #include <time.h>
X++#include <sys/types.h>
X+ #include <sys/socket.h>
X+ #include <netinet/in.h>
X+ #include <arpa/inet.h>
Xdiff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
X--- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	2013-06-21 03:50:16.000000000 +0900
X+++ graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,10 +0,0 @@
X---- libgphoto2_port/serial/unix.c.orig	Fri Jul 27 02:36:13 2007
X-+++ libgphoto2_port/serial/unix.c	Mon Aug 13 17:26:43 2007
X-@@ -43,6 +43,7 @@
X- #endif
X- #include <string.h>
X- #include <signal.h>
X-+#include <sys/select.h>
X- #include <sys/stat.h>
X- #include <sys/types.h>
X- #ifdef HAVE_SYS_TIME_H
Xdiff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c
X--- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c	2013-06-21 03:50:16.000000000 +0900
X+++ graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,45 +0,0 @@
X---- libgphoto2_port/usb/libusb.c.old	2011-01-16 15:22:21.000000000 +0100
X-+++ libgphoto2_port/usb/libusb.c	2011-01-16 15:21:57.000000000 +0100
X-@@ -824,23 +824,25 @@
X- 	 * MTP interface descriptions, that's how they can be detected, before
X- 	 * we try the more esoteric "OS descriptors" (below).
X- 	 */
X--	for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
X--		unsigned int j;
X--		for (j = 0; j < dev->config[i].bNumInterfaces; j++) {
X--			int k;
X--			for (k = 0; k < dev->config[i].interface[j].num_altsetting; k++) {
X--				buf[0] = '\0';
X--				ret = usb_get_string_simple(devh, 
X--					dev->config[i].interface[j].altsetting[k].iInterface, 
X--					(char *) buf, 
X--					1024);
X--				if (ret < 3)
X--					continue;
X--				if (strcmp((char *) buf, "MTP") == 0) {
X--					gp_log (GP_LOG_DEBUG, "mtp matcher", "Configuration %d, interface %d, altsetting %d:\n", i, j, k);
X--					gp_log (GP_LOG_DEBUG, "mtp matcher", "   Interface description contains the string \"MTP\"\n");
X--					gp_log (GP_LOG_DEBUG, "mtp matcher", "   Device recognized as MTP, no further probing.\n");
X--					goto found;
X-+	if(dev->config) {
X-+		for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
X-+			unsigned int j;
X-+			for (j = 0; j < dev->config[i].bNumInterfaces; j++) {
X-+				int k;
X-+				for (k = 0; k < dev->config[i].interface[j].num_altsetting; k++) {
X-+					buf[0] = '\0';
X-+					ret = usb_get_string_simple(devh, 
X-+						dev->config[i].interface[j].altsetting[k].iInterface, 
X-+						(char *) buf, 
X-+						1024);
X-+					if (ret < 3)
X-+						continue;
X-+					if (strcmp((char *) buf, "MTP") == 0) {
X-+						gp_log (GP_LOG_DEBUG, "mtp matcher", "Configuration %d, interface %d, altsetting %d:\n", i, j, k);
X-+						gp_log (GP_LOG_DEBUG, "mtp matcher", "   Interface description contains the string \"MTP\"\n");
X-+						gp_log (GP_LOG_DEBUG, "mtp matcher", "   Device recognized as MTP, no further probing.\n");
X-+						goto found;
X-+					}
X- 				}
X- 			}
X- 		}
Xdiff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h
X--- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h	1970-01-01 09:00:00.000000000 +0900
X+++ graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h	2013-08-06 00:00:00.000000000 +0900
X@@ -0,0 +1,21 @@
X+--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig
X++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h
X+@@ -152,6 +152,8 @@
X+ 
X+ /* yummy. :) */
X+ 
X++#ifdef __linux
X++
X+ /* XOPEN needed for usleep */
X+ #ifndef _XOPEN_SOURCE
X+ # define _XOPEN_SOURCE 500
X+@@ -166,6 +168,9 @@
X+ # ifndef _POSIX_C_SOURCE
X+ #  define _POSIX_C_SOURCE 199309
X+ # endif
X++
X++#endif
X++
X+ # include <time.h>
X+ 
X+ # include <strings.h>
Xdiff -urN /usr/ports/graphics/libgphoto2/pkg-plist graphics/libgphoto2/pkg-plist
X--- /usr/ports/graphics/libgphoto2/pkg-plist	2013-06-21 03:50:16.000000000 +0900
X+++ graphics/libgphoto2/pkg-plist	2013-08-06 00:00:00.000000000 +0900
X@@ -19,6 +19,10 @@
X include/gphoto2/gphoto2-version.h
X include/gphoto2/gphoto2-widget.h
X include/gphoto2/gphoto2.h
X+lib/libgphoto2.a
X+lib/libgphoto2.la
X+lib/libgphoto2.so
X+lib/libgphoto2.so.6
X lib/libgphoto2/%%VERSION%%/adc65.a
X lib/libgphoto2/%%VERSION%%/adc65.la
X lib/libgphoto2/%%VERSION%%/adc65.so
X@@ -43,6 +47,9 @@
X lib/libgphoto2/%%VERSION%%/clicksmart310.a
X lib/libgphoto2/%%VERSION%%/clicksmart310.la
X lib/libgphoto2/%%VERSION%%/clicksmart310.so
X+lib/libgphoto2/%%VERSION%%/digigr8.a
X+lib/libgphoto2/%%VERSION%%/digigr8.la
X+lib/libgphoto2/%%VERSION%%/digigr8.so
X lib/libgphoto2/%%VERSION%%/digita.a
X lib/libgphoto2/%%VERSION%%/digita.la
X lib/libgphoto2/%%VERSION%%/digita.so
X@@ -55,9 +62,6 @@
X lib/libgphoto2/%%VERSION%%/directory.a
X lib/libgphoto2/%%VERSION%%/directory.la
X lib/libgphoto2/%%VERSION%%/directory.so
X-lib/libgphoto2/%%VERSION%%/digigr8.a
X-lib/libgphoto2/%%VERSION%%/digigr8.la
X-lib/libgphoto2/%%VERSION%%/digigr8.so
X lib/libgphoto2/%%VERSION%%/enigma13.a
X lib/libgphoto2/%%VERSION%%/enigma13.la
X lib/libgphoto2/%%VERSION%%/enigma13.so
X@@ -136,6 +140,9 @@
X lib/libgphoto2/%%VERSION%%/pccam600.a
X lib/libgphoto2/%%VERSION%%/pccam600.la
X lib/libgphoto2/%%VERSION%%/pccam600.so
X+lib/libgphoto2/%%VERSION%%/pentax.a
X+lib/libgphoto2/%%VERSION%%/pentax.la
X+lib/libgphoto2/%%VERSION%%/pentax.so
X lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
X lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
X lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
X@@ -209,6 +216,10 @@
X lib/libgphoto2/%%VERSION%%/tp6801.la
X lib/libgphoto2/%%VERSION%%/tp6801.so
X lib/libgphoto2/print-camera-list
X+lib/libgphoto2_port.a
X+lib/libgphoto2_port.la
X+lib/libgphoto2_port.so
X+lib/libgphoto2_port.so.10
X lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
X lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
X lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
X@@ -218,122 +229,117 @@
X lib/libgphoto2_port/%%VERSION_PORT%%/serial.a
X lib/libgphoto2_port/%%VERSION_PORT%%/serial.la
X lib/libgphoto2_port/%%VERSION_PORT%%/serial.so
X-lib/libgphoto2_port/%%VERSION_PORT%%/usb.a
X-lib/libgphoto2_port/%%VERSION_PORT%%/usb.la
X-lib/libgphoto2_port/%%VERSION_PORT%%/usb.so
X+lib/libgphoto2_port/%%VERSION_PORT%%/usb1.a
X+lib/libgphoto2_port/%%VERSION_PORT%%/usb1.la
X+lib/libgphoto2_port/%%VERSION_PORT%%/usb1.so
X lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.a
X lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.la
X lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.so
X lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
X lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
X lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
X-lib/libgphoto2.a
X-lib/libgphoto2.la
X-lib/libgphoto2.so
X-lib/libgphoto2.so.2
X-lib/libgphoto2_port.a
X-lib/libgphoto2_port.la
X-lib/libgphoto2_port.so
X-lib/libgphoto2_port.so.0
X libdata/pkgconfig/libgphoto2.pc
X libdata/pkgconfig/libgphoto2_port.pc
X-share/doc/libgphoto2/ABOUT-NLS
X-share/doc/libgphoto2/AUTHORS
X-share/doc/libgphoto2/ChangeLog
X-share/doc/libgphoto2/COPYING
X-share/doc/libgphoto2/NEWS
X-share/doc/libgphoto2/README
X-share/doc/libgphoto2/README.packaging
X-share/doc/libgphoto2/camlibs/README.adc65
X-share/doc/libgphoto2/camlibs/README.agfa-cl20
X-share/doc/libgphoto2/camlibs/README.aox
X-share/doc/libgphoto2/camlibs/README.ax203
X-share/doc/libgphoto2/camlibs/README.ax203-compression
X-share/doc/libgphoto2/camlibs/README.canon
X-share/doc/libgphoto2/camlibs/README.clicksmart310
X-share/doc/libgphoto2/camlibs/README.enigma13
X-share/doc/libgphoto2/camlibs/README.gsmart300
X-share/doc/libgphoto2/camlibs/README.iclick
X-share/doc/libgphoto2/camlibs/README.jamcam
X-share/doc/libgphoto2/camlibs/README.jl2005a
X-share/doc/libgphoto2/camlibs/README.jl2005c
X-share/doc/libgphoto2/camlibs/README.konica
X-share/doc/libgphoto2/camlibs/README.largan-lmini
X-share/doc/libgphoto2/camlibs/README.lg_gsm
X-share/doc/libgphoto2/camlibs/README.jl2005bcd-compression
X-share/doc/libgphoto2/camlibs/README.mars
X-share/doc/libgphoto2/camlibs/README.minolta-dimagev
X-share/doc/libgphoto2/camlibs/README.mustek
X-share/doc/libgphoto2/camlibs/README.panasonic
X-share/doc/libgphoto2/camlibs/README.panasonic-coolshot
X-share/doc/libgphoto2/camlibs/README.panasonic-l859
X-share/doc/libgphoto2/camlibs/README.pccam300
X-share/doc/libgphoto2/camlibs/README.pccam600
X-share/doc/libgphoto2/camlibs/README.ptp2
X-share/doc/libgphoto2/camlibs/README.smal
X-share/doc/libgphoto2/camlibs/README.sonix
X-share/doc/libgphoto2/camlibs/README.sonydscf1
X-share/doc/libgphoto2/camlibs/README.soundvision
X-share/doc/libgphoto2/camlibs/README.spca50x
X-share/doc/libgphoto2/camlibs/README.sq905
X-share/doc/libgphoto2/camlibs/README.st2205
X-share/doc/libgphoto2/camlibs/README.st2205-compression
X-share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
X-share/doc/libgphoto2/camlibs/README.tp6801
X-share/doc/libgphoto2/camlibs/README.905C
X-share/doc/libgphoto2/camlibs/README.9050
X-share/doc/libgphoto2/camlibs/README.9051
X-share/doc/libgphoto2/camlibs/README.9052
X-share/doc/libgphoto2/camlibs/README.913C
X-share/doc/libgphoto2/camlibs/README.913D
X-share/doc/libgphoto2_port/AUTHORS
X-share/doc/libgphoto2_port/NEWS
X-share/doc/libgphoto2_port/README
X+%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
X+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
X+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
X+%%PORTDOCS%%%%DOCSDIR%%/NEWS
X+%%PORTDOCS%%%%DOCSDIR%%/README
X+%%PORTDOCS%%%%DOCSDIR%%/README.packaging
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
X+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801
X+%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
X+%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
X+%%PORTDOCS%%share/doc/libgphoto2_port/README
X share/libgphoto2/%%VERSION%%/konica/english
X share/libgphoto2/%%VERSION%%/konica/french
X share/libgphoto2/%%VERSION%%/konica/german
X share/libgphoto2/%%VERSION%%/konica/japanese
X share/libgphoto2/%%VERSION%%/konica/korean
X share/libgphoto2/%%VERSION%%/konica/spanish
X-%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
X-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo
X-%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
X+%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
X+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-10.mo
X+%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-10.mo
X @dirrm share/libgphoto2/%%VERSION%%/konica
X @dirrm share/libgphoto2/%%VERSION%%
X @dirrm share/libgphoto2
X-@dirrm share/doc/libgphoto2_port
X-@dirrm share/doc/libgphoto2/camlibs
X-@dirrm share/doc/libgphoto2
X+%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
X+%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
X+%%PORTDOCS%%@dirrm %%DOCSDIR%%
X @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
X @dirrm lib/libgphoto2_port
X @dirrm lib/libgphoto2/%%VERSION%%
d64ac200ec15b9bd128819af21875b49
echo x - graphics_gphoto2.diff
sed 's/^X//' >graphics_gphoto2.diff << '4a42443d63703904263e18f4dc1a673f'
Xdiff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
X--- /usr/ports/graphics/gphoto2/Makefile	2013-07-10 15:24:26.000000000 +0900
X+++ graphics/gphoto2/Makefile	2013-08-06 00:00:00.000000000 +0900
X@@ -2,7 +2,7 @@
X # $FreeBSD: head/graphics/gphoto2/Makefile 322615 2013-07-10 05:21:51Z danfe $
X 
X PORTNAME=	gphoto2
X-PORTVERSION=	2.4.14
X+PORTVERSION=	2.5.2
X CATEGORIES=	graphics
X MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
X 
X@@ -21,23 +21,36 @@
X 
X MAN1=		${PORTNAME}.1
X 
X-OPTIONS_DEFINE=	AALIB DOCS NLS
X-OPTIONS_DEFAULT=	AALIB
X+OPTIONS_DEFINE=	AALIB READLINE DOCS NLS
X+OPTIONS_DEFAULT=	AALIB READLINE
X OPTIONS_SUB=	yes
X 
X AALIB_DESC=	Text mode capture preview support
X 
X AALIB_LIB_DEPENDS=	aa:${PORTSDIR}/graphics/aalib
X-AALIB_CONFIGURE_OFF=	--without-aalib
X+AALIB_CONFIGURE_WITH=	aalib
X+
X+READLINE_USES=	readline
X+READLINE_CONFIGURE_WITH=	readline
X 
X NLS_USES=	gettext
X-NLS_CONFIGURE_OFF=	--disable-nls
X+NLS_CONFIGURE_ENABLE=	nls
X 
X .include <bsd.port.options.mk>
X 
X+post-patch:
X+	@${REINPLACE_CMD} -e \
X+		's|-lpthread|-pthread|' \
X+		${WRKSRC}/configure
X+	@${REINPLACE_CMD} -e \
X+		'/^install-data-am:/s|install-docDATA||' \
X+		${WRKSRC}/gphoto2/Makefile.in
X+
X post-install:
X .if ${PORT_OPTIONS:MDOCS}
X-	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
X+	@${MKDIR} ${DOCSDIR}
X+	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${DOCSDIR})
X+	(cd ${WRKSRC}/gphoto2 && ${INSTALL_DATA} test-hook.sh ${DOCSDIR})
X .endif
X 
X .include <bsd.port.mk>
Xdiff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
X--- /usr/ports/graphics/gphoto2/distinfo	2013-06-21 03:50:28.000000000 +0900
X+++ graphics/gphoto2/distinfo	2013-08-06 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
X-SIZE (gphoto2-2.4.14.tar.bz2) = 669292
X+SHA256 (gphoto2-2.5.2.tar.bz2) = 8eb9928f3872fea13d22c556a5bc2aea70caf23b287604cb3eef7ad759988899
X+SIZE (gphoto2-2.5.2.tar.bz2) = 720529
Xdiff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
X--- /usr/ports/graphics/gphoto2/pkg-plist	2013-06-21 03:50:28.000000000 +0900
X+++ graphics/gphoto2/pkg-plist	2013-08-06 00:00:00.000000000 +0900
X@@ -1,6 +1,6 @@
X bin/gphoto2
X %%PORTDOCS%%%%DOCSDIR%%/NEWS
X-%%DOCSDIR%%/test-hook.sh
X+%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
X %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
X %%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
X %%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
X@@ -31,4 +31,4 @@
X %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo
X %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
X %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
X-@dirrm %%DOCSDIR%%
X+%%PORTDOCS%%@dirrm %%DOCSDIR%%
4a42443d63703904263e18f4dc1a673f
echo x - graphics_gtkam.diff
sed 's/^X//' >graphics_gtkam.diff << 'e75a64e7684c8c30e005ca20a303ae01'
Xdiff -urN /usr/ports/graphics/gtkam/Makefile graphics/gtkam/Makefile
X--- /usr/ports/graphics/gtkam/Makefile	2013-07-10 15:24:26.000000000 +0900
X+++ graphics/gtkam/Makefile	2013-08-06 00:00:00.000000000 +0900
X@@ -2,8 +2,7 @@
X # $FreeBSD: head/graphics/gtkam/Makefile 322581 2013-07-09 21:26:48Z pav $
X 
X PORTNAME=	gtkam
X-PORTVERSION=	0.1.18
X-PORTREVISION=	3
X+PORTVERSION=	0.2.0
X CATEGORIES=	graphics
X MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
X 
X@@ -11,33 +10,30 @@
X COMMENT=	Download and view files from various digital cameras
X 
X LIB_DEPENDS=	exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
X-		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
X+		gphoto2:${PORTSDIR}/graphics/libgphoto2
X 
X-WANT_GNOME=	yes
X-USES=        pathfix
X+OPTIONS_DEFINE=	GIMP GNOME DOCS
X+OPTIONS_SUB=	yes
X+GIMP_DESC=	GIMP plugin support
X+
X+USES=		gmake pathfix
X USE_GNOME=	gnomehier gtk20
X-USE_GMAKE=	yes
X GNU_CONFIGURE=	yes
X+
X CPPFLAGS+=	-I${LOCALBASE}/include
X LDFLAGS+=	-L${LOCALBASE}/lib
X 
X MAN1=		gtkam.1
X 
X-.include <bsd.port.pre.mk>
X-
X-.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
X-WITH_GIMP=	yes
X-.endif
X+.include <bsd.port.options.mk>
X 
X-.if defined(WITH_GIMP)
X+.if ${PORT_OPTIONS:MGIMP}
X LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
X-PLIST_SUB+=	GIMP=""
X .else
X CONFIGURE_ARGS+=	--without-gimp
X-PLIST_SUB+=	GIMP="@comment "
X .endif
X 
X-.if ${HAVE_GNOME:Mlibgnomeui}!=""
X+.if ${PORT_OPTIONS:MGNOME}
X PKGNAMESUFFIX=	-gnome
X USE_GNOME+=	gnomeprefix libgnomeui
X INSTALLS_OMF=	yes
X@@ -47,32 +43,20 @@
X MAKE_ENV+=	GNOME_SUBDIRS=""
X .endif
X 
X-pre-everything::
X-.if !defined(WITH_GIMP)
X-	@${ECHO_MSG}
X-	@${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
X-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
X-	@${ECHO_MSG}
X-.endif
X-
X post-patch:
X 	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
X-		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
X+		 s|images/gtkam|gtkam/images|g ; \
X+		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
X 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
X 		's|images/gtkam|gtkam/images|g ; \
X 		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
X 
X post-install:
X-	${MKDIR} ${PREFIX}/share/applications
X-	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
X-		${PREFIX}/share/applications
X-	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
X-		${PREFIX}/share/pixmaps
X-.if !defined(NOPORTDOCS)
X+.if ${PORT_OPTIONS:MDOCS}
X 	@${MKDIR} ${DOCSDIR}
X-.for file in AUTHORS NEWS README
X-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
X+.for i in AUTHORS NEWS README
X+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
X .endfor
X .endif
X 
X-.include <bsd.port.post.mk>
X+.include <bsd.port.mk>
Xdiff -urN /usr/ports/graphics/gtkam/distinfo graphics/gtkam/distinfo
X--- /usr/ports/graphics/gtkam/distinfo	2013-06-21 03:50:15.000000000 +0900
X+++ graphics/gtkam/distinfo	2013-08-06 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
X-SIZE (gtkam-0.1.18.tar.gz) = 1443404
X+SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
X+SIZE (gtkam-0.2.0.tar.gz) = 1443593
Xdiff -urN /usr/ports/graphics/gtkam/files/patch-Makefile.in graphics/gtkam/files/patch-Makefile.in
X--- /usr/ports/graphics/gtkam/files/patch-Makefile.in	2013-06-21 03:50:15.000000000 +0900
X+++ graphics/gtkam/files/patch-Makefile.in	2013-08-06 00:00:00.000000000 +0900
X@@ -9,13 +9,12 @@
X  ACLOCAL_AMFLAGS = -I m4m
X  
X  # disable scrollkeeper for distcheck
X-@@ -714,8 +714,7 @@
X+@@ -858,7 +858,7 @@
X  
X  info-am:
X  
X -install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
X--	install-iconDATA
X-+install-data-am:
X++install-data-am: install-ApplicationsDATA \
X+ 	install-iconDATA
X  
X  install-dvi: install-dvi-recursive
X- 
Xdiff -urN /usr/ports/graphics/gtkam/pkg-plist graphics/gtkam/pkg-plist
X--- /usr/ports/graphics/gtkam/pkg-plist	2013-06-21 03:50:15.000000000 +0900
X+++ graphics/gtkam/pkg-plist	2013-08-06 00:00:00.000000000 +0900
X@@ -1,30 +1,27 @@
X bin/gtkam
X %%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
X+share/applications/gtkam.desktop
X %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
X %%PORTDOCS%%%%DOCSDIR%%/NEWS
X %%PORTDOCS%%%%DOCSDIR%%/README
X-share/applications/gtkam.desktop
X-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
X-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
X-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
X-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
X-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
X-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
X-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
X-%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
X-%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
X-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
X-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
X-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
X-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
X-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
X-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
X-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
X-%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
X-%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
X-%%GNOME:%%share/omf/gtkam/gtkam-C.omf
X-%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
X-share/pixmaps/gtkam.png
X+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
X+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
X+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
X+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
X+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
X+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
X+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
X+%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
X+%%GNOME%%share/gnome/help/gtkam/C/legal.xml
X+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
X+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
X+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
X+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
X+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
X+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
X+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
X+%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
X+%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
X %%DATADIR%%/images/gtkam-audio.png
X %%DATADIR%%/images/gtkam-camera.png
X %%DATADIR%%/images/gtkam-folder-camera.png
X@@ -59,18 +56,21 @@
X share/locale/sk/LC_MESSAGES/gtkam.mo
X share/locale/sl/LC_MESSAGES/gtkam.mo
X share/locale/sv/LC_MESSAGES/gtkam.mo
X-share/locale/vi/LC_MESSAGES/gtkam.mo
X share/locale/uk/LC_MESSAGES/gtkam.mo
X+share/locale/vi/LC_MESSAGES/gtkam.mo
X share/locale/zh_CN/LC_MESSAGES/gtkam.mo
X+%%GNOME%%share/omf/gtkam/gtkam-C.omf
X+%%GNOME%%share/omf/gtkam/gtkam-ru.omf
X share/pixmaps/gtkam-camera.png
X+share/pixmaps/gtkam.png
X @dirrm %%DATADIR%%/pixmaps
X @dirrm %%DATADIR%%/images
X @dirrm %%DATADIR%%
X-%%GNOME:%%@dirrm share/omf/gtkam
X-%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
X-%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
X-%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
X-%%GNOME:%%@dirrm share/gnome/help/gtkam/C
X-%%GNOME:%%@dirrm share/gnome/help/gtkam
X+%%GNOME%%@dirrm share/omf/gtkam
X+%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
X+%%GNOME%%@dirrm share/gnome/help/gtkam/ru
X+%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
X+%%GNOME%%@dirrm share/gnome/help/gtkam/C
X+%%GNOME%%@dirrm share/gnome/help/gtkam
X %%PORTDOCS%%@dirrm %%DOCSDIR%%
X @dirrmtry share/applications
e75a64e7684c8c30e005ca20a303ae01
echo x - graphics_fusefs-gphotofs.diff
sed 's/^X//' >graphics_fusefs-gphotofs.diff << 'a2c83f79c0cd4f526f345fc4e631a141'
Xdiff -urN /usr/ports/graphics/fusefs-gphotofs/Makefile graphics/fusefs-gphotofs/Makefile
X--- /usr/ports/graphics/fusefs-gphotofs/Makefile	2013-07-10 15:24:26.000000000 +0900
X+++ graphics/fusefs-gphotofs/Makefile	2013-08-06 00:00:00.000000000 +0900
X@@ -2,10 +2,9 @@
X # $FreeBSD: head/graphics/fusefs-gphotofs/Makefile 322596 2013-07-10 01:57:14Z danfe $
X 
X PORTNAME=	gphotofs
X-PORTVERSION=	0.4.0
X-PORTREVISION=	1
X+PORTVERSION=	0.5
X CATEGORIES=	graphics sysutils
X-MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
X+MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}.0
X PKGNAMEPREFIX=	fusefs-
X 
X MAINTAINER=	ports@FreeBSD.org
Xdiff -urN /usr/ports/graphics/fusefs-gphotofs/distinfo graphics/fusefs-gphotofs/distinfo
X--- /usr/ports/graphics/fusefs-gphotofs/distinfo	2013-06-21 03:49:39.000000000 +0900
X+++ graphics/fusefs-gphotofs/distinfo	2013-08-06 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (gphotofs-0.4.0.tar.bz2) = d88f37dd70d36585edcff887d04c886b4a3dd3f5cb68f5d3b5c67f3fb9b2fd1f
X-SIZE (gphotofs-0.4.0.tar.bz2) = 267708
X+SHA256 (gphotofs-0.5.tar.bz2) = 676ec4de69a81c193ffc31bdc7b587ac2a2cc3780b14f0e7c9c4c0a517b343cc
X+SIZE (gphotofs-0.5.tar.bz2) = 261357
a2c83f79c0cd4f526f345fc4e631a141
exit

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Aug 5 18:11:57 UTC 2013 
Responsible-Changed-Why:  
miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181073 

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: graphics/gphoto2: Update to version 2.5.2
Date: Wed, 4 Sep 2013 02:57:33 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Wed__4_Sep_2013_02_57_33_+0900_gAazt.wA.A76eYBE
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Wed__4_Sep_2013_02_57_33_+0900_gAazt.wA.A76eYBE
 Content-Type: text/x-diff;
  name="graphics_libgphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_libgphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile
 --- /usr/ports/graphics/libgphoto2/Makefile	2013-07-26 05:22:45.000000000 +0900
 +++ graphics/libgphoto2/Makefile	2013-09-04 00:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/graphics/libgphoto2/Makefile 323662 2013-07-25 18:55:01Z kwm $
  
  PORTNAME=	libgphoto2
 -PORTVERSION=	2.4.14
 -PORTREVISION=	3
 +PORTVERSION=	2.5.2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
  
 @@ -12,65 +11,106 @@
  
  LICENSE=	LGPL21
  
 -LIB_DEPENDS=	exif:${PORTSDIR}/graphics/libexif \
 -		jpeg:${PORTSDIR}/graphics/jpeg
 +OPTIONS_DEFINE=	EXIF GD JPEG XML DOCS NLS
 +OPTIONS_DEFAULT=EXIF GD JPEG XML
 +EXIF_DESC=	EXIF tag support
  
 -USES=		gmake pkgconfig
 +USES=		gmake iconv pkgconfig
  USE_BZIP2=	yes
  USE_GNOME=	ltverhack
  USE_AUTOTOOLS=	libtool libltdl
  LIBTOOLFILES=	configure libgphoto2_port/configure
 -USE_LDCONFIG=	yes
  CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 -		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
 +		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 +		ac_cv_path_DOT=false \
 +		ac_cv_path_DOXYGEN=false \
 +		udevscriptdir=${WRKDIR}
 +USE_LDCONFIG=	yes
  
 -PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
 +
 +PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.10.0
  
  MAN3=		libgphoto2.3 libgphoto2_port.3
  
  .include <bsd.port.options.mk>
  
 -.if ${OSVERSION} < 1000040
 -CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I/usr/include" \
 -		LIBUSB_LIBS="-lusb"
 +.if ${PORT_OPTIONS:MEXIF}
 +LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif
 +.else
 +CONFIGURE_ARGS+=	--without-libexif
 +.endif
 +
 +.if ${PORT_OPTIONS:MGD}
 +LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
  .else
 -# Safe because it's never used
 -CFLAGS+=	-DENODATA=0
 +CONFIGURE_ARGS+=	--without-gd
 +.endif
 +
 +.if ${PORT_OPTIONS:MJPEG}
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 +.else
 +CONFIGURE_ARGS+=	--without-jpeg
 +.endif
 +
 +.if ${PORT_OPTIONS:MXML}
 +USE_GNOME+=	libxml2
 +CPPFLAGS+=	$$(pkg-config --cflags-only-I libxml-2.0)
 +LDFLAGS+=	$$(pkg-config --libs-only-L libxml-2.0)
 +.else
 +CONFIGURE_ARGS+=	--without-libxml2
  .endif
  
  .if ${PORT_OPTIONS:MNLS}
  USES+=		gettext
  PLIST_SUB+=	NLS=""
  .else
 -USES+=		iconv
  CONFIGURE_ARGS+=	--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 +.include <bsd.port.pre.mk>
 +
 +.if ${OSVERSION} < 1000040
 +CONFIGURE_ENV+=	LIBUSB1_CFLAGS="-I/usr/include" \
 +		LIBUSB1_LIBS="-lusb"
 +.endif
 +
  post-patch:
 -.for file in configure libgphoto2_port/configure
 +.for i in configure libgphoto2_port/configure
  	@${REINPLACE_CMD} -e \
 -		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
 -		 s|-g -O2||g ; \
 +		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
 +		 /FLAGS/s|-g|| ; \
  		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
 -			${WRKSRC}/${file}
 +		${WRKSRC}/${i}
  .endfor
 -.if ${PORT_OPTIONS:MNLS}
 -	@${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \
 -		${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in
 -.endif
 -	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \
 -		s| "$$(DESTDIR)$$(udevscriptdir)"||' \
 -			${WRKSRC}/libgphoto2_port/usb/Makefile.in \
 -			${WRKSRC}/packaging/generic/Makefile.in
 -	@${REINPLACE_CMD} -e 's|linux-hotplug ||' \
 -		${WRKSRC}/packaging/Makefile.in
  	@${REINPLACE_CMD} -e \
 -		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
 -			${WRKSRC}/doc/Makefile.in
 -	@${REINPLACE_CMD} -e '/Requires/d' \
 -		${WRKSRC}/libgphoto2_port/libgphoto2_port.pc.in
 -	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
 -		${WRKSRC}/libgphoto2_port/configure
 +		'/^doc_DATA/s|COPYING|| ; \
 +		 /^install-data-am:/s|install-docDATA||' \
 +		${WRKSRC}/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		'/^install-data-am:/s|install-camlibdocDATA||' \
 +		${WRKSRC}/camlibs/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		'/^install-data-am:/s|install-docDATA||' \
 +		${WRKSRC}/libgphoto2_port/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		's|ENODATA|ENOATTR|g' \
 +		${WRKSRC}/libgphoto2_port/libusb1/libusb1.c
 +	@${REINPLACE_CMD} -e \
 +		'/^SUBDIRS/s|linux-hotplug||' \
 +		${WRKSRC}/packaging/Makefile.in
 +
 +post-install:
 +.if ${PORT_OPTIONS:MDOCS}
 +	@${MKDIR} ${DOCSDIR}
 +	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
 +		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-docDATA)
 +	@(cd ${WRKSRC}/camlibs && ${SETENV} ${MAKE_ENV} ${GMAKE} \
 +		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-camlibdocDATA)
 +	@(cd ${WRKSRC}/libgphoto2_port && ${SETENV} ${MAKE_ENV} ${GMAKE} \
 +		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-docDATA)
 +.endif
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo
 --- /usr/ports/graphics/libgphoto2/distinfo	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/distinfo	2013-09-04 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (libgphoto2-2.4.14.tar.bz2) = 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
 -SIZE (libgphoto2-2.4.14.tar.bz2) = 4481384
 +SHA256 (libgphoto2-2.5.2.tar.bz2) = a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838
 +SIZE (libgphoto2-2.5.2.tar.bz2) = 6446235
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES graphics/libgphoto2/files/patch-MAX_ENTRIES
 --- /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-MAX_ENTRIES	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- libgphoto2/gphoto2-list.c.orig	2007-07-27 07:52:55.000000000 +0200
 -+++ libgphoto2/gphoto2-list.c	2008-11-09 17:04:16.000000000 +0100
 -@@ -72,7 +72,7 @@
 - 
 - #ifdef CAMERALIST_STRUCT_COMPATIBILITY
 - 
 --#define MAX_ENTRIES 1024
 -+#define MAX_ENTRIES 8192
 - #define MAX_LIST_STRING_LENGTH 128
 - struct _CameraList {
 - 	int  count;
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- camlibs/smal/ultrapocket.c.orig	2008-10-18 19:55:46.000000000 +0200
 -+++ camlibs/smal/ultrapocket.c	2008-11-12 09:56:52.000000000 +0100
 -@@ -33,6 +33,7 @@
 - 
 - #define GP_MODULE "Smal Ultrapocket"
 - 
 -+#include <locale.h>
 - #ifdef ENABLE_NLS
 - #  include <libintl.h>
 - #  undef _
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-09-04 00:00:00.000000000 +0900
 @@ -1,11 +1,10 @@
  --- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
  +++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
 -@@ -19,6 +19,8 @@
 -  */
 - #include "config.h"
 - 
 -+#include <sys/types.h>
 -+#include <netinet/in.h>
 - #include <stdlib.h>
 +@@ -24,6 +24,7 @@
   #include <string.h>
   #include <stdio.h>
 + #include <time.h>
 ++#include <sys/types.h>
 + #include <sys/socket.h>
 + #include <netinet/in.h>
 + #include <arpa/inet.h>
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- libgphoto2_port/serial/unix.c.orig	Fri Jul 27 02:36:13 2007
 -+++ libgphoto2_port/serial/unix.c	Mon Aug 13 17:26:43 2007
 -@@ -43,6 +43,7 @@
 - #endif
 - #include <string.h>
 - #include <signal.h>
 -+#include <sys/select.h>
 - #include <sys/stat.h>
 - #include <sys/types.h>
 - #ifdef HAVE_SYS_TIME_H
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,45 +0,0 @@
 ---- libgphoto2_port/usb/libusb.c.old	2011-01-16 15:22:21.000000000 +0100
 -+++ libgphoto2_port/usb/libusb.c	2011-01-16 15:21:57.000000000 +0100
 -@@ -824,23 +824,25 @@
 - 	 * MTP interface descriptions, that's how they can be detected, before
 - 	 * we try the more esoteric "OS descriptors" (below).
 - 	 */
 --	for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
 --		unsigned int j;
 --		for (j = 0; j < dev->config[i].bNumInterfaces; j++) {
 --			int k;
 --			for (k = 0; k < dev->config[i].interface[j].num_altsetting; k++) {
 --				buf[0] = '\0';
 --				ret = usb_get_string_simple(devh, 
 --					dev->config[i].interface[j].altsetting[k].iInterface, 
 --					(char *) buf, 
 --					1024);
 --				if (ret < 3)
 --					continue;
 --				if (strcmp((char *) buf, "MTP") == 0) {
 --					gp_log (GP_LOG_DEBUG, "mtp matcher", "Configuration %d, interface %d, altsetting %d:\n", i, j, k);
 --					gp_log (GP_LOG_DEBUG, "mtp matcher", "   Interface description contains the string \"MTP\"\n");
 --					gp_log (GP_LOG_DEBUG, "mtp matcher", "   Device recognized as MTP, no further probing.\n");
 --					goto found;
 -+	if(dev->config) {
 -+		for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
 -+			unsigned int j;
 -+			for (j = 0; j < dev->config[i].bNumInterfaces; j++) {
 -+				int k;
 -+				for (k = 0; k < dev->config[i].interface[j].num_altsetting; k++) {
 -+					buf[0] = '\0';
 -+					ret = usb_get_string_simple(devh, 
 -+						dev->config[i].interface[j].altsetting[k].iInterface, 
 -+						(char *) buf, 
 -+						1024);
 -+					if (ret < 3)
 -+						continue;
 -+					if (strcmp((char *) buf, "MTP") == 0) {
 -+						gp_log (GP_LOG_DEBUG, "mtp matcher", "Configuration %d, interface %d, altsetting %d:\n", i, j, k);
 -+						gp_log (GP_LOG_DEBUG, "mtp matcher", "   Interface description contains the string \"MTP\"\n");
 -+						gp_log (GP_LOG_DEBUG, "mtp matcher", "   Device recognized as MTP, no further probing.\n");
 -+						goto found;
 -+					}
 - 				}
 - 			}
 - 		}
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h	1970-01-01 09:00:00.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h	2013-09-04 00:00:00.000000000 +0900
 @@ -0,0 +1,21 @@
 +--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig
 ++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h
 +@@ -152,6 +152,8 @@
 + 
 + /* yummy. :) */
 + 
 ++#ifdef __linux
 ++
 + /* XOPEN needed for usleep */
 + #ifndef _XOPEN_SOURCE
 + # define _XOPEN_SOURCE 500
 +@@ -166,6 +168,9 @@
 + # ifndef _POSIX_C_SOURCE
 + #  define _POSIX_C_SOURCE 199309
 + # endif
 ++
 ++#endif
 ++
 + # include <time.h>
 + 
 + # include <strings.h>
 diff -urN /usr/ports/graphics/libgphoto2/pkg-plist graphics/libgphoto2/pkg-plist
 --- /usr/ports/graphics/libgphoto2/pkg-plist	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/pkg-plist	2013-09-04 00:00:00.000000000 +0900
 @@ -19,6 +19,10 @@
  include/gphoto2/gphoto2-version.h
  include/gphoto2/gphoto2-widget.h
  include/gphoto2/gphoto2.h
 +lib/libgphoto2.a
 +lib/libgphoto2.la
 +lib/libgphoto2.so
 +lib/libgphoto2.so.6
  lib/libgphoto2/%%VERSION%%/adc65.a
  lib/libgphoto2/%%VERSION%%/adc65.la
  lib/libgphoto2/%%VERSION%%/adc65.so
 @@ -43,6 +47,9 @@
  lib/libgphoto2/%%VERSION%%/clicksmart310.a
  lib/libgphoto2/%%VERSION%%/clicksmart310.la
  lib/libgphoto2/%%VERSION%%/clicksmart310.so
 +lib/libgphoto2/%%VERSION%%/digigr8.a
 +lib/libgphoto2/%%VERSION%%/digigr8.la
 +lib/libgphoto2/%%VERSION%%/digigr8.so
  lib/libgphoto2/%%VERSION%%/digita.a
  lib/libgphoto2/%%VERSION%%/digita.la
  lib/libgphoto2/%%VERSION%%/digita.so
 @@ -55,9 +62,6 @@
  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
 @@ -136,6 +140,9 @@
  lib/libgphoto2/%%VERSION%%/pccam600.a
  lib/libgphoto2/%%VERSION%%/pccam600.la
  lib/libgphoto2/%%VERSION%%/pccam600.so
 +lib/libgphoto2/%%VERSION%%/pentax.a
 +lib/libgphoto2/%%VERSION%%/pentax.la
 +lib/libgphoto2/%%VERSION%%/pentax.so
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
 @@ -209,6 +216,10 @@
  lib/libgphoto2/%%VERSION%%/tp6801.la
  lib/libgphoto2/%%VERSION%%/tp6801.so
  lib/libgphoto2/print-camera-list
 +lib/libgphoto2_port.a
 +lib/libgphoto2_port.la
 +lib/libgphoto2_port.so
 +lib/libgphoto2_port.so.10
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
 @@ -218,122 +229,117 @@
  lib/libgphoto2_port/%%VERSION_PORT%%/serial.a
  lib/libgphoto2_port/%%VERSION_PORT%%/serial.la
  lib/libgphoto2_port/%%VERSION_PORT%%/serial.so
 -lib/libgphoto2_port/%%VERSION_PORT%%/usb.a
 -lib/libgphoto2_port/%%VERSION_PORT%%/usb.la
 -lib/libgphoto2_port/%%VERSION_PORT%%/usb.so
 +lib/libgphoto2_port/%%VERSION_PORT%%/usb1.a
 +lib/libgphoto2_port/%%VERSION_PORT%%/usb1.la
 +lib/libgphoto2_port/%%VERSION_PORT%%/usb1.so
  lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.a
  lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.la
  lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.so
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
 -lib/libgphoto2.a
 -lib/libgphoto2.la
 -lib/libgphoto2.so
 -lib/libgphoto2.so.2
 -lib/libgphoto2_port.a
 -lib/libgphoto2_port.la
 -lib/libgphoto2_port.so
 -lib/libgphoto2_port.so.0
  libdata/pkgconfig/libgphoto2.pc
  libdata/pkgconfig/libgphoto2_port.pc
 -share/doc/libgphoto2/ABOUT-NLS
 -share/doc/libgphoto2/AUTHORS
 -share/doc/libgphoto2/ChangeLog
 -share/doc/libgphoto2/COPYING
 -share/doc/libgphoto2/NEWS
 -share/doc/libgphoto2/README
 -share/doc/libgphoto2/README.packaging
 -share/doc/libgphoto2/camlibs/README.adc65
 -share/doc/libgphoto2/camlibs/README.agfa-cl20
 -share/doc/libgphoto2/camlibs/README.aox
 -share/doc/libgphoto2/camlibs/README.ax203
 -share/doc/libgphoto2/camlibs/README.ax203-compression
 -share/doc/libgphoto2/camlibs/README.canon
 -share/doc/libgphoto2/camlibs/README.clicksmart310
 -share/doc/libgphoto2/camlibs/README.enigma13
 -share/doc/libgphoto2/camlibs/README.gsmart300
 -share/doc/libgphoto2/camlibs/README.iclick
 -share/doc/libgphoto2/camlibs/README.jamcam
 -share/doc/libgphoto2/camlibs/README.jl2005a
 -share/doc/libgphoto2/camlibs/README.jl2005c
 -share/doc/libgphoto2/camlibs/README.konica
 -share/doc/libgphoto2/camlibs/README.largan-lmini
 -share/doc/libgphoto2/camlibs/README.lg_gsm
 -share/doc/libgphoto2/camlibs/README.jl2005bcd-compression
 -share/doc/libgphoto2/camlibs/README.mars
 -share/doc/libgphoto2/camlibs/README.minolta-dimagev
 -share/doc/libgphoto2/camlibs/README.mustek
 -share/doc/libgphoto2/camlibs/README.panasonic
 -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.ptp2
 -share/doc/libgphoto2/camlibs/README.smal
 -share/doc/libgphoto2/camlibs/README.sonix
 -share/doc/libgphoto2/camlibs/README.sonydscf1
 -share/doc/libgphoto2/camlibs/README.soundvision
 -share/doc/libgphoto2/camlibs/README.spca50x
 -share/doc/libgphoto2/camlibs/README.sq905
 -share/doc/libgphoto2/camlibs/README.st2205
 -share/doc/libgphoto2/camlibs/README.st2205-compression
 -share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
 -share/doc/libgphoto2/camlibs/README.tp6801
 -share/doc/libgphoto2/camlibs/README.905C
 -share/doc/libgphoto2/camlibs/README.9050
 -share/doc/libgphoto2/camlibs/README.9051
 -share/doc/libgphoto2/camlibs/README.9052
 -share/doc/libgphoto2/camlibs/README.913C
 -share/doc/libgphoto2/camlibs/README.913D
 -share/doc/libgphoto2_port/AUTHORS
 -share/doc/libgphoto2_port/NEWS
 -share/doc/libgphoto2_port/README
 +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS
 +%%PORTDOCS%%%%DOCSDIR%%/README
 +%%PORTDOCS%%%%DOCSDIR%%/README.packaging
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801
 +%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
 +%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
 +%%PORTDOCS%%share/doc/libgphoto2_port/README
  share/libgphoto2/%%VERSION%%/konica/english
  share/libgphoto2/%%VERSION%%/konica/french
  share/libgphoto2/%%VERSION%%/konica/german
  share/libgphoto2/%%VERSION%%/konica/japanese
  share/libgphoto2/%%VERSION%%/konica/korean
  share/libgphoto2/%%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/nl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
 -%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/pl/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/sk/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/vi/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/vi/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
 -%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-10.mo
  @dirrm share/libgphoto2/%%VERSION%%/konica
  @dirrm share/libgphoto2/%%VERSION%%
  @dirrm share/libgphoto2
 -@dirrm share/doc/libgphoto2_port
 -@dirrm share/doc/libgphoto2/camlibs
 -@dirrm share/doc/libgphoto2
 +%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
  @dirrm lib/libgphoto2_port
  @dirrm lib/libgphoto2/%%VERSION%%
 
 --Multipart=_Wed__4_Sep_2013_02_57_33_+0900_gAazt.wA.A76eYBE
 Content-Type: text/x-diff;
  name="graphics_gphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_gphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
 --- /usr/ports/graphics/gphoto2/Makefile	2013-07-10 15:24:26.000000000 +0900
 +++ graphics/gphoto2/Makefile	2013-09-04 00:00:00.000000000 +0900
 @@ -2,7 +2,7 @@
  # $FreeBSD: head/graphics/gphoto2/Makefile 322615 2013-07-10 05:21:51Z danfe $
  
  PORTNAME=	gphoto2
 -PORTVERSION=	2.4.14
 +PORTVERSION=	2.5.2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
  
 @@ -21,23 +21,36 @@
  
  MAN1=		${PORTNAME}.1
  
 -OPTIONS_DEFINE=	AALIB DOCS NLS
 -OPTIONS_DEFAULT=	AALIB
 +OPTIONS_DEFINE=	AALIB READLINE DOCS NLS
 +OPTIONS_DEFAULT=	AALIB READLINE
  OPTIONS_SUB=	yes
  
  AALIB_DESC=	Text mode capture preview support
  
  AALIB_LIB_DEPENDS=	aa:${PORTSDIR}/graphics/aalib
 -AALIB_CONFIGURE_OFF=	--without-aalib
 +AALIB_CONFIGURE_WITH=	aalib
 +
 +READLINE_USES=	readline
 +READLINE_CONFIGURE_WITH=	readline
  
  NLS_USES=	gettext
 -NLS_CONFIGURE_OFF=	--disable-nls
 +NLS_CONFIGURE_ENABLE=	nls
  
  .include <bsd.port.options.mk>
  
 +post-patch:
 +	@${REINPLACE_CMD} -e \
 +		's|-lpthread|-pthread|' \
 +		${WRKSRC}/configure
 +	@${REINPLACE_CMD} -e \
 +		'/^install-data-am:/s|install-docDATA||' \
 +		${WRKSRC}/gphoto2/Makefile.in
 +
  post-install:
  .if ${PORT_OPTIONS:MDOCS}
 -	${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
 +	@${MKDIR} ${DOCSDIR}
 +	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${DOCSDIR})
 +	(cd ${WRKSRC}/gphoto2 && ${INSTALL_DATA} test-hook.sh ${DOCSDIR})
  .endif
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
 --- /usr/ports/graphics/gphoto2/distinfo	2013-06-21 03:50:28.000000000 +0900
 +++ graphics/gphoto2/distinfo	2013-09-04 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
 -SIZE (gphoto2-2.4.14.tar.bz2) = 669292
 +SHA256 (gphoto2-2.5.2.tar.bz2) = 8eb9928f3872fea13d22c556a5bc2aea70caf23b287604cb3eef7ad759988899
 +SIZE (gphoto2-2.5.2.tar.bz2) = 720529
 diff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
 --- /usr/ports/graphics/gphoto2/pkg-plist	2013-06-21 03:50:28.000000000 +0900
 +++ graphics/gphoto2/pkg-plist	2013-09-04 00:00:00.000000000 +0900
 @@ -1,6 +1,6 @@
  bin/gphoto2
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
 -%%DOCSDIR%%/test-hook.sh
 +%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
  %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
 @@ -31,4 +31,4 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
 -@dirrm %%DOCSDIR%%
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Wed__4_Sep_2013_02_57_33_+0900_gAazt.wA.A76eYBE
 Content-Type: text/x-diff;
  name="graphics_gtkam.diff"
 Content-Disposition: attachment;
  filename="graphics_gtkam.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gtkam/Makefile graphics/gtkam/Makefile
 --- /usr/ports/graphics/gtkam/Makefile	2013-09-03 16:12:38.000000000 +0900
 +++ graphics/gtkam/Makefile	2013-09-04 00:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/graphics/gtkam/Makefile 326111 2013-09-02 22:50:21Z bapt $
  
  PORTNAME=	gtkam
 -PORTVERSION=	0.1.18
 -PORTREVISION=	3
 +PORTVERSION=	0.2.0
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
  
 @@ -11,33 +10,30 @@
  COMMENT=	Download and view files from various digital cameras
  
  LIB_DEPENDS=	exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
 -		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +		gphoto2:${PORTSDIR}/graphics/libgphoto2
  
 -WANT_GNOME=	yes
 -USES=        pathfix pkgconfig
 +OPTIONS_DEFINE=	GIMP GNOME DOCS
 +OPTIONS_SUB=	yes
 +GIMP_DESC=	GIMP plugin support
 +
 +USES=		gmake pathfix pkgconfig
  USE_GNOME=	gnomehier gtk20
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
  MAN1=		gtkam.1
  
 -.include <bsd.port.pre.mk>
 -
 -.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
 -WITH_GIMP=	yes
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if defined(WITH_GIMP)
 +.if ${PORT_OPTIONS:MGIMP}
  LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
 -PLIST_SUB+=	GIMP=""
  .else
  CONFIGURE_ARGS+=	--without-gimp
 -PLIST_SUB+=	GIMP="@comment "
  .endif
  
 -.if ${HAVE_GNOME:Mlibgnomeui}!=""
 +.if ${PORT_OPTIONS:MGNOME}
  PKGNAMESUFFIX=	-gnome
  USE_GNOME+=	gnomeprefix libgnomeui
  INSTALLS_OMF=	yes
 @@ -47,32 +43,20 @@
  MAKE_ENV+=	GNOME_SUBDIRS=""
  .endif
  
 -pre-everything::
 -.if !defined(WITH_GIMP)
 -	@${ECHO_MSG}
 -	@${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
 -	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
 -	@${ECHO_MSG}
 -.endif
 -
  post-patch:
  	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
 -		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
 +		 s|images/gtkam|gtkam/images|g ; \
 +		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
  	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
  		's|images/gtkam|gtkam/images|g ; \
  		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
  
  post-install:
 -	${MKDIR} ${PREFIX}/share/applications
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
 -		${PREFIX}/share/applications
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
 -		${PREFIX}/share/pixmaps
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
 -.for file in AUTHORS NEWS README
 -	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 +.for i in AUTHORS NEWS README
 +	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
  .endfor
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gtkam/distinfo graphics/gtkam/distinfo
 --- /usr/ports/graphics/gtkam/distinfo	2013-06-21 03:50:15.000000000 +0900
 +++ graphics/gtkam/distinfo	2013-09-04 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
 -SIZE (gtkam-0.1.18.tar.gz) = 1443404
 +SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
 +SIZE (gtkam-0.2.0.tar.gz) = 1443593
 diff -urN /usr/ports/graphics/gtkam/files/patch-Makefile.in graphics/gtkam/files/patch-Makefile.in
 --- /usr/ports/graphics/gtkam/files/patch-Makefile.in	2013-06-21 03:50:15.000000000 +0900
 +++ graphics/gtkam/files/patch-Makefile.in	2013-09-04 00:00:00.000000000 +0900
 @@ -9,13 +9,12 @@
   ACLOCAL_AMFLAGS = -I m4m
   
   # disable scrollkeeper for distcheck
 -@@ -714,8 +714,7 @@
 +@@ -858,7 +858,7 @@
   
   info-am:
   
  -install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
 --	install-iconDATA
 -+install-data-am:
 ++install-data-am: install-ApplicationsDATA \
 + 	install-iconDATA
   
   install-dvi: install-dvi-recursive
 - 
 diff -urN /usr/ports/graphics/gtkam/pkg-plist graphics/gtkam/pkg-plist
 --- /usr/ports/graphics/gtkam/pkg-plist	2013-06-21 03:50:15.000000000 +0900
 +++ graphics/gtkam/pkg-plist	2013-09-04 00:00:00.000000000 +0900
 @@ -1,30 +1,27 @@
  bin/gtkam
  %%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
 +share/applications/gtkam.desktop
  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
  %%PORTDOCS%%%%DOCSDIR%%/README
 -share/applications/gtkam.desktop
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
 -%%GNOME:%%share/omf/gtkam/gtkam-C.omf
 -%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
 -share/pixmaps/gtkam.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/C/legal.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
  %%DATADIR%%/images/gtkam-audio.png
  %%DATADIR%%/images/gtkam-camera.png
  %%DATADIR%%/images/gtkam-folder-camera.png
 @@ -59,18 +56,21 @@
  share/locale/sk/LC_MESSAGES/gtkam.mo
  share/locale/sl/LC_MESSAGES/gtkam.mo
  share/locale/sv/LC_MESSAGES/gtkam.mo
 -share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/uk/LC_MESSAGES/gtkam.mo
 +share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/zh_CN/LC_MESSAGES/gtkam.mo
 +%%GNOME%%share/omf/gtkam/gtkam-C.omf
 +%%GNOME%%share/omf/gtkam/gtkam-ru.omf
  share/pixmaps/gtkam-camera.png
 +share/pixmaps/gtkam.png
  @dirrm %%DATADIR%%/pixmaps
  @dirrm %%DATADIR%%/images
  @dirrm %%DATADIR%%
 -%%GNOME:%%@dirrm share/omf/gtkam
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C
 -%%GNOME:%%@dirrm share/gnome/help/gtkam
 +%%GNOME%%@dirrm share/omf/gtkam
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C
 +%%GNOME%%@dirrm share/gnome/help/gtkam
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrmtry share/applications
 
 --Multipart=_Wed__4_Sep_2013_02_57_33_+0900_gAazt.wA.A76eYBE
 Content-Type: text/x-diff;
  name="graphics_fusefs-gphotofs.diff"
 Content-Disposition: attachment;
  filename="graphics_fusefs-gphotofs.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/fusefs-gphotofs/Makefile graphics/fusefs-gphotofs/Makefile
 --- /usr/ports/graphics/fusefs-gphotofs/Makefile	2013-07-10 15:24:26.000000000 +0900
 +++ graphics/fusefs-gphotofs/Makefile	2013-09-04 00:00:00.000000000 +0900
 @@ -2,10 +2,9 @@
  # $FreeBSD: head/graphics/fusefs-gphotofs/Makefile 322596 2013-07-10 01:57:14Z danfe $
  
  PORTNAME=	gphotofs
 -PORTVERSION=	0.4.0
 -PORTREVISION=	1
 +PORTVERSION=	0.5
  CATEGORIES=	graphics sysutils
 -MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
 +MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}.0
  PKGNAMEPREFIX=	fusefs-
  
  MAINTAINER=	ports@FreeBSD.org
 diff -urN /usr/ports/graphics/fusefs-gphotofs/distinfo graphics/fusefs-gphotofs/distinfo
 --- /usr/ports/graphics/fusefs-gphotofs/distinfo	2013-06-21 03:49:39.000000000 +0900
 +++ graphics/fusefs-gphotofs/distinfo	2013-09-04 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gphotofs-0.4.0.tar.bz2) = d88f37dd70d36585edcff887d04c886b4a3dd3f5cb68f5d3b5c67f3fb9b2fd1f
 -SIZE (gphotofs-0.4.0.tar.bz2) = 267708
 +SHA256 (gphotofs-0.5.tar.bz2) = 676ec4de69a81c193ffc31bdc7b587ac2a2cc3780b14f0e7c9c4c0a517b343cc
 +SIZE (gphotofs-0.5.tar.bz2) = 261357
 
 --Multipart=_Wed__4_Sep_2013_02_57_33_+0900_gAazt.wA.A76eYBE--

From: "Marcel Bonnet [ports]" <ports@monovox.org>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/181073: graphics/gphoto2: Update to version 2.5.2
Date: Wed, 18 Sep 2013 15:48:42 -0300

 --089e01176b43f203e204e6ace296
 Content-Type: multipart/alternative; boundary=089e01176b43f203d704e6ace294
 
 --089e01176b43f203d704e6ace294
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hi, I used the last libgphoto2.diff provided in PR, but I corrected USES=
 gmake to USE_GMAKE=yes and wrote some new patches to ${FILESDIR}.
 
 graphics/gphoto2 worked with no extra patches.
 
 I also sent a diff to the upstream 'cos I realized that Fuji FinePix S2980
 is also supported, so I made a new entry in camlibs/ptp2/library.c
 
 I didn't tried the other patches submitted.
 
 The shar file attached contains a diff based on graphics/libgphoto2 svn
 revision 327548 and a files directory, which contains all new patches to be
 added to the current ${FILESDIR} .
 
 Thanks for your work, Kato . :D , saved me a lot of problems!
 
 -- 
 Marcel Bonnet
 <http://www.monovox.org>
 
 --089e01176b43f203d704e6ace294--
 --089e01176b43f203e204e6ace296
 Content-Type: text/plain; charset=US-ASCII; name="libgphoto2.shar.txt"
 Content-Disposition: attachment; filename="libgphoto2.shar.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hlqweksd0
 
 IyBUaGlzIGlzIGEgc2hlbGwgYXJjaGl2ZS4gIFNhdmUgaXQgaW4gYSBmaWxlLCByZW1vdmUgYW55
 dGhpbmcgYmVmb3JlCiMgdGhpcyBsaW5lLCBhbmQgdGhlbiB1bnBhY2sgaXQgYnkgZW50ZXJpbmcg
 InNoIGZpbGUiLiAgTm90ZSwgaXQgbWF5CiMgY3JlYXRlIGRpcmVjdG9yaWVzOyBmaWxlcyBhbmQg
 ZGlyZWN0b3JpZXMgd2lsbCBiZSBvd25lZCBieSB5b3UgYW5kCiMgaGF2ZSBkZWZhdWx0IHBlcm1p
 c3Npb25zLgojCiMgVGhpcyBhcmNoaXZlIGNvbnRhaW5zOgojCiMJLgojCS4vbGliZ3Bob3RvMi5k
 aWZmCiMJLi9maWxlcwojCS4vZmlsZXMvZXh0cmEtcGF0Y2gtdXNiMjAKIwkuL2ZpbGVzL3BhdGNo
 LWNhbWxpYnNfcHRwMl9saWJyYXJ5LmMKIwkuL2ZpbGVzL3BhdGNoLWxpYmdwaG90bzJfX3BvcnRf
 bGlidXNiMV9saWJ1c2IxLmMKIwkuL2ZpbGVzL3BhdGNoLWxpYmdwaG90bzJfX3BvcnRfdXNic2Nz
 aV9saW51eC5jCiMKZWNobyBjIC0gLgpta2RpciAtcCAuID4gL2Rldi9udWxsIDI+JjEKZWNobyB4
 IC0gLi9saWJncGhvdG8yLmRpZmYKc2VkICdzL15YLy8nID4uL2xpYmdwaG90bzIuZGlmZiA8PCAn
 OTIzZjYxMzZhMDk1MGYzOWI0YmQ5OTM1NWExNzczOTknClhkaWZmIC1ydSAvdXNyL3BvcnRzL2dy
 YXBoaWNzL2xpYmdwaG90bzIvTWFrZWZpbGUgbGliZ3Bob3RvMi9NYWtlZmlsZQpYLS0tIC91c3Iv
 cG9ydHMvZ3JhcGhpY3MvbGliZ3Bob3RvMi9NYWtlZmlsZQkyMDEzLTA5LTE4IDExOjIxOjI5LjAw
 MDAwMDAwMCAtMDMwMApYKysrIGxpYmdwaG90bzIvTWFrZWZpbGUJMjAxMy0wOS0xOCAxMDozNjoz
 NC4wMDAwMDAwMDAgLTAzMDAKWEBAIC0xLDc2ICsxLDEyMSBAQApYICMgQ3JlYXRlZCBieTogQW5k
 ZXJzIE5vcmRieSA8YW5kZXJzQGZpeC5ubz4KWC0jICRGcmVlQlNEOiBoZWFkL2dyYXBoaWNzL2xp
 YmdwaG90bzIvTWFrZWZpbGUgMzIzNjYyIDIwMTMtMDctMjUgMTg6NTU6MDFaIGt3bSAkClgrIyAk
 RnJlZUJTRDogaGVhZC9ncmFwaGljcy9saWJncGhvdG8yL01ha2VmaWxlIDMxNjg1MCAyMDEzLTA0
 LTI5IDIyOjI3OjA1WiBiYXB0ICQKWCAKWCBQT1JUTkFNRT0JbGliZ3Bob3RvMgpYLVBPUlRWRVJT
 SU9OPQkyLjQuMTQKWC1QT1JUUkVWSVNJT049CTMKWCtQT1JUVkVSU0lPTj0JMi41LjIKWCBDQVRF
 R09SSUVTPQlncmFwaGljcwpYIE1BU1RFUl9TSVRFUz0JU0YvZ3Bob3RvL2xpYmdwaG90by8ke1BP
 UlRWRVJTSU9OfQpYIApYLU1BSU5UQUlORVI9CXBvcnRzQEZyZWVCU0Qub3JnClgtQ09NTUVOVD0J
 VW5pdmVyc2FsIGRpZ2l0YWwgY2FtZXJhIGNvbnRyb2wgbGlicmFyeQpYK01BSU5UQUlORVI9CXBh
 dkBGcmVlQlNELm9yZwpYK0NPTU1FTlQ9CVVuaXZlcnNhbCBkaWdpdGFsIGNhbWVyYSBwaWN0dXJl
 IGNvbnRyb2wgdG9vbApYIApYLUxJQ0VOU0U9CUxHUEwyMQpYK09QVElPTlNfREVGSU5FPQlFWElG
 IEdEIEpQRUcgWE1MIERPQ1MgTkxTClgrT1BUSU9OU19ERUZBVUxUPUVYSUYgR0QgSlBFRyBYTUwK
 WCtFWElGX0RFU0M9CUVYSUYgdGFnIHN1cHBvcnQKWCsgClgrVVNFUz0JCWljb252IHBrZ2NvbmZp
 ZwpYIApYLUxJQl9ERVBFTkRTPQlleGlmOiR7UE9SVFNESVJ9L2dyYXBoaWNzL2xpYmV4aWYgXApY
 LQkJanBlZzoke1BPUlRTRElSfS9ncmFwaGljcy9qcGVnClgtClgtVVNFUz0JCWdtYWtlIHBrZ2Nv
 bmZpZwpYIFVTRV9CWklQMj0JeWVzClgtVVNFX0dOT01FPQlsdHZlcmhhY2sKWCtVU0VfR05PTUU9
 CXBrZ2NvbmZpZyBsdHZlcmhhY2sKWCtVU0VfR01BS0U9CXllcwpYIFVTRV9BVVRPVE9PTFM9CWxp
 YnRvb2wgbGlibHRkbApYIExJQlRPT0xGSUxFUz0JY29uZmlndXJlIGxpYmdwaG90bzJfcG9ydC9j
 b25maWd1cmUKWC1VU0VfTERDT05GSUc9CXllcwpYIENPTkZJR1VSRV9FTlY9CUxURExJTkNMPSIt
 SSR7TE9DQUxCQVNFfS9pbmNsdWRlIiBcClgtCQlMSUJMVERMPSItTCR7TE9DQUxCQVNFfS9saWIg
 LWxsdGRsIgpYKwkJTElCTFRETD0iLUwke0xPQ0FMQkFTRX0vbGliIC1sbHRkbCIgXApYKwkJYWNf
 Y3ZfcGF0aF9ET1Q9ZmFsc2UgXApYKwkJYWNfY3ZfcGF0aF9ET1hZR0VOPWZhbHNlIFwKWCsJCXVk
 ZXZzY3JpcHRkaXI9JHtXUktESVJ9ClgrVVNFX0xEQ09ORklHPQl5ZXMKWCsKWCtDUFBGTEFHUys9
 CS1JJHtMT0NBTEJBU0V9L2luY2x1ZGUKWCtMREZMQUdTKz0JLUwke0xPQ0FMQkFTRX0vbGliClgg
 ClgtUExJU1RfU1VCPQlWRVJTSU9OPSIke1BPUlRWRVJTSU9OfSIgVkVSU0lPTl9QT1JUPTAuOC4w
 ClgrUExJU1RfU1VCPQlWRVJTSU9OPSIke1BPUlRWRVJTSU9OfSIgVkVSU0lPTl9QT1JUPTAuMTAu
 MApYKwpYK01BS0VfSk9CU19TQUZFPQl5ZXMKWCAKWCBNQU4zPQkJbGliZ3Bob3RvMi4zIGxpYmdw
 aG90bzJfcG9ydC4zClggClggLmluY2x1ZGUgPGJzZC5wb3J0Lm9wdGlvbnMubWs+ClgrIApYKy5p
 ZiAke1BPUlRfT1BUSU9OUzpNRVhJRn0KWCtMSUJfREVQRU5EUys9CWV4aWY6JHtQT1JUU0RJUn0v
 Z3JhcGhpY3MvbGliZXhpZgpYKy5lbHNlClgrQ09ORklHVVJFX0FSR1MrPQktLXdpdGhvdXQtbGli
 ZXhpZgpYKy5lbmRpZgpYIApYLS5pZiAke09TVkVSU0lPTn0gPCAxMDAwMDQwClgtQ09ORklHVVJF
 X0VOVis9CUxJQlVTQl9DRkxBR1M9Ii1JL3Vzci9pbmNsdWRlIiBcClgtCQlMSUJVU0JfTElCUz0i
 LWx1c2IiClgrLmlmICR7UE9SVF9PUFRJT05TOk1HRH0KWCtMSUJfREVQRU5EUys9CWdkOiR7UE9S
 VFNESVJ9L2dyYXBoaWNzL2dkClgrLmVsc2UKWCtDT05GSUdVUkVfQVJHUys9CS0td2l0aG91dC1n
 ZApYKy5lbmRpZgpYKwpYKy5pZiAke1BPUlRfT1BUSU9OUzpNSlBFR30KWCtMSUJfREVQRU5EUys9
 CWpwZWc6JHtQT1JUU0RJUn0vZ3JhcGhpY3MvanBlZwpYIC5lbHNlClgtIyBTYWZlIGJlY2F1c2Ug
 aXQncyBuZXZlciB1c2VkClgtQ0ZMQUdTKz0JLURFTk9EQVRBPTAKWCtDT05GSUdVUkVfQVJHUys9
 CS0td2l0aG91dC1qcGVnClggLmVuZGlmClggClgrLmlmICR7UE9SVF9PUFRJT05TOk1YTUx9Clgr
 VVNFX0dOT01FKz0JbGlieG1sMgpYK0NQUEZMQUdTKz0JJCQocGtnLWNvbmZpZyAtLWNmbGFncy1v
 bmx5LUkgbGlieG1sLTIuMCkKWCtMREZMQUdTKz0JJCQocGtnLWNvbmZpZyAtLWxpYnMtb25seS1M
 IGxpYnhtbC0yLjApClgrLmVsc2UKWCtDT05GSUdVUkVfQVJHUys9CS0td2l0aG91dC1saWJ4bWwy
 ClgrLmVuZGlmClgrIApYIC5pZiAke1BPUlRfT1BUSU9OUzpNTkxTfQpYIFVTRVMrPQkJZ2V0dGV4
 dApYIFBMSVNUX1NVQis9CU5MUz0iIgpYIC5lbHNlClgtVVNFUys9CQlpY29udgpYIENPTkZJR1VS
 RV9BUkdTKz0JLS1kaXNhYmxlLW5scwpYIFBMSVNUX1NVQis9CU5MUz0iQGNvbW1lbnQgIgpYIC5l
 bmRpZgpYKyAKWCsuaW5jbHVkZSA8YnNkLnBvcnQucHJlLm1rPgpYKwpYKy5pZiAke09TVkVSU0lP
 Tn0gPCAxMDAwMDQwClgrQ09ORklHVVJFX0VOVis9CUxJQlVTQjFfQ0ZMQUdTPSItSS91c3IvaW5j
 bHVkZSIgXApYKwkJTElCVVNCMV9MSUJTPSItbHVzYiIKWCsuZW5kaWYKWCAKWCBwb3N0LXBhdGNo
 OgpYLS5mb3IgZmlsZSBpbiBjb25maWd1cmUgbGliZ3Bob3RvMl9wb3J0L2NvbmZpZ3VyZQpYKwpY
 Ky5mb3IgaSBpbiBjb25maWd1cmUgbGliZ3Bob3RvMl9wb3J0L2NvbmZpZ3VyZQpYIAlAJHtSRUlO
 UExBQ0VfQ01EfSAtZSBcClgtCQknc3x7bGliZGlyfS9wa2djb25maWd8e3ByZWZpeH0vbGliZGF0
 YS9wa2djb25maWd8ZyA7IFwKWC0JCSBzfC1nIC1PMnx8ZyA7IFwKWC0JCSAvZ3JlcCAtaSBsaW51
 eC9zfDsgZmkgOyB0aGVufDsgZWxzZSBmYWxzZTsgZmkgOyB0aGVufCcgXApYLQkJCSR7V1JLU1JD
 fS8ke2ZpbGV9ClgrCSdzfHtsaWJkaXJ9L3BrZ2NvbmZpZ3x7cHJlZml4fS9saWJkYXRhL3BrZ2Nv
 bmZpZ3wgOyBcClgrCS9GTEFHUy9zfC1nfHwgOyBcClgrCS9ncmVwIC1pIGxpbnV4L3N8OyBmaSA7
 IHRoZW58OyBlbHNlIGZhbHNlOyBmaSA7IHRoZW58JyBcClgrCSR7V1JLU1JDfS8ke2l9ClggLmVu
 ZGZvcgpYLS5pZiAke1BPUlRfT1BUSU9OUzpNTkxTfQpYLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAn
 c3woTERGTEFHUykgLW98KExERkxBR1MpIC1saW50bCAtb3wnIFwKWC0JCSR7V1JLU1JDfS9saWJn
 cGhvdG8yX3BvcnQvbGliZ3Bob3RvMl9wb3J0L01ha2VmaWxlLmluClgtLmVuZGlmClgtCUAke1JF
 SU5QTEFDRV9DTUR9IC1lICcvdGVzdC4qdWRldnNjcmlwdGRpci9kIDsgXApYLQkJc3wgIiQkKERF
 U1RESVIpJCQodWRldnNjcmlwdGRpcikifHwnIFwKWC0JCQkke1dSS1NSQ30vbGliZ3Bob3RvMl9w
 b3J0L3VzYi9NYWtlZmlsZS5pbiBcClgtCQkJJHtXUktTUkN9L3BhY2thZ2luZy9nZW5lcmljL01h
 a2VmaWxlLmluClgtCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfGxpbnV4LWhvdHBsdWcgfHwnIFwK
 WC0JCSR7V1JLU1JDfS9wYWNrYWdpbmcvTWFrZWZpbGUuaW4KWCsKWCsgCUAke1JFSU5QTEFDRV9D
 TUR9IC1lIFwKWCsJCScvXmRvY19EQVRBL3N8Q09QWUlOR3x8IDsgXApYKwkJIC9eaW5zdGFsbC1k
 YXRhLWFtOi9zfGluc3RhbGwtZG9jREFUQXx8JyBcClgrCQkke1dSS1NSQ30vTWFrZWZpbGUuaW4K
 WCAJQCR7UkVJTlBMQUNFX0NNRH0gLWUgXApYLQkJJ3N8QEhBVkVfRE9YWUdFTl9UUlVFQHwjfCA7
 IHN8QEhBVkVfRE9YWUdFTl9GQUxTRUB8fCcgXApYLQkJCSR7V1JLU1JDfS9kb2MvTWFrZWZpbGUu
 aW4KWC0JQCR7UkVJTlBMQUNFX0NNRH0gLWUgJy9SZXF1aXJlcy9kJyBcClgtCQkke1dSS1NSQ30v
 bGliZ3Bob3RvMl9wb3J0L2xpYmdwaG90bzJfcG9ydC5wYy5pbgpYLQlAJHtSRUlOUExBQ0VfQ01E
 fSAnc3x3aXRoX2hhbD15ZXN8d2l0aF9oYWw9bm98JyBcClgtCQkke1dSS1NSQ30vbGliZ3Bob3Rv
 Ml9wb3J0L2NvbmZpZ3VyZQpYKwkJJy9eaW5zdGFsbC1kYXRhLWFtOi9zfGluc3RhbGwtY2FtbGli
 ZG9jREFUQXx8JyBcClgrCQkke1dSS1NSQ30vY2FtbGlicy9NYWtlZmlsZS5pbgpYKwlAJHtSRUlO
 UExBQ0VfQ01EfSAtZSBcClgrCQknL15pbnN0YWxsLWRhdGEtYW06L3N8aW5zdGFsbC1kb2NEQVRB
 fHwnIFwKWCsJCSR7V1JLU1JDfS9saWJncGhvdG8yX3BvcnQvTWFrZWZpbGUuaW4KWCsJQCR7UkVJ
 TlBMQUNFX0NNRH0gLWUgXApYKwkJJ3N8RU5PREFUQXxFTk9BVFRSfGcnIFwKWCsJCSR7V1JLU1JD
 fS9saWJncGhvdG8yX3BvcnQvbGlidXNiMS9saWJ1c2IxLmMKWCsJQCR7UkVJTlBMQUNFX0NNRH0g
 LWUgXApYKwkJJy9eU1VCRElSUy9zfGxpbnV4LWhvdHBsdWd8fCcgXApYKwkJJHtXUktTUkN9L3Bh
 Y2thZ2luZy9NYWtlZmlsZS5pbgpYKwpYK3Bvc3QtaW5zdGFsbDoKWCsuaWYgJHtQT1JUX09QVElP
 TlM6TURPQ1N9ClgrCUAke01LRElSfSAke0RPQ1NESVJ9ClgrCUAoY2QgJHtXUktTUkN9ICYmICR7
 U0VURU5WfSAke01BS0VfRU5WfSAke0dNQUtFfSBcClgrCQkke01BS0VfRkxBR1N9ICR7TUFLRUZJ
 TEV9ICR7TUFLRV9BUkdTfSBpbnN0YWxsLWRvY0RBVEEpClgrCUAoY2QgJHtXUktTUkN9L2NhbWxp
 YnMgJiYgJHtTRVRFTlZ9ICR7TUFLRV9FTlZ9ICR7R01BS0V9IFwKWCsJCSR7TUFLRV9GTEFHU30g
 JHtNQUtFRklMRX0gJHtNQUtFX0FSR1N9IGluc3RhbGwtY2FtbGliZG9jREFUQSkKWCsJQChjZCAk
 e1dSS1NSQ30vbGliZ3Bob3RvMl9wb3J0ICYmICR7U0VURU5WfSAke01BS0VfRU5WfSAke0dNQUtF
 fSBcClgrCQkke01BS0VfRkxBR1N9ICR7TUFLRUZJTEV9ICR7TUFLRV9BUkdTfSBpbnN0YWxsLWRv
 Y0RBVEEpClgrLmVuZGlmClgrIApYIApYLS5pbmNsdWRlIDxic2QucG9ydC5taz4KWCsuaW5jbHVk
 ZSA8YnNkLnBvcnQucG9zdC5taz4KWGRpZmYgLXJ1IC91c3IvcG9ydHMvZ3JhcGhpY3MvbGliZ3Bo
 b3RvMi9kaXN0aW5mbyBsaWJncGhvdG8yL2Rpc3RpbmZvClgtLS0gL3Vzci9wb3J0cy9ncmFwaGlj
 cy9saWJncGhvdG8yL2Rpc3RpbmZvCTIwMTMtMDQtMTEgMTQ6MTA6NTMuMDAwMDAwMDAwIC0wMzAw
 ClgrKysgbGliZ3Bob3RvMi9kaXN0aW5mbwkyMDEzLTA5LTE4IDExOjEyOjE1LjAwMDAwMDAwMCAt
 MDMwMApYQEAgLTEsMiArMSwyIEBAClgtU0hBMjU2IChsaWJncGhvdG8yLTIuNC4xNC50YXIuYnoy
 KSA9IDU5YjMyZDQ1MjUyZjY3ZDA2NmNjM2JkYTdhNTlmODA3OGUwY2Y0ZTdmMjM1OTBhNGI2MjE2
 MzNlODEwNjAyOTIKWC1TSVpFIChsaWJncGhvdG8yLTIuNC4xNC50YXIuYnoyKSA9IDQ0ODEzODQK
 WCtTSEEyNTYgKGxpYmdwaG90bzItMi41LjIudGFyLmJ6MikgPSBhMzJkMTEzNTU1YmNiNTllMzMy
 YjMzY2EwMGYyODg3OGI1YTYxNTFlZGI3ZjE4NzM1ZGFlZTgxZDI4MGEyODM4ClgrU0laRSAobGli
 Z3Bob3RvMi0yLjUuMi50YXIuYnoyKSA9IDY0NDYyMzUKWE9ubHkgaW4gbGliZ3Bob3RvMi9maWxl
 czogZXh0cmEtcGF0Y2gtdXNiMjAKWE9ubHkgaW4gL3Vzci9wb3J0cy9ncmFwaGljcy9saWJncGhv
 dG8yL2ZpbGVzOiBwYXRjaC1NQVhfRU5UUklFUwpYT25seSBpbiAvdXNyL3BvcnRzL2dyYXBoaWNz
 L2xpYmdwaG90bzIvZmlsZXM6IHBhdGNoLWNhbWxpYnMtc21hbC11bHRyYXBvY2tldC5jClhkaWZm
 IC1ydSAvdXNyL3BvcnRzL2dyYXBoaWNzL2xpYmdwaG90bzIvZmlsZXMvcGF0Y2gtY2FtbGlic19w
 dHAyLWNvbmZpZy5jIGxpYmdwaG90bzIvZmlsZXMvcGF0Y2gtY2FtbGlic19wdHAyLWNvbmZpZy5j
 ClgtLS0gL3Vzci9wb3J0cy9ncmFwaGljcy9saWJncGhvdG8yL2ZpbGVzL3BhdGNoLWNhbWxpYnNf
 cHRwMi1jb25maWcuYwkyMDEzLTA0LTExIDE0OjEwOjUzLjAwMDAwMDAwMCAtMDMwMApYKysrIGxp
 YmdwaG90bzIvZmlsZXMvcGF0Y2gtY2FtbGlic19wdHAyLWNvbmZpZy5jCTIwMTMtMDktMTcgMTA6
 MjU6MDEuMDAwMDAwMDAwIC0wMzAwClhAQCAtMSwxMSArMSwxMCBAQApYIC0tLSBjYW1saWJzL3B0
 cDIvY29uZmlnLmMub3JpZwlUdWUgRGVjIDEyIDE4OjQzOjUzIDIwMDYKWCArKysgY2FtbGlicy9w
 dHAyL2NvbmZpZy5jCVR1ZSBEZWMgMTIgMTk6MDA6NDUgMjAwNgpYLUBAIC0xOSw2ICsxOSw4IEBA
 ClgtICAqLwpYLSAjaW5jbHVkZSAiY29uZmlnLmgiClgtIApYLSsjaW5jbHVkZSA8c3lzL3R5cGVz
 Lmg+ClgtKyNpbmNsdWRlIDxuZXRpbmV0L2luLmg+ClgtICNpbmNsdWRlIDxzdGRsaWIuaD4KWCtA
 QCAtMjQsNiArMjQsNyBAQApYICAjaW5jbHVkZSA8c3RyaW5nLmg+ClggICNpbmNsdWRlIDxzdGRp
 by5oPgpYKyAjaW5jbHVkZSA8dGltZS5oPgpYKysjaW5jbHVkZSA8c3lzL3R5cGVzLmg+ClgrICNp
 bmNsdWRlIDxzeXMvc29ja2V0Lmg+ClgrICNpbmNsdWRlIDxuZXRpbmV0L2luLmg+ClgrICNpbmNs
 dWRlIDxhcnBhL2luZXQuaD4KWE9ubHkgaW4gbGliZ3Bob3RvMi9maWxlczogcGF0Y2gtY2FtbGli
 c19wdHAyX2xpYnJhcnkuYwpYT25seSBpbiBsaWJncGhvdG8yL2ZpbGVzOiBwYXRjaC1saWJncGhv
 dG8yX19wb3J0X2xpYnVzYjFfbGlidXNiMS5jClhPbmx5IGluIGxpYmdwaG90bzIvZmlsZXM6IHBh
 dGNoLWxpYmdwaG90bzJfX3BvcnRfdXNic2NzaV9saW51eC5jClhPbmx5IGluIC91c3IvcG9ydHMv
 Z3JhcGhpY3MvbGliZ3Bob3RvMi9maWxlczogcGF0Y2gtbGliZ3Bob3RvMl9wb3J0LXNlcmlhbC11
 bml4LmMKWE9ubHkgaW4gL3Vzci9wb3J0cy9ncmFwaGljcy9saWJncGhvdG8yL2ZpbGVzOiBwYXRj
 aC1saWJncGhvdG8yX3BvcnQtdXNiLWxpYnVzYi5jClhkaWZmIC1ydSAvdXNyL3BvcnRzL2dyYXBo
 aWNzL2xpYmdwaG90bzIvcGtnLXBsaXN0IGxpYmdwaG90bzIvcGtnLXBsaXN0ClgtLS0gL3Vzci9w
 b3J0cy9ncmFwaGljcy9saWJncGhvdG8yL3BrZy1wbGlzdAkyMDEzLTA0LTExIDE0OjEwOjUzLjAw
 MDAwMDAwMCAtMDMwMApYKysrIGxpYmdwaG90bzIvcGtnLXBsaXN0CTIwMTMtMDktMTcgMTA6MjU6
 MDEuMDAwMDAwMDAwIC0wMzAwClhAQCAtMTksNiArMTksMTAgQEAKWCBpbmNsdWRlL2dwaG90bzIv
 Z3Bob3RvMi12ZXJzaW9uLmgKWCBpbmNsdWRlL2dwaG90bzIvZ3Bob3RvMi13aWRnZXQuaApYIGlu
 Y2x1ZGUvZ3Bob3RvMi9ncGhvdG8yLmgKWCtsaWIvbGliZ3Bob3RvMi5hClgrbGliL2xpYmdwaG90
 bzIubGEKWCtsaWIvbGliZ3Bob3RvMi5zbwpYK2xpYi9saWJncGhvdG8yLnNvLjYKWCBsaWIvbGli
 Z3Bob3RvMi8lJVZFUlNJT04lJS9hZGM2NS5hClggbGliL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUv
 YWRjNjUubGEKWCBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9hZGM2NS5zbwpYQEAgLTQzLDYg
 KzQ3LDkgQEAKWCBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9jbGlja3NtYXJ0MzEwLmEKWCBs
 aWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9jbGlja3NtYXJ0MzEwLmxhClggbGliL2xpYmdwaG90
 bzIvJSVWRVJTSU9OJSUvY2xpY2tzbWFydDMxMC5zbwpYK2xpYi9saWJncGhvdG8yLyUlVkVSU0lP
 TiUlL2RpZ2lncjguYQpYK2xpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2RpZ2lncjgubGEKWCts
 aWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9kaWdpZ3I4LnNvClggbGliL2xpYmdwaG90bzIvJSVW
 RVJTSU9OJSUvZGlnaXRhLmEKWCBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9kaWdpdGEubGEK
 WCBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9kaWdpdGEuc28KWEBAIC01NSw5ICs2Miw2IEBA
 ClggbGliL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUvZGlyZWN0b3J5LmEKWCBsaWIvbGliZ3Bob3Rv
 Mi8lJVZFUlNJT04lJS9kaXJlY3RvcnkubGEKWCBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9k
 aXJlY3Rvcnkuc28KWC1saWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9kaWdpZ3I4LmEKWC1saWIv
 bGliZ3Bob3RvMi8lJVZFUlNJT04lJS9kaWdpZ3I4LmxhClgtbGliL2xpYmdwaG90bzIvJSVWRVJT
 SU9OJSUvZGlnaWdyOC5zbwpYIGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2VuaWdtYTEzLmEK
 WCBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9lbmlnbWExMy5sYQpYIGxpYi9saWJncGhvdG8y
 LyUlVkVSU0lPTiUlL2VuaWdtYTEzLnNvClhAQCAtMTM2LDYgKzE0MCw5IEBAClggbGliL2xpYmdw
 aG90bzIvJSVWRVJTSU9OJSUvcGNjYW02MDAuYQpYIGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUl
 L3BjY2FtNjAwLmxhClggbGliL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUvcGNjYW02MDAuc28KWCts
 aWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9wZW50YXguYQpYK2xpYi9saWJncGhvdG8yLyUlVkVS
 U0lPTiUlL3BlbnRheC5sYQpYK2xpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL3BlbnRheC5zbwpY
 IGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL3BvbGFyb2lkX3BkYzMyMC5hClggbGliL2xpYmdw
 aG90bzIvJSVWRVJTSU9OJSUvcG9sYXJvaWRfcGRjMzIwLmxhClggbGliL2xpYmdwaG90bzIvJSVW
 RVJTSU9OJSUvcG9sYXJvaWRfcGRjMzIwLnNvClhAQCAtMjA5LDYgKzIxNiwxMCBAQApYIGxpYi9s
 aWJncGhvdG8yLyUlVkVSU0lPTiUlL3RwNjgwMS5sYQpYIGxpYi9saWJncGhvdG8yLyUlVkVSU0lP
 TiUlL3RwNjgwMS5zbwpYIGxpYi9saWJncGhvdG8yL3ByaW50LWNhbWVyYS1saXN0ClgrbGliL2xp
 YmdwaG90bzJfcG9ydC5hClgrbGliL2xpYmdwaG90bzJfcG9ydC5sYQpYK2xpYi9saWJncGhvdG8y
 X3BvcnQuc28KWCtsaWIvbGliZ3Bob3RvMl9wb3J0LnNvLjEwClggbGliL2xpYmdwaG90bzJfcG9y
 dC8lJVZFUlNJT05fUE9SVCUlL2Rpc2suYQpYIGxpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9O
 X1BPUlQlJS9kaXNrLmxhClggbGliL2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05fUE9SVCUlL2Rp
 c2suc28KWEBAIC0yMTgsMTIyICsyMjksMTE3IEBAClggbGliL2xpYmdwaG90bzJfcG9ydC8lJVZF
 UlNJT05fUE9SVCUlL3NlcmlhbC5hClggbGliL2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05fUE9S
 VCUlL3NlcmlhbC5sYQpYIGxpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJS9zZXJp
 YWwuc28KWC1saWIvbGliZ3Bob3RvMl9wb3J0LyUlVkVSU0lPTl9QT1JUJSUvdXNiLmEKWC1saWIv
 bGliZ3Bob3RvMl9wb3J0LyUlVkVSU0lPTl9QT1JUJSUvdXNiLmxhClgtbGliL2xpYmdwaG90bzJf
 cG9ydC8lJVZFUlNJT05fUE9SVCUlL3VzYi5zbwpYK2xpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJT
 SU9OX1BPUlQlJS91c2IxLmEKWCtsaWIvbGliZ3Bob3RvMl9wb3J0LyUlVkVSU0lPTl9QT1JUJSUv
 dXNiMS5sYQpYK2xpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJS91c2IxLnNvClgg
 bGliL2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05fUE9SVCUlL3VzYmRpc2tkaXJlY3QuYQpYIGxp
 Yi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJS91c2JkaXNrZGlyZWN0LmxhClggbGli
 L2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05fUE9SVCUlL3VzYmRpc2tkaXJlY3Quc28KWCBsaWIv
 bGliZ3Bob3RvMl9wb3J0LyUlVkVSU0lPTl9QT1JUJSUvdXNic2NzaS5hClggbGliL2xpYmdwaG90
 bzJfcG9ydC8lJVZFUlNJT05fUE9SVCUlL3VzYnNjc2kubGEKWCBsaWIvbGliZ3Bob3RvMl9wb3J0
 LyUlVkVSU0lPTl9QT1JUJSUvdXNic2NzaS5zbwpYLWxpYi9saWJncGhvdG8yLmEKWC1saWIvbGli
 Z3Bob3RvMi5sYQpYLWxpYi9saWJncGhvdG8yLnNvClgtbGliL2xpYmdwaG90bzIuc28uMgpYLWxp
 Yi9saWJncGhvdG8yX3BvcnQuYQpYLWxpYi9saWJncGhvdG8yX3BvcnQubGEKWC1saWIvbGliZ3Bo
 b3RvMl9wb3J0LnNvClgtbGliL2xpYmdwaG90bzJfcG9ydC5zby4wClggbGliZGF0YS9wa2djb25m
 aWcvbGliZ3Bob3RvMi5wYwpYIGxpYmRhdGEvcGtnY29uZmlnL2xpYmdwaG90bzJfcG9ydC5wYwpY
 LXNoYXJlL2RvYy9saWJncGhvdG8yL0FCT1VULU5MUwpYLXNoYXJlL2RvYy9saWJncGhvdG8yL0FV
 VEhPUlMKWC1zaGFyZS9kb2MvbGliZ3Bob3RvMi9DaGFuZ2VMb2cKWC1zaGFyZS9kb2MvbGliZ3Bo
 b3RvMi9DT1BZSU5HClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvTkVXUwpYLXNoYXJlL2RvYy9saWJn
 cGhvdG8yL1JFQURNRQpYLXNoYXJlL2RvYy9saWJncGhvdG8yL1JFQURNRS5wYWNrYWdpbmcKWC1z
 aGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5hZGM2NQpYLXNoYXJlL2RvYy9saWJn
 cGhvdG8yL2NhbWxpYnMvUkVBRE1FLmFnZmEtY2wyMApYLXNoYXJlL2RvYy9saWJncGhvdG8yL2Nh
 bWxpYnMvUkVBRE1FLmFveApYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLmF4
 MjAzClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuYXgyMDMtY29tcHJlc3Np
 b24KWC1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5jYW5vbgpYLXNoYXJlL2Rv
 Yy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLmNsaWNrc21hcnQzMTAKWC1zaGFyZS9kb2MvbGli
 Z3Bob3RvMi9jYW1saWJzL1JFQURNRS5lbmlnbWExMwpYLXNoYXJlL2RvYy9saWJncGhvdG8yL2Nh
 bWxpYnMvUkVBRE1FLmdzbWFydDMwMApYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVB
 RE1FLmljbGljawpYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLmphbWNhbQpY
 LXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLmpsMjAwNWEKWC1zaGFyZS9kb2Mv
 bGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5qbDIwMDVjClgtc2hhcmUvZG9jL2xpYmdwaG90bzIv
 Y2FtbGlicy9SRUFETUUua29uaWNhClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFE
 TUUubGFyZ2FuLWxtaW5pClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUubGdf
 Z3NtClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuamwyMDA1YmNkLWNvbXBy
 ZXNzaW9uClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUubWFycwpYLXNoYXJl
 L2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLm1pbm9sdGEtZGltYWdldgpYLXNoYXJlL2Rv
 Yy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLm11c3RlawpYLXNoYXJlL2RvYy9saWJncGhvdG8y
 L2NhbWxpYnMvUkVBRE1FLnBhbmFzb25pYwpYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMv
 UkVBRE1FLnBhbmFzb25pYy1jb29sc2hvdApYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMv
 UkVBRE1FLnBhbmFzb25pYy1sODU5Clgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFE
 TUUucGNjYW0zMDAKWC1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5wY2NhbTYw
 MApYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLnB0cDIKWC1zaGFyZS9kb2Mv
 bGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5zbWFsClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2Ft
 bGlicy9SRUFETUUuc29uaXgKWC1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5z
 b255ZHNjZjEKWC1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5zb3VuZHZpc2lv
 bgpYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLnNwY2E1MHgKWC1zaGFyZS9k
 b2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5zcTkwNQpYLXNoYXJlL2RvYy9saWJncGhvdG8y
 L2NhbWxpYnMvUkVBRE1FLnN0MjIwNQpYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVB
 RE1FLnN0MjIwNS1jb21wcmVzc2lvbgpYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVB
 RE1FLnRvc2hpYmEtcGRybTExClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUu
 dHA2ODAxClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuOTA1QwpYLXNoYXJl
 L2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLjkwNTAKWC1zaGFyZS9kb2MvbGliZ3Bob3Rv
 Mi9jYW1saWJzL1JFQURNRS45MDUxClgtc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFE
 TUUuOTA1MgpYLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLjkxM0MKWC1zaGFy
 ZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS45MTNEClgtc2hhcmUvZG9jL2xpYmdwaG90
 bzJfcG9ydC9BVVRIT1JTClgtc2hhcmUvZG9jL2xpYmdwaG90bzJfcG9ydC9ORVdTClgtc2hhcmUv
 ZG9jL2xpYmdwaG90bzJfcG9ydC9SRUFETUUKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9BQk9V
 VC1OTFMKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9BVVRIT1JTClgrJSVQT1JURE9DUyUlJSVE
 T0NTRElSJSUvQ2hhbmdlTG9nClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvTkVXUwpYKyUlUE9S
 VERPQ1MlJSUlRE9DU0RJUiUlL1JFQURNRQpYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL1JFQURN
 RS5wYWNrYWdpbmcKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL0NoYW5nZUxvZwpY
 KyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLjkwNTAKWCslJVBPUlRET0NT
 JSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS45MDUxClgrJSVQT1JURE9DUyUlJSVET0NTRElS
 JSUvY2FtbGlicy9SRUFETUUuOTA1MgpYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMv
 UkVBRE1FLjkwNUMKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS45MTND
 ClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuOTEzRApYKyUlUE9SVERP
 Q1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLmFkYzY1ClgrJSVQT1JURE9DUyUlJSVET0NT
 RElSJSUvY2FtbGlicy9SRUFETUUuYWdmYS1jbDIwClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUv
 Y2FtbGlicy9SRUFETUUuYW94ClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFE
 TUUuYXgyMDMKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5heDIwMy1j
 b21wcmVzc2lvbgpYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLmNhbm9u
 ClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuY2xpY2tzbWFydDMxMApY
 KyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLmVuaWdtYTEzClgrJSVQT1JU
 RE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuZ3NtYXJ0MzAwClgrJSVQT1JURE9DUyUl
 JSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuaWNsaWNrClgrJSVQT1JURE9DUyUlJSVET0NTRElS
 JSUvY2FtbGlicy9SRUFETUUuamFtY2FtClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGli
 cy9SRUFETUUuamwyMDA1YQpYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1F
 LmpsMjAwNWJjZC1jb21wcmVzc2lvbgpYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMv
 UkVBRE1FLmpsMjAwNWMKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5r
 b25pY2EKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5sYXJnYW4tbG1p
 bmkKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5sZ19nc20KWCslJVBP
 UlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5tYXJzClgrJSVQT1JURE9DUyUlJSVE
 T0NTRElSJSUvY2FtbGlicy9SRUFETUUubWlub2x0YS1kaW1hZ2V2ClgrJSVQT1JURE9DUyUlJSVE
 T0NTRElSJSUvY2FtbGlicy9SRUFETUUubXVzdGVrClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUv
 Y2FtbGlicy9SRUFETUUucGFuYXNvbmljClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGli
 cy9SRUFETUUucGFuYXNvbmljLWNvb2xzaG90ClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2Ft
 bGlicy9SRUFETUUucGFuYXNvbmljLWw4NTkKWCslJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1s
 aWJzL1JFQURNRS5wY2NhbTMwMApYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVB
 RE1FLnBjY2FtNjAwClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUucGVu
 dGF4ClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUucHRwMgpYKyUlUE9S
 VERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLnNtYWwKWCslJVBPUlRET0NTJSUlJURP
 Q1NESVIlJS9jYW1saWJzL1JFQURNRS5zb25peApYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2Nh
 bWxpYnMvUkVBRE1FLnNvbnlkc2NmMQpYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMv
 UkVBRE1FLnNvdW5kdmlzaW9uClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFE
 TUUuc3BjYTUweApYKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLnNxOTA1
 ClgrJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuc3QyMjA1ClgrJSVQT1JU
 RE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuc3QyMjA1LWNvbXByZXNzaW9uClgrJSVQ
 T1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUudG9zaGliYS1wZHJtMTEKWCslJVBP
 UlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS50cDY4MDEKWCslJVBPUlRET0NTJSVz
 aGFyZS9kb2MvbGliZ3Bob3RvMl9wb3J0L0FVVEhPUlMKWCslJVBPUlRET0NTJSVzaGFyZS9kb2Mv
 bGliZ3Bob3RvMl9wb3J0L05FV1MKWCslJVBPUlRET0NTJSVzaGFyZS9kb2MvbGliZ3Bob3RvMl9w
 b3J0L1JFQURNRQpYIHNoYXJlL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUva29uaWNhL2VuZ2xpc2gK
 WCBzaGFyZS9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2tvbmljYS9mcmVuY2gKWCBzaGFyZS9saWJn
 cGhvdG8yLyUlVkVSU0lPTiUlL2tvbmljYS9nZXJtYW4KWCBzaGFyZS9saWJncGhvdG8yLyUlVkVS
 U0lPTiUlL2tvbmljYS9qYXBhbmVzZQpYIHNoYXJlL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUva29u
 aWNhL2tvcmVhbgpYIHNoYXJlL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUva29uaWNhL3NwYW5pc2gK
 WC0lJU5MUyUlc2hhcmUvbG9jYWxlL2NzL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1v
 ClgtJSVOTFMlJXNoYXJlL2xvY2FsZS9kYS9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KWC0l
 JU5MUyUlc2hhcmUvbG9jYWxlL2RhL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vClgt
 JSVOTFMlJXNoYXJlL2xvY2FsZS9kZS9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KWC0lJU5M
 UyUlc2hhcmUvbG9jYWxlL2RlL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vClgtJSVO
 TFMlJXNoYXJlL2xvY2FsZS9lcy9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KWC0lJU5MUyUl
 c2hhcmUvbG9jYWxlL2VzL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vClgtJSVOTFMl
 JXNoYXJlL2xvY2FsZS9ldS9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KWC0lJU5MUyUlc2hh
 cmUvbG9jYWxlL2V1L0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vClgtJSVOTFMlJXNo
 YXJlL2xvY2FsZS9mci9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KWC0lJU5MUyUlc2hhcmUv
 bG9jYWxlL2ZyL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vClgtJSVOTFMlJXNoYXJl
 L2xvY2FsZS9odS9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KWC0lJU5MUyUlc2hhcmUvbG9j
 YWxlL2l0L0xDX01FU1NBR0VTL2xpYmdwaG90bzItMi5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUv
 aXQvTENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTAubW8KWC0lJU5MUyUlc2hhcmUvbG9jYWxl
 L2phL0xDX01FU1NBR0VTL2xpYmdwaG90bzItMi5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUvamEv
 TENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTAubW8KWC0lJU5MUyUlc2hhcmUvbG9jYWxlL25s
 L0xDX01FU1NBR0VTL2xpYmdwaG90bzItMi5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUvbmwvTENf
 TUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTAubW8KWC0lJU5MUyUlc2hhcmUvbG9jYWxlL3BsL0xD
 X01FU1NBR0VTL2xpYmdwaG90bzItMi5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUvcGwvTENfTUVT
 U0FHRVMvbGliZ3Bob3RvMl9wb3J0LTAubW8KWC0lJU5MUyUlc2hhcmUvbG9jYWxlL3B0X0JSL0xD
 X01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vClgtJSVOTFMlJXNoYXJlL2xvY2FsZS9ydS9M
 Q19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KWC0lJU5MUyUlc2hhcmUvbG9jYWxlL3J1L0xDX01F
 U1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vClgtJSVOTFMlJXNoYXJlL2xvY2FsZS9zay9MQ19N
 RVNTQUdFUy9saWJncGhvdG8yX3BvcnQtMC5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUvc3YvTENf
 TUVTU0FHRVMvbGliZ3Bob3RvMi0yLm1vClgtJSVOTFMlJXNoYXJlL2xvY2FsZS9zdi9MQ19NRVNT
 QUdFUy9saWJncGhvdG8yX3BvcnQtMC5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUvdWsvTENfTUVT
 U0FHRVMvbGliZ3Bob3RvMi0yLm1vClgtJSVOTFMlJXNoYXJlL2xvY2FsZS91ay9MQ19NRVNTQUdF
 Uy9saWJncGhvdG8yX3BvcnQtMC5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUvdmkvTENfTUVTU0FH
 RVMvbGliZ3Bob3RvMi0yLm1vClgtJSVOTFMlJXNoYXJlL2xvY2FsZS92aS9MQ19NRVNTQUdFUy9s
 aWJncGhvdG8yX3BvcnQtMC5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUvemhfQ04vTENfTUVTU0FH
 RVMvbGliZ3Bob3RvMi0yLm1vClgtJSVOTFMlJXNoYXJlL2xvY2FsZS96aF9DTi9MQ19NRVNTQUdF
 Uy9saWJncGhvdG8yX3BvcnQtMC5tbwpYLSUlTkxTJSVzaGFyZS9sb2NhbGUvemhfVFcvTENfTUVT
 U0FHRVMvbGliZ3Bob3RvMl9wb3J0LTAubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL2NzL0xDX01F
 U1NBR0VTL2xpYmdwaG90bzJfcG9ydC0xMC5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvZGEvTENf
 TUVTU0FHRVMvbGliZ3Bob3RvMi02Lm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9kYS9MQ19NRVNT
 QUdFUy9saWJncGhvdG8yX3BvcnQtMTAubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL2RlL0xDX01F
 U1NBR0VTL2xpYmdwaG90bzItNi5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvZGUvTENfTUVTU0FH
 RVMvbGliZ3Bob3RvMl9wb3J0LTEwLm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9lcy9MQ19NRVNT
 QUdFUy9saWJncGhvdG8yLTYubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL2VzL0xDX01FU1NBR0VT
 L2xpYmdwaG90bzJfcG9ydC0xMC5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvZXUvTENfTUVTU0FH
 RVMvbGliZ3Bob3RvMi02Lm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9ldS9MQ19NRVNTQUdFUy9s
 aWJncGhvdG8yX3BvcnQtMTAubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL2ZpL0xDX01FU1NBR0VT
 L2xpYmdwaG90bzJfcG9ydC0xMC5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvZnIvTENfTUVTU0FH
 RVMvbGliZ3Bob3RvMi02Lm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9mci9MQ19NRVNTQUdFUy9s
 aWJncGhvdG8yX3BvcnQtMTAubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL2h1L0xDX01FU1NBR0VT
 L2xpYmdwaG90bzItNi5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvaXQvTENfTUVTU0FHRVMvbGli
 Z3Bob3RvMi02Lm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9pdC9MQ19NRVNTQUdFUy9saWJncGhv
 dG8yX3BvcnQtMTAubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL2phL0xDX01FU1NBR0VTL2xpYmdw
 aG90bzItNi5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvamEvTENfTUVTU0FHRVMvbGliZ3Bob3Rv
 Ml9wb3J0LTEwLm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9ubC9MQ19NRVNTQUdFUy9saWJncGhv
 dG8yLTYubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL25sL0xDX01FU1NBR0VTL2xpYmdwaG90bzJf
 cG9ydC0xMC5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvcGwvTENfTUVTU0FHRVMvbGliZ3Bob3Rv
 Mi02Lm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9wbC9MQ19NRVNTQUdFUy9saWJncGhvdG8yX3Bv
 cnQtMTAubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL3B0X0JSL0xDX01FU1NBR0VTL2xpYmdwaG90
 bzJfcG9ydC0xMC5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvcnUvTENfTUVTU0FHRVMvbGliZ3Bo
 b3RvMi02Lm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9ydS9MQ19NRVNTQUdFUy9saWJncGhvdG8y
 X3BvcnQtMTAubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL3NrL0xDX01FU1NBR0VTL2xpYmdwaG90
 bzJfcG9ydC0xMC5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvc3IvTENfTUVTU0FHRVMvbGliZ3Bo
 b3RvMl9wb3J0LTEwLm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS9zdi9MQ19NRVNTQUdFUy9saWJn
 cGhvdG8yLTYubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL3N2L0xDX01FU1NBR0VTL2xpYmdwaG90
 bzJfcG9ydC0xMC5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvdWsvTENfTUVTU0FHRVMvbGliZ3Bo
 b3RvMi02Lm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS91ay9MQ19NRVNTQUdFUy9saWJncGhvdG8y
 X3BvcnQtMTAubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL3ZpL0xDX01FU1NBR0VTL2xpYmdwaG90
 bzItNi5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvdmkvTENfTUVTU0FHRVMvbGliZ3Bob3RvMl9w
 b3J0LTEwLm1vClgrJSVOTFMlJXNoYXJlL2xvY2FsZS96aF9DTi9MQ19NRVNTQUdFUy9saWJncGhv
 dG8yLTYubW8KWCslJU5MUyUlc2hhcmUvbG9jYWxlL3poX0NOL0xDX01FU1NBR0VTL2xpYmdwaG90
 bzJfcG9ydC0xMC5tbwpYKyUlTkxTJSVzaGFyZS9sb2NhbGUvemhfVFcvTENfTUVTU0FHRVMvbGli
 Z3Bob3RvMl9wb3J0LTEwLm1vClggQGRpcnJtIHNoYXJlL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUv
 a29uaWNhClggQGRpcnJtIHNoYXJlL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUKWCBAZGlycm0gc2hh
 cmUvbGliZ3Bob3RvMgpYLUBkaXJybSBzaGFyZS9kb2MvbGliZ3Bob3RvMl9wb3J0ClgtQGRpcnJt
 IHNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMKWC1AZGlycm0gc2hhcmUvZG9jL2xpYmdwaG90
 bzIKWCslJVBPUlRET0NTJSVAZGlycm0gc2hhcmUvZG9jL2xpYmdwaG90bzJfcG9ydApYKyUlUE9S
 VERPQ1MlJUBkaXJybSAlJURPQ1NESVIlJS9jYW1saWJzClgrJSVQT1JURE9DUyUlQGRpcnJtICUl
 RE9DU0RJUiUlClggQGRpcnJtIGxpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJQpY
 IEBkaXJybSBsaWIvbGliZ3Bob3RvMl9wb3J0ClggQGRpcnJtIGxpYi9saWJncGhvdG8yLyUlVkVS
 U0lPTiUlClhPbmx5IGluIGxpYmdwaG90bzI6IHdvcmsKOTIzZjYxMzZhMDk1MGYzOWI0YmQ5OTM1
 NWExNzczOTkKZWNobyBjIC0gLi9maWxlcwpta2RpciAtcCAuL2ZpbGVzID4gL2Rldi9udWxsIDI+
 JjEKZWNobyB4IC0gLi9maWxlcy9leHRyYS1wYXRjaC11c2IyMApzZWQgJ3MvXlgvLycgPi4vZmls
 ZXMvZXh0cmEtcGF0Y2gtdXNiMjAgPDwgJ2U3ZWM3MWI0NTJjODVlYjNmOWRjMDU1ZTgzYTViNzc3
 JwpYLS0tIGxpYmdwaG90bzJfcG9ydC91c2IvbGlidXNiLmMub3JpZwkyMDA4LTExLTIxIDE5OjI0
 OjQwLjAwMDAwMDAwMCArMDEwMApYKysrIGxpYmdwaG90bzJfcG9ydC91c2IvbGlidXNiLmMJMjAw
 OS0wMy0wOCAxODo1ODo1Ni4wMDAwMDAwMDAgKzAxMDAKWEBAIC0zMyw2ICszMyw4IEBAClggI2lu
 Y2x1ZGUgPHN0cmluZy5oPgpYIApYICNpbmNsdWRlIDx1c2IuaD4KWCsjaW5jbHVkZSA8bGlidXNi
 MjAuaD4KWCsjaW5jbHVkZSA8bGlidXNiMjBfY29tcGF0MTAuaD4KWCAKWCAjaW5jbHVkZSA8Z3Bo
 b3RvMi9ncGhvdG8yLXBvcnQuaD4KWCAjaW5jbHVkZSA8Z3Bob3RvMi9ncGhvdG8yLXBvcnQtcmVz
 dWx0Lmg+CmU3ZWM3MWI0NTJjODVlYjNmOWRjMDU1ZTgzYTViNzc3CmVjaG8geCAtIC4vZmlsZXMv
 cGF0Y2gtY2FtbGlic19wdHAyX2xpYnJhcnkuYwpzZWQgJ3MvXlgvLycgPi4vZmlsZXMvcGF0Y2gt
 Y2FtbGlic19wdHAyX2xpYnJhcnkuYyA8PCAnYjc5YjJiY2E5MmEyNzZlNTJjOGVlNDc0ZDAwOTQz
 YTYnClgtLS0gY2FtbGlicy9wdHAyL2xpYnJhcnkuYy5vcmlnCTIwMTMtMDktMTggMTE6NDM6MTEu
 MDAwMDAwMDAwIC0wMzAwClgrKysgY2FtbGlicy9wdHAyL2xpYnJhcnkuYwkyMDEzLTA5LTE4IDEx
 OjQ3OjEwLjAwMDAwMDAwMCAtMDMwMApYQEAgLTE0NjIsNiArMTQ2Miw3IEBAClggCXsiRnVqaTpG
 aW5lUGl4IEgyMEVYUiIsCQkJMHgwNGNiLCAweDAyMmQsIDB9LApYIAkvKiBodHRwczovL3NvdXJj
 ZWZvcmdlLm5ldC90cmFja2VyL2luZGV4LnBocD9mdW5jPWRldGFpbCZhaWQ9MzU1NjY5MiZncm91
 cF9pZD04ODc0JmF0aWQ9MTA4ODc0ICovClggCXsiRnVqaTpGaW5lUGl4IFMyOTUwIiwJCQkweDA0
 Y2IsIDB4MDI0MCwgMH0sClgrCXsiRnVqaTpGaW5lUGl4IFMyOTgwIiwJCQkweDA0Y2IsIDB4MDI3
 ZCwgMH0sClggCS8qIEx1aXMgQXJpYXMgPGthYWxvb0BnbWFpbC5jb20+ICovClggCXsiRnVqaTpG
 aW5lUGl4IFgxMCIsCQkJMHgwNGNiLCAweDAyNjMsIDB9LApYIAkvKiB0Lmx1ZGV3aWdAZ21haWwu
 Y29tICovCmI3OWIyYmNhOTJhMjc2ZTUyYzhlZTQ3NGQwMDk0M2E2CmVjaG8geCAtIC4vZmlsZXMv
 cGF0Y2gtbGliZ3Bob3RvMl9fcG9ydF9saWJ1c2IxX2xpYnVzYjEuYwpzZWQgJ3MvXlgvLycgPi4v
 ZmlsZXMvcGF0Y2gtbGliZ3Bob3RvMl9fcG9ydF9saWJ1c2IxX2xpYnVzYjEuYyA8PCAnYTNmNTRj
 OGUxNDA2MjZkMzRlN2VlM2ZlOTIwNDMxNzgnClgtLS0gbGliZ3Bob3RvMl9wb3J0L2xpYnVzYjEv
 bGlidXNiMS5jLm9yaWcJMjAxMy0wOS0xOCAxMDo0NDowMy4wMDAwMDAwMDAgLTAzMDAKWCsrKyBs
 aWJncGhvdG8yX3BvcnQvbGlidXNiMS9saWJ1c2IxLmMJMjAxMy0wOS0xOCAxMDo1MjozMy4wMDAw
 MDAwMDAgLTAzMDAKWEBAIC02MCw2ICs2MCw4IEBAClggClggI2RlZmluZSBDSEVDSyhyZXN1bHQp
 IHtpbnQgcj0ocmVzdWx0KTsgaWYgKHI8MCkgcmV0dXJuIChyKTt9ClggClgrI2RlZmluZSBFTk9E
 QVRBCTYxClgrClggc3RydWN0IF9HUFBvcnRQcml2YXRlTGlicmFyeSB7ClggCWxpYnVzYl9jb250
 ZXh0ICpjdHg7ClggCWxpYnVzYl9kZXZpY2UgKmQ7CmEzZjU0YzhlMTQwNjI2ZDM0ZTdlZTNmZTky
 MDQzMTc4CmVjaG8geCAtIC4vZmlsZXMvcGF0Y2gtbGliZ3Bob3RvMl9fcG9ydF91c2JzY3NpX2xp
 bnV4LmMKc2VkICdzL15YLy8nID4uL2ZpbGVzL3BhdGNoLWxpYmdwaG90bzJfX3BvcnRfdXNic2Nz
 aV9saW51eC5jIDw8ICc2MmEzYTMzZWNjYzQzZWMxZGMwNTljYWZhNjUwMzUzOCcKWC0tLSBsaWJn
 cGhvdG8yX3BvcnQvdXNic2NzaS9saW51eC5jLm9yaWcJMjAxMy0wNC0xMyAwNjoxMzoyNC4wMDAw
 MDAwMDAgLTAzMDAKWCsrKyBsaWJncGhvdG8yX3BvcnQvdXNic2NzaS9saW51eC5jCTIwMTMtMDkt
 MTggMTE6MDc6MzUuMDAwMDAwMDAwIC0wMzAwClhAQCAtMjcsMTUgKzI3LDEzIEBAClggI2luY2x1
 ZGUgPHN0ZGxpYi5oPgpYICNpbmNsdWRlIDx1bmlzdGQuaD4KWCAjaW5jbHVkZSA8c3RyaW5nLmg+
 ClgtI2lmZGVmIEhBVkVfRkNOVExfSApYICMgaW5jbHVkZSA8ZmNudGwuaD4KWC0jZW5kaWYKWCAj
 aWZkZWYgSEFWRV9MSU1JVFNfSApYICMgaW5jbHVkZSA8bGltaXRzLmg+ClggI2VuZGlmClgtI2lm
 ZGVmIEhBVkVfU1lTX0ZJTEVfSApYLSMgaW5jbHVkZSA8c3lzL2ZpbGUuaD4KWC0jZW5kaWYKWCsv
 LyNpZmRlZiBIQVZFX1NZU19GSUxFX0gKWCsvLyMgaW5jbHVkZSA8c3lzL2ZpbGUuaD4KWCsvLyNl
 bmRpZgpYICNpbmNsdWRlIDxzeXMvc3RhdC5oPgpYICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KWCAj
 aWZkZWYgSEFWRV9TWVNfUEFSQU1fSApYQEAgLTkwLDkgKzg4LDE5IEBAClggCWdwX2xvZyAoR1Bf
 TE9HX0RFQlVHLCAiZ3Bob3RvMi1wb3J0LXVzYnNjc2kiLApYIAkJIlRyeWluZyB0byBsb2NrICcl
 cycuLi4iLCBwb3J0LT5zZXR0aW5ncy51c2JzY3NpLnBhdGgpOwpYIApYLQlpZiAoZmxvY2socG9y
 dC0+cGwtPmZkLCBMT0NLX0VYIHwgTE9DS19OQikgIT0gMCkgewpYKwkvKgpYKwkgKiBodHRwOi8v
 d3d3LnBlcmtpbi5vcmcudWsvcG9zdHMvc29sYXJpcy1wb3J0YWJpbGl0eS1mbG9jay5odG1sClgr
 CSAqLwpYKwlzdHJ1Y3QgZmxvY2sgbG9jazsKWCsJbG9jay5sX3N0YXJ0ID0gMDsKWCsJbG9jay5s
 X2xlbiA9IDA7ClgrCWxvY2subF90eXBlID0gRl9XUkxDSzsKWCsJbG9jay5sX3doZW5jZSA9IFNF
 RUtfU0VUOwpYKwpYKwlpZiAoZmNudGwocG9ydC0+cGwtPmZkLCBGX1NFVExLLCAmbG9jaykgIT0g
 MCkgewpYIAkJc3dpdGNoIChlcnJubykgewpYLQkJY2FzZSBFV09VTERCTE9DSzoKWCsJCS8vY2Fz
 ZSBFV09VTERCTE9DSzoKWCsJCWNhc2UgRUFHQUlOOgpYIAkJCWdwX3BvcnRfc2V0X2Vycm9yIChw
 b3J0LApYIAkJCQlfKCJEZXZpY2UgJyVzJyBpcyBsb2NrZWQgYnkgYW5vdGhlciBhcHAuIiksClgg
 CQkJCXBvcnQtPnNldHRpbmdzLnVzYnNjc2kucGF0aCk7ClhAQCAtMTE1LDcgKzEyMywxNiBAQApY
 IGdwX3BvcnRfdXNic2NzaV91bmxvY2sgKEdQUG9ydCAqcG9ydCkKWCB7ClggI2lmZGVmIEhBVkVf
 RkxPQ0sKWC0JaWYgKGZsb2NrKHBvcnQtPnBsLT5mZCwgTE9DS19VTikgIT0gMCkgewpYKyAgICAg
 ICAgLyoKWCsgICAgICAgICAqIGh0dHA6Ly93d3cucGVya2luLm9yZy51ay9wb3N0cy9zb2xhcmlz
 LXBvcnRhYmlsaXR5LWZsb2NrLmh0bWwKWCsgICAgICAgICAqLwpYKyAgICAgICAgc3RydWN0IGZs
 b2NrIGxvY2s7ClgrICAgICAgICBsb2NrLmxfc3RhcnQgPSAwOwpYKyAgICAgICAgbG9jay5sX2xl
 biA9IDA7ClgrICAgICAgICBsb2NrLmxfdHlwZSA9IEZfV1JMQ0s7ClgrICAgICAgICBsb2NrLmxf
 d2hlbmNlID0gU0VFS19TRVQ7ClgrClgrCWlmIChmY250bChwb3J0LT5wbC0+ZmQsIEZfVU5MQ0ss
 ICZsb2NrKSAhPSAwKSB7ClggCQlncF9wb3J0X3NldF9lcnJvciAocG9ydCwgXygiRmFpbGVkIHRv
 IHVubG9jayAnJXMnICglbSkuIiksClggCQkJCSAgIHBvcnQtPnNldHRpbmdzLnVzYnNjc2kucGF0
 aCk7ClggCQlyZXR1cm4gR1BfRVJST1JfSU87CjYyYTNhMzNlY2NjNDNlYzFkYzA1OWNhZmE2NTAz
 NTM4CmV4aXQKCg==
 --089e01176b43f203e204e6ace296--

Date: Wed, 18 Sep 2013 12:20:02 -0300
From: "Marcel Bonnet [ports]" <ports@monovox.org>
Sender: marcelbonnet@gmail.com
To: bug-followup@freebsd.org
Cc: tkato432@yahoo.com
Subject: Re: [PATCH] ports/181073: graphics/gphoto2: Update to version 2.5.2

 --089e0158b154aed8cc04e6a9f84a
 Content-Type: multipart/alternative; boundary=089e0158b154aed8c804e6a9f848
 
 --089e0158b154aed8c804e6a9f848
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hi, I used the last libgphoto2.diff provided in PR, but I corrected USES=
 gmake to USE_GMAKE=yes and wrote some new patches to ${FILESDIR}.
 
 graphics/gphoto2 worked with no extra patches.
 
 I also sent a diff to the upstream 'cos I realized that Fuji FinePix S2980
 is also supported, so I made a new entry in camlibs/ptp2/library.c
 
 I didn't tried the other patches submitted.
 
 Thanks for your work, Kato . :D , saved me a lot of problems!
 
 --089e0158b154aed8c804e6a9f848--
 --089e0158b154aed8cc04e6a9f84a
 Content-Type: application/octet-stream; 
 	name="libgphoto2_from_svn_rev327548.diff"
 Content-Disposition: attachment; 
 	filename="libgphoto2_from_svn_rev327548.diff"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hlqoqk3q0
 
 ZGlmZiAtcnUgL3Vzci9wb3J0cy9ncmFwaGljcy9saWJncGhvdG8yL01ha2VmaWxlIGxpYmdwaG90
 bzIvTWFrZWZpbGUKLS0tIC91c3IvcG9ydHMvZ3JhcGhpY3MvbGliZ3Bob3RvMi9NYWtlZmlsZQky
 MDEzLTA5LTE4IDExOjIxOjI5LjAwMDAwMDAwMCAtMDMwMAorKysgbGliZ3Bob3RvMi9NYWtlZmls
 ZQkyMDEzLTA5LTE4IDEwOjM2OjM0LjAwMDAwMDAwMCAtMDMwMApAQCAtMSw3NiArMSwxMjEgQEAK
 ICMgQ3JlYXRlZCBieTogQW5kZXJzIE5vcmRieSA8YW5kZXJzQGZpeC5ubz4KLSMgJEZyZWVCU0Q6
 IGhlYWQvZ3JhcGhpY3MvbGliZ3Bob3RvMi9NYWtlZmlsZSAzMjM2NjIgMjAxMy0wNy0yNSAxODo1
 NTowMVoga3dtICQKKyMgJEZyZWVCU0Q6IGhlYWQvZ3JhcGhpY3MvbGliZ3Bob3RvMi9NYWtlZmls
 ZSAzMTY4NTAgMjAxMy0wNC0yOSAyMjoyNzowNVogYmFwdCAkCiAKIFBPUlROQU1FPQlsaWJncGhv
 dG8yCi1QT1JUVkVSU0lPTj0JMi40LjE0Ci1QT1JUUkVWSVNJT049CTMKK1BPUlRWRVJTSU9OPQky
 LjUuMgogQ0FURUdPUklFUz0JZ3JhcGhpY3MKIE1BU1RFUl9TSVRFUz0JU0YvZ3Bob3RvL2xpYmdw
 aG90by8ke1BPUlRWRVJTSU9OfQogCi1NQUlOVEFJTkVSPQlwb3J0c0BGcmVlQlNELm9yZwotQ09N
 TUVOVD0JVW5pdmVyc2FsIGRpZ2l0YWwgY2FtZXJhIGNvbnRyb2wgbGlicmFyeQorTUFJTlRBSU5F
 Uj0JcGF2QEZyZWVCU0Qub3JnCitDT01NRU5UPQlVbml2ZXJzYWwgZGlnaXRhbCBjYW1lcmEgcGlj
 dHVyZSBjb250cm9sIHRvb2wKIAotTElDRU5TRT0JTEdQTDIxCitPUFRJT05TX0RFRklORT0JRVhJ
 RiBHRCBKUEVHIFhNTCBET0NTIE5MUworT1BUSU9OU19ERUZBVUxUPUVYSUYgR0QgSlBFRyBYTUwK
 K0VYSUZfREVTQz0JRVhJRiB0YWcgc3VwcG9ydAorIAorVVNFUz0JCWljb252IHBrZ2NvbmZpZwog
 Ci1MSUJfREVQRU5EUz0JZXhpZjoke1BPUlRTRElSfS9ncmFwaGljcy9saWJleGlmIFwKLQkJanBl
 Zzoke1BPUlRTRElSfS9ncmFwaGljcy9qcGVnCi0KLVVTRVM9CQlnbWFrZSBwa2djb25maWcKIFVT
 RV9CWklQMj0JeWVzCi1VU0VfR05PTUU9CWx0dmVyaGFjaworVVNFX0dOT01FPQlwa2djb25maWcg
 bHR2ZXJoYWNrCitVU0VfR01BS0U9CXllcwogVVNFX0FVVE9UT09MUz0JbGlidG9vbCBsaWJsdGRs
 CiBMSUJUT09MRklMRVM9CWNvbmZpZ3VyZSBsaWJncGhvdG8yX3BvcnQvY29uZmlndXJlCi1VU0Vf
 TERDT05GSUc9CXllcwogQ09ORklHVVJFX0VOVj0JTFRETElOQ0w9Ii1JJHtMT0NBTEJBU0V9L2lu
 Y2x1ZGUiIFwKLQkJTElCTFRETD0iLUwke0xPQ0FMQkFTRX0vbGliIC1sbHRkbCIKKwkJTElCTFRE
 TD0iLUwke0xPQ0FMQkFTRX0vbGliIC1sbHRkbCIgXAorCQlhY19jdl9wYXRoX0RPVD1mYWxzZSBc
 CisJCWFjX2N2X3BhdGhfRE9YWUdFTj1mYWxzZSBcCisJCXVkZXZzY3JpcHRkaXI9JHtXUktESVJ9
 CitVU0VfTERDT05GSUc9CXllcworCitDUFBGTEFHUys9CS1JJHtMT0NBTEJBU0V9L2luY2x1ZGUK
 K0xERkxBR1MrPQktTCR7TE9DQUxCQVNFfS9saWIKIAotUExJU1RfU1VCPQlWRVJTSU9OPSIke1BP
 UlRWRVJTSU9OfSIgVkVSU0lPTl9QT1JUPTAuOC4wCitQTElTVF9TVUI9CVZFUlNJT049IiR7UE9S
 VFZFUlNJT059IiBWRVJTSU9OX1BPUlQ9MC4xMC4wCisKK01BS0VfSk9CU19TQUZFPQl5ZXMKIAog
 TUFOMz0JCWxpYmdwaG90bzIuMyBsaWJncGhvdG8yX3BvcnQuMwogCiAuaW5jbHVkZSA8YnNkLnBv
 cnQub3B0aW9ucy5taz4KKyAKKy5pZiAke1BPUlRfT1BUSU9OUzpNRVhJRn0KK0xJQl9ERVBFTkRT
 Kz0JZXhpZjoke1BPUlRTRElSfS9ncmFwaGljcy9saWJleGlmCisuZWxzZQorQ09ORklHVVJFX0FS
 R1MrPQktLXdpdGhvdXQtbGliZXhpZgorLmVuZGlmCiAKLS5pZiAke09TVkVSU0lPTn0gPCAxMDAw
 MDQwCi1DT05GSUdVUkVfRU5WKz0JTElCVVNCX0NGTEFHUz0iLUkvdXNyL2luY2x1ZGUiIFwKLQkJ
 TElCVVNCX0xJQlM9Ii1sdXNiIgorLmlmICR7UE9SVF9PUFRJT05TOk1HRH0KK0xJQl9ERVBFTkRT
 Kz0JZ2Q6JHtQT1JUU0RJUn0vZ3JhcGhpY3MvZ2QKKy5lbHNlCitDT05GSUdVUkVfQVJHUys9CS0t
 d2l0aG91dC1nZAorLmVuZGlmCisKKy5pZiAke1BPUlRfT1BUSU9OUzpNSlBFR30KK0xJQl9ERVBF
 TkRTKz0JanBlZzoke1BPUlRTRElSfS9ncmFwaGljcy9qcGVnCiAuZWxzZQotIyBTYWZlIGJlY2F1
 c2UgaXQncyBuZXZlciB1c2VkCi1DRkxBR1MrPQktREVOT0RBVEE9MAorQ09ORklHVVJFX0FSR1Mr
 PQktLXdpdGhvdXQtanBlZwogLmVuZGlmCiAKKy5pZiAke1BPUlRfT1BUSU9OUzpNWE1MfQorVVNF
 X0dOT01FKz0JbGlieG1sMgorQ1BQRkxBR1MrPQkkJChwa2ctY29uZmlnIC0tY2ZsYWdzLW9ubHkt
 SSBsaWJ4bWwtMi4wKQorTERGTEFHUys9CSQkKHBrZy1jb25maWcgLS1saWJzLW9ubHktTCBsaWJ4
 bWwtMi4wKQorLmVsc2UKK0NPTkZJR1VSRV9BUkdTKz0JLS13aXRob3V0LWxpYnhtbDIKKy5lbmRp
 ZgorIAogLmlmICR7UE9SVF9PUFRJT05TOk1OTFN9CiBVU0VTKz0JCWdldHRleHQKIFBMSVNUX1NV
 Qis9CU5MUz0iIgogLmVsc2UKLVVTRVMrPQkJaWNvbnYKIENPTkZJR1VSRV9BUkdTKz0JLS1kaXNh
 YmxlLW5scwogUExJU1RfU1VCKz0JTkxTPSJAY29tbWVudCAiCiAuZW5kaWYKKyAKKy5pbmNsdWRl
 IDxic2QucG9ydC5wcmUubWs+CisKKy5pZiAke09TVkVSU0lPTn0gPCAxMDAwMDQwCitDT05GSUdV
 UkVfRU5WKz0JTElCVVNCMV9DRkxBR1M9Ii1JL3Vzci9pbmNsdWRlIiBcCisJCUxJQlVTQjFfTElC
 Uz0iLWx1c2IiCisuZW5kaWYKIAogcG9zdC1wYXRjaDoKLS5mb3IgZmlsZSBpbiBjb25maWd1cmUg
 bGliZ3Bob3RvMl9wb3J0L2NvbmZpZ3VyZQorCisuZm9yIGkgaW4gY29uZmlndXJlIGxpYmdwaG90
 bzJfcG9ydC9jb25maWd1cmUKIAlAJHtSRUlOUExBQ0VfQ01EfSAtZSBcCi0JCSdzfHtsaWJkaXJ9
 L3BrZ2NvbmZpZ3x7cHJlZml4fS9saWJkYXRhL3BrZ2NvbmZpZ3xnIDsgXAotCQkgc3wtZyAtTzJ8
 fGcgOyBcCi0JCSAvZ3JlcCAtaSBsaW51eC9zfDsgZmkgOyB0aGVufDsgZWxzZSBmYWxzZTsgZmkg
 OyB0aGVufCcgXAotCQkJJHtXUktTUkN9LyR7ZmlsZX0KKwknc3x7bGliZGlyfS9wa2djb25maWd8
 e3ByZWZpeH0vbGliZGF0YS9wa2djb25maWd8IDsgXAorCS9GTEFHUy9zfC1nfHwgOyBcCisJL2dy
 ZXAgLWkgbGludXgvc3w7IGZpIDsgdGhlbnw7IGVsc2UgZmFsc2U7IGZpIDsgdGhlbnwnIFwKKwkk
 e1dSS1NSQ30vJHtpfQogLmVuZGZvcgotLmlmICR7UE9SVF9PUFRJT05TOk1OTFN9Ci0JQCR7UkVJ
 TlBMQUNFX0NNRH0gLWUgJ3N8KExERkxBR1MpIC1vfChMREZMQUdTKSAtbGludGwgLW98JyBcCi0J
 CSR7V1JLU1JDfS9saWJncGhvdG8yX3BvcnQvbGliZ3Bob3RvMl9wb3J0L01ha2VmaWxlLmluCi0u
 ZW5kaWYKLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAnL3Rlc3QuKnVkZXZzY3JpcHRkaXIvZCA7IFwK
 LQkJc3wgIiQkKERFU1RESVIpJCQodWRldnNjcmlwdGRpcikifHwnIFwKLQkJCSR7V1JLU1JDfS9s
 aWJncGhvdG8yX3BvcnQvdXNiL01ha2VmaWxlLmluIFwKLQkJCSR7V1JLU1JDfS9wYWNrYWdpbmcv
 Z2VuZXJpYy9NYWtlZmlsZS5pbgotCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfGxpbnV4LWhvdHBs
 dWcgfHwnIFwKLQkJJHtXUktTUkN9L3BhY2thZ2luZy9NYWtlZmlsZS5pbgorCisgCUAke1JFSU5Q
 TEFDRV9DTUR9IC1lIFwKKwkJJy9eZG9jX0RBVEEvc3xDT1BZSU5HfHwgOyBcCisJCSAvXmluc3Rh
 bGwtZGF0YS1hbTovc3xpbnN0YWxsLWRvY0RBVEF8fCcgXAorCQkke1dSS1NSQ30vTWFrZWZpbGUu
 aW4KIAlAJHtSRUlOUExBQ0VfQ01EfSAtZSBcCi0JCSdzfEBIQVZFX0RPWFlHRU5fVFJVRUB8I3wg
 OyBzfEBIQVZFX0RPWFlHRU5fRkFMU0VAfHwnIFwKLQkJCSR7V1JLU1JDfS9kb2MvTWFrZWZpbGUu
 aW4KLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAnL1JlcXVpcmVzL2QnIFwKLQkJJHtXUktTUkN9L2xp
 YmdwaG90bzJfcG9ydC9saWJncGhvdG8yX3BvcnQucGMuaW4KLQlAJHtSRUlOUExBQ0VfQ01EfSAn
 c3x3aXRoX2hhbD15ZXN8d2l0aF9oYWw9bm98JyBcCi0JCSR7V1JLU1JDfS9saWJncGhvdG8yX3Bv
 cnQvY29uZmlndXJlCisJCScvXmluc3RhbGwtZGF0YS1hbTovc3xpbnN0YWxsLWNhbWxpYmRvY0RB
 VEF8fCcgXAorCQkke1dSS1NSQ30vY2FtbGlicy9NYWtlZmlsZS5pbgorCUAke1JFSU5QTEFDRV9D
 TUR9IC1lIFwKKwkJJy9eaW5zdGFsbC1kYXRhLWFtOi9zfGluc3RhbGwtZG9jREFUQXx8JyBcCisJ
 CSR7V1JLU1JDfS9saWJncGhvdG8yX3BvcnQvTWFrZWZpbGUuaW4KKwlAJHtSRUlOUExBQ0VfQ01E
 fSAtZSBcCisJCSdzfEVOT0RBVEF8RU5PQVRUUnxnJyBcCisJCSR7V1JLU1JDfS9saWJncGhvdG8y
 X3BvcnQvbGlidXNiMS9saWJ1c2IxLmMKKwlAJHtSRUlOUExBQ0VfQ01EfSAtZSBcCisJCScvXlNV
 QkRJUlMvc3xsaW51eC1ob3RwbHVnfHwnIFwKKwkJJHtXUktTUkN9L3BhY2thZ2luZy9NYWtlZmls
 ZS5pbgorCitwb3N0LWluc3RhbGw6CisuaWYgJHtQT1JUX09QVElPTlM6TURPQ1N9CisJQCR7TUtE
 SVJ9ICR7RE9DU0RJUn0KKwlAKGNkICR7V1JLU1JDfSAmJiAke1NFVEVOVn0gJHtNQUtFX0VOVn0g
 JHtHTUFLRX0gXAorCQkke01BS0VfRkxBR1N9ICR7TUFLRUZJTEV9ICR7TUFLRV9BUkdTfSBpbnN0
 YWxsLWRvY0RBVEEpCisJQChjZCAke1dSS1NSQ30vY2FtbGlicyAmJiAke1NFVEVOVn0gJHtNQUtF
 X0VOVn0gJHtHTUFLRX0gXAorCQkke01BS0VfRkxBR1N9ICR7TUFLRUZJTEV9ICR7TUFLRV9BUkdT
 fSBpbnN0YWxsLWNhbWxpYmRvY0RBVEEpCisJQChjZCAke1dSS1NSQ30vbGliZ3Bob3RvMl9wb3J0
 ICYmICR7U0VURU5WfSAke01BS0VfRU5WfSAke0dNQUtFfSBcCisJCSR7TUFLRV9GTEFHU30gJHtN
 QUtFRklMRX0gJHtNQUtFX0FSR1N9IGluc3RhbGwtZG9jREFUQSkKKy5lbmRpZgorIAogCi0uaW5j
 bHVkZSA8YnNkLnBvcnQubWs+CisuaW5jbHVkZSA8YnNkLnBvcnQucG9zdC5taz4KZGlmZiAtcnUg
 L3Vzci9wb3J0cy9ncmFwaGljcy9saWJncGhvdG8yL2Rpc3RpbmZvIGxpYmdwaG90bzIvZGlzdGlu
 Zm8KLS0tIC91c3IvcG9ydHMvZ3JhcGhpY3MvbGliZ3Bob3RvMi9kaXN0aW5mbwkyMDEzLTA0LTEx
 IDE0OjEwOjUzLjAwMDAwMDAwMCAtMDMwMAorKysgbGliZ3Bob3RvMi9kaXN0aW5mbwkyMDEzLTA5
 LTE4IDExOjEyOjE1LjAwMDAwMDAwMCAtMDMwMApAQCAtMSwyICsxLDIgQEAKLVNIQTI1NiAobGli
 Z3Bob3RvMi0yLjQuMTQudGFyLmJ6MikgPSA1OWIzMmQ0NTI1MmY2N2QwNjZjYzNiZGE3YTU5Zjgw
 NzhlMGNmNGU3ZjIzNTkwYTRiNjIxNjMzZTgxMDYwMjkyCi1TSVpFIChsaWJncGhvdG8yLTIuNC4x
 NC50YXIuYnoyKSA9IDQ0ODEzODQKK1NIQTI1NiAobGliZ3Bob3RvMi0yLjUuMi50YXIuYnoyKSA9
 IGEzMmQxMTM1NTViY2I1OWUzMzJiMzNjYTAwZjI4ODc4YjVhNjE1MWVkYjdmMTg3MzVkYWVlODFk
 MjgwYTI4MzgKK1NJWkUgKGxpYmdwaG90bzItMi41LjIudGFyLmJ6MikgPSA2NDQ2MjM1Ck9ubHkg
 aW4gbGliZ3Bob3RvMi9maWxlczogZXh0cmEtcGF0Y2gtdXNiMjAKT25seSBpbiAvdXNyL3BvcnRz
 L2dyYXBoaWNzL2xpYmdwaG90bzIvZmlsZXM6IHBhdGNoLU1BWF9FTlRSSUVTCk9ubHkgaW4gL3Vz
 ci9wb3J0cy9ncmFwaGljcy9saWJncGhvdG8yL2ZpbGVzOiBwYXRjaC1jYW1saWJzLXNtYWwtdWx0
 cmFwb2NrZXQuYwpkaWZmIC1ydSAvdXNyL3BvcnRzL2dyYXBoaWNzL2xpYmdwaG90bzIvZmlsZXMv
 cGF0Y2gtY2FtbGlic19wdHAyLWNvbmZpZy5jIGxpYmdwaG90bzIvZmlsZXMvcGF0Y2gtY2FtbGli
 c19wdHAyLWNvbmZpZy5jCi0tLSAvdXNyL3BvcnRzL2dyYXBoaWNzL2xpYmdwaG90bzIvZmlsZXMv
 cGF0Y2gtY2FtbGlic19wdHAyLWNvbmZpZy5jCTIwMTMtMDQtMTEgMTQ6MTA6NTMuMDAwMDAwMDAw
 IC0wMzAwCisrKyBsaWJncGhvdG8yL2ZpbGVzL3BhdGNoLWNhbWxpYnNfcHRwMi1jb25maWcuYwky
 MDEzLTA5LTE3IDEwOjI1OjAxLjAwMDAwMDAwMCAtMDMwMApAQCAtMSwxMSArMSwxMCBAQAogLS0t
 IGNhbWxpYnMvcHRwMi9jb25maWcuYy5vcmlnCVR1ZSBEZWMgMTIgMTg6NDM6NTMgMjAwNgogKysr
 IGNhbWxpYnMvcHRwMi9jb25maWcuYwlUdWUgRGVjIDEyIDE5OjAwOjQ1IDIwMDYKLUBAIC0xOSw2
 ICsxOSw4IEBACi0gICovCi0gI2luY2x1ZGUgImNvbmZpZy5oIgotIAotKyNpbmNsdWRlIDxzeXMv
 dHlwZXMuaD4KLSsjaW5jbHVkZSA8bmV0aW5ldC9pbi5oPgotICNpbmNsdWRlIDxzdGRsaWIuaD4K
 K0BAIC0yNCw2ICsyNCw3IEBACiAgI2luY2x1ZGUgPHN0cmluZy5oPgogICNpbmNsdWRlIDxzdGRp
 by5oPgorICNpbmNsdWRlIDx0aW1lLmg+CisrI2luY2x1ZGUgPHN5cy90eXBlcy5oPgorICNpbmNs
 dWRlIDxzeXMvc29ja2V0Lmg+CisgI2luY2x1ZGUgPG5ldGluZXQvaW4uaD4KKyAjaW5jbHVkZSA8
 YXJwYS9pbmV0Lmg+Ck9ubHkgaW4gbGliZ3Bob3RvMi9maWxlczogcGF0Y2gtY2FtbGlic19wdHAy
 X2xpYnJhcnkuYwpPbmx5IGluIGxpYmdwaG90bzIvZmlsZXM6IHBhdGNoLWxpYmdwaG90bzJfX3Bv
 cnRfbGlidXNiMV9saWJ1c2IxLmMKT25seSBpbiBsaWJncGhvdG8yL2ZpbGVzOiBwYXRjaC1saWJn
 cGhvdG8yX19wb3J0X3VzYnNjc2lfbGludXguYwpPbmx5IGluIC91c3IvcG9ydHMvZ3JhcGhpY3Mv
 bGliZ3Bob3RvMi9maWxlczogcGF0Y2gtbGliZ3Bob3RvMl9wb3J0LXNlcmlhbC11bml4LmMKT25s
 eSBpbiAvdXNyL3BvcnRzL2dyYXBoaWNzL2xpYmdwaG90bzIvZmlsZXM6IHBhdGNoLWxpYmdwaG90
 bzJfcG9ydC11c2ItbGlidXNiLmMKZGlmZiAtcnUgL3Vzci9wb3J0cy9ncmFwaGljcy9saWJncGhv
 dG8yL3BrZy1wbGlzdCBsaWJncGhvdG8yL3BrZy1wbGlzdAotLS0gL3Vzci9wb3J0cy9ncmFwaGlj
 cy9saWJncGhvdG8yL3BrZy1wbGlzdAkyMDEzLTA0LTExIDE0OjEwOjUzLjAwMDAwMDAwMCAtMDMw
 MAorKysgbGliZ3Bob3RvMi9wa2ctcGxpc3QJMjAxMy0wOS0xNyAxMDoyNTowMS4wMDAwMDAwMDAg
 LTAzMDAKQEAgLTE5LDYgKzE5LDEwIEBACiBpbmNsdWRlL2dwaG90bzIvZ3Bob3RvMi12ZXJzaW9u
 LmgKIGluY2x1ZGUvZ3Bob3RvMi9ncGhvdG8yLXdpZGdldC5oCiBpbmNsdWRlL2dwaG90bzIvZ3Bo
 b3RvMi5oCitsaWIvbGliZ3Bob3RvMi5hCitsaWIvbGliZ3Bob3RvMi5sYQorbGliL2xpYmdwaG90
 bzIuc28KK2xpYi9saWJncGhvdG8yLnNvLjYKIGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2Fk
 YzY1LmEKIGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2FkYzY1LmxhCiBsaWIvbGliZ3Bob3Rv
 Mi8lJVZFUlNJT04lJS9hZGM2NS5zbwpAQCAtNDMsNiArNDcsOSBAQAogbGliL2xpYmdwaG90bzIv
 JSVWRVJTSU9OJSUvY2xpY2tzbWFydDMxMC5hCiBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9j
 bGlja3NtYXJ0MzEwLmxhCiBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9jbGlja3NtYXJ0MzEw
 LnNvCitsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9kaWdpZ3I4LmEKK2xpYi9saWJncGhvdG8y
 LyUlVkVSU0lPTiUlL2RpZ2lncjgubGEKK2xpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2RpZ2ln
 cjguc28KIGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2RpZ2l0YS5hCiBsaWIvbGliZ3Bob3Rv
 Mi8lJVZFUlNJT04lJS9kaWdpdGEubGEKIGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2RpZ2l0
 YS5zbwpAQCAtNTUsOSArNjIsNiBAQAogbGliL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUvZGlyZWN0
 b3J5LmEKIGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2RpcmVjdG9yeS5sYQogbGliL2xpYmdw
 aG90bzIvJSVWRVJTSU9OJSUvZGlyZWN0b3J5LnNvCi1saWIvbGliZ3Bob3RvMi8lJVZFUlNJT04l
 JS9kaWdpZ3I4LmEKLWxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2RpZ2lncjgubGEKLWxpYi9s
 aWJncGhvdG8yLyUlVkVSU0lPTiUlL2RpZ2lncjguc28KIGxpYi9saWJncGhvdG8yLyUlVkVSU0lP
 TiUlL2VuaWdtYTEzLmEKIGxpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL2VuaWdtYTEzLmxhCiBs
 aWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9lbmlnbWExMy5zbwpAQCAtMTM2LDYgKzE0MCw5IEBA
 CiBsaWIvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9wY2NhbTYwMC5hCiBsaWIvbGliZ3Bob3RvMi8l
 JVZFUlNJT04lJS9wY2NhbTYwMC5sYQogbGliL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUvcGNjYW02
 MDAuc28KK2xpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL3BlbnRheC5hCitsaWIvbGliZ3Bob3Rv
 Mi8lJVZFUlNJT04lJS9wZW50YXgubGEKK2xpYi9saWJncGhvdG8yLyUlVkVSU0lPTiUlL3BlbnRh
 eC5zbwogbGliL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUvcG9sYXJvaWRfcGRjMzIwLmEKIGxpYi9s
 aWJncGhvdG8yLyUlVkVSU0lPTiUlL3BvbGFyb2lkX3BkYzMyMC5sYQogbGliL2xpYmdwaG90bzIv
 JSVWRVJTSU9OJSUvcG9sYXJvaWRfcGRjMzIwLnNvCkBAIC0yMDksNiArMjE2LDEwIEBACiBsaWIv
 bGliZ3Bob3RvMi8lJVZFUlNJT04lJS90cDY4MDEubGEKIGxpYi9saWJncGhvdG8yLyUlVkVSU0lP
 TiUlL3RwNjgwMS5zbwogbGliL2xpYmdwaG90bzIvcHJpbnQtY2FtZXJhLWxpc3QKK2xpYi9saWJn
 cGhvdG8yX3BvcnQuYQorbGliL2xpYmdwaG90bzJfcG9ydC5sYQorbGliL2xpYmdwaG90bzJfcG9y
 dC5zbworbGliL2xpYmdwaG90bzJfcG9ydC5zby4xMAogbGliL2xpYmdwaG90bzJfcG9ydC8lJVZF
 UlNJT05fUE9SVCUlL2Rpc2suYQogbGliL2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05fUE9SVCUl
 L2Rpc2subGEKIGxpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJS9kaXNrLnNvCkBA
 IC0yMTgsMTIyICsyMjksMTE3IEBACiBsaWIvbGliZ3Bob3RvMl9wb3J0LyUlVkVSU0lPTl9QT1JU
 JSUvc2VyaWFsLmEKIGxpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJS9zZXJpYWwu
 bGEKIGxpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJS9zZXJpYWwuc28KLWxpYi9s
 aWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJS91c2IuYQotbGliL2xpYmdwaG90bzJfcG9y
 dC8lJVZFUlNJT05fUE9SVCUlL3VzYi5sYQotbGliL2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05f
 UE9SVCUlL3VzYi5zbworbGliL2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05fUE9SVCUlL3VzYjEu
 YQorbGliL2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05fUE9SVCUlL3VzYjEubGEKK2xpYi9saWJn
 cGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQlJS91c2IxLnNvCiBsaWIvbGliZ3Bob3RvMl9wb3J0
 LyUlVkVSU0lPTl9QT1JUJSUvdXNiZGlza2RpcmVjdC5hCiBsaWIvbGliZ3Bob3RvMl9wb3J0LyUl
 VkVSU0lPTl9QT1JUJSUvdXNiZGlza2RpcmVjdC5sYQogbGliL2xpYmdwaG90bzJfcG9ydC8lJVZF
 UlNJT05fUE9SVCUlL3VzYmRpc2tkaXJlY3Quc28KIGxpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJT
 SU9OX1BPUlQlJS91c2JzY3NpLmEKIGxpYi9saWJncGhvdG8yX3BvcnQvJSVWRVJTSU9OX1BPUlQl
 JS91c2JzY3NpLmxhCiBsaWIvbGliZ3Bob3RvMl9wb3J0LyUlVkVSU0lPTl9QT1JUJSUvdXNic2Nz
 aS5zbwotbGliL2xpYmdwaG90bzIuYQotbGliL2xpYmdwaG90bzIubGEKLWxpYi9saWJncGhvdG8y
 LnNvCi1saWIvbGliZ3Bob3RvMi5zby4yCi1saWIvbGliZ3Bob3RvMl9wb3J0LmEKLWxpYi9saWJn
 cGhvdG8yX3BvcnQubGEKLWxpYi9saWJncGhvdG8yX3BvcnQuc28KLWxpYi9saWJncGhvdG8yX3Bv
 cnQuc28uMAogbGliZGF0YS9wa2djb25maWcvbGliZ3Bob3RvMi5wYwogbGliZGF0YS9wa2djb25m
 aWcvbGliZ3Bob3RvMl9wb3J0LnBjCi1zaGFyZS9kb2MvbGliZ3Bob3RvMi9BQk9VVC1OTFMKLXNo
 YXJlL2RvYy9saWJncGhvdG8yL0FVVEhPUlMKLXNoYXJlL2RvYy9saWJncGhvdG8yL0NoYW5nZUxv
 Zwotc2hhcmUvZG9jL2xpYmdwaG90bzIvQ09QWUlORwotc2hhcmUvZG9jL2xpYmdwaG90bzIvTkVX
 Uwotc2hhcmUvZG9jL2xpYmdwaG90bzIvUkVBRE1FCi1zaGFyZS9kb2MvbGliZ3Bob3RvMi9SRUFE
 TUUucGFja2FnaW5nCi1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5hZGM2NQot
 c2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuYWdmYS1jbDIwCi1zaGFyZS9kb2Mv
 bGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5hb3gKLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxp
 YnMvUkVBRE1FLmF4MjAzCi1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5heDIw
 My1jb21wcmVzc2lvbgotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuY2Fub24K
 LXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLmNsaWNrc21hcnQzMTAKLXNoYXJl
 L2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLmVuaWdtYTEzCi1zaGFyZS9kb2MvbGliZ3Bo
 b3RvMi9jYW1saWJzL1JFQURNRS5nc21hcnQzMDAKLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxp
 YnMvUkVBRE1FLmljbGljawotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuamFt
 Y2FtCi1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5qbDIwMDVhCi1zaGFyZS9k
 b2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5qbDIwMDVjCi1zaGFyZS9kb2MvbGliZ3Bob3Rv
 Mi9jYW1saWJzL1JFQURNRS5rb25pY2EKLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVB
 RE1FLmxhcmdhbi1sbWluaQotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUubGdf
 Z3NtCi1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5qbDIwMDViY2QtY29tcHJl
 c3Npb24KLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLm1hcnMKLXNoYXJlL2Rv
 Yy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLm1pbm9sdGEtZGltYWdldgotc2hhcmUvZG9jL2xp
 YmdwaG90bzIvY2FtbGlicy9SRUFETUUubXVzdGVrCi1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1s
 aWJzL1JFQURNRS5wYW5hc29uaWMKLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1F
 LnBhbmFzb25pYy1jb29sc2hvdAotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUu
 cGFuYXNvbmljLWw4NTkKLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLnBjY2Ft
 MzAwCi1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5wY2NhbTYwMAotc2hhcmUv
 ZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUucHRwMgotc2hhcmUvZG9jL2xpYmdwaG90bzIv
 Y2FtbGlicy9SRUFETUUuc21hbAotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUu
 c29uaXgKLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLnNvbnlkc2NmMQotc2hh
 cmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuc291bmR2aXNpb24KLXNoYXJlL2RvYy9s
 aWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLnNwY2E1MHgKLXNoYXJlL2RvYy9saWJncGhvdG8yL2Nh
 bWxpYnMvUkVBRE1FLnNxOTA1Ci1zaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzL1JFQURNRS5z
 dDIyMDUKLXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLnN0MjIwNS1jb21wcmVz
 c2lvbgotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUudG9zaGliYS1wZHJtMTEK
 LXNoYXJlL2RvYy9saWJncGhvdG8yL2NhbWxpYnMvUkVBRE1FLnRwNjgwMQotc2hhcmUvZG9jL2xp
 YmdwaG90bzIvY2FtbGlicy9SRUFETUUuOTA1Qwotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGli
 cy9SRUFETUUuOTA1MAotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuOTA1MQot
 c2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9SRUFETUUuOTA1Mgotc2hhcmUvZG9jL2xpYmdw
 aG90bzIvY2FtbGlicy9SRUFETUUuOTEzQwotc2hhcmUvZG9jL2xpYmdwaG90bzIvY2FtbGlicy9S
 RUFETUUuOTEzRAotc2hhcmUvZG9jL2xpYmdwaG90bzJfcG9ydC9BVVRIT1JTCi1zaGFyZS9kb2Mv
 bGliZ3Bob3RvMl9wb3J0L05FV1MKLXNoYXJlL2RvYy9saWJncGhvdG8yX3BvcnQvUkVBRE1FCisl
 JVBPUlRET0NTJSUlJURPQ1NESVIlJS9BQk9VVC1OTFMKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUl
 L0FVVEhPUlMKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL0NoYW5nZUxvZworJSVQT1JURE9DUyUl
 JSVET0NTRElSJSUvTkVXUworJSVQT1JURE9DUyUlJSVET0NTRElSJSUvUkVBRE1FCislJVBPUlRE
 T0NTJSUlJURPQ1NESVIlJS9SRUFETUUucGFja2FnaW5nCislJVBPUlRET0NTJSUlJURPQ1NESVIl
 JS9jYW1saWJzL0NoYW5nZUxvZworJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFE
 TUUuOTA1MAorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuOTA1MQorJSVQ
 T1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuOTA1MgorJSVQT1JURE9DUyUlJSVE
 T0NTRElSJSUvY2FtbGlicy9SRUFETUUuOTA1QworJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2Ft
 bGlicy9SRUFETUUuOTEzQworJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUu
 OTEzRAorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuYWRjNjUKKyUlUE9S
 VERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLmFnZmEtY2wyMAorJSVQT1JURE9DUyUl
 JSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuYW94CislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9j
 YW1saWJzL1JFQURNRS5heDIwMworJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFE
 TUUuYXgyMDMtY29tcHJlc3Npb24KKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVB
 RE1FLmNhbm9uCislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5jbGlja3Nt
 YXJ0MzEwCislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5lbmlnbWExMwor
 JSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuZ3NtYXJ0MzAwCislJVBPUlRE
 T0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5pY2xpY2sKKyUlUE9SVERPQ1MlJSUlRE9D
 U0RJUiUlL2NhbWxpYnMvUkVBRE1FLmphbWNhbQorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2Ft
 bGlicy9SRUFETUUuamwyMDA1YQorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFE
 TUUuamwyMDA1YmNkLWNvbXByZXNzaW9uCislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJz
 L1JFQURNRS5qbDIwMDVjCislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5r
 b25pY2EKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLmxhcmdhbi1sbWlu
 aQorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUubGdfZ3NtCislJVBPUlRE
 T0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURNRS5tYXJzCislJVBPUlRET0NTJSUlJURPQ1NE
 SVIlJS9jYW1saWJzL1JFQURNRS5taW5vbHRhLWRpbWFnZXYKKyUlUE9SVERPQ1MlJSUlRE9DU0RJ
 UiUlL2NhbWxpYnMvUkVBRE1FLm11c3RlaworJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGli
 cy9SRUFETUUucGFuYXNvbmljCislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURN
 RS5wYW5hc29uaWMtY29vbHNob3QKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVB
 RE1FLnBhbmFzb25pYy1sODU5CislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9jYW1saWJzL1JFQURN
 RS5wY2NhbTMwMAorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUucGNjYW02
 MDAKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLnBlbnRheAorJSVQT1JU
 RE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUucHRwMgorJSVQT1JURE9DUyUlJSVET0NT
 RElSJSUvY2FtbGlicy9SRUFETUUuc21hbAorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGli
 cy9SRUFETUUuc29uaXgKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLnNv
 bnlkc2NmMQorJSVQT1JURE9DUyUlJSVET0NTRElSJSUvY2FtbGlicy9SRUFETUUuc291bmR2aXNp
 b24KKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLnNwY2E1MHgKKyUlUE9S
 VERPQ1MlJSUlRE9DU0RJUiUlL2NhbWxpYnMvUkVBRE1FLnNxOTA1CislJVBPUlRET0NTJSUlJURP
 Q1NESVIlJS9jYW1saWJzL1JFQURNRS5zdDIyMDUKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2Nh
 bWxpYnMvUkVBRE1FLnN0MjIwNS1jb21wcmVzc2lvbgorJSVQT1JURE9DUyUlJSVET0NTRElSJSUv
 Y2FtbGlicy9SRUFETUUudG9zaGliYS1wZHJtMTEKKyUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL2Nh
 bWxpYnMvUkVBRE1FLnRwNjgwMQorJSVQT1JURE9DUyUlc2hhcmUvZG9jL2xpYmdwaG90bzJfcG9y
 dC9BVVRIT1JTCislJVBPUlRET0NTJSVzaGFyZS9kb2MvbGliZ3Bob3RvMl9wb3J0L05FV1MKKyUl
 UE9SVERPQ1MlJXNoYXJlL2RvYy9saWJncGhvdG8yX3BvcnQvUkVBRE1FCiBzaGFyZS9saWJncGhv
 dG8yLyUlVkVSU0lPTiUlL2tvbmljYS9lbmdsaXNoCiBzaGFyZS9saWJncGhvdG8yLyUlVkVSU0lP
 TiUlL2tvbmljYS9mcmVuY2gKIHNoYXJlL2xpYmdwaG90bzIvJSVWRVJTSU9OJSUva29uaWNhL2dl
 cm1hbgogc2hhcmUvbGliZ3Bob3RvMi8lJVZFUlNJT04lJS9rb25pY2EvamFwYW5lc2UKIHNoYXJl
 L2xpYmdwaG90bzIvJSVWRVJTSU9OJSUva29uaWNhL2tvcmVhbgogc2hhcmUvbGliZ3Bob3RvMi8l
 JVZFUlNJT04lJS9rb25pY2Evc3BhbmlzaAotJSVOTFMlJXNoYXJlL2xvY2FsZS9jcy9MQ19NRVNT
 QUdFUy9saWJncGhvdG8yX3BvcnQtMC5tbwotJSVOTFMlJXNoYXJlL2xvY2FsZS9kYS9MQ19NRVNT
 QUdFUy9saWJncGhvdG8yLTIubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUvZGEvTENfTUVTU0FHRVMv
 bGliZ3Bob3RvMl9wb3J0LTAubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUvZGUvTENfTUVTU0FHRVMv
 bGliZ3Bob3RvMi0yLm1vCi0lJU5MUyUlc2hhcmUvbG9jYWxlL2RlL0xDX01FU1NBR0VTL2xpYmdw
 aG90bzJfcG9ydC0wLm1vCi0lJU5MUyUlc2hhcmUvbG9jYWxlL2VzL0xDX01FU1NBR0VTL2xpYmdw
 aG90bzItMi5tbwotJSVOTFMlJXNoYXJlL2xvY2FsZS9lcy9MQ19NRVNTQUdFUy9saWJncGhvdG8y
 X3BvcnQtMC5tbwotJSVOTFMlJXNoYXJlL2xvY2FsZS9ldS9MQ19NRVNTQUdFUy9saWJncGhvdG8y
 LTIubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUvZXUvTENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0
 LTAubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUvZnIvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi0yLm1v
 Ci0lJU5MUyUlc2hhcmUvbG9jYWxlL2ZyL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1v
 Ci0lJU5MUyUlc2hhcmUvbG9jYWxlL2h1L0xDX01FU1NBR0VTL2xpYmdwaG90bzItMi5tbwotJSVO
 TFMlJXNoYXJlL2xvY2FsZS9pdC9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KLSUlTkxTJSVz
 aGFyZS9sb2NhbGUvaXQvTENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTAubW8KLSUlTkxTJSVz
 aGFyZS9sb2NhbGUvamEvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi0yLm1vCi0lJU5MUyUlc2hhcmUv
 bG9jYWxlL2phL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vCi0lJU5MUyUlc2hhcmUv
 bG9jYWxlL25sL0xDX01FU1NBR0VTL2xpYmdwaG90bzItMi5tbwotJSVOTFMlJXNoYXJlL2xvY2Fs
 ZS9ubC9MQ19NRVNTQUdFUy9saWJncGhvdG8yX3BvcnQtMC5tbwotJSVOTFMlJXNoYXJlL2xvY2Fs
 ZS9wbC9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTIubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUvcGwv
 TENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTAubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUvcHRf
 QlIvTENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTAubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUv
 cnUvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi0yLm1vCi0lJU5MUyUlc2hhcmUvbG9jYWxlL3J1L0xD
 X01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vCi0lJU5MUyUlc2hhcmUvbG9jYWxlL3NrL0xD
 X01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0wLm1vCi0lJU5MUyUlc2hhcmUvbG9jYWxlL3N2L0xD
 X01FU1NBR0VTL2xpYmdwaG90bzItMi5tbwotJSVOTFMlJXNoYXJlL2xvY2FsZS9zdi9MQ19NRVNT
 QUdFUy9saWJncGhvdG8yX3BvcnQtMC5tbwotJSVOTFMlJXNoYXJlL2xvY2FsZS91ay9MQ19NRVNT
 QUdFUy9saWJncGhvdG8yLTIubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUvdWsvTENfTUVTU0FHRVMv
 bGliZ3Bob3RvMl9wb3J0LTAubW8KLSUlTkxTJSVzaGFyZS9sb2NhbGUvdmkvTENfTUVTU0FHRVMv
 bGliZ3Bob3RvMi0yLm1vCi0lJU5MUyUlc2hhcmUvbG9jYWxlL3ZpL0xDX01FU1NBR0VTL2xpYmdw
 aG90bzJfcG9ydC0wLm1vCi0lJU5MUyUlc2hhcmUvbG9jYWxlL3poX0NOL0xDX01FU1NBR0VTL2xp
 YmdwaG90bzItMi5tbwotJSVOTFMlJXNoYXJlL2xvY2FsZS96aF9DTi9MQ19NRVNTQUdFUy9saWJn
 cGhvdG8yX3BvcnQtMC5tbwotJSVOTFMlJXNoYXJlL2xvY2FsZS96aF9UVy9MQ19NRVNTQUdFUy9s
 aWJncGhvdG8yX3BvcnQtMC5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS9jcy9MQ19NRVNTQUdFUy9s
 aWJncGhvdG8yX3BvcnQtMTAubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvZGEvTENfTUVTU0FHRVMv
 bGliZ3Bob3RvMi02Lm1vCislJU5MUyUlc2hhcmUvbG9jYWxlL2RhL0xDX01FU1NBR0VTL2xpYmdw
 aG90bzJfcG9ydC0xMC5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS9kZS9MQ19NRVNTQUdFUy9saWJn
 cGhvdG8yLTYubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvZGUvTENfTUVTU0FHRVMvbGliZ3Bob3Rv
 Ml9wb3J0LTEwLm1vCislJU5MUyUlc2hhcmUvbG9jYWxlL2VzL0xDX01FU1NBR0VTL2xpYmdwaG90
 bzItNi5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS9lcy9MQ19NRVNTQUdFUy9saWJncGhvdG8yX3Bv
 cnQtMTAubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvZXUvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi02
 Lm1vCislJU5MUyUlc2hhcmUvbG9jYWxlL2V1L0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0x
 MC5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS9maS9MQ19NRVNTQUdFUy9saWJncGhvdG8yX3BvcnQt
 MTAubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvZnIvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi02Lm1v
 CislJU5MUyUlc2hhcmUvbG9jYWxlL2ZyL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0xMC5t
 bworJSVOTFMlJXNoYXJlL2xvY2FsZS9odS9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTYubW8KKyUl
 TkxTJSVzaGFyZS9sb2NhbGUvaXQvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi02Lm1vCislJU5MUyUl
 c2hhcmUvbG9jYWxlL2l0L0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0xMC5tbworJSVOTFMl
 JXNoYXJlL2xvY2FsZS9qYS9MQ19NRVNTQUdFUy9saWJncGhvdG8yLTYubW8KKyUlTkxTJSVzaGFy
 ZS9sb2NhbGUvamEvTENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTEwLm1vCislJU5MUyUlc2hh
 cmUvbG9jYWxlL25sL0xDX01FU1NBR0VTL2xpYmdwaG90bzItNi5tbworJSVOTFMlJXNoYXJlL2xv
 Y2FsZS9ubC9MQ19NRVNTQUdFUy9saWJncGhvdG8yX3BvcnQtMTAubW8KKyUlTkxTJSVzaGFyZS9s
 b2NhbGUvcGwvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi02Lm1vCislJU5MUyUlc2hhcmUvbG9jYWxl
 L3BsL0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0xMC5tbworJSVOTFMlJXNoYXJlL2xvY2Fs
 ZS9wdF9CUi9MQ19NRVNTQUdFUy9saWJncGhvdG8yX3BvcnQtMTAubW8KKyUlTkxTJSVzaGFyZS9s
 b2NhbGUvcnUvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi02Lm1vCislJU5MUyUlc2hhcmUvbG9jYWxl
 L3J1L0xDX01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0xMC5tbworJSVOTFMlJXNoYXJlL2xvY2Fs
 ZS9zay9MQ19NRVNTQUdFUy9saWJncGhvdG8yX3BvcnQtMTAubW8KKyUlTkxTJSVzaGFyZS9sb2Nh
 bGUvc3IvTENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTEwLm1vCislJU5MUyUlc2hhcmUvbG9j
 YWxlL3N2L0xDX01FU1NBR0VTL2xpYmdwaG90bzItNi5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS9z
 di9MQ19NRVNTQUdFUy9saWJncGhvdG8yX3BvcnQtMTAubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUv
 dWsvTENfTUVTU0FHRVMvbGliZ3Bob3RvMi02Lm1vCislJU5MUyUlc2hhcmUvbG9jYWxlL3VrL0xD
 X01FU1NBR0VTL2xpYmdwaG90bzJfcG9ydC0xMC5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS92aS9M
 Q19NRVNTQUdFUy9saWJncGhvdG8yLTYubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvdmkvTENfTUVT
 U0FHRVMvbGliZ3Bob3RvMl9wb3J0LTEwLm1vCislJU5MUyUlc2hhcmUvbG9jYWxlL3poX0NOL0xD
 X01FU1NBR0VTL2xpYmdwaG90bzItNi5tbworJSVOTFMlJXNoYXJlL2xvY2FsZS96aF9DTi9MQ19N
 RVNTQUdFUy9saWJncGhvdG8yX3BvcnQtMTAubW8KKyUlTkxTJSVzaGFyZS9sb2NhbGUvemhfVFcv
 TENfTUVTU0FHRVMvbGliZ3Bob3RvMl9wb3J0LTEwLm1vCiBAZGlycm0gc2hhcmUvbGliZ3Bob3Rv
 Mi8lJVZFUlNJT04lJS9rb25pY2EKIEBkaXJybSBzaGFyZS9saWJncGhvdG8yLyUlVkVSU0lPTiUl
 CiBAZGlycm0gc2hhcmUvbGliZ3Bob3RvMgotQGRpcnJtIHNoYXJlL2RvYy9saWJncGhvdG8yX3Bv
 cnQKLUBkaXJybSBzaGFyZS9kb2MvbGliZ3Bob3RvMi9jYW1saWJzCi1AZGlycm0gc2hhcmUvZG9j
 L2xpYmdwaG90bzIKKyUlUE9SVERPQ1MlJUBkaXJybSBzaGFyZS9kb2MvbGliZ3Bob3RvMl9wb3J0
 CislJVBPUlRET0NTJSVAZGlycm0gJSVET0NTRElSJSUvY2FtbGlicworJSVQT1JURE9DUyUlQGRp
 cnJtICUlRE9DU0RJUiUlCiBAZGlycm0gbGliL2xpYmdwaG90bzJfcG9ydC8lJVZFUlNJT05fUE9S
 VCUlCiBAZGlycm0gbGliL2xpYmdwaG90bzJfcG9ydAogQGRpcnJtIGxpYi9saWJncGhvdG8yLyUl
 VkVSU0lPTiUlCk9ubHkgaW4gbGliZ3Bob3RvMjogd29yawo=
 --089e0158b154aed8cc04e6a9f84a--

Date: Wed, 18 Sep 2013 12:39:04 -0300
From: "Marcel Bonnet [ports]" <ports@monovox.org>
Sender: marcelbonnet@gmail.com
To: bug-followup@freebsd.org
Subject: Re: [PATCH] [FILESDIR] ports/181073: graphics/gphoto2: Update to
 version 2.5.2

 --047d7b677efabf18a304e6aa3c7e
 Content-Type: multipart/alternative; boundary=047d7b677efabf189f04e6aa3c7c
 
 --047d7b677efabf189f04e6aa3c7c
 Content-Type: text/plain; charset=ISO-8859-1
 
 I'm sorry. I forgot the new patches in ${FILESDIR} I mentioned earlier.
 
 --047d7b677efabf189f04e6aa3c7c--
 --047d7b677efabf18a304e6aa3c7e
 Content-Type: application/octet-stream; name=extra-patch-usb20
 Content-Disposition: attachment; filename=extra-patch-usb20
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hlqpnnva0
 
 LS0tIGxpYmdwaG90bzJfcG9ydC91c2IvbGlidXNiLmMub3JpZwkyMDA4LTExLTIxIDE5OjI0OjQw
 LjAwMDAwMDAwMCArMDEwMAorKysgbGliZ3Bob3RvMl9wb3J0L3VzYi9saWJ1c2IuYwkyMDA5LTAz
 LTA4IDE4OjU4OjU2LjAwMDAwMDAwMCArMDEwMApAQCAtMzMsNiArMzMsOCBAQAogI2luY2x1ZGUg
 PHN0cmluZy5oPgogCiAjaW5jbHVkZSA8dXNiLmg+CisjaW5jbHVkZSA8bGlidXNiMjAuaD4KKyNp
 bmNsdWRlIDxsaWJ1c2IyMF9jb21wYXQxMC5oPgogCiAjaW5jbHVkZSA8Z3Bob3RvMi9ncGhvdG8y
 LXBvcnQuaD4KICNpbmNsdWRlIDxncGhvdG8yL2dwaG90bzItcG9ydC1yZXN1bHQuaD4K
 --047d7b677efabf18a304e6aa3c7e
 Content-Type: text/x-csrc; charset=US-ASCII; name="patch-camlibs_ptp2_library.c"
 Content-Disposition: attachment; filename="patch-camlibs_ptp2_library.c"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hlqpo3c61
 
 LS0tIGNhbWxpYnMvcHRwMi9saWJyYXJ5LmMub3JpZwkyMDEzLTA5LTE4IDExOjQzOjExLjAwMDAw
 MDAwMCAtMDMwMAorKysgY2FtbGlicy9wdHAyL2xpYnJhcnkuYwkyMDEzLTA5LTE4IDExOjQ3OjEw
 LjAwMDAwMDAwMCAtMDMwMApAQCAtMTQ2Miw2ICsxNDYyLDcgQEAKIAl7IkZ1amk6RmluZVBpeCBI
 MjBFWFIiLAkJCTB4MDRjYiwgMHgwMjJkLCAwfSwKIAkvKiBodHRwczovL3NvdXJjZWZvcmdlLm5l
 dC90cmFja2VyL2luZGV4LnBocD9mdW5jPWRldGFpbCZhaWQ9MzU1NjY5MiZncm91cF9pZD04ODc0
 JmF0aWQ9MTA4ODc0ICovCiAJeyJGdWppOkZpbmVQaXggUzI5NTAiLAkJCTB4MDRjYiwgMHgwMjQw
 LCAwfSwKKwl7IkZ1amk6RmluZVBpeCBTMjk4MCIsCQkJMHgwNGNiLCAweDAyN2QsIDB9LAogCS8q
 IEx1aXMgQXJpYXMgPGthYWxvb0BnbWFpbC5jb20+ICovCiAJeyJGdWppOkZpbmVQaXggWDEwIiwJ
 CQkweDA0Y2IsIDB4MDI2MywgMH0sCiAJLyogdC5sdWRld2lnQGdtYWlsLmNvbSAqLwo=
 --047d7b677efabf18a304e6aa3c7e
 Content-Type: text/x-csrc; charset=US-ASCII; 
 	name="patch-libgphoto2__port_libusb1_libusb1.c"
 Content-Disposition: attachment; 
 	filename="patch-libgphoto2__port_libusb1_libusb1.c"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hlqpo8cn2
 
 LS0tIGxpYmdwaG90bzJfcG9ydC9saWJ1c2IxL2xpYnVzYjEuYy5vcmlnCTIwMTMtMDktMTggMTA6
 NDQ6MDMuMDAwMDAwMDAwIC0wMzAwCisrKyBsaWJncGhvdG8yX3BvcnQvbGlidXNiMS9saWJ1c2Ix
 LmMJMjAxMy0wOS0xOCAxMDo1MjozMy4wMDAwMDAwMDAgLTAzMDAKQEAgLTYwLDYgKzYwLDggQEAK
 IAogI2RlZmluZSBDSEVDSyhyZXN1bHQpIHtpbnQgcj0ocmVzdWx0KTsgaWYgKHI8MCkgcmV0dXJu
 IChyKTt9CiAKKyNkZWZpbmUgRU5PREFUQQk2MQorCiBzdHJ1Y3QgX0dQUG9ydFByaXZhdGVMaWJy
 YXJ5IHsKIAlsaWJ1c2JfY29udGV4dCAqY3R4OwogCWxpYnVzYl9kZXZpY2UgKmQ7Cg==
 --047d7b677efabf18a304e6aa3c7e
 Content-Type: text/x-csrc; charset=US-ASCII; name="patch-libgphoto2__port_usbscsi_linux.c"
 Content-Disposition: attachment; 
 	filename="patch-libgphoto2__port_usbscsi_linux.c"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hlqpod6m3
 
 LS0tIGxpYmdwaG90bzJfcG9ydC91c2JzY3NpL2xpbnV4LmMub3JpZwkyMDEzLTA0LTEzIDA2OjEz
 OjI0LjAwMDAwMDAwMCAtMDMwMAorKysgbGliZ3Bob3RvMl9wb3J0L3VzYnNjc2kvbGludXguYwky
 MDEzLTA5LTE4IDExOjA3OjM1LjAwMDAwMDAwMCAtMDMwMApAQCAtMjcsMTUgKzI3LDEzIEBACiAj
 aW5jbHVkZSA8c3RkbGliLmg+CiAjaW5jbHVkZSA8dW5pc3RkLmg+CiAjaW5jbHVkZSA8c3RyaW5n
 Lmg+Ci0jaWZkZWYgSEFWRV9GQ05UTF9ICiAjIGluY2x1ZGUgPGZjbnRsLmg+Ci0jZW5kaWYKICNp
 ZmRlZiBIQVZFX0xJTUlUU19ICiAjIGluY2x1ZGUgPGxpbWl0cy5oPgogI2VuZGlmCi0jaWZkZWYg
 SEFWRV9TWVNfRklMRV9ICi0jIGluY2x1ZGUgPHN5cy9maWxlLmg+Ci0jZW5kaWYKKy8vI2lmZGVm
 IEhBVkVfU1lTX0ZJTEVfSAorLy8jIGluY2x1ZGUgPHN5cy9maWxlLmg+CisvLyNlbmRpZgogI2lu
 Y2x1ZGUgPHN5cy9zdGF0Lmg+CiAjaW5jbHVkZSA8c3lzL3R5cGVzLmg+CiAjaWZkZWYgSEFWRV9T
 WVNfUEFSQU1fSApAQCAtOTAsOSArODgsMTkgQEAKIAlncF9sb2cgKEdQX0xPR19ERUJVRywgImdw
 aG90bzItcG9ydC11c2JzY3NpIiwKIAkJIlRyeWluZyB0byBsb2NrICclcycuLi4iLCBwb3J0LT5z
 ZXR0aW5ncy51c2JzY3NpLnBhdGgpOwogCi0JaWYgKGZsb2NrKHBvcnQtPnBsLT5mZCwgTE9DS19F
 WCB8IExPQ0tfTkIpICE9IDApIHsKKwkvKgorCSAqIGh0dHA6Ly93d3cucGVya2luLm9yZy51ay9w
 b3N0cy9zb2xhcmlzLXBvcnRhYmlsaXR5LWZsb2NrLmh0bWwKKwkgKi8KKwlzdHJ1Y3QgZmxvY2sg
 bG9jazsKKwlsb2NrLmxfc3RhcnQgPSAwOworCWxvY2subF9sZW4gPSAwOworCWxvY2subF90eXBl
 ID0gRl9XUkxDSzsKKwlsb2NrLmxfd2hlbmNlID0gU0VFS19TRVQ7CisKKwlpZiAoZmNudGwocG9y
 dC0+cGwtPmZkLCBGX1NFVExLLCAmbG9jaykgIT0gMCkgewogCQlzd2l0Y2ggKGVycm5vKSB7Ci0J
 CWNhc2UgRVdPVUxEQkxPQ0s6CisJCS8vY2FzZSBFV09VTERCTE9DSzoKKwkJY2FzZSBFQUdBSU46
 CiAJCQlncF9wb3J0X3NldF9lcnJvciAocG9ydCwKIAkJCQlfKCJEZXZpY2UgJyVzJyBpcyBsb2Nr
 ZWQgYnkgYW5vdGhlciBhcHAuIiksCiAJCQkJcG9ydC0+c2V0dGluZ3MudXNic2NzaS5wYXRoKTsK
 QEAgLTExNSw3ICsxMjMsMTYgQEAKIGdwX3BvcnRfdXNic2NzaV91bmxvY2sgKEdQUG9ydCAqcG9y
 dCkKIHsKICNpZmRlZiBIQVZFX0ZMT0NLCi0JaWYgKGZsb2NrKHBvcnQtPnBsLT5mZCwgTE9DS19V
 TikgIT0gMCkgeworICAgICAgICAvKgorICAgICAgICAgKiBodHRwOi8vd3d3LnBlcmtpbi5vcmcu
 dWsvcG9zdHMvc29sYXJpcy1wb3J0YWJpbGl0eS1mbG9jay5odG1sCisgICAgICAgICAqLworICAg
 ICAgICBzdHJ1Y3QgZmxvY2sgbG9jazsKKyAgICAgICAgbG9jay5sX3N0YXJ0ID0gMDsKKyAgICAg
 ICAgbG9jay5sX2xlbiA9IDA7CisgICAgICAgIGxvY2subF90eXBlID0gRl9XUkxDSzsKKyAgICAg
 ICAgbG9jay5sX3doZW5jZSA9IFNFRUtfU0VUOworCisJaWYgKGZjbnRsKHBvcnQtPnBsLT5mZCwg
 Rl9VTkxDSywgJmxvY2spICE9IDApIHsKIAkJZ3BfcG9ydF9zZXRfZXJyb3IgKHBvcnQsIF8oIkZh
 aWxlZCB0byB1bmxvY2sgJyVzJyAoJW0pLiIpLAogCQkJCSAgIHBvcnQtPnNldHRpbmdzLnVzYnNj
 c2kucGF0aCk7CiAJCXJldHVybiBHUF9FUlJPUl9JTzsK
 --047d7b677efabf18a304e6aa3c7e--
Responsible-Changed-From-To: miwi->freebsd-ports-bugs 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Sun Sep 22 09:11:01 CDT 2013 
Responsible-Changed-Why:  
Back to the heap due to timeout 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181073 

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: graphics/gphoto2: Update to version 2.5.2
Date: Wed, 23 Oct 2013 02:58:21 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Wed__23_Oct_2013_02_58_21_+0900_YVUR8xKOK/EjTosg
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Wed__23_Oct_2013_02_58_21_+0900_YVUR8xKOK/EjTosg
 Content-Type: text/x-diff;
  name="graphics_libgphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_libgphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile
 --- /usr/ports/graphics/libgphoto2/Makefile	2013-10-22 21:03:41.000000000 +0900
 +++ graphics/libgphoto2/Makefile	2013-10-23 00:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/graphics/libgphoto2/Makefile 331225 2013-10-22 07:47:42Z amdmi3 $
  
  PORTNAME=	libgphoto2
 -PORTVERSION=	2.4.14
 -PORTREVISION=	3
 +PORTVERSION=	2.5.2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
  
 @@ -12,63 +11,86 @@
  
  LICENSE=	LGPL21
  
 -LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 -		libjpeg.so:${PORTSDIR}/graphics/jpeg
 +OPTIONS_DEFINE=	EXIF GD JPEG XML DOCS NLS
 +OPTIONS_DEFAULT=EXIF GD JPEG XML
 +OPTIONS_SUB=	yes
 +EXIF_DESC=	EXIF tag support
  
 -USES=		gmake pkgconfig
 +USES=		gmake iconv pkgconfig
  USE_BZIP2=	yes
  USE_GNOME=	ltverhack
  USE_AUTOTOOLS=	libtool libltdl
  LIBTOOLFILES=	configure libgphoto2_port/configure
 -USE_LDCONFIG=	yes
  CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 -		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
 +		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 +		PATH="${PATH:C,${HOME}/bin,,}" \
 +		ac_cv_path_DOT=false \
 +		ac_cv_path_DOXYGEN=false \
 +		udevscriptdir=${WRKDIR}
 +USE_LDCONFIG=	yes
 +
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
  
 -PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 +PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.10.0
  
  .include <bsd.port.options.mk>
  
 -.if ${OSVERSION} < 1000040
 -CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I/usr/include" \
 -		LIBUSB_LIBS="-lusb"
 +.if ${PORT_OPTIONS:MEXIF}
 +LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
 +.else
 +CONFIGURE_ARGS+=	--without-libexif
 +.endif
 +
 +.if ${PORT_OPTIONS:MGD}
 +LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
 +.else
 +CONFIGURE_ARGS+=	--without-gd
 +.endif
 +
 +.if ${PORT_OPTIONS:MJPEG}
 +LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
  .else
 -# Safe because it's never used
 -CFLAGS+=	-DENODATA=0
 +CONFIGURE_ARGS+=	--without-jpeg
 +.endif
 +
 +.if ${PORT_OPTIONS:MXML}
 +USE_GNOME+=	libxml2
 +CPPFLAGS+=	$$(pkg-config --cflags-only-I libxml-2.0)
 +LDFLAGS+=	$$(pkg-config --libs-only-L libxml-2.0)
 +.else
 +CONFIGURE_ARGS+=	--without-libxml2
  .endif
  
  .if ${PORT_OPTIONS:MNLS}
  USES+=		gettext
 -PLIST_SUB+=	NLS=""
  .else
 -USES+=		iconv
  CONFIGURE_ARGS+=	--disable-nls
 -PLIST_SUB+=	NLS="@comment "
 +.endif
 +
 +.include <bsd.port.pre.mk>
 +
 +.if ${OSVERSION} < 1000040
 +CONFIGURE_ENV+=	LIBUSB1_CFLAGS="-I/usr/include" \
 +		LIBUSB1_LIBS="-lusb"
  .endif
  
  post-patch:
 -.for file in configure libgphoto2_port/configure
 +.for i in configure libgphoto2_port/configure
  	@${REINPLACE_CMD} -e \
 -		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
 -		 s|-g -O2||g ; \
 +		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
 +		 /FLAGS/s|-g|| ; \
  		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
 -			${WRKSRC}/${file}
 +		${WRKSRC}/${i}
  .endfor
 -.if ${PORT_OPTIONS:MNLS}
 -	@${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \
 -		${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in
 -.endif
 -	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \
 -		s| "$$(DESTDIR)$$(udevscriptdir)"||' \
 -			${WRKSRC}/libgphoto2_port/usb/Makefile.in \
 -			${WRKSRC}/packaging/generic/Makefile.in
 -	@${REINPLACE_CMD} -e 's|linux-hotplug ||' \
 -		${WRKSRC}/packaging/Makefile.in
  	@${REINPLACE_CMD} -e \
 -		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
 -			${WRKSRC}/doc/Makefile.in
 -	@${REINPLACE_CMD} -e '/Requires/d' \
 -		${WRKSRC}/libgphoto2_port/libgphoto2_port.pc.in
 -	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
 -		${WRKSRC}/libgphoto2_port/configure
 +		'/^doc_DATA/s|COPYING||' \
 +		${WRKSRC}/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		's|ENODATA|ENOATTR|g' \
 +		${WRKSRC}/libgphoto2_port/libusb1/libusb1.c
 +	@${REINPLACE_CMD} -e \
 +		'/^SUBDIRS/s|linux-hotplug||' \
 +		${WRKSRC}/packaging/Makefile.in
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo
 --- /usr/ports/graphics/libgphoto2/distinfo	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/distinfo	2013-10-23 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (libgphoto2-2.4.14.tar.bz2) = 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
 -SIZE (libgphoto2-2.4.14.tar.bz2) = 4481384
 +SHA256 (libgphoto2-2.5.2.tar.bz2) = a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838
 +SIZE (libgphoto2-2.5.2.tar.bz2) = 6446235
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES graphics/libgphoto2/files/patch-MAX_ENTRIES
 --- /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-MAX_ENTRIES	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- libgphoto2/gphoto2-list.c.orig	2007-07-27 07:52:55.000000000 +0200
 -+++ libgphoto2/gphoto2-list.c	2008-11-09 17:04:16.000000000 +0100
 -@@ -72,7 +72,7 @@
 - 
 - #ifdef CAMERALIST_STRUCT_COMPATIBILITY
 - 
 --#define MAX_ENTRIES 1024
 -+#define MAX_ENTRIES 8192
 - #define MAX_LIST_STRING_LENGTH 128
 - struct _CameraList {
 - 	int  count;
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- camlibs/smal/ultrapocket.c.orig	2008-10-18 19:55:46.000000000 +0200
 -+++ camlibs/smal/ultrapocket.c	2008-11-12 09:56:52.000000000 +0100
 -@@ -33,6 +33,7 @@
 - 
 - #define GP_MODULE "Smal Ultrapocket"
 - 
 -+#include <locale.h>
 - #ifdef ENABLE_NLS
 - #  include <libintl.h>
 - #  undef _
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-10-23 00:00:00.000000000 +0900
 @@ -1,11 +1,10 @@
  --- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
  +++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
 -@@ -19,6 +19,8 @@
 -  */
 - #include "config.h"
 - 
 -+#include <sys/types.h>
 -+#include <netinet/in.h>
 - #include <stdlib.h>
 +@@ -24,6 +24,7 @@
   #include <string.h>
   #include <stdio.h>
 + #include <time.h>
 ++#include <sys/types.h>
 + #include <sys/socket.h>
 + #include <netinet/in.h>
 + #include <arpa/inet.h>
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- libgphoto2_port/serial/unix.c.orig	Fri Jul 27 02:36:13 2007
 -+++ libgphoto2_port/serial/unix.c	Mon Aug 13 17:26:43 2007
 -@@ -43,6 +43,7 @@
 - #endif
 - #include <string.h>
 - #include <signal.h>
 -+#include <sys/select.h>
 - #include <sys/stat.h>
 - #include <sys/types.h>
 - #ifdef HAVE_SYS_TIME_H
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,45 +0,0 @@
 ---- libgphoto2_port/usb/libusb.c.old	2011-01-16 15:22:21.000000000 +0100
 -+++ libgphoto2_port/usb/libusb.c	2011-01-16 15:21:57.000000000 +0100
 -@@ -824,23 +824,25 @@
 - 	 * MTP interface descriptions, that's how they can be detected, before
 - 	 * we try the more esoteric "OS descriptors" (below).
 - 	 */
 --	for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
 --		unsigned int j;
 --		for (j = 0; j < dev->config[i].bNumInterfaces; j++) {
 --			int k;
 --			for (k = 0; k < dev->config[i].interface[j].num_altsetting; k++) {
 --				buf[0] = '\0';
 --				ret = usb_get_string_simple(devh, 
 --					dev->config[i].interface[j].altsetting[k].iInterface, 
 --					(char *) buf, 
 --					1024);
 --				if (ret < 3)
 --					continue;
 --				if (strcmp((char *) buf, "MTP") == 0) {
 --					gp_log (GP_LOG_DEBUG, "mtp matcher", "Configuration %d, interface %d, altsetting %d:\n", i, j, k);
 --					gp_log (GP_LOG_DEBUG, "mtp matcher", "   Interface description contains the string \"MTP\"\n");
 --					gp_log (GP_LOG_DEBUG, "mtp matcher", "   Device recognized as MTP, no further probing.\n");
 --					goto found;
 -+	if(dev->config) {
 -+		for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
 -+			unsigned int j;
 -+			for (j = 0; j < dev->config[i].bNumInterfaces; j++) {
 -+				int k;
 -+				for (k = 0; k < dev->config[i].interface[j].num_altsetting; k++) {
 -+					buf[0] = '\0';
 -+					ret = usb_get_string_simple(devh, 
 -+						dev->config[i].interface[j].altsetting[k].iInterface, 
 -+						(char *) buf, 
 -+						1024);
 -+					if (ret < 3)
 -+						continue;
 -+					if (strcmp((char *) buf, "MTP") == 0) {
 -+						gp_log (GP_LOG_DEBUG, "mtp matcher", "Configuration %d, interface %d, altsetting %d:\n", i, j, k);
 -+						gp_log (GP_LOG_DEBUG, "mtp matcher", "   Interface description contains the string \"MTP\"\n");
 -+						gp_log (GP_LOG_DEBUG, "mtp matcher", "   Device recognized as MTP, no further probing.\n");
 -+						goto found;
 -+					}
 - 				}
 - 			}
 - 		}
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h	1970-01-01 09:00:00.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port__gphoto2__gohoto2-port-portability.h	2013-10-23 00:00:00.000000000 +0900
 @@ -0,0 +1,21 @@
 +--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig
 ++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h
 +@@ -152,6 +152,8 @@
 + 
 + /* yummy. :) */
 + 
 ++#ifdef __linux
 ++
 + /* XOPEN needed for usleep */
 + #ifndef _XOPEN_SOURCE
 + # define _XOPEN_SOURCE 500
 +@@ -166,6 +168,9 @@
 + # ifndef _POSIX_C_SOURCE
 + #  define _POSIX_C_SOURCE 199309
 + # endif
 ++
 ++#endif
 ++
 + # include <time.h>
 + 
 + # include <strings.h>
 diff -urN /usr/ports/graphics/libgphoto2/pkg-plist graphics/libgphoto2/pkg-plist
 --- /usr/ports/graphics/libgphoto2/pkg-plist	2013-10-22 21:03:41.000000000 +0900
 +++ graphics/libgphoto2/pkg-plist	2013-10-23 00:00:00.000000000 +0900
 @@ -19,6 +19,10 @@
  include/gphoto2/gphoto2-version.h
  include/gphoto2/gphoto2-widget.h
  include/gphoto2/gphoto2.h
 +lib/libgphoto2.a
 +lib/libgphoto2.la
 +lib/libgphoto2.so
 +lib/libgphoto2.so.6
  lib/libgphoto2/%%VERSION%%/adc65.a
  lib/libgphoto2/%%VERSION%%/adc65.la
  lib/libgphoto2/%%VERSION%%/adc65.so
 @@ -43,6 +47,9 @@
  lib/libgphoto2/%%VERSION%%/clicksmart310.a
  lib/libgphoto2/%%VERSION%%/clicksmart310.la
  lib/libgphoto2/%%VERSION%%/clicksmart310.so
 +lib/libgphoto2/%%VERSION%%/digigr8.a
 +lib/libgphoto2/%%VERSION%%/digigr8.la
 +lib/libgphoto2/%%VERSION%%/digigr8.so
  lib/libgphoto2/%%VERSION%%/digita.a
  lib/libgphoto2/%%VERSION%%/digita.la
  lib/libgphoto2/%%VERSION%%/digita.so
 @@ -55,9 +62,6 @@
  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
 @@ -136,6 +140,9 @@
  lib/libgphoto2/%%VERSION%%/pccam600.a
  lib/libgphoto2/%%VERSION%%/pccam600.la
  lib/libgphoto2/%%VERSION%%/pccam600.so
 +lib/libgphoto2/%%VERSION%%/pentax.a
 +lib/libgphoto2/%%VERSION%%/pentax.la
 +lib/libgphoto2/%%VERSION%%/pentax.so
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
 @@ -209,6 +216,10 @@
  lib/libgphoto2/%%VERSION%%/tp6801.la
  lib/libgphoto2/%%VERSION%%/tp6801.so
  lib/libgphoto2/print-camera-list
 +lib/libgphoto2_port.a
 +lib/libgphoto2_port.la
 +lib/libgphoto2_port.so
 +lib/libgphoto2_port.so.10
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
 @@ -218,124 +229,119 @@
  lib/libgphoto2_port/%%VERSION_PORT%%/serial.a
  lib/libgphoto2_port/%%VERSION_PORT%%/serial.la
  lib/libgphoto2_port/%%VERSION_PORT%%/serial.so
 -lib/libgphoto2_port/%%VERSION_PORT%%/usb.a
 -lib/libgphoto2_port/%%VERSION_PORT%%/usb.la
 -lib/libgphoto2_port/%%VERSION_PORT%%/usb.so
 +lib/libgphoto2_port/%%VERSION_PORT%%/usb1.a
 +lib/libgphoto2_port/%%VERSION_PORT%%/usb1.la
 +lib/libgphoto2_port/%%VERSION_PORT%%/usb1.so
  lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.a
  lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.la
  lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.so
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
 -lib/libgphoto2.a
 -lib/libgphoto2.la
 -lib/libgphoto2.so
 -lib/libgphoto2.so.2
 -lib/libgphoto2_port.a
 -lib/libgphoto2_port.la
 -lib/libgphoto2_port.so
 -lib/libgphoto2_port.so.0
  libdata/pkgconfig/libgphoto2.pc
  libdata/pkgconfig/libgphoto2_port.pc
  man/man3/libgphoto2.3.gz
  man/man3/libgphoto2_port.3.gz
 -share/doc/libgphoto2/ABOUT-NLS
 -share/doc/libgphoto2/AUTHORS
 -share/doc/libgphoto2/ChangeLog
 -share/doc/libgphoto2/COPYING
 -share/doc/libgphoto2/NEWS
 -share/doc/libgphoto2/README
 -share/doc/libgphoto2/README.packaging
 -share/doc/libgphoto2/camlibs/README.adc65
 -share/doc/libgphoto2/camlibs/README.agfa-cl20
 -share/doc/libgphoto2/camlibs/README.aox
 -share/doc/libgphoto2/camlibs/README.ax203
 -share/doc/libgphoto2/camlibs/README.ax203-compression
 -share/doc/libgphoto2/camlibs/README.canon
 -share/doc/libgphoto2/camlibs/README.clicksmart310
 -share/doc/libgphoto2/camlibs/README.enigma13
 -share/doc/libgphoto2/camlibs/README.gsmart300
 -share/doc/libgphoto2/camlibs/README.iclick
 -share/doc/libgphoto2/camlibs/README.jamcam
 -share/doc/libgphoto2/camlibs/README.jl2005a
 -share/doc/libgphoto2/camlibs/README.jl2005c
 -share/doc/libgphoto2/camlibs/README.konica
 -share/doc/libgphoto2/camlibs/README.largan-lmini
 -share/doc/libgphoto2/camlibs/README.lg_gsm
 -share/doc/libgphoto2/camlibs/README.jl2005bcd-compression
 -share/doc/libgphoto2/camlibs/README.mars
 -share/doc/libgphoto2/camlibs/README.minolta-dimagev
 -share/doc/libgphoto2/camlibs/README.mustek
 -share/doc/libgphoto2/camlibs/README.panasonic
 -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.ptp2
 -share/doc/libgphoto2/camlibs/README.smal
 -share/doc/libgphoto2/camlibs/README.sonix
 -share/doc/libgphoto2/camlibs/README.sonydscf1
 -share/doc/libgphoto2/camlibs/README.soundvision
 -share/doc/libgphoto2/camlibs/README.spca50x
 -share/doc/libgphoto2/camlibs/README.sq905
 -share/doc/libgphoto2/camlibs/README.st2205
 -share/doc/libgphoto2/camlibs/README.st2205-compression
 -share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
 -share/doc/libgphoto2/camlibs/README.tp6801
 -share/doc/libgphoto2/camlibs/README.905C
 -share/doc/libgphoto2/camlibs/README.9050
 -share/doc/libgphoto2/camlibs/README.9051
 -share/doc/libgphoto2/camlibs/README.9052
 -share/doc/libgphoto2/camlibs/README.913C
 -share/doc/libgphoto2/camlibs/README.913D
 -share/doc/libgphoto2_port/AUTHORS
 -share/doc/libgphoto2_port/NEWS
 -share/doc/libgphoto2_port/README
 +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS
 +%%PORTDOCS%%%%DOCSDIR%%/README
 +%%PORTDOCS%%%%DOCSDIR%%/README.packaging
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801
 +%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
 +%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
 +%%PORTDOCS%%share/doc/libgphoto2_port/README
  share/libgphoto2/%%VERSION%%/konica/english
  share/libgphoto2/%%VERSION%%/konica/french
  share/libgphoto2/%%VERSION%%/konica/german
  share/libgphoto2/%%VERSION%%/konica/japanese
  share/libgphoto2/%%VERSION%%/konica/korean
  share/libgphoto2/%%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/nl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
 -%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/pl/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/sk/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/vi/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/vi/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
 -%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-10.mo
  @dirrm share/libgphoto2/%%VERSION%%/konica
  @dirrm share/libgphoto2/%%VERSION%%
  @dirrm share/libgphoto2
 -@dirrm share/doc/libgphoto2_port
 -@dirrm share/doc/libgphoto2/camlibs
 -@dirrm share/doc/libgphoto2
 +%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
  @dirrm lib/libgphoto2_port
  @dirrm lib/libgphoto2/%%VERSION%%
 
 --Multipart=_Wed__23_Oct_2013_02_58_21_+0900_YVUR8xKOK/EjTosg
 Content-Type: text/x-diff;
  name="graphics_gphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_gphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
 --- /usr/ports/graphics/gphoto2/Makefile	2013-10-20 16:53:50.000000000 +0900
 +++ graphics/gphoto2/Makefile	2013-10-23 00:00:00.000000000 +0900
 @@ -2,7 +2,7 @@
  # $FreeBSD: head/graphics/gphoto2/Makefile 330928 2013-10-19 19:32:28Z danfe $
  
  PORTNAME=	gphoto2
 -PORTVERSION=	2.4.14
 +PORTVERSION=	2.5.2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
  
 @@ -19,19 +19,29 @@
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--without-cdk
  
 -OPTIONS_DEFINE=	AALIB DOCS NLS
 -OPTIONS_DEFAULT=	AALIB
 +OPTIONS_DEFINE=	AALIB READLINE DOCS NLS
 +OPTIONS_DEFAULT=	AALIB READLINE
  OPTIONS_SUB=	yes
  
  AALIB_DESC=	Text mode capture preview support
  
  AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
 -AALIB_CONFIGURE_OFF=	--without-aalib
 +AALIB_CONFIGURE_WITH=	aalib
 +
 +READLINE_USES=	readline
 +READLINE_CONFIGURE_WITH=	readline
  
  NLS_USES=	gettext
 -NLS_CONFIGURE_OFF=	--disable-nls
 +NLS_CONFIGURE_ENABLE=	nls
 +
 +.include <bsd.port.options.mk>
 +
 +post-patch:
 +	@${REINPLACE_CMD} -e \
 +		's|-lpthread|-pthread|' \
 +		${WRKSRC}/configure
  
  post-install:
 -	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 +	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR})
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
 --- /usr/ports/graphics/gphoto2/distinfo	2013-06-21 03:50:28.000000000 +0900
 +++ graphics/gphoto2/distinfo	2013-10-23 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
 -SIZE (gphoto2-2.4.14.tar.bz2) = 669292
 +SHA256 (gphoto2-2.5.2.tar.bz2) = 8eb9928f3872fea13d22c556a5bc2aea70caf23b287604cb3eef7ad759988899
 +SIZE (gphoto2-2.5.2.tar.bz2) = 720529
 diff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
 --- /usr/ports/graphics/gphoto2/pkg-plist	2013-10-20 16:53:50.000000000 +0900
 +++ graphics/gphoto2/pkg-plist	2013-10-23 00:00:00.000000000 +0900
 @@ -1,7 +1,7 @@
  bin/gphoto2
  man/man1/gphoto2.1.gz
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
 -%%DOCSDIR%%/test-hook.sh
 +%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
  %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
 @@ -32,4 +32,4 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
 -@dirrm %%DOCSDIR%%
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Wed__23_Oct_2013_02_58_21_+0900_YVUR8xKOK/EjTosg
 Content-Type: text/x-diff;
  name="graphics_gtkam.diff"
 Content-Disposition: attachment;
  filename="graphics_gtkam.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gtkam/Makefile graphics/gtkam/Makefile
 --- /usr/ports/graphics/gtkam/Makefile	2013-10-23 00:36:27.000000000 +0900
 +++ graphics/gtkam/Makefile	2013-10-23 00:00:00.000000000 +0900
 @@ -2,43 +2,38 @@
  # $FreeBSD: head/graphics/gtkam/Makefile 331272 2013-10-22 13:58:55Z amdmi3 $
  
  PORTNAME=	gtkam
 -PORTVERSION=	0.1.18
 -PORTREVISION=	3
 +PORTVERSION=	0.2.0
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	Download and view files from various digital cameras
  
 -LIB_DEPENDS=	exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
 -		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +LICENSE=	GPLv2 # (or later)
  
 -WANT_GNOME=	yes
 -USES=        pathfix pkgconfig
 +LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
 +		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 +
 +OPTIONS_DEFINE=	GIMP GNOME DOCS
 +OPTIONS_SUB=	yes
 +GIMP_DESC=	GIMP plugin support
 +
 +USES=		gmake pathfix pkgconfig
  USE_GNOME=	gnomehier gtk20
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -MAN1=		gtkam.1
 -
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 -
 -.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
 -WITH_GIMP=	yes
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if defined(WITH_GIMP)
 -LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
 -PLIST_SUB+=	GIMP=""
 +.if ${PORT_OPTIONS:MGIMP}
 +LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
  .else
  CONFIGURE_ARGS+=	--without-gimp
 -PLIST_SUB+=	GIMP="@comment "
  .endif
  
 -.if ${HAVE_GNOME:Mlibgnomeui}!=""
 +.if ${PORT_OPTIONS:MGNOME}
  PKGNAMESUFFIX=	-gnome
  USE_GNOME+=	gnomeprefix libgnomeui
  INSTALLS_OMF=	yes
 @@ -48,31 +43,12 @@
  MAKE_ENV+=	GNOME_SUBDIRS=""
  .endif
  
 -pre-everything::
 -.if !defined(WITH_GIMP)
 -	@${ECHO_MSG}
 -	@${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
 -	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
 -	@${ECHO_MSG}
 -.endif
 -
  post-patch:
  	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
 -		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
 +		 s|images/gtkam|gtkam/images|g ; \
 +		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
  	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
  		's|images/gtkam|gtkam/images|g ; \
  		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
  
 -post-install:
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
 -		${PREFIX}/share/applications
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
 -		${PREFIX}/share/pixmaps
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -.for file in AUTHORS NEWS README
 -	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 -.endfor
 -.endif
 -
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gtkam/distinfo graphics/gtkam/distinfo
 --- /usr/ports/graphics/gtkam/distinfo	2013-06-21 03:50:15.000000000 +0900
 +++ graphics/gtkam/distinfo	2013-10-23 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
 -SIZE (gtkam-0.1.18.tar.gz) = 1443404
 +SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
 +SIZE (gtkam-0.2.0.tar.gz) = 1443593
 diff -urN /usr/ports/graphics/gtkam/files/patch-Makefile.in graphics/gtkam/files/patch-Makefile.in
 --- /usr/ports/graphics/gtkam/files/patch-Makefile.in	2013-06-21 03:50:15.000000000 +0900
 +++ graphics/gtkam/files/patch-Makefile.in	2013-10-23 00:00:00.000000000 +0900
 @@ -1,7 +1,7 @@
  --- Makefile.in.orig	2008-04-23 22:55:02.000000000 +0200
  +++ Makefile.in	2008-04-23 22:56:37.000000000 +0200
 -@@ -253,7 +253,7 @@
 - target_alias = @target_alias@
 +@@ -333,7 +333,7 @@
 + top_build_prefix = @top_build_prefix@
   top_builddir = @top_builddir@
   top_srcdir = @top_srcdir@
  -SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
 @@ -9,13 +9,12 @@
   ACLOCAL_AMFLAGS = -I m4m
   
   # disable scrollkeeper for distcheck
 -@@ -714,8 +714,7 @@
 - 
 - info-am:
 - 
 --install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
 --	install-iconDATA
 -+install-data-am:
 - 
 - install-dvi: install-dvi-recursive
 - 
 +@@ -342,7 +342,7 @@
 + ########################################################################
 + # Install a few support and doc files
 + gtkamdocdir = $(datadir)/doc/gtkam
 +-gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
 ++gtkamdoc_DATA = AUTHORS NEWS README TODO CHANGES
 + icondir = $(datadir)/pixmaps
 + icon_DATA = gtkam.png
 + DESKTOP_IN_FILES = gtkam.desktop.in
 diff -urN /usr/ports/graphics/gtkam/pkg-plist graphics/gtkam/pkg-plist
 --- /usr/ports/graphics/gtkam/pkg-plist	2013-10-23 00:36:27.000000000 +0900
 +++ graphics/gtkam/pkg-plist	2013-10-23 00:00:00.000000000 +0900
 @@ -1,30 +1,30 @@
  bin/gtkam
  %%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
 +man/man1/gtkam.1.gz
 +share/applications/gtkam.desktop
  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/CHANGES
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
  %%PORTDOCS%%%%DOCSDIR%%/README
 -share/applications/gtkam.desktop
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
 -%%GNOME:%%share/omf/gtkam/gtkam-C.omf
 -%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
 -share/pixmaps/gtkam.png
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/C/legal.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
  %%DATADIR%%/images/gtkam-audio.png
  %%DATADIR%%/images/gtkam-camera.png
  %%DATADIR%%/images/gtkam-folder-camera.png
 @@ -59,17 +59,20 @@
  share/locale/sk/LC_MESSAGES/gtkam.mo
  share/locale/sl/LC_MESSAGES/gtkam.mo
  share/locale/sv/LC_MESSAGES/gtkam.mo
 -share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/uk/LC_MESSAGES/gtkam.mo
 +share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/zh_CN/LC_MESSAGES/gtkam.mo
 +%%GNOME%%share/omf/gtkam/gtkam-C.omf
 +%%GNOME%%share/omf/gtkam/gtkam-ru.omf
  share/pixmaps/gtkam-camera.png
 +share/pixmaps/gtkam.png
  @dirrm %%DATADIR%%/pixmaps
  @dirrm %%DATADIR%%/images
  @dirrm %%DATADIR%%
 -%%GNOME:%%@dirrm share/omf/gtkam
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C
 -%%GNOME:%%@dirrm share/gnome/help/gtkam
 +%%GNOME%%@dirrm share/omf/gtkam
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C
 +%%GNOME%%@dirrm share/gnome/help/gtkam
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Wed__23_Oct_2013_02_58_21_+0900_YVUR8xKOK/EjTosg--

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: graphics/gphoto2: Update to version 2.5.2
Date: Sun, 27 Oct 2013 02:45:14 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r
 Content-Type: text/x-diff;
  name="graphics_libgphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_libgphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile
 --- /usr/ports/graphics/libgphoto2/Makefile	2013-10-27 01:02:24.000000000 +0900
 +++ graphics/libgphoto2/Makefile	2013-10-27 00:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/graphics/libgphoto2/Makefile 331670 2013-10-26 09:58:00Z tijl $
  
  PORTNAME=	libgphoto2
 -PORTVERSION=	2.4.14
 -PORTREVISION=	4
 +PORTVERSION=	2.5.2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
  
 @@ -12,58 +11,86 @@
  
  LICENSE=	LGPL21
  
 -LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 -		libjpeg.so:${PORTSDIR}/graphics/jpeg
 +OPTIONS_DEFINE=	EXIF GD JPEG XML DOCS NLS
 +OPTIONS_DEFAULT=EXIF GD JPEG XML
 +OPTIONS_SUB=	yes
 +EXIF_DESC=	EXIF tag support
  
 -USES=		gmake pkgconfig
 +USES=		gmake iconv pkgconfig
  USE_BZIP2=	yes
  USE_GNOME=	ltverhack
  USE_AUTOTOOLS=	libtool libltdl
  LIBTOOLFILES=	configure libgphoto2_port/configure
 -USE_LDCONFIG=	yes
  CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 -		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
 -CFLAGS+=	-DENODATA=9999	# Safe because it's never used
 +		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 +		PATH="${PATH:C,${HOME}/bin,,}" \
 +		ac_cv_path_DOT=false \
 +		ac_cv_path_DOXYGEN=false \
 +		udevscriptdir=${WRKDIR}
 +USE_LDCONFIG=	yes
 +
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
  
 -PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 +PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.10.0
  
  .include <bsd.port.options.mk>
  
 -.if ${OSVERSION} < 1000040
 -CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
 +.if ${PORT_OPTIONS:MEXIF}
 +LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
 +.else
 +CONFIGURE_ARGS+=	--without-libexif
 +.endif
 +
 +.if ${PORT_OPTIONS:MGD}
 +LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
 +.else
 +CONFIGURE_ARGS+=	--without-gd
 +.endif
 +
 +.if ${PORT_OPTIONS:MJPEG}
 +LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 +.else
 +CONFIGURE_ARGS+=	--without-jpeg
 +.endif
 +
 +.if ${PORT_OPTIONS:MXML}
 +USE_GNOME+=	libxml2
 +CPPFLAGS+=	$$(pkg-config --cflags-only-I libxml-2.0)
 +LDFLAGS+=	$$(pkg-config --libs-only-L libxml-2.0)
 +.else
 +CONFIGURE_ARGS+=	--without-libxml2
  .endif
  
  .if ${PORT_OPTIONS:MNLS}
  USES+=		gettext
 -PLIST_SUB+=	NLS=""
  .else
 -USES+=		iconv
  CONFIGURE_ARGS+=	--disable-nls
 -PLIST_SUB+=	NLS="@comment "
 +.endif
 +
 +.include <bsd.port.pre.mk>
 +
 +.if ${OSVERSION} < 1000040
 +CONFIGURE_ENV+=	LIBUSB1_CFLAGS="-I/usr/include" \
 +		LIBUSB1_LIBS="-lusb"
  .endif
  
  post-patch:
 -.for file in configure libgphoto2_port/configure
 +.for i in configure libgphoto2_port/configure
  	@${REINPLACE_CMD} -e \
 -		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
 -		 s|-g -O2||g ; \
 +		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
 +		 /FLAGS/s|-g|| ; \
  		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
 -			${WRKSRC}/${file}
 +		${WRKSRC}/${i}
  .endfor
 -.if ${PORT_OPTIONS:MNLS}
 -	@${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \
 -		${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in
 -.endif
 -	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \
 -		s| "$$(DESTDIR)$$(udevscriptdir)"||' \
 -			${WRKSRC}/libgphoto2_port/usb/Makefile.in \
 -			${WRKSRC}/packaging/generic/Makefile.in
 -	@${REINPLACE_CMD} -e 's|linux-hotplug ||' \
 -		${WRKSRC}/packaging/Makefile.in
  	@${REINPLACE_CMD} -e \
 -		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
 -			${WRKSRC}/doc/Makefile.in
 -	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
 -		${WRKSRC}/libgphoto2_port/configure
 +		'/^doc_DATA/s|COPYING||' \
 +		${WRKSRC}/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		's|ENODATA|ENOATTR|g' \
 +		${WRKSRC}/libgphoto2_port/libusb1/libusb1.c
 +	@${REINPLACE_CMD} -e \
 +		'/^SUBDIRS/s|linux-hotplug||' \
 +		${WRKSRC}/packaging/Makefile.in
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo
 --- /usr/ports/graphics/libgphoto2/distinfo	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/distinfo	2013-10-27 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (libgphoto2-2.4.14.tar.bz2) = 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
 -SIZE (libgphoto2-2.4.14.tar.bz2) = 4481384
 +SHA256 (libgphoto2-2.5.2.tar.bz2) = a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838
 +SIZE (libgphoto2-2.5.2.tar.bz2) = 6446235
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES graphics/libgphoto2/files/patch-MAX_ENTRIES
 --- /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-MAX_ENTRIES	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- libgphoto2/gphoto2-list.c.orig	2007-07-27 07:52:55.000000000 +0200
 -+++ libgphoto2/gphoto2-list.c	2008-11-09 17:04:16.000000000 +0100
 -@@ -72,7 +72,7 @@
 - 
 - #ifdef CAMERALIST_STRUCT_COMPATIBILITY
 - 
 --#define MAX_ENTRIES 1024
 -+#define MAX_ENTRIES 8192
 - #define MAX_LIST_STRING_LENGTH 128
 - struct _CameraList {
 - 	int  count;
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- camlibs/smal/ultrapocket.c.orig	2008-10-18 19:55:46.000000000 +0200
 -+++ camlibs/smal/ultrapocket.c	2008-11-12 09:56:52.000000000 +0100
 -@@ -33,6 +33,7 @@
 - 
 - #define GP_MODULE "Smal Ultrapocket"
 - 
 -+#include <locale.h>
 - #ifdef ENABLE_NLS
 - #  include <libintl.h>
 - #  undef _
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-10-27 00:00:00.000000000 +0900
 @@ -1,11 +1,10 @@
  --- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
  +++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
 -@@ -19,6 +19,8 @@
 -  */
 - #include "config.h"
 - 
 -+#include <sys/types.h>
 -+#include <netinet/in.h>
 - #include <stdlib.h>
 +@@ -24,6 +24,7 @@
   #include <string.h>
   #include <stdio.h>
 + #include <time.h>
 ++#include <sys/types.h>
 + #include <sys/socket.h>
 + #include <netinet/in.h>
 + #include <arpa/inet.h>
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	2013-06-21 03:50:16.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- libgphoto2_port/serial/unix.c.orig	Fri Jul 27 02:36:13 2007
 -+++ libgphoto2_port/serial/unix.c	Mon Aug 13 17:26:43 2007
 -@@ -43,6 +43,7 @@
 - #endif
 - #include <string.h>
 - #include <signal.h>
 -+#include <sys/select.h>
 - #include <sys/stat.h>
 - #include <sys/types.h>
 - #ifdef HAVE_SYS_TIME_H
 diff -urN /usr/ports/graphics/libgphoto2/pkg-plist graphics/libgphoto2/pkg-plist
 --- /usr/ports/graphics/libgphoto2/pkg-plist	2013-10-27 01:02:24.000000000 +0900
 +++ graphics/libgphoto2/pkg-plist	2013-10-27 00:00:00.000000000 +0900
 @@ -19,6 +19,10 @@
  include/gphoto2/gphoto2-version.h
  include/gphoto2/gphoto2-widget.h
  include/gphoto2/gphoto2.h
 +lib/libgphoto2.a
 +lib/libgphoto2.la
 +lib/libgphoto2.so
 +lib/libgphoto2.so.6
  lib/libgphoto2/%%VERSION%%/adc65.a
  lib/libgphoto2/%%VERSION%%/adc65.la
  lib/libgphoto2/%%VERSION%%/adc65.so
 @@ -43,6 +47,9 @@
  lib/libgphoto2/%%VERSION%%/clicksmart310.a
  lib/libgphoto2/%%VERSION%%/clicksmart310.la
  lib/libgphoto2/%%VERSION%%/clicksmart310.so
 +lib/libgphoto2/%%VERSION%%/digigr8.a
 +lib/libgphoto2/%%VERSION%%/digigr8.la
 +lib/libgphoto2/%%VERSION%%/digigr8.so
  lib/libgphoto2/%%VERSION%%/digita.a
  lib/libgphoto2/%%VERSION%%/digita.la
  lib/libgphoto2/%%VERSION%%/digita.so
 @@ -55,9 +62,6 @@
  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
 @@ -136,6 +140,9 @@
  lib/libgphoto2/%%VERSION%%/pccam600.a
  lib/libgphoto2/%%VERSION%%/pccam600.la
  lib/libgphoto2/%%VERSION%%/pccam600.so
 +lib/libgphoto2/%%VERSION%%/pentax.a
 +lib/libgphoto2/%%VERSION%%/pentax.la
 +lib/libgphoto2/%%VERSION%%/pentax.so
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
 @@ -209,6 +216,10 @@
  lib/libgphoto2/%%VERSION%%/tp6801.la
  lib/libgphoto2/%%VERSION%%/tp6801.so
  lib/libgphoto2/print-camera-list
 +lib/libgphoto2_port.a
 +lib/libgphoto2_port.la
 +lib/libgphoto2_port.so
 +lib/libgphoto2_port.so.10
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
 @@ -227,115 +238,110 @@
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
 -lib/libgphoto2.a
 -lib/libgphoto2.la
 -lib/libgphoto2.so
 -lib/libgphoto2.so.2
 -lib/libgphoto2_port.a
 -lib/libgphoto2_port.la
 -lib/libgphoto2_port.so
 -lib/libgphoto2_port.so.0
  libdata/pkgconfig/libgphoto2.pc
  libdata/pkgconfig/libgphoto2_port.pc
  man/man3/libgphoto2.3.gz
  man/man3/libgphoto2_port.3.gz
 -share/doc/libgphoto2/ABOUT-NLS
 -share/doc/libgphoto2/AUTHORS
 -share/doc/libgphoto2/ChangeLog
 -share/doc/libgphoto2/COPYING
 -share/doc/libgphoto2/NEWS
 -share/doc/libgphoto2/README
 -share/doc/libgphoto2/README.packaging
 -share/doc/libgphoto2/camlibs/README.adc65
 -share/doc/libgphoto2/camlibs/README.agfa-cl20
 -share/doc/libgphoto2/camlibs/README.aox
 -share/doc/libgphoto2/camlibs/README.ax203
 -share/doc/libgphoto2/camlibs/README.ax203-compression
 -share/doc/libgphoto2/camlibs/README.canon
 -share/doc/libgphoto2/camlibs/README.clicksmart310
 -share/doc/libgphoto2/camlibs/README.enigma13
 -share/doc/libgphoto2/camlibs/README.gsmart300
 -share/doc/libgphoto2/camlibs/README.iclick
 -share/doc/libgphoto2/camlibs/README.jamcam
 -share/doc/libgphoto2/camlibs/README.jl2005a
 -share/doc/libgphoto2/camlibs/README.jl2005c
 -share/doc/libgphoto2/camlibs/README.konica
 -share/doc/libgphoto2/camlibs/README.largan-lmini
 -share/doc/libgphoto2/camlibs/README.lg_gsm
 -share/doc/libgphoto2/camlibs/README.jl2005bcd-compression
 -share/doc/libgphoto2/camlibs/README.mars
 -share/doc/libgphoto2/camlibs/README.minolta-dimagev
 -share/doc/libgphoto2/camlibs/README.mustek
 -share/doc/libgphoto2/camlibs/README.panasonic
 -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.ptp2
 -share/doc/libgphoto2/camlibs/README.smal
 -share/doc/libgphoto2/camlibs/README.sonix
 -share/doc/libgphoto2/camlibs/README.sonydscf1
 -share/doc/libgphoto2/camlibs/README.soundvision
 -share/doc/libgphoto2/camlibs/README.spca50x
 -share/doc/libgphoto2/camlibs/README.sq905
 -share/doc/libgphoto2/camlibs/README.st2205
 -share/doc/libgphoto2/camlibs/README.st2205-compression
 -share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
 -share/doc/libgphoto2/camlibs/README.tp6801
 -share/doc/libgphoto2/camlibs/README.905C
 -share/doc/libgphoto2/camlibs/README.9050
 -share/doc/libgphoto2/camlibs/README.9051
 -share/doc/libgphoto2/camlibs/README.9052
 -share/doc/libgphoto2/camlibs/README.913C
 -share/doc/libgphoto2/camlibs/README.913D
 -share/doc/libgphoto2_port/AUTHORS
 -share/doc/libgphoto2_port/NEWS
 -share/doc/libgphoto2_port/README
 +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS
 +%%PORTDOCS%%%%DOCSDIR%%/README
 +%%PORTDOCS%%%%DOCSDIR%%/README.packaging
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801
 +%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
 +%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
 +%%PORTDOCS%%share/doc/libgphoto2_port/README
  share/libgphoto2/%%VERSION%%/konica/english
  share/libgphoto2/%%VERSION%%/konica/french
  share/libgphoto2/%%VERSION%%/konica/german
  share/libgphoto2/%%VERSION%%/konica/japanese
  share/libgphoto2/%%VERSION%%/konica/korean
  share/libgphoto2/%%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/nl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
 -%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/pl/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/sk/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/vi/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/vi/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
 -%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-10.mo
  @dirrm share/libgphoto2/%%VERSION%%/konica
  @dirrm share/libgphoto2/%%VERSION%%
  @dirrm share/libgphoto2
 -@dirrm share/doc/libgphoto2_port
 -@dirrm share/doc/libgphoto2/camlibs
 -@dirrm share/doc/libgphoto2
 +%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
  @dirrm lib/libgphoto2_port
  @dirrm lib/libgphoto2/%%VERSION%%
 
 --Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r
 Content-Type: text/x-diff;
  name="graphics_gphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_gphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
 --- /usr/ports/graphics/gphoto2/Makefile	2013-10-20 16:53:50.000000000 +0900
 +++ graphics/gphoto2/Makefile	2013-10-27 00:00:00.000000000 +0900
 @@ -2,7 +2,7 @@
  # $FreeBSD: head/graphics/gphoto2/Makefile 330928 2013-10-19 19:32:28Z danfe $
  
  PORTNAME=	gphoto2
 -PORTVERSION=	2.4.14
 +PORTVERSION=	2.5.2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
  
 @@ -19,19 +19,29 @@
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--without-cdk
  
 -OPTIONS_DEFINE=	AALIB DOCS NLS
 -OPTIONS_DEFAULT=	AALIB
 +OPTIONS_DEFINE=	AALIB READLINE DOCS NLS
 +OPTIONS_DEFAULT=	AALIB READLINE
  OPTIONS_SUB=	yes
  
  AALIB_DESC=	Text mode capture preview support
  
  AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
 -AALIB_CONFIGURE_OFF=	--without-aalib
 +AALIB_CONFIGURE_WITH=	aalib
 +
 +READLINE_USES=	readline
 +READLINE_CONFIGURE_WITH=	readline
  
  NLS_USES=	gettext
 -NLS_CONFIGURE_OFF=	--disable-nls
 +NLS_CONFIGURE_ENABLE=	nls
 +
 +.include <bsd.port.options.mk>
 +
 +post-patch:
 +	@${REINPLACE_CMD} -e \
 +		's|-lpthread|-pthread|' \
 +		${WRKSRC}/configure
  
  post-install:
 -	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 +	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR})
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
 --- /usr/ports/graphics/gphoto2/distinfo	2013-06-21 03:50:28.000000000 +0900
 +++ graphics/gphoto2/distinfo	2013-10-27 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
 -SIZE (gphoto2-2.4.14.tar.bz2) = 669292
 +SHA256 (gphoto2-2.5.2.tar.bz2) = 8eb9928f3872fea13d22c556a5bc2aea70caf23b287604cb3eef7ad759988899
 +SIZE (gphoto2-2.5.2.tar.bz2) = 720529
 diff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
 --- /usr/ports/graphics/gphoto2/pkg-plist	2013-10-20 16:53:50.000000000 +0900
 +++ graphics/gphoto2/pkg-plist	2013-10-27 00:00:00.000000000 +0900
 @@ -1,7 +1,7 @@
  bin/gphoto2
  man/man1/gphoto2.1.gz
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
 -%%DOCSDIR%%/test-hook.sh
 +%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
  %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
 @@ -32,4 +32,4 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
 -@dirrm %%DOCSDIR%%
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r
 Content-Type: text/x-diff;
  name="graphics_gtkam.diff"
 Content-Disposition: attachment;
  filename="graphics_gtkam.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gtkam/Makefile graphics/gtkam/Makefile
 --- /usr/ports/graphics/gtkam/Makefile	2013-10-23 00:36:27.000000000 +0900
 +++ graphics/gtkam/Makefile	2013-10-27 00:00:00.000000000 +0900
 @@ -2,43 +2,38 @@
  # $FreeBSD: head/graphics/gtkam/Makefile 331272 2013-10-22 13:58:55Z amdmi3 $
  
  PORTNAME=	gtkam
 -PORTVERSION=	0.1.18
 -PORTREVISION=	3
 +PORTVERSION=	0.2.0
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	Download and view files from various digital cameras
  
 -LIB_DEPENDS=	exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
 -		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +LICENSE=	GPLv2 # (or later)
  
 -WANT_GNOME=	yes
 -USES=        pathfix pkgconfig
 +LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
 +		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 +
 +OPTIONS_DEFINE=	GIMP GNOME DOCS
 +OPTIONS_SUB=	yes
 +GIMP_DESC=	GIMP plugin support
 +
 +USES=		gmake pathfix pkgconfig
  USE_GNOME=	gnomehier gtk20
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -MAN1=		gtkam.1
 -
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 -
 -.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
 -WITH_GIMP=	yes
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if defined(WITH_GIMP)
 -LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
 -PLIST_SUB+=	GIMP=""
 +.if ${PORT_OPTIONS:MGIMP}
 +LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
  .else
  CONFIGURE_ARGS+=	--without-gimp
 -PLIST_SUB+=	GIMP="@comment "
  .endif
  
 -.if ${HAVE_GNOME:Mlibgnomeui}!=""
 +.if ${PORT_OPTIONS:MGNOME}
  PKGNAMESUFFIX=	-gnome
  USE_GNOME+=	gnomeprefix libgnomeui
  INSTALLS_OMF=	yes
 @@ -48,31 +43,12 @@
  MAKE_ENV+=	GNOME_SUBDIRS=""
  .endif
  
 -pre-everything::
 -.if !defined(WITH_GIMP)
 -	@${ECHO_MSG}
 -	@${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
 -	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
 -	@${ECHO_MSG}
 -.endif
 -
  post-patch:
  	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
 -		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
 +		 s|images/gtkam|gtkam/images|g ; \
 +		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
  	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
  		's|images/gtkam|gtkam/images|g ; \
  		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
  
 -post-install:
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
 -		${PREFIX}/share/applications
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
 -		${PREFIX}/share/pixmaps
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -.for file in AUTHORS NEWS README
 -	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 -.endfor
 -.endif
 -
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gtkam/distinfo graphics/gtkam/distinfo
 --- /usr/ports/graphics/gtkam/distinfo	2013-06-21 03:50:15.000000000 +0900
 +++ graphics/gtkam/distinfo	2013-10-27 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
 -SIZE (gtkam-0.1.18.tar.gz) = 1443404
 +SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
 +SIZE (gtkam-0.2.0.tar.gz) = 1443593
 diff -urN /usr/ports/graphics/gtkam/files/patch-Makefile.in graphics/gtkam/files/patch-Makefile.in
 --- /usr/ports/graphics/gtkam/files/patch-Makefile.in	2013-06-21 03:50:15.000000000 +0900
 +++ graphics/gtkam/files/patch-Makefile.in	2013-10-27 00:00:00.000000000 +0900
 @@ -1,7 +1,7 @@
  --- Makefile.in.orig	2008-04-23 22:55:02.000000000 +0200
  +++ Makefile.in	2008-04-23 22:56:37.000000000 +0200
 -@@ -253,7 +253,7 @@
 - target_alias = @target_alias@
 +@@ -333,7 +333,7 @@
 + top_build_prefix = @top_build_prefix@
   top_builddir = @top_builddir@
   top_srcdir = @top_srcdir@
  -SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
 @@ -9,13 +9,12 @@
   ACLOCAL_AMFLAGS = -I m4m
   
   # disable scrollkeeper for distcheck
 -@@ -714,8 +714,7 @@
 - 
 - info-am:
 - 
 --install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
 --	install-iconDATA
 -+install-data-am:
 - 
 - install-dvi: install-dvi-recursive
 - 
 +@@ -342,7 +342,7 @@
 + ########################################################################
 + # Install a few support and doc files
 + gtkamdocdir = $(datadir)/doc/gtkam
 +-gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
 ++gtkamdoc_DATA = AUTHORS NEWS README TODO CHANGES
 + icondir = $(datadir)/pixmaps
 + icon_DATA = gtkam.png
 + DESKTOP_IN_FILES = gtkam.desktop.in
 diff -urN /usr/ports/graphics/gtkam/pkg-plist graphics/gtkam/pkg-plist
 --- /usr/ports/graphics/gtkam/pkg-plist	2013-10-23 00:36:27.000000000 +0900
 +++ graphics/gtkam/pkg-plist	2013-10-27 00:00:00.000000000 +0900
 @@ -1,30 +1,30 @@
  bin/gtkam
  %%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
 +man/man1/gtkam.1.gz
 +share/applications/gtkam.desktop
  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/CHANGES
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
  %%PORTDOCS%%%%DOCSDIR%%/README
 -share/applications/gtkam.desktop
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
 -%%GNOME:%%share/omf/gtkam/gtkam-C.omf
 -%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
 -share/pixmaps/gtkam.png
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/C/legal.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
  %%DATADIR%%/images/gtkam-audio.png
  %%DATADIR%%/images/gtkam-camera.png
  %%DATADIR%%/images/gtkam-folder-camera.png
 @@ -59,17 +59,20 @@
  share/locale/sk/LC_MESSAGES/gtkam.mo
  share/locale/sl/LC_MESSAGES/gtkam.mo
  share/locale/sv/LC_MESSAGES/gtkam.mo
 -share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/uk/LC_MESSAGES/gtkam.mo
 +share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/zh_CN/LC_MESSAGES/gtkam.mo
 +%%GNOME%%share/omf/gtkam/gtkam-C.omf
 +%%GNOME%%share/omf/gtkam/gtkam-ru.omf
  share/pixmaps/gtkam-camera.png
 +share/pixmaps/gtkam.png
  @dirrm %%DATADIR%%/pixmaps
  @dirrm %%DATADIR%%/images
  @dirrm %%DATADIR%%
 -%%GNOME:%%@dirrm share/omf/gtkam
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C
 -%%GNOME:%%@dirrm share/gnome/help/gtkam
 +%%GNOME%%@dirrm share/omf/gtkam
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C
 +%%GNOME%%@dirrm share/gnome/help/gtkam
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r--

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: graphics/gphoto2: Update to version 2.5.2
Date: Fri, 29 Nov 2013 03:30:00 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Fri__29_Nov_2013_03_30_00_+0900_usk5xjB6OinZS7V8
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Fri__29_Nov_2013_03_30_00_+0900_usk5xjB6OinZS7V8
 Content-Type: text/x-diff;
  name="graphics_libgphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_libgphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile
 --- /usr/ports/graphics/libgphoto2/Makefile	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/Makefile	2013-11-29 00:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/graphics/libgphoto2/Makefile 331670 2013-10-26 09:58:00Z tijl $
  
  PORTNAME=	libgphoto2
 -PORTVERSION=	2.4.14
 -PORTREVISION=	4
 +PORTVERSION=	2.5.2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
  
 @@ -12,58 +11,86 @@
  
  LICENSE=	LGPL21
  
 -LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 -		libjpeg.so:${PORTSDIR}/graphics/jpeg
 +OPTIONS_DEFINE=	EXIF GD JPEG XML DOCS NLS
 +OPTIONS_DEFAULT=EXIF GD JPEG XML
 +OPTIONS_SUB=	yes
 +EXIF_DESC=	EXIF tag support
  
 -USES=		gmake pkgconfig
 +USES=		gmake iconv pkgconfig
  USE_BZIP2=	yes
  USE_GNOME=	ltverhack
  USE_AUTOTOOLS=	libtool libltdl
  LIBTOOLFILES=	configure libgphoto2_port/configure
 -USE_LDCONFIG=	yes
  CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 -		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
 -CFLAGS+=	-DENODATA=9999	# Safe because it's never used
 +		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 +		PATH="${PATH:C,${HOME}/bin,,}" \
 +		ac_cv_path_DOT=false \
 +		ac_cv_path_DOXYGEN=false \
 +		udevscriptdir=${WRKDIR}
 +USE_LDCONFIG=	yes
 +
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
  
 -PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 +PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.10.0
  
  .include <bsd.port.options.mk>
  
 -.if ${OSVERSION} < 1000040
 -CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
 +.if ${PORT_OPTIONS:MEXIF}
 +LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
 +.else
 +CONFIGURE_ARGS+=	--without-libexif
 +.endif
 +
 +.if ${PORT_OPTIONS:MGD}
 +LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
 +.else
 +CONFIGURE_ARGS+=	--without-gd
 +.endif
 +
 +.if ${PORT_OPTIONS:MJPEG}
 +LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 +.else
 +CONFIGURE_ARGS+=	--without-jpeg
 +.endif
 +
 +.if ${PORT_OPTIONS:MXML}
 +USE_GNOME+=	libxml2
 +CPPFLAGS+=	$$(pkg-config --cflags-only-I libxml-2.0)
 +LDFLAGS+=	$$(pkg-config --libs-only-L libxml-2.0)
 +.else
 +CONFIGURE_ARGS+=	--without-libxml2
  .endif
  
  .if ${PORT_OPTIONS:MNLS}
  USES+=		gettext
 -PLIST_SUB+=	NLS=""
  .else
 -USES+=		iconv
  CONFIGURE_ARGS+=	--disable-nls
 -PLIST_SUB+=	NLS="@comment "
 +.endif
 +
 +.include <bsd.port.pre.mk>
 +
 +.if ${OSVERSION} < 1000040
 +CONFIGURE_ENV+=	LIBUSB1_CFLAGS="-I/usr/include" \
 +		LIBUSB1_LIBS="-lusb"
  .endif
  
  post-patch:
 -.for file in configure libgphoto2_port/configure
 +.for i in configure libgphoto2_port/configure
  	@${REINPLACE_CMD} -e \
 -		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
 -		 s|-g -O2||g ; \
 +		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
 +		 /FLAGS/s|-g|| ; \
  		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
 -			${WRKSRC}/${file}
 +		${WRKSRC}/${i}
  .endfor
 -.if ${PORT_OPTIONS:MNLS}
 -	@${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \
 -		${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in
 -.endif
 -	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \
 -		s| "$$(DESTDIR)$$(udevscriptdir)"||' \
 -			${WRKSRC}/libgphoto2_port/usb/Makefile.in \
 -			${WRKSRC}/packaging/generic/Makefile.in
 -	@${REINPLACE_CMD} -e 's|linux-hotplug ||' \
 -		${WRKSRC}/packaging/Makefile.in
  	@${REINPLACE_CMD} -e \
 -		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
 -			${WRKSRC}/doc/Makefile.in
 -	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
 -		${WRKSRC}/libgphoto2_port/configure
 +		'/^doc_DATA/s|COPYING||' \
 +		${WRKSRC}/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		's|ENODATA|ENOATTR|g' \
 +		${WRKSRC}/libgphoto2_port/libusb1/libusb1.c
 +	@${REINPLACE_CMD} -e \
 +		'/^SUBDIRS/s|linux-hotplug||' \
 +		${WRKSRC}/packaging/Makefile.in
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo
 --- /usr/ports/graphics/libgphoto2/distinfo	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/distinfo	2013-11-29 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (libgphoto2-2.4.14.tar.bz2) = 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
 -SIZE (libgphoto2-2.4.14.tar.bz2) = 4481384
 +SHA256 (libgphoto2-2.5.2.tar.bz2) = a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838
 +SIZE (libgphoto2-2.5.2.tar.bz2) = 6446235
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES graphics/libgphoto2/files/patch-MAX_ENTRIES
 --- /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/files/patch-MAX_ENTRIES	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- libgphoto2/gphoto2-list.c.orig	2007-07-27 07:52:55.000000000 +0200
 -+++ libgphoto2/gphoto2-list.c	2008-11-09 17:04:16.000000000 +0100
 -@@ -72,7 +72,7 @@
 - 
 - #ifdef CAMERALIST_STRUCT_COMPATIBILITY
 - 
 --#define MAX_ENTRIES 1024
 -+#define MAX_ENTRIES 8192
 - #define MAX_LIST_STRING_LENGTH 128
 - struct _CameraList {
 - 	int  count;
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- camlibs/smal/ultrapocket.c.orig	2008-10-18 19:55:46.000000000 +0200
 -+++ camlibs/smal/ultrapocket.c	2008-11-12 09:56:52.000000000 +0100
 -@@ -33,6 +33,7 @@
 - 
 - #define GP_MODULE "Smal Ultrapocket"
 - 
 -+#include <locale.h>
 - #ifdef ENABLE_NLS
 - #  include <libintl.h>
 - #  undef _
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-11-29 00:00:00.000000000 +0900
 @@ -1,11 +1,10 @@
  --- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
  +++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
 -@@ -19,6 +19,8 @@
 -  */
 - #include "config.h"
 - 
 -+#include <sys/types.h>
 -+#include <netinet/in.h>
 - #include <stdlib.h>
 +@@ -24,6 +24,7 @@
   #include <string.h>
   #include <stdio.h>
 + #include <time.h>
 ++#include <sys/types.h>
 + #include <sys/socket.h>
 + #include <netinet/in.h>
 + #include <arpa/inet.h>
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- libgphoto2_port/serial/unix.c.orig	Fri Jul 27 02:36:13 2007
 -+++ libgphoto2_port/serial/unix.c	Mon Aug 13 17:26:43 2007
 -@@ -43,6 +43,7 @@
 - #endif
 - #include <string.h>
 - #include <signal.h>
 -+#include <sys/select.h>
 - #include <sys/stat.h>
 - #include <sys/types.h>
 - #ifdef HAVE_SYS_TIME_H
 diff -urN /usr/ports/graphics/libgphoto2/pkg-plist graphics/libgphoto2/pkg-plist
 --- /usr/ports/graphics/libgphoto2/pkg-plist	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/pkg-plist	2013-11-29 00:00:00.000000000 +0900
 @@ -19,6 +19,10 @@
  include/gphoto2/gphoto2-version.h
  include/gphoto2/gphoto2-widget.h
  include/gphoto2/gphoto2.h
 +lib/libgphoto2.a
 +lib/libgphoto2.la
 +lib/libgphoto2.so
 +lib/libgphoto2.so.6
  lib/libgphoto2/%%VERSION%%/adc65.a
  lib/libgphoto2/%%VERSION%%/adc65.la
  lib/libgphoto2/%%VERSION%%/adc65.so
 @@ -43,6 +47,9 @@
  lib/libgphoto2/%%VERSION%%/clicksmart310.a
  lib/libgphoto2/%%VERSION%%/clicksmart310.la
  lib/libgphoto2/%%VERSION%%/clicksmart310.so
 +lib/libgphoto2/%%VERSION%%/digigr8.a
 +lib/libgphoto2/%%VERSION%%/digigr8.la
 +lib/libgphoto2/%%VERSION%%/digigr8.so
  lib/libgphoto2/%%VERSION%%/digita.a
  lib/libgphoto2/%%VERSION%%/digita.la
  lib/libgphoto2/%%VERSION%%/digita.so
 @@ -55,9 +62,6 @@
  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
 @@ -136,6 +140,9 @@
  lib/libgphoto2/%%VERSION%%/pccam600.a
  lib/libgphoto2/%%VERSION%%/pccam600.la
  lib/libgphoto2/%%VERSION%%/pccam600.so
 +lib/libgphoto2/%%VERSION%%/pentax.a
 +lib/libgphoto2/%%VERSION%%/pentax.la
 +lib/libgphoto2/%%VERSION%%/pentax.so
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
 @@ -209,6 +216,10 @@
  lib/libgphoto2/%%VERSION%%/tp6801.la
  lib/libgphoto2/%%VERSION%%/tp6801.so
  lib/libgphoto2/print-camera-list
 +lib/libgphoto2_port.a
 +lib/libgphoto2_port.la
 +lib/libgphoto2_port.so
 +lib/libgphoto2_port.so.10
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
 @@ -227,115 +238,110 @@
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
 -lib/libgphoto2.a
 -lib/libgphoto2.la
 -lib/libgphoto2.so
 -lib/libgphoto2.so.2
 -lib/libgphoto2_port.a
 -lib/libgphoto2_port.la
 -lib/libgphoto2_port.so
 -lib/libgphoto2_port.so.0
  libdata/pkgconfig/libgphoto2.pc
  libdata/pkgconfig/libgphoto2_port.pc
  man/man3/libgphoto2.3.gz
  man/man3/libgphoto2_port.3.gz
 -share/doc/libgphoto2/ABOUT-NLS
 -share/doc/libgphoto2/AUTHORS
 -share/doc/libgphoto2/ChangeLog
 -share/doc/libgphoto2/COPYING
 -share/doc/libgphoto2/NEWS
 -share/doc/libgphoto2/README
 -share/doc/libgphoto2/README.packaging
 -share/doc/libgphoto2/camlibs/README.adc65
 -share/doc/libgphoto2/camlibs/README.agfa-cl20
 -share/doc/libgphoto2/camlibs/README.aox
 -share/doc/libgphoto2/camlibs/README.ax203
 -share/doc/libgphoto2/camlibs/README.ax203-compression
 -share/doc/libgphoto2/camlibs/README.canon
 -share/doc/libgphoto2/camlibs/README.clicksmart310
 -share/doc/libgphoto2/camlibs/README.enigma13
 -share/doc/libgphoto2/camlibs/README.gsmart300
 -share/doc/libgphoto2/camlibs/README.iclick
 -share/doc/libgphoto2/camlibs/README.jamcam
 -share/doc/libgphoto2/camlibs/README.jl2005a
 -share/doc/libgphoto2/camlibs/README.jl2005c
 -share/doc/libgphoto2/camlibs/README.konica
 -share/doc/libgphoto2/camlibs/README.largan-lmini
 -share/doc/libgphoto2/camlibs/README.lg_gsm
 -share/doc/libgphoto2/camlibs/README.jl2005bcd-compression
 -share/doc/libgphoto2/camlibs/README.mars
 -share/doc/libgphoto2/camlibs/README.minolta-dimagev
 -share/doc/libgphoto2/camlibs/README.mustek
 -share/doc/libgphoto2/camlibs/README.panasonic
 -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.ptp2
 -share/doc/libgphoto2/camlibs/README.smal
 -share/doc/libgphoto2/camlibs/README.sonix
 -share/doc/libgphoto2/camlibs/README.sonydscf1
 -share/doc/libgphoto2/camlibs/README.soundvision
 -share/doc/libgphoto2/camlibs/README.spca50x
 -share/doc/libgphoto2/camlibs/README.sq905
 -share/doc/libgphoto2/camlibs/README.st2205
 -share/doc/libgphoto2/camlibs/README.st2205-compression
 -share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
 -share/doc/libgphoto2/camlibs/README.tp6801
 -share/doc/libgphoto2/camlibs/README.905C
 -share/doc/libgphoto2/camlibs/README.9050
 -share/doc/libgphoto2/camlibs/README.9051
 -share/doc/libgphoto2/camlibs/README.9052
 -share/doc/libgphoto2/camlibs/README.913C
 -share/doc/libgphoto2/camlibs/README.913D
 -share/doc/libgphoto2_port/AUTHORS
 -share/doc/libgphoto2_port/NEWS
 -share/doc/libgphoto2_port/README
 +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS
 +%%PORTDOCS%%%%DOCSDIR%%/README
 +%%PORTDOCS%%%%DOCSDIR%%/README.packaging
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801
 +%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
 +%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
 +%%PORTDOCS%%share/doc/libgphoto2_port/README
  share/libgphoto2/%%VERSION%%/konica/english
  share/libgphoto2/%%VERSION%%/konica/french
  share/libgphoto2/%%VERSION%%/konica/german
  share/libgphoto2/%%VERSION%%/konica/japanese
  share/libgphoto2/%%VERSION%%/konica/korean
  share/libgphoto2/%%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/nl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
 -%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/pl/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/sk/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/vi/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/vi/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
 -%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-10.mo
  @dirrm share/libgphoto2/%%VERSION%%/konica
  @dirrm share/libgphoto2/%%VERSION%%
  @dirrm share/libgphoto2
 -@dirrm share/doc/libgphoto2_port
 -@dirrm share/doc/libgphoto2/camlibs
 -@dirrm share/doc/libgphoto2
 +%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
  @dirrm lib/libgphoto2_port
  @dirrm lib/libgphoto2/%%VERSION%%
 
 --Multipart=_Fri__29_Nov_2013_03_30_00_+0900_usk5xjB6OinZS7V8
 Content-Type: text/x-diff;
  name="graphics_gphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_gphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
 --- /usr/ports/graphics/gphoto2/Makefile	2013-11-28 06:59:39.000000000 +0900
 +++ graphics/gphoto2/Makefile	2013-11-29 00:00:00.000000000 +0900
 @@ -2,7 +2,7 @@
  # $FreeBSD: head/graphics/gphoto2/Makefile 335042 2013-11-27 18:33:24Z amdmi3 $
  
  PORTNAME=	gphoto2
 -PORTVERSION=	2.4.14
 +PORTVERSION=	2.5.2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
  
 @@ -17,23 +17,33 @@
  USES=		gmake pkgconfig
  USE_BZIP2=	yes
  GNU_CONFIGURE=	yes
 +CONFIGURE_ENV=	POPT_CFLAGS="$$(pkg-config --cflags popt)" \
 +		POPT_LIBS="$$(pkg-config --libs popt)"
  CONFIGURE_ARGS=	--without-cdk
 -CONFIGURE_ENV=	POPT_CFLAGS="-I${LOCALBASE}/include" \
 -		POPT_LIBS="-L${LOCALBASE}/lib -lpopt"
  
 -OPTIONS_DEFINE=	AALIB DOCS NLS
 -OPTIONS_DEFAULT=	AALIB
 +OPTIONS_DEFINE=	AALIB READLINE DOCS NLS
 +OPTIONS_DEFAULT=	AALIB READLINE
  OPTIONS_SUB=	yes
  
  AALIB_DESC=	Text mode capture preview support
  
  AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
 -AALIB_CONFIGURE_OFF=	--without-aalib
 +AALIB_CONFIGURE_WITH=	aalib
 +
 +READLINE_USES=	readline
 +READLINE_CONFIGURE_WITH=	readline
  
  NLS_USES=	gettext
 -NLS_CONFIGURE_OFF=	--disable-nls
 +NLS_CONFIGURE_ENABLE=	nls
 +
 +.include <bsd.port.options.mk>
 +
 +post-patch:
 +	@${REINPLACE_CMD} -e \
 +		's|-lpthread|-pthread|' \
 +		${WRKSRC}/configure
  
  post-install:
 -	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 +	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR})
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
 --- /usr/ports/graphics/gphoto2/distinfo	2013-11-06 22:01:31.000000000 +0900
 +++ graphics/gphoto2/distinfo	2013-11-29 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
 -SIZE (gphoto2-2.4.14.tar.bz2) = 669292
 +SHA256 (gphoto2-2.5.2.tar.bz2) = 8eb9928f3872fea13d22c556a5bc2aea70caf23b287604cb3eef7ad759988899
 +SIZE (gphoto2-2.5.2.tar.bz2) = 720529
 diff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
 --- /usr/ports/graphics/gphoto2/pkg-plist	2013-11-06 22:01:31.000000000 +0900
 +++ graphics/gphoto2/pkg-plist	2013-11-29 00:00:00.000000000 +0900
 @@ -1,7 +1,7 @@
  bin/gphoto2
  man/man1/gphoto2.1.gz
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
 -%%DOCSDIR%%/test-hook.sh
 +%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
  %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
 @@ -32,4 +32,4 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
 -@dirrm %%DOCSDIR%%
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Fri__29_Nov_2013_03_30_00_+0900_usk5xjB6OinZS7V8
 Content-Type: text/x-diff;
  name="graphics_gtkam.diff"
 Content-Disposition: attachment;
  filename="graphics_gtkam.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gtkam/Makefile graphics/gtkam/Makefile
 --- /usr/ports/graphics/gtkam/Makefile	2013-11-06 22:01:32.000000000 +0900
 +++ graphics/gtkam/Makefile	2013-11-29 00:00:00.000000000 +0900
 @@ -2,43 +2,38 @@
  # $FreeBSD: head/graphics/gtkam/Makefile 331272 2013-10-22 13:58:55Z amdmi3 $
  
  PORTNAME=	gtkam
 -PORTVERSION=	0.1.18
 -PORTREVISION=	3
 +PORTVERSION=	0.2.0
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	Download and view files from various digital cameras
  
 -LIB_DEPENDS=	exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
 -		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +LICENSE=	GPLv2 # (or later)
  
 -WANT_GNOME=	yes
 -USES=        pathfix pkgconfig
 +LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
 +		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 +
 +OPTIONS_DEFINE=	GIMP GNOME DOCS
 +OPTIONS_SUB=	yes
 +GIMP_DESC=	GIMP plugin support
 +
 +USES=		gmake pathfix pkgconfig
  USE_GNOME=	gnomehier gtk20
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -MAN1=		gtkam.1
 -
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 -
 -.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
 -WITH_GIMP=	yes
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if defined(WITH_GIMP)
 -LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
 -PLIST_SUB+=	GIMP=""
 +.if ${PORT_OPTIONS:MGIMP}
 +LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
  .else
  CONFIGURE_ARGS+=	--without-gimp
 -PLIST_SUB+=	GIMP="@comment "
  .endif
  
 -.if ${HAVE_GNOME:Mlibgnomeui}!=""
 +.if ${PORT_OPTIONS:MGNOME}
  PKGNAMESUFFIX=	-gnome
  USE_GNOME+=	gnomeprefix libgnomeui
  INSTALLS_OMF=	yes
 @@ -48,31 +43,12 @@
  MAKE_ENV+=	GNOME_SUBDIRS=""
  .endif
  
 -pre-everything::
 -.if !defined(WITH_GIMP)
 -	@${ECHO_MSG}
 -	@${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
 -	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
 -	@${ECHO_MSG}
 -.endif
 -
  post-patch:
  	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
 -		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
 +		 s|images/gtkam|gtkam/images|g ; \
 +		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
  	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
  		's|images/gtkam|gtkam/images|g ; \
  		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
  
 -post-install:
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
 -		${PREFIX}/share/applications
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
 -		${PREFIX}/share/pixmaps
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -.for file in AUTHORS NEWS README
 -	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 -.endfor
 -.endif
 -
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gtkam/distinfo graphics/gtkam/distinfo
 --- /usr/ports/graphics/gtkam/distinfo	2013-11-06 22:01:32.000000000 +0900
 +++ graphics/gtkam/distinfo	2013-11-29 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
 -SIZE (gtkam-0.1.18.tar.gz) = 1443404
 +SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
 +SIZE (gtkam-0.2.0.tar.gz) = 1443593
 diff -urN /usr/ports/graphics/gtkam/files/patch-Makefile.in graphics/gtkam/files/patch-Makefile.in
 --- /usr/ports/graphics/gtkam/files/patch-Makefile.in	2013-11-06 22:01:32.000000000 +0900
 +++ graphics/gtkam/files/patch-Makefile.in	2013-11-29 00:00:00.000000000 +0900
 @@ -1,7 +1,7 @@
  --- Makefile.in.orig	2008-04-23 22:55:02.000000000 +0200
  +++ Makefile.in	2008-04-23 22:56:37.000000000 +0200
 -@@ -253,7 +253,7 @@
 - target_alias = @target_alias@
 +@@ -333,7 +333,7 @@
 + top_build_prefix = @top_build_prefix@
   top_builddir = @top_builddir@
   top_srcdir = @top_srcdir@
  -SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
 @@ -9,13 +9,12 @@
   ACLOCAL_AMFLAGS = -I m4m
   
   # disable scrollkeeper for distcheck
 -@@ -714,8 +714,7 @@
 - 
 - info-am:
 - 
 --install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
 --	install-iconDATA
 -+install-data-am:
 - 
 - install-dvi: install-dvi-recursive
 - 
 +@@ -342,7 +342,7 @@
 + ########################################################################
 + # Install a few support and doc files
 + gtkamdocdir = $(datadir)/doc/gtkam
 +-gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
 ++gtkamdoc_DATA = AUTHORS NEWS README TODO CHANGES
 + icondir = $(datadir)/pixmaps
 + icon_DATA = gtkam.png
 + DESKTOP_IN_FILES = gtkam.desktop.in
 diff -urN /usr/ports/graphics/gtkam/pkg-plist graphics/gtkam/pkg-plist
 --- /usr/ports/graphics/gtkam/pkg-plist	2013-11-06 22:01:32.000000000 +0900
 +++ graphics/gtkam/pkg-plist	2013-11-29 00:00:00.000000000 +0900
 @@ -1,30 +1,30 @@
  bin/gtkam
  %%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
 +man/man1/gtkam.1.gz
 +share/applications/gtkam.desktop
  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/CHANGES
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
  %%PORTDOCS%%%%DOCSDIR%%/README
 -share/applications/gtkam.desktop
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
 -%%GNOME:%%share/omf/gtkam/gtkam-C.omf
 -%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
 -share/pixmaps/gtkam.png
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/C/legal.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
  %%DATADIR%%/images/gtkam-audio.png
  %%DATADIR%%/images/gtkam-camera.png
  %%DATADIR%%/images/gtkam-folder-camera.png
 @@ -59,17 +59,20 @@
  share/locale/sk/LC_MESSAGES/gtkam.mo
  share/locale/sl/LC_MESSAGES/gtkam.mo
  share/locale/sv/LC_MESSAGES/gtkam.mo
 -share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/uk/LC_MESSAGES/gtkam.mo
 +share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/zh_CN/LC_MESSAGES/gtkam.mo
 +%%GNOME%%share/omf/gtkam/gtkam-C.omf
 +%%GNOME%%share/omf/gtkam/gtkam-ru.omf
  share/pixmaps/gtkam-camera.png
 +share/pixmaps/gtkam.png
  @dirrm %%DATADIR%%/pixmaps
  @dirrm %%DATADIR%%/images
  @dirrm %%DATADIR%%
 -%%GNOME:%%@dirrm share/omf/gtkam
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C
 -%%GNOME:%%@dirrm share/gnome/help/gtkam
 +%%GNOME%%@dirrm share/omf/gtkam
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C
 +%%GNOME%%@dirrm share/gnome/help/gtkam
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Fri__29_Nov_2013_03_30_00_+0900_usk5xjB6OinZS7V8--

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: graphics/gphoto2: Update to version 2.5.2
Date: Mon, 13 Jan 2014 03:00:01 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Mon__13_Jan_2014_03_00_01_+0900_6FTzIYTRNAEpbM58
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Version 2.5.3 has been released.
 
 --Multipart=_Mon__13_Jan_2014_03_00_01_+0900_6FTzIYTRNAEpbM58
 Content-Type: text/x-diff;
  name="graphics_libgphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_libgphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile
 --- /usr/ports/graphics/libgphoto2/Makefile	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/Makefile	2014-01-13 02:38:40.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/graphics/libgphoto2/Makefile 331670 2013-10-26 09:58:00Z tijl $
  
  PORTNAME=	libgphoto2
 -PORTVERSION=	2.4.14
 -PORTREVISION=	4
 +PORTVERSION=	2.5.3
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
  
 @@ -12,58 +11,65 @@
  
  LICENSE=	LGPL21
  
 -LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 -		libjpeg.so:${PORTSDIR}/graphics/jpeg
 -
 -USES=		gmake pkgconfig
  USE_BZIP2=	yes
 +USES=		gmake iconv pkgconfig
  USE_GNOME=	ltverhack
  USE_AUTOTOOLS=	libtool libltdl
  LIBTOOLFILES=	configure libgphoto2_port/configure
 -USE_LDCONFIG=	yes
  CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 -		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
 -CFLAGS+=	-DENODATA=9999	# Safe because it's never used
 +		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 +		PATH="${PATH:C,${HOME}/bin,,}" \
 +		ac_cv_path_DOT=false \
 +		ac_cv_path_DOXYGEN=false \
 +		udevscriptdir=${WRKDIR}
 +USE_LDCONFIG=	yes
  
 -PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
 +
 +PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.10.0
 +
 +OPTIONS_DEFINE=		DOCS GD JPEG LIBEXIF NLS XML
 +OPTIONS_DEFAULT=	GD JPEG LIBEXIF XML
 +OPTIONS_SUB=		yes
 +
 +GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
 +GD_CONFIGURE_WITH=	gd
 +JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 +JPEG_CONFIGURE_WITH=	jpeg
 +LIBEXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
 +LIBEXIF_CONFIGURE_ON=	--with-libexif=${LOCALBASE}
 +LIBEXIF_CONFIGURE_OFF=	--with-libexif=no
 +NLS_USES=		gettext
 +NLS_CONFIGURE_ENABLE=	nls
 +XML_USE=		GNOME=libxml2
 +XML_CPPFLAGS=		$$(pkg-config --cflags-only-I libxml-2.0)
 +XML_LDFLAGS=		$$(pkg-config --libs-only-L libxml-2.0)
 +XML_CONFIGURE_WITH=	libxml2
  
  .include <bsd.port.options.mk>
 +.include <bsd.port.pre.mk>
  
  .if ${OSVERSION} < 1000040
  CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
  .endif
  
 -.if ${PORT_OPTIONS:MNLS}
 -USES+=		gettext
 -PLIST_SUB+=	NLS=""
 -.else
 -USES+=		iconv
 -CONFIGURE_ARGS+=	--disable-nls
 -PLIST_SUB+=	NLS="@comment "
 -.endif
 -
  post-patch:
 -.for file in configure libgphoto2_port/configure
 +.for i in configure libgphoto2_port/configure
  	@${REINPLACE_CMD} -e \
 -		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
 -		 s|-g -O2||g ; \
 +		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
 +		 /FLAGS/s|-g|| ; \
  		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
 -			${WRKSRC}/${file}
 +		${WRKSRC}/${i}
  .endfor
 -.if ${PORT_OPTIONS:MNLS}
 -	@${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \
 -		${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in
 -.endif
 -	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \
 -		s| "$$(DESTDIR)$$(udevscriptdir)"||' \
 -			${WRKSRC}/libgphoto2_port/usb/Makefile.in \
 -			${WRKSRC}/packaging/generic/Makefile.in
 -	@${REINPLACE_CMD} -e 's|linux-hotplug ||' \
 -		${WRKSRC}/packaging/Makefile.in
  	@${REINPLACE_CMD} -e \
 -		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
 -			${WRKSRC}/doc/Makefile.in
 -	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
 -		${WRKSRC}/libgphoto2_port/configure
 +		'/^doc_DATA/s|COPYING||' \
 +		${WRKSRC}/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		's|ENODATA|ENOATTR|g' \
 +		${WRKSRC}/libgphoto2_port/libusb1/libusb1.c
 +	@${REINPLACE_CMD} -e \
 +		'/^SUBDIRS/s|linux-hotplug||' \
 +		${WRKSRC}/packaging/Makefile.in
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo
 --- /usr/ports/graphics/libgphoto2/distinfo	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/distinfo	2014-01-13 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (libgphoto2-2.4.14.tar.bz2) = 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
 -SIZE (libgphoto2-2.4.14.tar.bz2) = 4481384
 +SHA256 (libgphoto2-2.5.3.tar.bz2) = 7fa0515f7ef9060e99e92790cdd3b80650d7acd9f2e4ef6c9c68003c600b2475
 +SIZE (libgphoto2-2.5.3.tar.bz2) = 6662282
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES graphics/libgphoto2/files/patch-MAX_ENTRIES
 --- /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/files/patch-MAX_ENTRIES	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- libgphoto2/gphoto2-list.c.orig	2007-07-27 07:52:55.000000000 +0200
 -+++ libgphoto2/gphoto2-list.c	2008-11-09 17:04:16.000000000 +0100
 -@@ -72,7 +72,7 @@
 - 
 - #ifdef CAMERALIST_STRUCT_COMPATIBILITY
 - 
 --#define MAX_ENTRIES 1024
 -+#define MAX_ENTRIES 8192
 - #define MAX_LIST_STRING_LENGTH 128
 - struct _CameraList {
 - 	int  count;
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- camlibs/smal/ultrapocket.c.orig	2008-10-18 19:55:46.000000000 +0200
 -+++ camlibs/smal/ultrapocket.c	2008-11-12 09:56:52.000000000 +0100
 -@@ -33,6 +33,7 @@
 - 
 - #define GP_MODULE "Smal Ultrapocket"
 - 
 -+#include <locale.h>
 - #ifdef ENABLE_NLS
 - #  include <libintl.h>
 - #  undef _
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
 --- /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	2014-01-13 00:00:00.000000000 +0900
 @@ -1,11 +1,10 @@
  --- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
  +++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
 -@@ -19,6 +19,8 @@
 -  */
 - #include "config.h"
 - 
 -+#include <sys/types.h>
 -+#include <netinet/in.h>
 - #include <stdlib.h>
 +@@ -24,6 +24,7 @@
   #include <string.h>
   #include <stdio.h>
 + #include <time.h>
 ++#include <sys/types.h>
 + #include <sys/socket.h>
 + #include <netinet/in.h>
 + #include <arpa/inet.h>
 diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
 --- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,10 +0,0 @@
 ---- libgphoto2_port/serial/unix.c.orig	Fri Jul 27 02:36:13 2007
 -+++ libgphoto2_port/serial/unix.c	Mon Aug 13 17:26:43 2007
 -@@ -43,6 +43,7 @@
 - #endif
 - #include <string.h>
 - #include <signal.h>
 -+#include <sys/select.h>
 - #include <sys/stat.h>
 - #include <sys/types.h>
 - #ifdef HAVE_SYS_TIME_H
 diff -urN /usr/ports/graphics/libgphoto2/pkg-plist graphics/libgphoto2/pkg-plist
 --- /usr/ports/graphics/libgphoto2/pkg-plist	2013-11-06 22:01:58.000000000 +0900
 +++ graphics/libgphoto2/pkg-plist	2014-01-13 00:00:00.000000000 +0900
 @@ -19,6 +19,10 @@
  include/gphoto2/gphoto2-version.h
  include/gphoto2/gphoto2-widget.h
  include/gphoto2/gphoto2.h
 +lib/libgphoto2.a
 +lib/libgphoto2.la
 +lib/libgphoto2.so
 +lib/libgphoto2.so.6
  lib/libgphoto2/%%VERSION%%/adc65.a
  lib/libgphoto2/%%VERSION%%/adc65.la
  lib/libgphoto2/%%VERSION%%/adc65.so
 @@ -43,6 +47,9 @@
  lib/libgphoto2/%%VERSION%%/clicksmart310.a
  lib/libgphoto2/%%VERSION%%/clicksmart310.la
  lib/libgphoto2/%%VERSION%%/clicksmart310.so
 +lib/libgphoto2/%%VERSION%%/digigr8.a
 +lib/libgphoto2/%%VERSION%%/digigr8.la
 +lib/libgphoto2/%%VERSION%%/digigr8.so
  lib/libgphoto2/%%VERSION%%/digita.a
  lib/libgphoto2/%%VERSION%%/digita.la
  lib/libgphoto2/%%VERSION%%/digita.so
 @@ -55,9 +62,6 @@
  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
 @@ -136,6 +140,9 @@
  lib/libgphoto2/%%VERSION%%/pccam600.a
  lib/libgphoto2/%%VERSION%%/pccam600.la
  lib/libgphoto2/%%VERSION%%/pccam600.so
 +lib/libgphoto2/%%VERSION%%/pentax.a
 +lib/libgphoto2/%%VERSION%%/pentax.la
 +lib/libgphoto2/%%VERSION%%/pentax.so
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
 @@ -209,6 +216,10 @@
  lib/libgphoto2/%%VERSION%%/tp6801.la
  lib/libgphoto2/%%VERSION%%/tp6801.so
  lib/libgphoto2/print-camera-list
 +lib/libgphoto2_port.a
 +lib/libgphoto2_port.la
 +lib/libgphoto2_port.so
 +lib/libgphoto2_port.so.10
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
 @@ -227,115 +238,111 @@
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
 -lib/libgphoto2.a
 -lib/libgphoto2.la
 -lib/libgphoto2.so
 -lib/libgphoto2.so.2
 -lib/libgphoto2_port.a
 -lib/libgphoto2_port.la
 -lib/libgphoto2_port.so
 -lib/libgphoto2_port.so.0
  libdata/pkgconfig/libgphoto2.pc
  libdata/pkgconfig/libgphoto2_port.pc
  man/man3/libgphoto2.3.gz
  man/man3/libgphoto2_port.3.gz
 -share/doc/libgphoto2/ABOUT-NLS
 -share/doc/libgphoto2/AUTHORS
 -share/doc/libgphoto2/ChangeLog
 -share/doc/libgphoto2/COPYING
 -share/doc/libgphoto2/NEWS
 -share/doc/libgphoto2/README
 -share/doc/libgphoto2/README.packaging
 -share/doc/libgphoto2/camlibs/README.adc65
 -share/doc/libgphoto2/camlibs/README.agfa-cl20
 -share/doc/libgphoto2/camlibs/README.aox
 -share/doc/libgphoto2/camlibs/README.ax203
 -share/doc/libgphoto2/camlibs/README.ax203-compression
 -share/doc/libgphoto2/camlibs/README.canon
 -share/doc/libgphoto2/camlibs/README.clicksmart310
 -share/doc/libgphoto2/camlibs/README.enigma13
 -share/doc/libgphoto2/camlibs/README.gsmart300
 -share/doc/libgphoto2/camlibs/README.iclick
 -share/doc/libgphoto2/camlibs/README.jamcam
 -share/doc/libgphoto2/camlibs/README.jl2005a
 -share/doc/libgphoto2/camlibs/README.jl2005c
 -share/doc/libgphoto2/camlibs/README.konica
 -share/doc/libgphoto2/camlibs/README.largan-lmini
 -share/doc/libgphoto2/camlibs/README.lg_gsm
 -share/doc/libgphoto2/camlibs/README.jl2005bcd-compression
 -share/doc/libgphoto2/camlibs/README.mars
 -share/doc/libgphoto2/camlibs/README.minolta-dimagev
 -share/doc/libgphoto2/camlibs/README.mustek
 -share/doc/libgphoto2/camlibs/README.panasonic
 -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.ptp2
 -share/doc/libgphoto2/camlibs/README.smal
 -share/doc/libgphoto2/camlibs/README.sonix
 -share/doc/libgphoto2/camlibs/README.sonydscf1
 -share/doc/libgphoto2/camlibs/README.soundvision
 -share/doc/libgphoto2/camlibs/README.spca50x
 -share/doc/libgphoto2/camlibs/README.sq905
 -share/doc/libgphoto2/camlibs/README.st2205
 -share/doc/libgphoto2/camlibs/README.st2205-compression
 -share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
 -share/doc/libgphoto2/camlibs/README.tp6801
 -share/doc/libgphoto2/camlibs/README.905C
 -share/doc/libgphoto2/camlibs/README.9050
 -share/doc/libgphoto2/camlibs/README.9051
 -share/doc/libgphoto2/camlibs/README.9052
 -share/doc/libgphoto2/camlibs/README.913C
 -share/doc/libgphoto2/camlibs/README.913D
 -share/doc/libgphoto2_port/AUTHORS
 -share/doc/libgphoto2_port/NEWS
 -share/doc/libgphoto2_port/README
 +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS
 +%%PORTDOCS%%%%DOCSDIR%%/README
 +%%PORTDOCS%%%%DOCSDIR%%/README.packaging
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801
 +%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
 +%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
 +%%PORTDOCS%%share/doc/libgphoto2_port/README
  share/libgphoto2/%%VERSION%%/konica/english
  share/libgphoto2/%%VERSION%%/konica/french
  share/libgphoto2/%%VERSION%%/konica/german
  share/libgphoto2/%%VERSION%%/konica/japanese
  share/libgphoto2/%%VERSION%%/konica/korean
  share/libgphoto2/%%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/nl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
 -%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/pl/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/sk/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/vi/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/vi/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
 -%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-10.mo
  @dirrm share/libgphoto2/%%VERSION%%/konica
  @dirrm share/libgphoto2/%%VERSION%%
  @dirrm share/libgphoto2
 -@dirrm share/doc/libgphoto2_port
 -@dirrm share/doc/libgphoto2/camlibs
 -@dirrm share/doc/libgphoto2
 +%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
  @dirrm lib/libgphoto2_port
  @dirrm lib/libgphoto2/%%VERSION%%
 
 --Multipart=_Mon__13_Jan_2014_03_00_01_+0900_6FTzIYTRNAEpbM58
 Content-Type: text/x-diff;
  name="graphics_gphoto2.diff"
 Content-Disposition: attachment;
  filename="graphics_gphoto2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
 --- /usr/ports/graphics/gphoto2/Makefile	2013-11-28 06:59:39.000000000 +0900
 +++ graphics/gphoto2/Makefile	2014-01-13 00:00:00.000000000 +0900
 @@ -2,7 +2,7 @@
  # $FreeBSD: head/graphics/gphoto2/Makefile 335042 2013-11-27 18:33:24Z amdmi3 $
  
  PORTNAME=	gphoto2
 -PORTVERSION=	2.4.14
 +PORTVERSION=	2.5.3
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
  
 @@ -14,26 +14,33 @@
  LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
  		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
  
 -USES=		gmake pkgconfig
  USE_BZIP2=	yes
 +USES=		gmake pkgconfig
  GNU_CONFIGURE=	yes
 +CONFIGURE_ENV=	POPT_CFLAGS="$$(pkg-config --cflags popt)" \
 +		POPT_LIBS="$$(pkg-config --libs popt)"
  CONFIGURE_ARGS=	--without-cdk
 -CONFIGURE_ENV=	POPT_CFLAGS="-I${LOCALBASE}/include" \
 -		POPT_LIBS="-L${LOCALBASE}/lib -lpopt"
  
 -OPTIONS_DEFINE=	AALIB DOCS NLS
 -OPTIONS_DEFAULT=	AALIB
 -OPTIONS_SUB=	yes
 -
 -AALIB_DESC=	Text mode capture preview support
 +OPTIONS_DEFINE=		AALIB DOCS NLS READLINE
 +OPTIONS_DEFAULT=	AALIB READLINE
 +OPTIONS_SUB=		yes
  
 +AALIB_DESC=		Text mode capture preview support
  AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
 -AALIB_CONFIGURE_OFF=	--without-aalib
 -
 -NLS_USES=	gettext
 -NLS_CONFIGURE_OFF=	--disable-nls
 +AALIB_CONFIGURE_WITH=	aalib
 +NLS_USES=		gettext
 +NLS_CONFIGURE_ENABLE=	nls
 +READLINE_USES=		readline
 +READLINE_CONFIGURE_WITH=	readline
 +
 +.include <bsd.port.options.mk>
 +
 +post-patch:
 +	@${REINPLACE_CMD} -e \
 +		's|-lpthread|-pthread|' \
 +		${WRKSRC}/configure
  
  post-install:
 -	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 +	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR})
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
 --- /usr/ports/graphics/gphoto2/distinfo	2013-11-06 22:01:31.000000000 +0900
 +++ graphics/gphoto2/distinfo	2014-01-13 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
 -SIZE (gphoto2-2.4.14.tar.bz2) = 669292
 +SHA256 (gphoto2-2.5.3.tar.bz2) = 719447efe115c519c81f6ddd3e4e7d22795743d93c56bae2d54a0dfbb697d844
 +SIZE (gphoto2-2.5.3.tar.bz2) = 740384
 diff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
 --- /usr/ports/graphics/gphoto2/pkg-plist	2013-11-06 22:01:31.000000000 +0900
 +++ graphics/gphoto2/pkg-plist	2014-01-13 00:00:00.000000000 +0900
 @@ -1,7 +1,7 @@
  bin/gphoto2
  man/man1/gphoto2.1.gz
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
 -%%DOCSDIR%%/test-hook.sh
 +%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
  %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
 @@ -32,4 +32,4 @@
  %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
 -@dirrm %%DOCSDIR%%
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Mon__13_Jan_2014_03_00_01_+0900_6FTzIYTRNAEpbM58
 Content-Type: text/x-diff;
  name="graphics_gtkam.diff"
 Content-Disposition: attachment;
  filename="graphics_gtkam.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/graphics/gtkam/Makefile graphics/gtkam/Makefile
 --- /usr/ports/graphics/gtkam/Makefile	2013-11-06 22:01:32.000000000 +0900
 +++ graphics/gtkam/Makefile	2014-01-13 00:00:00.000000000 +0900
 @@ -2,77 +2,48 @@
  # $FreeBSD: head/graphics/gtkam/Makefile 331272 2013-10-22 13:58:55Z amdmi3 $
  
  PORTNAME=	gtkam
 -PORTVERSION=	0.1.18
 -PORTREVISION=	3
 +PORTVERSION=	0.2.0
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	Download and view files from various digital cameras
  
 -LIB_DEPENDS=	exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
 -		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +LICENSE=	GPLv2 # (or later)
  
 -WANT_GNOME=	yes
 -USES=        pathfix pkgconfig
 +LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
 +		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 +
 +USES=		gmake pathfix pkgconfig
  USE_GNOME=	gnomehier gtk20
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -MAN1=		gtkam.1
 +OPTIONS_DEFINE=	DOCS GIMP GNOME
 +OPTIONS_SUB=	yes
  
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 +GIMP_DESC=		GIMP plugin support
 +GIMP_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
 +GIMP_CONFIGURE_WITH=	gimp
  
 -.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
 -WITH_GIMP=	yes
 -.endif
 +GNOME_USE=		GNOME=gnomeprefix,libgnomeui
 +GNOME_CONFIGURE_OFF=	--without-bonobo --without-gnome
 +GNOME_MAKE_ENV=		GNOME_SUBDIRS="help omf-install"
  
 -.if defined(WITH_GIMP)
 -LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
 -PLIST_SUB+=	GIMP=""
 -.else
 -CONFIGURE_ARGS+=	--without-gimp
 -PLIST_SUB+=	GIMP="@comment "
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if ${HAVE_GNOME:Mlibgnomeui}!=""
 -PKGNAMESUFFIX=	-gnome
 -USE_GNOME+=	gnomeprefix libgnomeui
 +.if ${PORT_OPTIONS:MGNOME}
  INSTALLS_OMF=	yes
 -MAKE_ENV+=	GNOME_SUBDIRS="help omf-install"
 -.else
 -CONFIGURE_ARGS+=	--without-bonobo --without-gnome
 -MAKE_ENV+=	GNOME_SUBDIRS=""
 -.endif
 -
 -pre-everything::
 -.if !defined(WITH_GIMP)
 -	@${ECHO_MSG}
 -	@${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
 -	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
 -	@${ECHO_MSG}
  .endif
  
  post-patch:
  	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
 -		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
 +		 s|images/gtkam|gtkam/images|g ; \
 +		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
  	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
  		's|images/gtkam|gtkam/images|g ; \
  		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
  
 -post-install:
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
 -		${PREFIX}/share/applications
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
 -		${PREFIX}/share/pixmaps
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -.for file in AUTHORS NEWS README
 -	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 -.endfor
 -.endif
 -
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -urN /usr/ports/graphics/gtkam/distinfo graphics/gtkam/distinfo
 --- /usr/ports/graphics/gtkam/distinfo	2013-11-06 22:01:32.000000000 +0900
 +++ graphics/gtkam/distinfo	2014-01-13 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
 -SIZE (gtkam-0.1.18.tar.gz) = 1443404
 +SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
 +SIZE (gtkam-0.2.0.tar.gz) = 1443593
 diff -urN /usr/ports/graphics/gtkam/files/patch-Makefile.in graphics/gtkam/files/patch-Makefile.in
 --- /usr/ports/graphics/gtkam/files/patch-Makefile.in	2013-11-06 22:01:32.000000000 +0900
 +++ graphics/gtkam/files/patch-Makefile.in	2014-01-13 00:00:00.000000000 +0900
 @@ -1,7 +1,7 @@
  --- Makefile.in.orig	2008-04-23 22:55:02.000000000 +0200
  +++ Makefile.in	2008-04-23 22:56:37.000000000 +0200
 -@@ -253,7 +253,7 @@
 - target_alias = @target_alias@
 +@@ -333,7 +333,7 @@
 + top_build_prefix = @top_build_prefix@
   top_builddir = @top_builddir@
   top_srcdir = @top_srcdir@
  -SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
 @@ -9,13 +9,12 @@
   ACLOCAL_AMFLAGS = -I m4m
   
   # disable scrollkeeper for distcheck
 -@@ -714,8 +714,7 @@
 - 
 - info-am:
 - 
 --install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
 --	install-iconDATA
 -+install-data-am:
 - 
 - install-dvi: install-dvi-recursive
 - 
 +@@ -342,7 +342,7 @@
 + ########################################################################
 + # Install a few support and doc files
 + gtkamdocdir = $(datadir)/doc/gtkam
 +-gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
 ++gtkamdoc_DATA = AUTHORS NEWS README TODO CHANGES
 + icondir = $(datadir)/pixmaps
 + icon_DATA = gtkam.png
 + DESKTOP_IN_FILES = gtkam.desktop.in
 diff -urN /usr/ports/graphics/gtkam/pkg-plist graphics/gtkam/pkg-plist
 --- /usr/ports/graphics/gtkam/pkg-plist	2013-11-06 22:01:32.000000000 +0900
 +++ graphics/gtkam/pkg-plist	2014-01-13 00:00:00.000000000 +0900
 @@ -1,30 +1,30 @@
  bin/gtkam
  %%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
 +man/man1/gtkam.1.gz
 +share/applications/gtkam.desktop
  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/CHANGES
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
  %%PORTDOCS%%%%DOCSDIR%%/README
 -share/applications/gtkam.desktop
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
 -%%GNOME:%%share/omf/gtkam/gtkam-C.omf
 -%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
 -share/pixmaps/gtkam.png
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/C/legal.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
  %%DATADIR%%/images/gtkam-audio.png
  %%DATADIR%%/images/gtkam-camera.png
  %%DATADIR%%/images/gtkam-folder-camera.png
 @@ -59,17 +59,20 @@
  share/locale/sk/LC_MESSAGES/gtkam.mo
  share/locale/sl/LC_MESSAGES/gtkam.mo
  share/locale/sv/LC_MESSAGES/gtkam.mo
 -share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/uk/LC_MESSAGES/gtkam.mo
 +share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/zh_CN/LC_MESSAGES/gtkam.mo
 +%%GNOME%%share/omf/gtkam/gtkam-C.omf
 +%%GNOME%%share/omf/gtkam/gtkam-ru.omf
 +share/pixmaps/gtkam.png
  share/pixmaps/gtkam-camera.png
  @dirrm %%DATADIR%%/pixmaps
  @dirrm %%DATADIR%%/images
  @dirrm %%DATADIR%%
 -%%GNOME:%%@dirrm share/omf/gtkam
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C
 -%%GNOME:%%@dirrm share/gnome/help/gtkam
 +%%GNOME%%@dirrm share/omf/gtkam
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C
 +%%GNOME%%@dirrm share/gnome/help/gtkam
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --Multipart=_Mon__13_Jan_2014_03_00_01_+0900_6FTzIYTRNAEpbM58--
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Jan 17 16:59:18 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181073 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: commit references a PR
Date: Fri, 17 Jan 2014 16:55:32 +0000 (UTC)

 Author: miwi
 Date: Fri Jan 17 16:55:22 2014
 New Revision: 340071
 URL: http://svnweb.freebsd.org/changeset/ports/340071
 QAT: https://qat.redports.org/buildarchive/r340071/
 
 Log:
   - Update to 2.5.3
   
   PR:		ports/181073
   Submitted by:	Ports Fury
 
 Deleted:
   head/graphics/libgphoto2/files/patch-MAX_ENTRIES
   head/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c
   head/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
 Modified:
   head/graphics/libgphoto2/Makefile
   head/graphics/libgphoto2/distinfo   (contents, props changed)
   head/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c   (contents, props changed)
   head/graphics/libgphoto2/pkg-plist
 
 Modified: head/graphics/libgphoto2/Makefile
 ==============================================================================
 --- head/graphics/libgphoto2/Makefile	Fri Jan 17 16:54:52 2014	(r340070)
 +++ head/graphics/libgphoto2/Makefile	Fri Jan 17 16:55:22 2014	(r340071)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	libgphoto2
 -PORTVERSION=	2.4.14
 -PORTREVISION=	4
 +PORTVERSION=	2.5.3
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
  
 @@ -12,58 +11,65 @@ COMMENT=	Universal digital camera contro
  
  LICENSE=	LGPL21
  
 -LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 -		libjpeg.so:${PORTSDIR}/graphics/jpeg
 -
 -USES=		gmake pkgconfig
  USE_BZIP2=	yes
 +USES=		gmake iconv pkgconfig
  USE_GNOME=	ltverhack
  USE_AUTOTOOLS=	libtool libltdl
  LIBTOOLFILES=	configure libgphoto2_port/configure
 -USE_LDCONFIG=	yes
  CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 -		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
 -CFLAGS+=	-DENODATA=9999	# Safe because it's never used
 +		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 +		PATH="${PATH:C,${HOME}/bin,,}" \
 +		ac_cv_path_DOT=false \
 +		ac_cv_path_DOXYGEN=false \
 +		udevscriptdir=${WRKDIR}
 +USE_LDCONFIG=	yes
  
 -PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
 +
 +PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.10.0
 +
 +OPTIONS_DEFINE=		DOCS GD JPEG LIBEXIF NLS XML
 +OPTIONS_DEFAULT=	GD JPEG LIBEXIF XML
 +OPTIONS_SUB=		yes
 +
 +GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
 +GD_CONFIGURE_WITH=	gd
 +JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 +JPEG_CONFIGURE_WITH=	jpeg
 +LIBEXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
 +LIBEXIF_CONFIGURE_ON=	--with-libexif=${LOCALBASE}
 +LIBEXIF_CONFIGURE_OFF=	--with-libexif=no
 +NLS_USES=		gettext
 +NLS_CONFIGURE_ENABLE=	nls
 +XML_USE=		GNOME=libxml2
 +XML_CPPFLAGS=		$$(pkg-config --cflags-only-I libxml-2.0)
 +XML_LDFLAGS=		$$(pkg-config --libs-only-L libxml-2.0)
 +XML_CONFIGURE_WITH=	libxml2
  
  .include <bsd.port.options.mk>
 +.include <bsd.port.pre.mk>
  
  .if ${OSVERSION} < 1000040
  CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
  .endif
  
 -.if ${PORT_OPTIONS:MNLS}
 -USES+=		gettext
 -PLIST_SUB+=	NLS=""
 -.else
 -USES+=		iconv
 -CONFIGURE_ARGS+=	--disable-nls
 -PLIST_SUB+=	NLS="@comment "
 -.endif
 -
  post-patch:
 -.for file in configure libgphoto2_port/configure
 +.for i in configure libgphoto2_port/configure
  	@${REINPLACE_CMD} -e \
 -		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
 -		 s|-g -O2||g ; \
 +		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
 +		 /FLAGS/s|-g|| ; \
  		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
 -			${WRKSRC}/${file}
 +		${WRKSRC}/${i}
  .endfor
 -.if ${PORT_OPTIONS:MNLS}
 -	@${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \
 -		${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in
 -.endif
 -	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \
 -		s| "$$(DESTDIR)$$(udevscriptdir)"||' \
 -			${WRKSRC}/libgphoto2_port/usb/Makefile.in \
 -			${WRKSRC}/packaging/generic/Makefile.in
 -	@${REINPLACE_CMD} -e 's|linux-hotplug ||' \
 -		${WRKSRC}/packaging/Makefile.in
  	@${REINPLACE_CMD} -e \
 -		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
 -			${WRKSRC}/doc/Makefile.in
 -	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
 -		${WRKSRC}/libgphoto2_port/configure
 +		'/^doc_DATA/s|COPYING||' \
 +		${WRKSRC}/Makefile.in
 +	@${REINPLACE_CMD} -e \
 +		's|ENODATA|ENOATTR|g' \
 +		${WRKSRC}/libgphoto2_port/libusb1/libusb1.c
 +	@${REINPLACE_CMD} -e \
 +		'/^SUBDIRS/s|linux-hotplug||' \
 +		${WRKSRC}/packaging/Makefile.in
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 
 Modified: head/graphics/libgphoto2/distinfo
 ==============================================================================
 --- head/graphics/libgphoto2/distinfo	Fri Jan 17 16:54:52 2014	(r340070)
 +++ head/graphics/libgphoto2/distinfo	Fri Jan 17 16:55:22 2014	(r340071)
 @@ -1,2 +1,2 @@
 -SHA256 (libgphoto2-2.4.14.tar.bz2) = 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
 -SIZE (libgphoto2-2.4.14.tar.bz2) = 4481384
 +SHA256 (libgphoto2-2.5.3.tar.bz2) = 7fa0515f7ef9060e99e92790cdd3b80650d7acd9f2e4ef6c9c68003c600b2475
 +SIZE (libgphoto2-2.5.3.tar.bz2) = 6662282
 
 Modified: head/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
 ==============================================================================
 --- head/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	Fri Jan 17 16:54:52 2014	(r340070)
 +++ head/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c	Fri Jan 17 16:55:22 2014	(r340071)
 @@ -1,11 +1,10 @@
  --- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
  +++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
 -@@ -19,6 +19,8 @@
 -  */
 - #include "config.h"
 - 
 -+#include <sys/types.h>
 -+#include <netinet/in.h>
 - #include <stdlib.h>
 +@@ -24,6 +24,7 @@
   #include <string.h>
   #include <stdio.h>
 + #include <time.h>
 ++#include <sys/types.h>
 + #include <sys/socket.h>
 + #include <netinet/in.h>
 + #include <arpa/inet.h>
 
 Modified: head/graphics/libgphoto2/pkg-plist
 ==============================================================================
 --- head/graphics/libgphoto2/pkg-plist	Fri Jan 17 16:54:52 2014	(r340070)
 +++ head/graphics/libgphoto2/pkg-plist	Fri Jan 17 16:55:22 2014	(r340071)
 @@ -19,6 +19,10 @@ include/gphoto2/gphoto2-setting.h
  include/gphoto2/gphoto2-version.h
  include/gphoto2/gphoto2-widget.h
  include/gphoto2/gphoto2.h
 +lib/libgphoto2.a
 +lib/libgphoto2.la
 +lib/libgphoto2.so
 +lib/libgphoto2.so.6
  lib/libgphoto2/%%VERSION%%/adc65.a
  lib/libgphoto2/%%VERSION%%/adc65.la
  lib/libgphoto2/%%VERSION%%/adc65.so
 @@ -43,6 +47,9 @@ lib/libgphoto2/%%VERSION%%/casio_qv.so
  lib/libgphoto2/%%VERSION%%/clicksmart310.a
  lib/libgphoto2/%%VERSION%%/clicksmart310.la
  lib/libgphoto2/%%VERSION%%/clicksmart310.so
 +lib/libgphoto2/%%VERSION%%/digigr8.a
 +lib/libgphoto2/%%VERSION%%/digigr8.la
 +lib/libgphoto2/%%VERSION%%/digigr8.so
  lib/libgphoto2/%%VERSION%%/digita.a
  lib/libgphoto2/%%VERSION%%/digita.la
  lib/libgphoto2/%%VERSION%%/digita.so
 @@ -55,9 +62,6 @@ 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
 @@ -136,6 +140,9 @@ lib/libgphoto2/%%VERSION%%/pccam300.so
  lib/libgphoto2/%%VERSION%%/pccam600.a
  lib/libgphoto2/%%VERSION%%/pccam600.la
  lib/libgphoto2/%%VERSION%%/pccam600.so
 +lib/libgphoto2/%%VERSION%%/pentax.a
 +lib/libgphoto2/%%VERSION%%/pentax.la
 +lib/libgphoto2/%%VERSION%%/pentax.so
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
  lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
 @@ -209,6 +216,10 @@ lib/libgphoto2/%%VERSION%%/tp6801.a
  lib/libgphoto2/%%VERSION%%/tp6801.la
  lib/libgphoto2/%%VERSION%%/tp6801.so
  lib/libgphoto2/print-camera-list
 +lib/libgphoto2_port.a
 +lib/libgphoto2_port.la
 +lib/libgphoto2_port.so
 +lib/libgphoto2_port.so.10
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
  lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
 @@ -227,115 +238,111 @@ lib/libgphoto2_port/%%VERSION_PORT%%/usb
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
  lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
 -lib/libgphoto2.a
 -lib/libgphoto2.la
 -lib/libgphoto2.so
 -lib/libgphoto2.so.2
 -lib/libgphoto2_port.a
 -lib/libgphoto2_port.la
 -lib/libgphoto2_port.so
 -lib/libgphoto2_port.so.0
  libdata/pkgconfig/libgphoto2.pc
  libdata/pkgconfig/libgphoto2_port.pc
  man/man3/libgphoto2.3.gz
  man/man3/libgphoto2_port.3.gz
 -share/doc/libgphoto2/ABOUT-NLS
 -share/doc/libgphoto2/AUTHORS
 -share/doc/libgphoto2/ChangeLog
 -share/doc/libgphoto2/COPYING
 -share/doc/libgphoto2/NEWS
 -share/doc/libgphoto2/README
 -share/doc/libgphoto2/README.packaging
 -share/doc/libgphoto2/camlibs/README.adc65
 -share/doc/libgphoto2/camlibs/README.agfa-cl20
 -share/doc/libgphoto2/camlibs/README.aox
 -share/doc/libgphoto2/camlibs/README.ax203
 -share/doc/libgphoto2/camlibs/README.ax203-compression
 -share/doc/libgphoto2/camlibs/README.canon
 -share/doc/libgphoto2/camlibs/README.clicksmart310
 -share/doc/libgphoto2/camlibs/README.enigma13
 -share/doc/libgphoto2/camlibs/README.gsmart300
 -share/doc/libgphoto2/camlibs/README.iclick
 -share/doc/libgphoto2/camlibs/README.jamcam
 -share/doc/libgphoto2/camlibs/README.jl2005a
 -share/doc/libgphoto2/camlibs/README.jl2005c
 -share/doc/libgphoto2/camlibs/README.konica
 -share/doc/libgphoto2/camlibs/README.largan-lmini
 -share/doc/libgphoto2/camlibs/README.lg_gsm
 -share/doc/libgphoto2/camlibs/README.jl2005bcd-compression
 -share/doc/libgphoto2/camlibs/README.mars
 -share/doc/libgphoto2/camlibs/README.minolta-dimagev
 -share/doc/libgphoto2/camlibs/README.mustek
 -share/doc/libgphoto2/camlibs/README.panasonic
 -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.ptp2
 -share/doc/libgphoto2/camlibs/README.smal
 -share/doc/libgphoto2/camlibs/README.sonix
 -share/doc/libgphoto2/camlibs/README.sonydscf1
 -share/doc/libgphoto2/camlibs/README.soundvision
 -share/doc/libgphoto2/camlibs/README.spca50x
 -share/doc/libgphoto2/camlibs/README.sq905
 -share/doc/libgphoto2/camlibs/README.st2205
 -share/doc/libgphoto2/camlibs/README.st2205-compression
 -share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
 -share/doc/libgphoto2/camlibs/README.tp6801
 -share/doc/libgphoto2/camlibs/README.905C
 -share/doc/libgphoto2/camlibs/README.9050
 -share/doc/libgphoto2/camlibs/README.9051
 -share/doc/libgphoto2/camlibs/README.9052
 -share/doc/libgphoto2/camlibs/README.913C
 -share/doc/libgphoto2/camlibs/README.913D
 -share/doc/libgphoto2_port/AUTHORS
 -share/doc/libgphoto2_port/NEWS
 -share/doc/libgphoto2_port/README
 +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS
 +%%PORTDOCS%%%%DOCSDIR%%/README
 +%%PORTDOCS%%%%DOCSDIR%%/README.packaging
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
 +%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801
 +%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
 +%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
 +%%PORTDOCS%%share/doc/libgphoto2_port/README
  share/libgphoto2/%%VERSION%%/konica/english
  share/libgphoto2/%%VERSION%%/konica/french
  share/libgphoto2/%%VERSION%%/konica/german
  share/libgphoto2/%%VERSION%%/konica/japanese
  share/libgphoto2/%%VERSION%%/konica/korean
  share/libgphoto2/%%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/nl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
 -%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/pl/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/sk/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/vi/LC_MESSAGES/libgphoto2-2.mo
 -%%NLS%%share/locale/vi/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
 -%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-10.mo
 +%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-10.mo
  @dirrm share/libgphoto2/%%VERSION%%/konica
  @dirrm share/libgphoto2/%%VERSION%%
  @dirrm share/libgphoto2
 -@dirrm share/doc/libgphoto2_port
 -@dirrm share/doc/libgphoto2/camlibs
 -@dirrm share/doc/libgphoto2
 +%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
  @dirrm lib/libgphoto2_port
  @dirrm lib/libgphoto2/%%VERSION%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: commit references a PR
Date: Fri, 17 Jan 2014 16:57:02 +0000 (UTC)

 Author: miwi
 Date: Fri Jan 17 16:56:53 2014
 New Revision: 340074
 URL: http://svnweb.freebsd.org/changeset/ports/340074
 QAT: https://qat.redports.org/buildarchive/r340074/
 
 Log:
   - Update to 0.2.0
   
   PR:		ports/181073
   Submitted by:	Ports Fury
 
 Modified:
   head/graphics/gtkam/Makefile
   head/graphics/gtkam/distinfo   (contents, props changed)
   head/graphics/gtkam/files/patch-Makefile.in   (contents, props changed)
   head/graphics/gtkam/pkg-plist   (contents, props changed)
 
 Modified: head/graphics/gtkam/Makefile
 ==============================================================================
 --- head/graphics/gtkam/Makefile	Fri Jan 17 16:56:15 2014	(r340073)
 +++ head/graphics/gtkam/Makefile	Fri Jan 17 16:56:53 2014	(r340074)
 @@ -2,77 +2,48 @@
  # $FreeBSD$
  
  PORTNAME=	gtkam
 -PORTVERSION=	0.1.18
 -PORTREVISION=	3
 +PORTVERSION=	0.2.0
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	Download and view files from various digital cameras
  
 -LIB_DEPENDS=	exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
 -		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +LICENSE=	GPLv2 # (or later)
  
 -WANT_GNOME=	yes
 -USES=        pathfix pkgconfig
 +LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
 +		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 +
 +USES=		gmake pathfix pkgconfig
  USE_GNOME=	gnomehier gtk20
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 +
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  
 -MAN1=		gtkam.1
 +OPTIONS_DEFINE=	DOCS GIMP GNOME
 +OPTIONS_SUB=	yes
  
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 +GIMP_DESC=		GIMP plugin support
 +GIMP_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
 +GIMP_CONFIGURE_WITH=	gimp
  
 -.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
 -WITH_GIMP=	yes
 -.endif
 +GNOME_USE=		GNOME=gnomeprefix,libgnomeui
 +GNOME_CONFIGURE_OFF=	--without-bonobo --without-gnome
 +GNOME_MAKE_ENV=		GNOME_SUBDIRS="help omf-install"
  
 -.if defined(WITH_GIMP)
 -LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
 -PLIST_SUB+=	GIMP=""
 -.else
 -CONFIGURE_ARGS+=	--without-gimp
 -PLIST_SUB+=	GIMP="@comment "
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if ${HAVE_GNOME:Mlibgnomeui}!=""
 -PKGNAMESUFFIX=	-gnome
 -USE_GNOME+=	gnomeprefix libgnomeui
 +.if ${PORT_OPTIONS:MGNOME}
  INSTALLS_OMF=	yes
 -MAKE_ENV+=	GNOME_SUBDIRS="help omf-install"
 -.else
 -CONFIGURE_ARGS+=	--without-bonobo --without-gnome
 -MAKE_ENV+=	GNOME_SUBDIRS=""
 -.endif
 -
 -pre-everything::
 -.if !defined(WITH_GIMP)
 -	@${ECHO_MSG}
 -	@${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
 -	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
 -	@${ECHO_MSG}
  .endif
  
  post-patch:
  	@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
 -		 s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
 +		 s|images/gtkam|gtkam/images|g ; \
 +		 s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
  	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
  		's|images/gtkam|gtkam/images|g ; \
  		 s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
  
 -post-install:
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
 -		${PREFIX}/share/applications
 -	${INSTALL_DATA} ${WRKSRC}/gtkam.png \
 -		${PREFIX}/share/pixmaps
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -.for file in AUTHORS NEWS README
 -	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 -.endfor
 -.endif
 -
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/graphics/gtkam/distinfo
 ==============================================================================
 --- head/graphics/gtkam/distinfo	Fri Jan 17 16:56:15 2014	(r340073)
 +++ head/graphics/gtkam/distinfo	Fri Jan 17 16:56:53 2014	(r340074)
 @@ -1,2 +1,2 @@
 -SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
 -SIZE (gtkam-0.1.18.tar.gz) = 1443404
 +SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
 +SIZE (gtkam-0.2.0.tar.gz) = 1443593
 
 Modified: head/graphics/gtkam/files/patch-Makefile.in
 ==============================================================================
 --- head/graphics/gtkam/files/patch-Makefile.in	Fri Jan 17 16:56:15 2014	(r340073)
 +++ head/graphics/gtkam/files/patch-Makefile.in	Fri Jan 17 16:56:53 2014	(r340074)
 @@ -1,7 +1,7 @@
  --- Makefile.in.orig	2008-04-23 22:55:02.000000000 +0200
  +++ Makefile.in	2008-04-23 22:56:37.000000000 +0200
 -@@ -253,7 +253,7 @@
 - target_alias = @target_alias@
 +@@ -333,7 +333,7 @@
 + top_build_prefix = @top_build_prefix@
   top_builddir = @top_builddir@
   top_srcdir = @top_srcdir@
  -SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
 @@ -9,13 +9,12 @@
   ACLOCAL_AMFLAGS = -I m4m
   
   # disable scrollkeeper for distcheck
 -@@ -714,8 +714,7 @@
 - 
 - info-am:
 - 
 --install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
 --	install-iconDATA
 -+install-data-am:
 - 
 - install-dvi: install-dvi-recursive
 - 
 +@@ -342,7 +342,7 @@
 + ########################################################################
 + # Install a few support and doc files
 + gtkamdocdir = $(datadir)/doc/gtkam
 +-gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
 ++gtkamdoc_DATA = AUTHORS NEWS README TODO CHANGES
 + icondir = $(datadir)/pixmaps
 + icon_DATA = gtkam.png
 + DESKTOP_IN_FILES = gtkam.desktop.in
 
 Modified: head/graphics/gtkam/pkg-plist
 ==============================================================================
 --- head/graphics/gtkam/pkg-plist	Fri Jan 17 16:56:15 2014	(r340073)
 +++ head/graphics/gtkam/pkg-plist	Fri Jan 17 16:56:53 2014	(r340074)
 @@ -1,30 +1,30 @@
  bin/gtkam
  %%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
 +man/man1/gtkam.1.gz
 +share/applications/gtkam.desktop
  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/CHANGES
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
  %%PORTDOCS%%%%DOCSDIR%%/README
 -share/applications/gtkam.desktop
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 -%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
 -%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
 -%%GNOME:%%share/omf/gtkam/gtkam-C.omf
 -%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
 -share/pixmaps/gtkam.png
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/C/legal.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
 +%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
 +%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
 +%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
  %%DATADIR%%/images/gtkam-audio.png
  %%DATADIR%%/images/gtkam-camera.png
  %%DATADIR%%/images/gtkam-folder-camera.png
 @@ -59,17 +59,20 @@ share/locale/ru/LC_MESSAGES/gtkam.mo
  share/locale/sk/LC_MESSAGES/gtkam.mo
  share/locale/sl/LC_MESSAGES/gtkam.mo
  share/locale/sv/LC_MESSAGES/gtkam.mo
 -share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/uk/LC_MESSAGES/gtkam.mo
 +share/locale/vi/LC_MESSAGES/gtkam.mo
  share/locale/zh_CN/LC_MESSAGES/gtkam.mo
 +%%GNOME%%share/omf/gtkam/gtkam-C.omf
 +%%GNOME%%share/omf/gtkam/gtkam-ru.omf
 +share/pixmaps/gtkam.png
  share/pixmaps/gtkam-camera.png
  @dirrm %%DATADIR%%/pixmaps
  @dirrm %%DATADIR%%/images
  @dirrm %%DATADIR%%
 -%%GNOME:%%@dirrm share/omf/gtkam
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
 -%%GNOME:%%@dirrm share/gnome/help/gtkam/C
 -%%GNOME:%%@dirrm share/gnome/help/gtkam
 +%%GNOME%%@dirrm share/omf/gtkam
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/ru
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
 +%%GNOME%%@dirrm share/gnome/help/gtkam/C
 +%%GNOME%%@dirrm share/gnome/help/gtkam
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181073: commit references a PR
Date: Fri, 17 Jan 2014 16:56:24 +0000 (UTC)

 Author: miwi
 Date: Fri Jan 17 16:56:15 2014
 New Revision: 340073
 URL: http://svnweb.freebsd.org/changeset/ports/340073
 QAT: https://qat.redports.org/buildarchive/r340073/
 
 Log:
   - Update to  2.5.3
   
   PR:		ports/181073
   Submitted by:	Ports Fury
 
 Modified:
   head/graphics/gphoto2/Makefile
   head/graphics/gphoto2/distinfo   (contents, props changed)
   head/graphics/gphoto2/pkg-plist   (contents, props changed)
 
 Modified: head/graphics/gphoto2/Makefile
 ==============================================================================
 --- head/graphics/gphoto2/Makefile	Fri Jan 17 16:56:00 2014	(r340072)
 +++ head/graphics/gphoto2/Makefile	Fri Jan 17 16:56:15 2014	(r340073)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	gphoto2
 -PORTVERSION=	2.4.14
 +PORTVERSION=	2.5.3
  CATEGORIES=	graphics
  MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
  
 @@ -14,26 +14,33 @@ LICENSE=	GPLv2
  LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
  		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
  
 -USES=		gmake pkgconfig
  USE_BZIP2=	yes
 +USES=		gmake pkgconfig
  GNU_CONFIGURE=	yes
 +CONFIGURE_ENV=	POPT_CFLAGS="$$(pkg-config --cflags popt)" \
 +		POPT_LIBS="$$(pkg-config --libs popt)"
  CONFIGURE_ARGS=	--without-cdk
 -CONFIGURE_ENV=	POPT_CFLAGS="-I${LOCALBASE}/include" \
 -		POPT_LIBS="-L${LOCALBASE}/lib -lpopt"
  
 -OPTIONS_DEFINE=	AALIB DOCS NLS
 -OPTIONS_DEFAULT=	AALIB
 -OPTIONS_SUB=	yes
 -
 -AALIB_DESC=	Text mode capture preview support
 +OPTIONS_DEFINE=		AALIB DOCS NLS READLINE
 +OPTIONS_DEFAULT=	AALIB READLINE
 +OPTIONS_SUB=		yes
  
 +AALIB_DESC=		Text mode capture preview support
  AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
 -AALIB_CONFIGURE_OFF=	--without-aalib
 -
 -NLS_USES=	gettext
 -NLS_CONFIGURE_OFF=	--disable-nls
 +AALIB_CONFIGURE_WITH=	aalib
 +NLS_USES=		gettext
 +NLS_CONFIGURE_ENABLE=	nls
 +READLINE_USES=		readline
 +READLINE_CONFIGURE_WITH=	readline
 +
 +.include <bsd.port.options.mk>
 +
 +post-patch:
 +	@${REINPLACE_CMD} -e \
 +		's|-lpthread|-pthread|' \
 +		${WRKSRC}/configure
  
  post-install:
 -	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 +	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR})
  
  .include <bsd.port.mk>
 
 Modified: head/graphics/gphoto2/distinfo
 ==============================================================================
 --- head/graphics/gphoto2/distinfo	Fri Jan 17 16:56:00 2014	(r340072)
 +++ head/graphics/gphoto2/distinfo	Fri Jan 17 16:56:15 2014	(r340073)
 @@ -1,2 +1,2 @@
 -SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
 -SIZE (gphoto2-2.4.14.tar.bz2) = 669292
 +SHA256 (gphoto2-2.5.3.tar.bz2) = 719447efe115c519c81f6ddd3e4e7d22795743d93c56bae2d54a0dfbb697d844
 +SIZE (gphoto2-2.5.3.tar.bz2) = 740384
 
 Modified: head/graphics/gphoto2/pkg-plist
 ==============================================================================
 --- head/graphics/gphoto2/pkg-plist	Fri Jan 17 16:56:00 2014	(r340072)
 +++ head/graphics/gphoto2/pkg-plist	Fri Jan 17 16:56:15 2014	(r340073)
 @@ -1,7 +1,7 @@
  bin/gphoto2
  man/man1/gphoto2.1.gz
  %%PORTDOCS%%%%DOCSDIR%%/NEWS
 -%%DOCSDIR%%/test-hook.sh
 +%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
  %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
 @@ -32,4 +32,4 @@ man/man1/gphoto2.1.gz
  %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
 -@dirrm %%DOCSDIR%%
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
