diff options
| author | tron <tron> | 2006-04-18 12:56:03 +0000 |
|---|---|---|
| committer | tron <tron> | 2006-04-18 12:56:03 +0000 |
| commit | 7423fac6667b1ac72e32c485481e0edb86d43bc4 (patch) | |
| tree | 19b9feef43d6480bb9c8739e1662ff4000e5a52c /graphics/gif2png | |
| parent | 18033056b50f779626addf06799eb4f043e4016f (diff) | |
| download | pkgsrc-7423fac6667b1ac72e32c485481e0edb86d43bc4.tar.gz | |
- Add missing Python dependence and use standard facility for modifying
the interpreter path.
- Use new "libpng" API which fixes build problems with the latest "png"
package.
Bump package revision because of these changes.
Diffstat (limited to 'graphics/gif2png')
| -rw-r--r-- | graphics/gif2png/Makefile | 11 | ||||
| -rw-r--r-- | graphics/gif2png/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gif2png/patches/patch-aa | 34 |
3 files changed, 40 insertions, 8 deletions
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile index 6e5d2cad962..dfa8b11df22 100644 --- a/graphics/gif2png/Makefile +++ b/graphics/gif2png/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2006/04/17 13:46:31 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2006/04/18 12:56:03 tron Exp $ DISTNAME= gif2png-2.5.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics converters MASTER_SITES= http://www.catb.org/~esr/gif2png/ @@ -11,11 +11,8 @@ COMMENT= Convert GIF files to PNG GNU_CONFIGURE= YES -post-install: - ${SED} "s,/usr/bin/python,${PREFIX}/bin/python," \ - ${PREFIX}/bin/web2png > ${PREFIX}/bin/web2png.done - ${MV} ${PREFIX}/bin/web2png.done ${PREFIX}/bin/web2png - ${CHMOD} +x ${PREFIX}/bin/web2png +PYTHON_PATCH_SCRIPTS+= web2png .include "../../graphics/png/buildlink3.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gif2png/distinfo b/graphics/gif2png/distinfo index d80a1628ace..eb249107c2a 100644 --- a/graphics/gif2png/distinfo +++ b/graphics/gif2png/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/02/24 08:45:05 agc Exp $ +$NetBSD: distinfo,v 1.8 2006/04/18 12:56:03 tron Exp $ SHA1 (gif2png-2.5.1.tar.gz) = 682f3dc2849ed1e938c12459eb089247aee09a2b RMD160 (gif2png-2.5.1.tar.gz) = 64dfd73ef988a1f45f221abf6cfbf2e790f42ea3 Size (gif2png-2.5.1.tar.gz) = 104449 bytes +SHA1 (patch-aa) = 20570f65b5b0604aa6449da38d847979119360db diff --git a/graphics/gif2png/patches/patch-aa b/graphics/gif2png/patches/patch-aa new file mode 100644 index 00000000000..b9d18a0c581 --- /dev/null +++ b/graphics/gif2png/patches/patch-aa @@ -0,0 +1,34 @@ +$NetBSD: patch-aa,v 1.3 2006/04/18 12:56:03 tron Exp $ + +--- gif2png.c.orig 2002-05-10 15:06:02.000000000 +0100 ++++ gif2png.c 2006-04-18 13:52:45.000000000 +0100 +@@ -135,7 +135,7 @@ + unsigned long hist_maxvalue; + int passcount; + int errtype, errorcount = 0; +- png_text software; ++ png_text comment, software; + + /* these volatile declarations prevent gcc warnings ("variable might be + * clobbered by `longjmp' or `vfork'") */ +@@ -517,11 +517,15 @@ + j = s->size; + if (j > 0 && data[j-1] == '\0') /* some apps include a NULL in GIF comment */ + --j; +- if (j<500) { +- png_write_tEXt(png_ptr, "Comment", (png_charp)data, j); +- } else { +- png_write_zTXt(png_ptr, "Comment", (png_charp)data, j, 0); +- } ++ if (j<1000) ++ comment.compression = PNG_TEXT_COMPRESSION_NONE; ++ else ++ comment.compression = PNG_TEXT_COMPRESSION_zTXt; ++ comment.key = "Comment"; ++ comment.text = data; ++ comment.text_length = j; ++ ++ png_set_text(png_ptr, info_ptr, &comment, 1); + break; + + case GIFapplication: |