Wed Mar 7 15:28:13 2012 UTC ()
Update to 2.5.5.

* 2.5.5 @ 2012-02-28
  Added -m (preserve file modification time) option by Steve Ward.
  web2png is checked with pylint.


(wiz)
diff -r1.39 -r1.40 pkgsrc/graphics/gif2png/Makefile
diff -r1.11 -r1.12 pkgsrc/graphics/gif2png/distinfo
diff -r1.5 -r1.6 pkgsrc/graphics/gif2png/patches/patch-aa
cvs diff -r1.39 -r1.40 pkgsrc/graphics/gif2png/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gif2png/Makefile 2011/01/24 12:47:19 1.39
+++ pkgsrc/graphics/gif2png/Makefile 2012/03/07 15:28:12 1.40
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.39 2011/01/24 12:47:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.40 2012/03/07 15:28:12 wiz Exp $
2 2
3DISTNAME= gif2png-2.5.4 3DISTNAME= gif2png-2.5.5
4CATEGORIES= graphics converters 4CATEGORIES= graphics converters
5MASTER_SITES= http://www.catb.org/~esr/gif2png/ 5MASTER_SITES= http://www.catb.org/~esr/gif2png/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.catb.org/~esr/gif2png/ 8HOMEPAGE= http://www.catb.org/~esr/gif2png/
9COMMENT= Convert GIF files to PNG 9COMMENT= Convert GIF files to PNG
10LICENSE= png-license 10LICENSE= png-license
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15 15
16PYTHON_PATCH_SCRIPTS+= web2png 16PYTHON_PATCH_SCRIPTS+= web2png
cvs diff -r1.11 -r1.12 pkgsrc/graphics/gif2png/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gif2png/distinfo 2011/01/24 12:47:19 1.11
+++ pkgsrc/graphics/gif2png/distinfo 2012/03/07 15:28:12 1.12
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.11 2011/01/24 12:47:19 wiz Exp $ 1$NetBSD: distinfo,v 1.12 2012/03/07 15:28:12 wiz Exp $
2 2
3SHA1 (gif2png-2.5.4.tar.gz) = 40a33457e5d2beb0f001c14fabf0e92533c38450 3SHA1 (gif2png-2.5.5.tar.gz) = df38c056ab8441fff3735316fb0fc2c3953f6c93
4RMD160 (gif2png-2.5.4.tar.gz) = 372a56e260957a7f8895322904f3691df7e56d7e 4RMD160 (gif2png-2.5.5.tar.gz) = 1c1e68553d508bd34a37e0dafc061e39efc42228
5Size (gif2png-2.5.4.tar.gz) = 125731 bytes 5Size (gif2png-2.5.5.tar.gz) = 126884 bytes
6SHA1 (patch-aa) = ae26b928890c0d7577a0889ae21f6f836faa71b1 6SHA1 (patch-aa) = 513f9d79aa3594eea9e3e848911e11f26abcb1dd
cvs diff -r1.5 -r1.6 pkgsrc/graphics/gif2png/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/gif2png/patches/Attic/patch-aa 2011/01/13 17:07:53 1.5
+++ pkgsrc/graphics/gif2png/patches/Attic/patch-aa 2012/03/07 15:28:12 1.6
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1$NetBSD: patch-aa,v 1.5 2011/01/13 17:07:53 wiz Exp $ 1$NetBSD: patch-aa,v 1.6 2012/03/07 15:28:12 wiz Exp $
2 2
3Fix build with png-1.5. 3Fix build with png-1.5.
4 4
5--- gif2png.c.orig 2009-11-11 20:28:02.000000000 +0000 5--- gif2png.c.orig 2012-01-28 23:02:06.000000000 +0000
6+++ gif2png.c 6+++ gif2png.c
7@@ -10,6 +10,7 @@ 7@@ -10,6 +10,7 @@
8 #include <string.h> 8 #include <string.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <unistd.h> /* for isatty() */ 10 #include <unistd.h> /* for isatty() */
11+#include <zlib.h> 11+#include <zlib.h>
 12 #include <sys/stat.h>
 13 #include <utime.h>
12  14
13 #if !defined(TRUE) 15@@ -122,8 +123,8 @@ int writefile(struct GIFelement *s,struc
14 #define FALSE 0 
15@@ -120,8 +121,8 @@ int writefile(struct GIFelement *s,struc 
16 int colors_used = 0; 16 int colors_used = 0;
17 byte remap[MAXCMSIZE]; 17 byte remap[MAXCMSIZE];
18 int low_prec; 18 int low_prec;
19- png_struct *png_ptr = xalloc(sizeof (png_struct)); 19- png_struct *png_ptr = xalloc(sizeof (png_struct));
20- png_info *info_ptr = xalloc(sizeof (png_info)); 20- png_info *info_ptr = xalloc(sizeof (png_info));
21+ png_struct *png_ptr; 21+ png_struct *png_ptr;
22+ png_info *info_ptr; 22+ png_info *info_ptr;
23 int p; 23 int p;
24 int gray_bitdepth; 24 int gray_bitdepth;
25 png_color pal_rgb[MAXCMSIZE], *pltep; 25 png_color pal_rgb[MAXCMSIZE], *pltep;
26@@ -136,6 +137,19 @@ int writefile(struct GIFelement *s,struc 26@@ -138,6 +139,19 @@ int writefile(struct GIFelement *s,struc
27 png_text software; 27 png_text software;
28 png_text comment; 28 png_text comment;
29  29
30+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); 30+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
31+ if (png_ptr == NULL) { 31+ if (png_ptr == NULL) {
32+ fprintf(stderr, "gif2png: fatal error, out of memory\n"); 32+ fprintf(stderr, "gif2png: fatal error, out of memory\n");
33+ fprintf(stderr, "gif2png: exiting ungracefully\n"); 33+ fprintf(stderr, "gif2png: exiting ungracefully\n");
34+ exit(1); 34+ exit(1);
35+ } 35+ }
36+ info_ptr = png_create_info_struct(png_ptr); 36+ info_ptr = png_create_info_struct(png_ptr);
37+ if (info_ptr == NULL) { 37+ if (info_ptr == NULL) {
38+ fprintf(stderr, "gif2png: fatal error, out of memory\n"); 38+ fprintf(stderr, "gif2png: fatal error, out of memory\n");
39+ fprintf(stderr, "gif2png: exiting ungracefully\n"); 39+ fprintf(stderr, "gif2png: exiting ungracefully\n");