Changes 5.0.5:

This release sets the error return properly when a screen descriptor read fails, and fixes minor API documentation bugs.

6 files changed, 64 insertions, 86 deletions

diff --git a/graphics/giflib-util/Makefile b/graphics/giflib-util/Makefile
index 3286a03ea0f..20ab5ce6a6b 100644
--- a/graphics/giflib-util/Makefile
+++ b/graphics/giflib-util/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2013/07/05 13:47:53 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.7 2013/08/31 18:41:33 adam Exp $
 
 .include "../../graphics/giflib/Makefile.common"
 
-PKGNAME=	giflib-util-5.0.4
+PKGNAME=	${DISTNAME:S/-/-util-/}
 
 COMMENT=	GIF image format utility
 
@@ -11,8 +10,8 @@ CONFLICTS+=	libungif-[0-9]*
 
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
-BUILD_DIRS+=	util doc
-HTMLDIR=        share/doc/html/giflib
+BUILD_DIRS+=		util doc
+HTMLDIR=		share/doc/giflib
 INSTALLATION_DIRS=	${HTMLDIR} ${HTMLDIR}/whatsinagif
 
 post-install:
diff --git a/graphics/giflib-util/PLIST b/graphics/giflib-util/PLIST
index ba7b21b5c66..542f103564c 100644
--- a/graphics/giflib-util/PLIST
+++ b/graphics/giflib-util/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/07/05 13:47:53 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/08/31 18:41:33 adam Exp $
 bin/gif2raw
 bin/gif2rgb
 bin/gifbuild
@@ -10,63 +10,59 @@ bin/giftext
 bin/giftool
 man/man1/gif2raw.1
 man/man1/gif2rgb.1
-man/man1/gifbg.1
 man/man1/gifbuild.1
 man/man1/gifclrmp.1
-man/man1/gifcolor.1
 man/man1/gifecho.1
 man/man1/giffix.1
-man/man1/gifhisto.1
 man/man1/gifinto.1
 man/man1/giflib.1
 man/man1/giftext.1
 man/man1/giftool.1
-man/man1/gifwedge.1
-share/doc/html/giflib/gif2raw.html
-share/doc/html/giflib/gif2rgb.html
-share/doc/html/giflib/gif87.txt
-share/doc/html/giflib/gif89.txt
-share/doc/html/giflib/gif_lib.html
-share/doc/html/giflib/gifbg.html
-share/doc/html/giflib/gifbuild.html
-share/doc/html/giflib/gifclrmp.html
-share/doc/html/giflib/gifcolor.html
-share/doc/html/giflib/gifecho.html
-share/doc/html/giflib/giffix.html
-share/doc/html/giflib/gifhisto.html
-share/doc/html/giflib/gifinto.html
-share/doc/html/giflib/giflib.html
-share/doc/html/giflib/giftext.html
-share/doc/html/giflib/giftool.html
-share/doc/html/giflib/gifwedge.html
-share/doc/html/giflib/intro.html
-share/doc/html/giflib/lzgif.txt
-share/doc/html/giflib/whatsinagif/animation_and_transparency.html
-share/doc/html/giflib/whatsinagif/bits_and_bytes.html
-share/doc/html/giflib/whatsinagif/comment_ext.gif
-share/doc/html/giflib/whatsinagif/gif_file_stream.gif
-share/doc/html/giflib/whatsinagif/global_color_table.gif
-share/doc/html/giflib/whatsinagif/graphic_control_ext.gif
-share/doc/html/giflib/whatsinagif/header_block.gif
-share/doc/html/giflib/whatsinagif/highlight_green.gif
-share/doc/html/giflib/whatsinagif/highlight_purple.gif
-share/doc/html/giflib/whatsinagif/image_data_block.gif
-share/doc/html/giflib/whatsinagif/image_descriptor_block.gif
-share/doc/html/giflib/whatsinagif/index.html
-share/doc/html/giflib/whatsinagif/logical_screen_desc_block.gif
-share/doc/html/giflib/whatsinagif/lzw_decoding_bytes.gif
-share/doc/html/giflib/whatsinagif/lzw_encoding_codes.gif
-share/doc/html/giflib/whatsinagif/lzw_image_data.html
-share/doc/html/giflib/whatsinagif/lzw_image_data_code_table.html
-share/doc/html/giflib/whatsinagif/sample_1.gif
-share/doc/html/giflib/whatsinagif/sample_1_enlarged.gif
-share/doc/html/giflib/whatsinagif/sample_1_trans.gif
-share/doc/html/giflib/whatsinagif/sample_1_trans_blue.gif
-share/doc/html/giflib/whatsinagif/sample_1_trans_red.gif
-share/doc/html/giflib/whatsinagif/sample_2_animation_green.gif
-share/doc/html/giflib/whatsinagif/sample_2_animation_red.gif
-share/doc/html/giflib/whatsinagif/sample_2_animation_yellow.gif
-share/doc/html/giflib/whatsinagif/sample_2_green_large.gif
-share/doc/html/giflib/whatsinagif/sample_2_green_yellow_diff.gif
-share/doc/html/giflib/whatsinagif/sample_2_yellow_large.gif
-share/doc/html/giflib/whatsinagif/trailer_block.gif
+share/doc/giflib/gif2raw.html
+share/doc/giflib/gif2rgb.html
+share/doc/giflib/gif87.txt
+share/doc/giflib/gif89.txt
+share/doc/giflib/gif_lib.html
+share/doc/giflib/gifbg.html
+share/doc/giflib/gifbuild.html
+share/doc/giflib/gifclrmp.html
+share/doc/giflib/gifcolor.html
+share/doc/giflib/gifecho.html
+share/doc/giflib/giffix.html
+share/doc/giflib/gifhisto.html
+share/doc/giflib/gifinto.html
+share/doc/giflib/giflib.html
+share/doc/giflib/giftext.html
+share/doc/giflib/giftool.html
+share/doc/giflib/gifwedge.html
+share/doc/giflib/intro.html
+share/doc/giflib/lzgif.txt
+share/doc/giflib/whatsinagif/animation_and_transparency.html
+share/doc/giflib/whatsinagif/bits_and_bytes.html
+share/doc/giflib/whatsinagif/comment_ext.gif
+share/doc/giflib/whatsinagif/gif_file_stream.gif
+share/doc/giflib/whatsinagif/global_color_table.gif
+share/doc/giflib/whatsinagif/graphic_control_ext.gif
+share/doc/giflib/whatsinagif/header_block.gif
+share/doc/giflib/whatsinagif/highlight_green.gif
+share/doc/giflib/whatsinagif/highlight_purple.gif
+share/doc/giflib/whatsinagif/image_data_block.gif
+share/doc/giflib/whatsinagif/image_descriptor_block.gif
+share/doc/giflib/whatsinagif/index.html
+share/doc/giflib/whatsinagif/logical_screen_desc_block.gif
+share/doc/giflib/whatsinagif/lzw_decoding_bytes.gif
+share/doc/giflib/whatsinagif/lzw_encoding_codes.gif
+share/doc/giflib/whatsinagif/lzw_image_data.html
+share/doc/giflib/whatsinagif/lzw_image_data_code_table.html
+share/doc/giflib/whatsinagif/sample_1.gif
+share/doc/giflib/whatsinagif/sample_1_enlarged.gif
+share/doc/giflib/whatsinagif/sample_1_trans.gif
+share/doc/giflib/whatsinagif/sample_1_trans_blue.gif
+share/doc/giflib/whatsinagif/sample_1_trans_red.gif
+share/doc/giflib/whatsinagif/sample_2_animation_green.gif
+share/doc/giflib/whatsinagif/sample_2_animation_red.gif
+share/doc/giflib/whatsinagif/sample_2_animation_yellow.gif
+share/doc/giflib/whatsinagif/sample_2_green_large.gif
+share/doc/giflib/whatsinagif/sample_2_green_yellow_diff.gif
+share/doc/giflib/whatsinagif/sample_2_yellow_large.gif
+share/doc/giflib/whatsinagif/trailer_block.gif
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 92eefef4943..175f035d12d 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2013/08/13 10:20:47 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.48 2013/08/31 18:41:33 adam Exp $
 
-.include "${.CURDIR}/Makefile.common"
+.include "Makefile.common"
 
 COMMENT=	GIF image format library
-PKGREVISION=	1
 
 CONFLICTS+=	libungif-[0-9]*
 
diff --git a/graphics/giflib/Makefile.common b/graphics/giflib/Makefile.common
index 306931c4e8f..3d5aa4bc45d 100644
--- a/graphics/giflib/Makefile.common
+++ b/graphics/giflib/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2013/07/05 13:23:20 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.5 2013/08/31 18:41:33 adam Exp $
 # used by graphics/giflib/Makefile
 # used by graphics/giflib-util/Makefile
 
-DISTNAME=	giflib-5.0.4
+DISTNAME=	giflib-5.0.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=giflib/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,9 +14,9 @@ LICENSE=	mit
 #PATCHDIR=	${.CURDIR}/../../graphics/giflib/patches
 DISTINFO_FILE=	${.CURDIR}/../../graphics/giflib/distinfo
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--disable-rle
 CONFIGURE_ARGS+=	--disable-x11
diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo
index d778d8c9096..ba7047423d5 100644
--- a/graphics/giflib/distinfo
+++ b/graphics/giflib/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2013/08/13 10:20:47 joerg Exp $
+$NetBSD: distinfo,v 1.12 2013/08/31 18:41:33 adam Exp $
 
-SHA1 (giflib-5.0.4.tar.bz2) = af3fdf84e2b9ac5c18e7102835a92e2066c7c9f1
-RMD160 (giflib-5.0.4.tar.bz2) = d8791810f6b4f24fc8e31af269d04b445f138d87
-Size (giflib-5.0.4.tar.bz2) = 629190 bytes
-SHA1 (patch-lib_gif__lib.h) = 05b23c454972d6061a5c1a9f84e904df9bbaf638
+SHA1 (giflib-5.0.5.tar.bz2) = 926fecbcef1c5b1ca9d17257d15a197b8b35e405
+RMD160 (giflib-5.0.5.tar.bz2) = 424fa0fc1ecf21bf6e8b2bc90bd313805c3323ff
+Size (giflib-5.0.5.tar.bz2) = 651559 bytes
diff --git a/graphics/giflib/patches/patch-lib_gif__lib.h b/graphics/giflib/patches/patch-lib_gif__lib.h
deleted file mode 100644
index 5b4e1aa0e65..00000000000
--- a/graphics/giflib/patches/patch-lib_gif__lib.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_gif__lib.h,v 1.1 2013/08/13 10:20:47 joerg Exp $
-
-Pull in correct header for size_t.
-
---- lib/gif_lib.h.orig	2013-08-12 16:47:43.000000000 +0000
-+++ lib/gif_lib.h
-@@ -19,6 +19,7 @@ extern "C" {
- #define GIF_OK      1
- 
- #include <stdbool.h>
-+#include <stddef.h>
- 
- #define GIF_STAMP "GIFVER"          /* First chars in file - GIF stamp.  */
- #define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1