Update to 3.2.5e:

BUGS FIXED:
	o HTML map output was limited to 100 links.
	  Fix by Jan van Dijk
	o Updated for compatibility to PNG 1.5
	  From Matthias Scheler
	o Was adding "showpage" command when producing bitmap formats from intermediate EPS.
	  This produced "illegal" PNG and JPEG files with extra, blank image.
	o Maximum width of included image in PS/EPS output increased from 8192 to 16384
	o Precision of some PIC objects increased from %.2f to %.3f
	o Double close of output file when ghostscript fails. Original bug report from
	  https://bugzilla.redhat.com/728825

5 files changed, 13 insertions, 112 deletions

diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 2c19ac0ed71..cdd067cdca7 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2013/02/16 11:18:03 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2014/02/24 12:12:02 wiz Exp $
 
-DISTNAME=	transfig.3.2.5d
-PKGNAME=	transfig-3.2.5d
-PKGREVISION=	1
+DISTNAME=	transfig.3.2.5e
+PKGNAME=	${DISTNAME:S/g./g-/}
 CATEGORIES=	graphics print
-MASTER_SITES=	ftp://epb.lbl.gov/xfig/alpha/ \
-		${MASTER_SITE_SOURCEFORGE:=mcj/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mcj/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xfig.org/
diff --git a/print/transfig/PLIST b/print/transfig/PLIST
index a568d5ffeaf..685c107e239 100644
--- a/print/transfig/PLIST
+++ b/print/transfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:12:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/02/24 12:12:02 wiz Exp $
 bin/fig2dev
 bin/fig2ps2tex
 bin/fig2ps2tex.sh
@@ -71,7 +71,7 @@ lib/fig2dev/ro_RO.ps
 lib/fig2dev/pl_PL.ps
 lib/fig2dev/sk_SK.ps
 lib/fig2dev/sl_SI.ps
-${IMAKE_MAN_DIR}/fig2dev.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/fig2ps2tex.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/pic2tpic.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/transfig.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/fig2dev.1
+${IMAKE_MAN_DIR}/fig2ps2tex.1
+${IMAKE_MAN_DIR}/pic2tpic.1
+${IMAKE_MAN_DIR}/transfig.1
diff --git a/print/transfig/distinfo b/print/transfig/distinfo
index 13b68a5c743..fa04d41f367 100644
--- a/print/transfig/distinfo
+++ b/print/transfig/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.19 2012/05/04 16:31:59 joerg Exp $
+$NetBSD: distinfo,v 1.20 2014/02/24 12:12:02 wiz Exp $
 
-SHA1 (transfig.3.2.5d.tar.gz) = 90ff277cc9b3fa0d0313052fcf5e3ffad8652abc
-RMD160 (transfig.3.2.5d.tar.gz) = 6d6aff522bd9e886029bf317e7b9dcd495a5c0ef
-Size (transfig.3.2.5d.tar.gz) = 497451 bytes
+SHA1 (transfig.3.2.5e.tar.gz) = 27aa9691bf84f8775db9be39c453a8132148bad1
+RMD160 (transfig.3.2.5e.tar.gz) = cc919f081483c3f570abeca6a8cadd4796d25015
+Size (transfig.3.2.5e.tar.gz) = 531256 bytes
 SHA1 (patch-aa) = bd898082a8c34825efe04d0102ddb33b2f4cffbd
 SHA1 (patch-ab) = b056ff88914bccfc172f15adb663eda0f254e125
 SHA1 (patch-ac) = 0258794cf6f6d22d3355ed01c2cc89c7ee0088d4
-SHA1 (patch-ad) = b15995d7b3282d68bbcea0a161ed2db8188141ac
 SHA1 (patch-ae) = 07a18544e7c2d6aac7d0d3f950b7820f33869b06
-SHA1 (patch-af) = 544bae557e193f9bbee4dbe1aefa454c38100c69
 SHA1 (patch-fig2dev_dev_genibmgl.c) = 86d75d687066e77f90f5e35914a5edc409708e3e
diff --git a/print/transfig/patches/patch-ad b/print/transfig/patches/patch-ad
deleted file mode 100644
index e13ece42e2f..00000000000
--- a/print/transfig/patches/patch-ad
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2011/01/19 19:14:15 drochner Exp $
-
-Fix build with png-1.5.
-
---- fig2dev/dev/readpng.c.orig	2010-04-21 16:02:14.000000000 +0000
-+++ fig2dev/dev/readpng.c
-@@ -39,6 +39,8 @@ read_png(file,filetype,pic,llx,lly)
-     char	   *ptr;
-     int		    num_palette;
-     png_colorp	    palette;
-+    double          gamma;
-+    png_color_16p   file_background;
-     png_color_16    png_background;
- 
-     *llx = *lly = 0;
-@@ -62,7 +64,7 @@ read_png(file,filetype,pic,llx,lly)
-     }
- 
-     /* set long jump here */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* if we get here there was a problem reading the file */
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	return 0;
-@@ -78,14 +80,14 @@ read_png(file,filetype,pic,llx,lly)
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    if (info_ptr->valid & PNG_INFO_gAMA)
--	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
-+    if (png_get_gAMA(png_ptr, info_ptr, &gamma))
-+	png_set_gamma(png_ptr, 2.2, gamma);
-     else
- 	png_set_gamma(png_ptr, 2.2, 0.45);
- 
--    if (info_ptr->valid & PNG_INFO_bKGD)
-+    if (png_get_bKGD(png_ptr, info_ptr, &file_background))
- 	/* set the background to the one supplied */
--	png_set_background(png_ptr, &info_ptr->background,
-+	png_set_background(png_ptr, file_background,
- 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-     else {
- 	/* blend the canvas background using the alpha channel */
diff --git a/print/transfig/patches/patch-af b/print/transfig/patches/patch-af
deleted file mode 100644
index ec7cccf5412..00000000000
--- a/print/transfig/patches/patch-af
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/12/23 14:19:58 drochner Exp $
-
---- fig2dev/read1_3.c.orig	2003-04-08 22:18:51.000000000 +0000
-+++ fig2dev/read1_3.c
-@@ -441,7 +441,7 @@ FILE	*fp;
- {
- 	F_text	*t;
- 	int	n;
--	char	buf[128];
-+	char	buf[512];
- 
- 	Text_malloc(t);
- 	t->type = T_LEFT_JUSTIFIED;
-@@ -451,21 +451,33 @@ FILE	*fp;
- 	t->pen = 0;
- 	t->angle = 0.0;
- 	t->next = NULL;
--	n = fscanf(fp," %d %lf %d %lf %lf %d %d %[^\n]", &t->font, 
-+	if (!fgets(buf, sizeof(buf), fp)) {
-+		put_msg("Incomplete text data");
-+		free((char *) t);
-+		return (NULL);
-+	}
-+
-+	/* Note using strlen(buf) here will waste a few bytes, as the
-+	   various text attributes are counted into this length too. */
-+	t->cstring = (char *) calloc((unsigned)(strlen(buf)+1), sizeof(char));
-+	if (t->cstring == NULL)
-+		return (NULL);
-+	n = sscanf(buf," %d %lf %d %lf %lf %d %d %[^\n]", &t->font, 
- 		&t->size, &t->flags, &t->height, &t->length, 
--		&t->base_x, &t->base_y, buf);
-+		&t->base_x, &t->base_y, t->cstring);
- 	if (n != 8) {
- 	    put_msg("incomplete text data");
-+	    free(t->cstring);
- 	    free((char*)t);
- 	    return(NULL);
- 	    }
--	t->cstring = (char *) calloc((unsigned)(strlen(buf)+1), sizeof(char));
--	if (t->cstring == NULL) {
-+
-+	if (!strlen(t->cstring)) {
-+	    free(t->cstring);
- 	    put_msg(Err_mem);
- 	    free((char*) t);
- 	    return(NULL);
- 	    }
--	(void)strcpy(t->cstring, buf);
- 	if (t->size == 0) t->size = 18;
- 	return(t);
- 	}