Date: Tue, 12 Apr 2016 15:05:47 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413128 - in head/graphics/giftool: . files Message-ID: <201604121505.u3CF5llU030683@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Apr 12 15:05:46 2016 New Revision: 413128 URL: https://svnweb.freebsd.org/changeset/ports/413128 Log: Upbreak. - Regen patches. - Move part of pkg-descr explaining the options to pkg-help, where it belongs. PR: 208711 Submitted by: tkato432 yahoo com Sponsored by: Absolight Added: head/graphics/giftool/pkg-help (contents, props changed) Modified: head/graphics/giftool/Makefile (contents, props changed) head/graphics/giftool/distinfo (contents, props changed) head/graphics/giftool/files/extra-patch-aa (contents, props changed) head/graphics/giftool/files/extra-patch-ab (contents, props changed) head/graphics/giftool/pkg-descr (contents, props changed) Modified: head/graphics/giftool/Makefile ============================================================================== --- head/graphics/giftool/Makefile Tue Apr 12 15:05:40 2016 (r413127) +++ head/graphics/giftool/Makefile Tue Apr 12 15:05:46 2016 (r413128) @@ -4,20 +4,17 @@ PORTNAME= giftool PORTVERSION= 1.0 CATEGORIES= graphics -MASTER_SITES= http://www.the-labs.com/GIFTool/ -DISTNAME= ${PORTNAME} -EXTRACT_SUFX= .tar.Z +MASTER_SITES= SUNSITE/apps/graphics/convert/ MAINTAINER= ports@FreeBSD.org COMMENT= Tool for GIF89a transparent option and interlace mode -BROKEN= unfetchable - NO_CDROM= Shareware NO_WRKSUBDIR= yes ALL_TARGET= giftool MAKE_ARGS= CFLAGS="${CFLAGS}" +USES= tar:tgz OPTIONS_DEFINE= RETVALUE MALLOCSIZE DOCS OPTIONS_DEFAULT= RETVALUE MALLOCSIZE @@ -32,6 +29,8 @@ MALLOCSIZE_EXTRA_PATCHES= ${PATCHDIR}/ex do-install: ${INSTALL_PROGRAM} ${WRKSRC}/giftool ${STAGEDIR}${PREFIX}/bin + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Modified: head/graphics/giftool/distinfo ============================================================================== --- head/graphics/giftool/distinfo Tue Apr 12 15:05:40 2016 (r413127) +++ head/graphics/giftool/distinfo Tue Apr 12 15:05:46 2016 (r413128) @@ -1,2 +1,2 @@ -SHA256 (giftool.tar.Z) = 5bcd4f7a76729a1f823b53c2af804cc34ac4f0f261f42671af0e5843db4337ba -SIZE (giftool.tar.Z) = 33697 +SHA256 (giftool-1.0.tgz) = fdf0e818839a3997ead856db7232e49fff4ba1eb3ec2d4a46c52826708e29b44 +SIZE (giftool-1.0.tgz) = 21512 Modified: head/graphics/giftool/files/extra-patch-aa ============================================================================== --- head/graphics/giftool/files/extra-patch-aa Tue Apr 12 15:05:40 2016 (r413127) +++ head/graphics/giftool/files/extra-patch-aa Tue Apr 12 15:05:46 2016 (r413128) @@ -1,27 +1,17 @@ -*** main.c.orig Sat Mar 8 06:34:28 1997 ---- main.c Sat Mar 8 06:37:33 1997 -*************** -*** 1275,1281 **** - exit(1); - } - -! main(int argc, char *argv[]) - { - int c, i; - int batchMode = 0; ---- 1275,1281 ---- - exit(1); - } - -! int main(int argc, char *argv[]) - { - int c, i; - int batchMode = 0; -*************** -*** 1410,1413 **** ---- 1410,1414 ---- - GIFFree(stream); - } - } -+ return 0; - } +--- main.c.orig 1994-12-07 18:31:59 UTC ++++ main.c +@@ -1275,7 +1275,7 @@ static void usage() + exit(1); + } + +-main(int argc, char *argv[]) ++int main(int argc, char *argv[]) + { + int c, i; + int batchMode = 0; +@@ -1410,4 +1410,5 @@ main(int argc, char *argv[]) + GIFFree(stream); + } + } ++ return 0; + } Modified: head/graphics/giftool/files/extra-patch-ab ============================================================================== --- head/graphics/giftool/files/extra-patch-ab Tue Apr 12 15:05:40 2016 (r413127) +++ head/graphics/giftool/files/extra-patch-ab Tue Apr 12 15:05:46 2016 (r413128) @@ -1,19 +1,11 @@ -*** readGIF.c.orig Sat Mar 8 06:28:02 1997 ---- readGIF.c Sat Mar 8 06:30:05 1997 -*************** -*** 253,259 **** - cur->data.image.cmapSize = 0; - - } -! cur->data.image.data = (unsigned char *)malloc(cur->width * cur->height); - cur->data.image.interlaced = BitSet(buf[8], INTERLACE); - readImage(fd, BitSet(buf[8], INTERLACE), - cur->width, cur->height, cur->data.image.data); ---- 253,259 ---- - cur->data.image.cmapSize = 0; - - } -! cur->data.image.data = (unsigned char *)malloc(cur->width * cur->height + 1); - cur->data.image.interlaced = BitSet(buf[8], INTERLACE); - readImage(fd, BitSet(buf[8], INTERLACE), - cur->width, cur->height, cur->data.image.data); +--- readGIF.c.orig 1994-12-09 19:17:03 UTC ++++ readGIF.c +@@ -253,7 +253,7 @@ GIFStream *GIFReadFP(FILE *fd) + cur->data.image.cmapSize = 0; + + } +- cur->data.image.data = (unsigned char *)malloc(cur->width * cur->height); ++ cur->data.image.data = (unsigned char *)malloc(cur->width * cur->height + 1); + cur->data.image.interlaced = BitSet(buf[8], INTERLACE); + readImage(fd, BitSet(buf[8], INTERLACE), + cur->width, cur->height, cur->data.image.data); Modified: head/graphics/giftool/pkg-descr ============================================================================== --- head/graphics/giftool/pkg-descr Tue Apr 12 15:05:40 2016 (r413127) +++ head/graphics/giftool/pkg-descr Tue Apr 12 15:05:46 2016 (r413128) @@ -2,15 +2,3 @@ GIFTool is a tool for GIF89a transparent instance 'giftool -B -i *.gif' converts all images to interlaced GIF files. GIFTool is shareware. Use the -info option to read the licensing information. - -Two options are recommended: -WITH_RETVALUE=yes - This option, suggested by Sergei Chechetkin - <csl@whale.sunbay.crimea.ua>, causes GIFTool to provide a return value - so may be used in pipes or with programs like make(1). -WITH_MALLOCSIZE=yes - This option, suggested by Hidetoshi Shimokawa - <simokawa@sat.t.u-tokyo.ac.jp>, increases the size of a malloc, to avoid - a segmentation fault when pre-reading some images. - -WWW: http://www.the-labs.com/GIFTool/ Added: head/graphics/giftool/pkg-help ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/giftool/pkg-help Tue Apr 12 15:05:46 2016 (r413128) @@ -0,0 +1,12 @@ +RETVALUE + +This option, suggested by Sergei Chechetkin +<csl@whale.sunbay.crimea.ua>, causes GIFTool to provide a return +value so may be used in pipes or with programs like make(1). + +MALLOCSIZE + +This option, suggested by Hidetoshi Shimokawa +<simokawa@sat.t.u-tokyo.ac.jp>, increases the size of a malloc, to +avoid a segmentation fault when pre-reading some images. +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604121505.u3CF5llU030683>