ports/75266: Update port: graphics/gphoto2 to 2.1.5

[KATO Tsuguru]

>Number:         75266
>Category:       ports
>Synopsis:       Update port: graphics/gphoto2 to 2.1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 19 17:10:06 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.10-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 2.1.5

Remove file:
files/patch-gphoto2::actions.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
--- /usr/ports/graphics/gphoto2/Makefile	Wed Feb  4 18:59:23 2004
+++ graphics/gphoto2/Makefile	Sun Dec 19 02:17:54 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gphoto2
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.1.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
@@ -20,16 +19,25 @@
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 
-USE_BZIP2=	yes
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--without-cdk
 
 MAN1=		gphoto2.1
+
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREADS_LIBS:S/"//g}|g ; \
diff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
--- /usr/ports/graphics/gphoto2/distinfo	Thu Jan 29 20:26:14 2004
+++ graphics/gphoto2/distinfo	Sun Dec 19 02:13:41 2004
@@ -1,2 +1,2 @@
-MD5 (gphoto2-2.1.4.tar.bz2) = 5bbee55d4e59b063d3cff0fbc9121006
-SIZE (gphoto2-2.1.4.tar.bz2) = 350858
+MD5 (gphoto2-2.1.5.tar.gz) = 9bd1a033389f9e4e6425dda4f6e603c9
+SIZE (gphoto2-2.1.5.tar.gz) = 535490
diff -urN /usr/ports/graphics/gphoto2/files/patch-gphoto2::actions.c graphics/gphoto2/files/patch-gphoto2::actions.c
--- /usr/ports/graphics/gphoto2/files/patch-gphoto2::actions.c	Wed Oct 13 06:22:18 2004
+++ graphics/gphoto2/files/patch-gphoto2::actions.c	Thu Jan  1 09:00:00 1970
@@ -1,17 +0,0 @@
---- gphoto2/actions.c.orig	Thu Sep 30 13:04:05 2004
-+++ gphoto2/actions.c	Thu Sep 30 13:14:06 2004
-@@ -346,12 +346,13 @@
- {
-         ExifEntry *e;
-         unsigned int i;
-+        char value[1024];
- 
-         for (i = 0; i < content->count; i++) {
-                 e = content->entries[i];
-                 printf ("%-20.20s", exif_tag_get_name (e->tag));
-                 printf ("|");
--                printf ("%-59.59s", exif_entry_get_value (e));
-+                printf ("%-59.59s", exif_entry_get_value (e, value, sizeof(value)));
-                 printf ("\n");
-         }
- }
diff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
--- /usr/ports/graphics/gphoto2/pkg-plist	Sat May  8 20:59:11 2004
+++ graphics/gphoto2/pkg-plist	Sun Dec 19 02:32:18 2004
@@ -2,20 +2,26 @@
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-share/locale/cs/LC_MESSAGES/gphoto2.mo
-share/locale/da/LC_MESSAGES/gphoto2.mo
-share/locale/de/LC_MESSAGES/gphoto2.mo
-share/locale/es/LC_MESSAGES/gphoto2.mo
-share/locale/fr/LC_MESSAGES/gphoto2.mo
-share/locale/it/LC_MESSAGES/gphoto2.mo
-share/locale/ja/LC_MESSAGES/gphoto2.mo
-share/locale/no/LC_MESSAGES/gphoto2.mo
-share/locale/pt_BR/LC_MESSAGES/gphoto2.mo
-share/locale/ro/LC_MESSAGES/gphoto2.mo
-share/locale/ru/LC_MESSAGES/gphoto2.mo
-share/locale/sk/LC_MESSAGES/gphoto2.mo
-share/locale/sl/LC_MESSAGES/gphoto2.mo
-share/locale/sv/LC_MESSAGES/gphoto2.mo
-share/locale/uk/LC_MESSAGES/gphoto2.mo
-share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/no/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gphoto2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: