From d1c3c90043d8a4458a97b7c57c814fec1610eda9 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sat, 11 Jun 2011 14:38:59 +0000
Subject: [PATCH] - update to 4.0.0beta7

---
 graphics/tiff/Makefile               |  4 +++-
 graphics/tiff/distinfo               |  5 ++---
 graphics/tiff/files/patch-fax2ps.c   | 18 ------------------
 graphics/tiff/files/patch-tiff2pdf.c | 11 -----------
 graphics/tiff/pkg-plist              |  1 +
 5 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 graphics/tiff/files/patch-fax2ps.c
 delete mode 100644 graphics/tiff/files/patch-tiff2pdf.c

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index d1aba8a60320..7a7b29fa343e 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -9,7 +9,8 @@
 
 PORTNAME=	tiff
 PORTVERSION=	4.0.0
-DISTVERSION=	4.0.0beta6
+PORTREVISION=	1
+DISTVERSION=	4.0.0beta7
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://dl1.maptools.org/dl/libtiff/
@@ -17,6 +18,7 @@ MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Tools and library routines for working with TIFF images
 
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		jbig.1:${PORTSDIR}/graphics/jbigkit
 
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 2a63fda6d1b1..5cdba43909e9 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,3 +1,2 @@
-MD5 (tiff-4.0.0beta6.tar.gz) = 6a1e51841a5a5062cc381e34a48122a0
-SHA256 (tiff-4.0.0beta6.tar.gz) = de016175742bcdd0cd6f326dd2e7bbc7154437d7bb09976ad4789016065061e6
-SIZE (tiff-4.0.0beta6.tar.gz) = 1968829
+SHA256 (tiff-4.0.0beta7.tar.gz) = 7b622db9e62a14464b0ae27e5eed4e2e893d7aab889c778e56ac28df069c3ded
+SIZE (tiff-4.0.0beta7.tar.gz) = 2004539
diff --git a/graphics/tiff/files/patch-fax2ps.c b/graphics/tiff/files/patch-fax2ps.c
deleted file mode 100644
index 4e048d78ff2f..000000000000
--- a/graphics/tiff/files/patch-fax2ps.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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-tiff2pdf.c b/graphics/tiff/files/patch-tiff2pdf.c
deleted file mode 100644
index 1e9e88effb4c..000000000000
--- a/graphics/tiff/files/patch-tiff2pdf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/tiff2pdf.c.orig	2009-01-01 01:10:43.000000000 +0100
-+++ tools/tiff2pdf.c	2009-09-14 12:13:39.000000000 +0200
-@@ -3726,7 +3726,7 @@
- 	written += t2pWriteFile(output, (tdata_t) "(", 1);
- 	for (i=0; i<len; i++) {
- 		if((pdfstr[i]&0x80) || (pdfstr[i]==127) || (pdfstr[i]<32)){
--			sprintf(buffer, "\\%.3hho", pdfstr[i]);
-+			snprintf(buffer, sizeof(buffer), "\\%.3hho", pdfstr[i]);
- 			buffer[sizeof(buffer) - 1] = '\0';
- 			written += t2pWriteFile(output, (tdata_t) buffer, 4);
- 		} else {
diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist
index 91364e62c57e..d46cf89e5ee7 100644
--- a/graphics/tiff/pkg-plist
+++ b/graphics/tiff/pkg-plist
@@ -35,6 +35,7 @@ lib/libtiffxx.a
 lib/libtiffxx.la
 lib/libtiffxx.so
 lib/libtiffxx.so.4
+lib/pkgconfig/libtiff-4.pc
 %%PORTDOCS%%%%DOCSDIR%%/TIFFTechNote2.html
 %%PORTDOCS%%%%DOCSDIR%%/addingtags.html
 %%PORTDOCS%%%%DOCSDIR%%/bugs.html