Update to 0.6.13.

New in 0.6.13:

  * Bug fixes: #803191, #1051994, #1054321, #1054323, #1196787

  * For pkg-config users, force usage of #include <libexif/exif-*.h>
    (disable #include <exif-.h>)

  * Updated German translation

  * Build system tuning

  * Misc changes:
    Fix COPYRIGHT tag, fix memory corruption, use qsort.

6 files changed, 36 insertions, 94 deletions

diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index dea52a723a3..9070bca20d4 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2005/07/24 00:06:44 dillo Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/06 15:19:18 wiz Exp $
 
-DISTNAME=	libexif-0.6.12
-PKGREVISION=	2
+DISTNAME=	libexif-0.6.13
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libexif/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libexif/PLIST b/graphics/libexif/PLIST
index 7d083d793bd..8e9db91f4f4 100644
--- a/graphics/libexif/PLIST
+++ b/graphics/libexif/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.12 2005/04/20 12:40:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/01/06 15:19:18 wiz Exp $
 include/libexif/_stdint.h
 include/libexif/exif-byte-order.h
 include/libexif/exif-content.h
+include/libexif/exif-data-type.h
 include/libexif/exif-data.h
 include/libexif/exif-entry.h
 include/libexif/exif-format.h
@@ -14,7 +15,16 @@ include/libexif/exif-tag.h
 include/libexif/exif-utils.h
 lib/libexif.la
 lib/pkgconfig/libexif.pc
+share/doc/libexif/ABOUT-NLS
+share/doc/libexif/AUTHORS
+share/doc/libexif/COPYING
+share/doc/libexif/ChangeLog
+share/doc/libexif/NEWS
+share/doc/libexif/README
+share/doc/libexif/README.apidocs
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libexif-12.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libexif-12.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libexif-12.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libexif-12.mo
+@dirrm share/doc/libexif
 @dirrm include/libexif
diff --git a/graphics/libexif/distinfo b/graphics/libexif/distinfo
index 223bc1e3964..e7b77f0f535 100644
--- a/graphics/libexif/distinfo
+++ b/graphics/libexif/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.18 2005/10/23 20:02:01 rillig Exp $
+$NetBSD: distinfo,v 1.19 2006/01/06 15:19:18 wiz Exp $
 
-SHA1 (libexif-0.6.12.tar.bz2) = 5d2c5976521e179d41ff8908b678b14f2e8e690b
-RMD160 (libexif-0.6.12.tar.bz2) = 24cfdb7663f0566f2907987e5dbc472c21b583d9
-Size (libexif-0.6.12.tar.bz2) = 378650 bytes
+SHA1 (libexif-0.6.13.tar.bz2) = 9b3a222586f9efc3d591ed83db16f85bba5dc362
+RMD160 (libexif-0.6.13.tar.bz2) = 19160314c1656c72234640074e1e1739f1a67f38
+Size (libexif-0.6.13.tar.bz2) = 519803 bytes
 SHA1 (patch-aa) = e32ab9cad1720f0b4d6178240e78193a97c4c876
 SHA1 (patch-ab) = 973ca09fc059d74e3221bba12e6e8f4630db20bb
-SHA1 (patch-ac) = 0aa196539b3e272487dd85a4cccf0f1b7761d132
-SHA1 (patch-ad) = de370b315555ef8b83a5582569ac36b808d08879
+SHA1 (patch-ae) = b8a347338fc9b2c82fedf6cc193c53fcdd56a9a7
diff --git a/graphics/libexif/patches/patch-ac b/graphics/libexif/patches/patch-ac
deleted file mode 100644
index 67dafc26058..00000000000
--- a/graphics/libexif/patches/patch-ac
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/05/27 14:20:36 jschauma Exp $
-
---- ./libexif/exif-data.c.orig	2005-03-12 21:27:13.000000000 -0500
-+++ ./libexif/exif-data.c	2005-05-27 10:08:40.000000000 -0400
-@@ -284,9 +284,10 @@
- }
- 
- static void
--exif_data_load_data_content (ExifData *data, ExifContent *ifd,
-+exif_data_load_data_content_recurse (ExifData *data, ExifContent *ifd,
- 			     const unsigned char *d,
--			     unsigned int ds, unsigned int offset)
-+				     unsigned int ds, unsigned int offset,
-+				     unsigned int level)
- {
- 	ExifLong o, thumbnail_offset = 0, thumbnail_length = 0;
- 	ExifShort n;
-@@ -296,6 +297,13 @@
- 
- 	if (!data || !data->priv) return;
- 
-+	if (level > 150)
-+	  {
-+	    exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",
-+		      "Deep recursion in exif_data_load_data_content");
-+	    return;
-+	  }
-+
- 	/* Read the number of entries */
- 	if (offset >= ds - 1) return;
- 	n = exif_get_short (d + offset, data->priv->order);
-@@ -320,18 +328,18 @@
- 			switch (tag) {
- 			case EXIF_TAG_EXIF_IFD_POINTER:
- 				CHECK_REC (EXIF_IFD_EXIF);
--				exif_data_load_data_content (data,
--					data->ifd[EXIF_IFD_EXIF], d, ds, o);
-+				exif_data_load_data_content_recurse (data,
-+					data->ifd[EXIF_IFD_EXIF], d, ds, o, level + 1);
- 				break;
- 			case EXIF_TAG_GPS_INFO_IFD_POINTER:
- 				CHECK_REC (EXIF_IFD_GPS);
--				exif_data_load_data_content (data,
--					data->ifd[EXIF_IFD_GPS], d, ds, o);
-+				exif_data_load_data_content_recurse (data,
-+					data->ifd[EXIF_IFD_GPS], d, ds, o, level + 1);
- 				break;
- 			case EXIF_TAG_INTEROPERABILITY_IFD_POINTER:
- 				CHECK_REC (EXIF_IFD_INTEROPERABILITY);
--				exif_data_load_data_content (data,
--					data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, o);
-+				exif_data_load_data_content_recurse (data,
-+					data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, o, level + 1);
- 				break;
- 			case EXIF_TAG_JPEG_INTERCHANGE_FORMAT:
- 				thumbnail_offset = o;
-@@ -373,6 +381,14 @@
- }
- 
- static void
-+exif_data_load_data_content (ExifData *data, ExifContent *ifd,
-+			     const unsigned char *d,
-+			     unsigned int ds, unsigned int offset)
-+{
-+  exif_data_load_data_content_recurse (data, ifd, d, ds, offset, 0);
-+}
-+
-+static void
- exif_data_save_data_content (ExifData *data, ExifContent *ifd,
- 			     unsigned char **d, unsigned int *ds,
- 			     unsigned int offset)
diff --git a/graphics/libexif/patches/patch-ad b/graphics/libexif/patches/patch-ad
deleted file mode 100644
index 8fbec89a4c4..00000000000
--- a/graphics/libexif/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/10/23 20:02:01 rillig Exp $
-
---- libexif/exif-data.c.orig	Sun Mar 13 03:27:13 2005
-+++ libexif/exif-data.c	Wed Apr 13 22:42:35 2005
-@@ -231,7 +231,7 @@
- 		 * the offset must be an even number. If we need to introduce
- 		 * a padding byte, we set it to 0.
- 		 */
--		if (s & 1) *ds++;
-+		if (s & 1) (*ds)++;
- 		*d = exif_mem_realloc (data->priv->mem, *d, *ds);
- 		if (!*d) {
- 			EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", *ds);
diff --git a/graphics/libexif/patches/patch-ae b/graphics/libexif/patches/patch-ae
new file mode 100644
index 00000000000..e6b16af1f11
--- /dev/null
+++ b/graphics/libexif/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2006/01/06 15:19:18 wiz Exp $
+
+--- doc/Makefile.in.orig	2005-12-27 21:18:36.000000000 +0000
++++ doc/Makefile.in
+@@ -444,9 +444,11 @@ uninstall-am: uninstall-docDATA uninstal
+ 
+ all-local: $(DOXYGEN_STAMPS)
+ 
+-install-data-local: install-apidocs install-apidocs-internals
++@HAVE_DOXYGEN_TRUE@install-data-local: install-apidocs install-apidocs-internals
++@HAVE_DOXYGEN_FALSE@install-data-local:
+ 
+-uninstall-local: uninstall-apidocs uninstall-apidocs-internals
++@HAVE_DOXYGEN_TRUE@uninstall-local: uninstall-apidocs uninstall-apidocs-internals
++@HAVE_DOXYGEN_FALSE@uninstall-local:
+ 
+ clean-local: clean-apidocs
+