diff options
author | dinoex <dinoex@FreeBSD.org> | 2005-04-18 13:43:19 +0800 |
---|---|---|
committer | dinoex <dinoex@FreeBSD.org> | 2005-04-18 13:43:19 +0800 |
commit | 345608c29b748174fa58645acdc11337322fd57d (patch) | |
tree | 34ac56b6a7ab861451efb624f7d0ebc0dd2697ba /graphics | |
parent | 85cba2156478b722e15095c0a3a8d83c9b56711f (diff) | |
download | freebsd-ports-gnome-345608c29b748174fa58645acdc11337322fd57d.tar.gz freebsd-ports-gnome-345608c29b748174fa58645acdc11337322fd57d.tar.zst freebsd-ports-gnome-345608c29b748174fa58645acdc11337322fd57d.zip |
- update to 3.7.2
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/tiff/Makefile | 3 | ||||
-rw-r--r-- | graphics/tiff/distinfo | 4 | ||||
-rw-r--r-- | graphics/tiff/files/patch-af | 12 | ||||
-rw-r--r-- | graphics/tiff/files/patch-fax2ps.c | 18 | ||||
-rw-r--r-- | graphics/tiff/files/patch-tif_getimage.c | 12 | ||||
-rw-r--r-- | graphics/tiff/files/patch-tiffdump.c | 14 | ||||
-rw-r--r-- | graphics/tiff/pkg-plist | 80 |
7 files changed, 63 insertions, 80 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index e4a774287987..d72169d99299 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -8,8 +8,7 @@ # PORTNAME= tiff -PORTVERSION= 3.7.1 -PORTREVISION= 2 +PORTVERSION= 3.7.2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ http://dl1.maptools.org/dl/libtiff/ diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index 86d6e392a486..dcbb8e354184 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,2 +1,2 @@ -MD5 (tiff-3.7.1.tar.gz) = 37d222df12eb23691614cd40b7b1f215 -SIZE (tiff-3.7.1.tar.gz) = 1253810 +MD5 (tiff-3.7.2.tar.gz) = 9d7123bd0dbde2a3853fb758346adb78 +SIZE (tiff-3.7.2.tar.gz) = 1260598 diff --git a/graphics/tiff/files/patch-af b/graphics/tiff/files/patch-af deleted file mode 100644 index 456bc825d9ec..000000000000 --- a/graphics/tiff/files/patch-af +++ /dev/null @@ -1,12 +0,0 @@ ---- tools/fax2ps.c.orig Wed Mar 29 13:22:33 2000 -+++ tools/fax2ps.c Sat Apr 1 00:00:00 2000 -@@ -382,8 +382,7 @@ - char temp[1024], buf[16*1024]; - - strcpy(temp, "/tmp/fax2psXXXXXX"); -- (void) mktemp(temp); -- fd = fopen(temp, "w"); -+ fd = fdopen(mkstemp(temp), "w+"); - if (fd == NULL) { - fprintf(stderr, "Could not create temp file \"%s\"\n", temp); - exit(-2); diff --git a/graphics/tiff/files/patch-fax2ps.c b/graphics/tiff/files/patch-fax2ps.c new file mode 100644 index 000000000000..4e048d78ff2f --- /dev/null +++ b/graphics/tiff/files/patch-fax2ps.c @@ -0,0 +1,18 @@ +--- tools/fax2ps.c.orig Sat Mar 5 10:06:08 2005 ++++ tools/fax2ps.c Sun Apr 17 23:20:43 2005 +@@ -373,11 +373,12 @@ + int n; + FILE* fd; + char buf[16*1024]; ++ char temp[1024]; + +- fd = tmpfile(); ++ strcpy(temp, "/tmp/fax2psXXXXXX"); ++ fd = fdopen(mkstemp(temp), "w+"); + if (fd == NULL) { +- fprintf(stderr, "Could not create temporary file, exiting.\n"); +- fclose(fd); ++ fprintf(stderr, "Could not create temp file \"%s\"\n", temp); + exit(-2); + } + while ((n = read(fileno(stdin), buf, sizeof (buf))) > 0) diff --git a/graphics/tiff/files/patch-tif_getimage.c b/graphics/tiff/files/patch-tif_getimage.c deleted file mode 100644 index 2e19f67fb47a..000000000000 --- a/graphics/tiff/files/patch-tif_getimage.c +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -p -r1.43 libtiff/tif_getimage.c ---- libtiff/tif_getimage.c 19 Dec 2004 17:11:17 -0000 1.43 -+++ libtiff/tif_getimage.c 24 Dec 2004 09:30:18 -0000 -@@ -247,7 +247,7 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, T - TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &img->samplesperpixel); - TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES, - &extrasamples, &sampleinfo); -- if (extrasamples > 1) -+ if (extrasamples >= 1) - { - switch (sampleinfo[0]) { - case EXTRASAMPLE_UNSPECIFIED: /* Workaround for some images without */ diff --git a/graphics/tiff/files/patch-tiffdump.c b/graphics/tiff/files/patch-tiffdump.c deleted file mode 100644 index 5928954ce8d5..000000000000 --- a/graphics/tiff/files/patch-tiffdump.c +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/tiffdump.c.orig 2004-09-03 12:16:01 +0400 -+++ tools/tiffdump.c 2004-12-22 01:57:51 +0300 -@@ -307,6 +307,11 @@ ReadDirectory(int fd, unsigned ix, off_t - continue; - } - space = dp->tdir_count * datawidth[dp->tdir_type]; -+ if (space <= 0) { -+ printf(">\n"); -+ Error("Invalid count for tag %u", dp->tdir_tag); -+ continue; -+ } - if (space <= 4) { - switch (dp->tdir_type) { - case TIFF_FLOAT: diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist index 110bcbe4a7c7..0b9213b0eac7 100644 --- a/graphics/tiff/pkg-plist +++ b/graphics/tiff/pkg-plist @@ -28,6 +28,9 @@ include/tiffvers.h lib/libtiff.a lib/libtiff.so lib/libtiff.so.4 +lib/libtiffxx.a +lib/libtiffxx.so +lib/libtiffxx.so.4 %%PORTDOCS%%%%DOCSDIR%%/TIFFTechNote2.html %%PORTDOCS%%%%DOCSDIR%%/addingtags.html %%PORTDOCS%%%%DOCSDIR%%/bugs.html @@ -55,48 +58,48 @@ lib/libtiff.so.4 %%PORTDOCS%%%%DOCSDIR%%/internals.html %%PORTDOCS%%%%DOCSDIR%%/intro.html %%PORTDOCS%%%%DOCSDIR%%/libtiff.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFClose.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFDataWidth.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFError.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFlush.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFGetField.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFOpen.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFPrintDirectory.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFRGBAImage.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadDirectory.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadEncodedStrip.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadEncodedTile.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBAImage.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBAStrip.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBATile.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRawStrip.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRawTile.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadScanline.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadTile.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFSetDirectory.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFSetField.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWarning.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteDirectory.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteEncodedStrip.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteEncodedTile.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteRawStrip.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteRawTile.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteScanline.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteTile.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFbuffer.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFcodec.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFcolor.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFmemory.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFquery.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFsize.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFstrip.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFswab.3t.html -%%PORTDOCS%%%%DOCSDIR%%/man/TIFFtile.3t.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFClose.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFDataWidth.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFError.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFlush.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFGetField.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFOpen.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFPrintDirectory.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFRGBAImage.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadDirectory.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadEncodedStrip.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadEncodedTile.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBAImage.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBAStrip.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBATile.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRawStrip.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRawTile.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadScanline.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadTile.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFSetDirectory.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFSetField.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWarning.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteDirectory.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteEncodedStrip.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteEncodedTile.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteRawStrip.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteRawTile.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteScanline.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteTile.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFbuffer.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFcodec.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFcolor.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFmemory.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFquery.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFsize.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFstrip.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFswab.3tiff.html +%%PORTDOCS%%%%DOCSDIR%%/man/TIFFtile.3tiff.html %%PORTDOCS%%%%DOCSDIR%%/man/fax2ps.1.html %%PORTDOCS%%%%DOCSDIR%%/man/fax2tiff.1.html %%PORTDOCS%%%%DOCSDIR%%/man/gif2tiff.1.html %%PORTDOCS%%%%DOCSDIR%%/man/index.html -%%PORTDOCS%%%%DOCSDIR%%/man/libtiff.3t.html +%%PORTDOCS%%%%DOCSDIR%%/man/libtiff.3tiff.html %%PORTDOCS%%%%DOCSDIR%%/man/pal2rgb.1.html %%PORTDOCS%%%%DOCSDIR%%/man/ppm2tiff.1.html %%PORTDOCS%%%%DOCSDIR%%/man/ras2tiff.1.html @@ -147,6 +150,7 @@ lib/libtiff.so.4 %%PORTDOCS%%%%DOCSDIR%%/v3.7.0beta.html %%PORTDOCS%%%%DOCSDIR%%/v3.7.0beta2.html %%PORTDOCS%%%%DOCSDIR%%/v3.7.1.html +%%PORTDOCS%%%%DOCSDIR%%/v3.7.2.html %%PORTDOCS%%@dirrm %%DOCSDIR%%/man %%PORTDOCS%%@dirrm %%DOCSDIR%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%% |