Update to transfig 3.2 pachlevel 5-alpha7.

Summary of changes from CHANGES.transfig:

Patchlevel 5-alpha7 (Oct, 27, 2005)

NEW FEATURES
	o Updated SVG driver from Martin Kroeker was missing from alpha6
	o Another SVG update: Use a font-family list of "Times,Symbol" for symbol
	  characters - the Times fontface does not contain all elements of the
	  Symbol font on all platforms

BUGS FIXED:
	o Typo in font name (was cmit10, should be cmti10) in MetaPost driver
	  This bug fix was omitted from alpha6

Patchlevel 5-alpha6 (Oct, 12, 2005)

NEW FEATURES:
	o Added -dPDFSETTINGS=/prepress option to ghostscript when generating
	  PDF output to improve quality of bitmap graphics
	o Fill patterns now use PostScript Level 2 built-in pattern commands
	  for Postscript/EPS/PDF and bitmap output
	  From Konstantin Shemyak
	o Updated SVG driver from Martin Kroeker
	o New -K option to size bounding box to whole figure when exporting
	  only certain depths
	  From Dirk Osswald

BUGS FIXED:
	o Typo in font name (was cmit10, should be cmti10) in MetaPost driver
	o When all texts were "special" (LaTeX coded) in a figure, ISO
	  characters weren't encoded in straight PS and PDF output
	o Bug in radius for circles in SVG driver (dev/gensvg.c)
	o fig2dev.man was missing many papersize options
	o Double fclose() in bitmap driver

-------------------------------------
Patchlevel 5-alpha5 (April, 26, 2004)

NEW FEATURES:
	o Raster picture support added to SVG driver. (In SVG, this translates
	  to a link to the image file plus rotation/scaling information.
	  While 'conformant' SVG viewers need only support PNG and JPEG, there
	  is no a filetype test, as there is no limit on supported formats
	  in the standard, and e.g. Batik is able to display XBM and GIF in
	  addition.  Added code for rounded boxes (polyline subtype 4).
	  Added code for boxes, explicit support for polygons.  Added
	  xml-space:preserve qualifier on texts to preserve whitespace. Rewrote
	  fill pattern handling to generate patterns as needed - adding support
	  for penwidth and color.  Corrected tiling of all shingle patterns and
	  reversal of horizontal shingles.
	  From Martin Kroeker
	o Better arrowheads in SVG driver.  Corrected font family selection.
	  Corrected (and simplified) calculation of white-tinted fill colors
	  (and removed the HSV/RGB conversion code).
	  From Justus Piater

BUGS FIXED:
	o Typo in LATEX_AND_XFIG file. Text should be:
	  \convertMPtoPDF{foo.0}{1}{1}
	  It was missing parameters {1}{1}
	o Depth filter option -D was parsing range (e.g. 40:80) incorrectly
	  Fix from Justus Piater
	o C++ style comments "//" changed to "/* */" in genmp.c
	o Integer overflow in computing some spline steps
	o \pagestyle{empty} added for epic/eepic driver so it doesn't produce
	  unnecessary page number when LaTeXing

---------------------------------
Patchlevel 5-alpha4 (Feb 19, 2004)

NEW FEATURES
	o Many SVG driver enhancements from Martin Kroeker
	  (martin@ruby.chemie.uni-freiburg.de)
	o New features in EMF driver from ITOH Yasufumi:
	    support for locale text (if iconv() is available),
	    arc box, open arc, rotated ellipse, picture,
	    dash-triple-dotted line style, and all fill patterns.

BUGS FIXED
	o "cleandir" directive missing from doc/manual/Makefile
	o Added note about requiring dummy argument for -R option
	o SVG driver bug fixes: semicolon missing in CSS properties, multiline
	  string problem, width, height and viewbox attributes now relative to
	  figure bounds instead of pagesize. Fixes from Justus Piater.
	o Font info was put in the pstex file even when there were only special
	  texts.

---------------------------------
Patchlevel 5-alpha3 (Dec 9, 2003)

NEW FEATURES
	o Global option "-Z maxdim" to scale figure so that largest dimension
	  (width or height) is maxdim inches
	o Shapepar driver to generate shaped paragraphs for LaTeX (-L shape)
	  from Christian Gollwitzer
	o I18N support postscript file installation moved to fig2dev/dev
	  directory and installed with InstallNonExecFile (imake directive)
	o options -dAutoFilterColorImages=false and -dColorImageFilter=/FlateEncode
	  added to ghostscript call when exporting to pdf to improve image
	  quality during compression
	o "Epoch" added to rpm spec
	o New HP/GL2 driver from Glenn Burkhardt with paper size selection,
	  offset, centering and orientation options

BUGS FIXED
	o comments about BINDIR added to fig2dev/Imakefile and transfig/Imakefile
	  so user can easily change installation directory of both programs
	o MKDIRHIER used in Imakefile for installing support files instead of mkdir
	o commands like \\small used instead of SetFigFont for thick and thin
	  dots for LaTeX export
	  From Bo Thilde
	o removed typedefs of uint, ushort and ulong from genemf.h because
	  systems should already have those defined
	o SVG driver not mentioned in fig2dev.1 (.man)
	o shortened two fprintf calls in gensvg.c for HP-UX which can't handle
	  long strings
	o If an imported picture path points to some directory which is not the
	  current directory, and there exists a picture file of the same name in
	  the current directory, and the correct file is not compressed, fig2dev
	  would use the file in the current directory because it stripped off
	  the path first.  This was fixed by looking for the uncompressed name
	  first.
	o Color values should be divided by 255, not 256 to produce values from
	  0 to 1.0 in LaTeX, Tk and PostScript drivers, and readpng and readpcx
	  utilities
	o Increased precision of arc angles from %.1f to %.4f in PS/EPS/PDF
	  driver
	o Postscript support files now installed with r/w permissions only (was
	  r/w/x)
	o Metapost (mp) driver now generates all Fig styles of arrowheads
	  From Tim Braun
	o Bug in pic preamble - default font size either 0 or garbage
	o PDF not rotated anymore for landscape mode (similar to eps)
	o fontmag not set when magnification was read from Fig file
	o When there were only LaTeX special texts without backslashes (\) and
	  no other objects in the figure, a bounding box of 0 width was produced
	  for EPS, PS and PSTEX output.
	o Added ZLIBDIR variable in fig2dev/Imakefile to specify zlib directory
	  if different from standard location
	o pstex_t export lacked border option (-b) to align LaTeX text when
	  pstex figure specified border (also fixed in xfig Combined PS/LaTeX)
	o warnings in gentpic.c caused failure of gcc on hppa architecture under
	  Debian
	o cleaned up lots of implicit declarations of functions/procs
	o transfig: the "psfig" language was missing from the list of languages,
	  making things go out of sync past "ps".
	o transfig: "transfig -L pstex" was generating rules for ps not eps
	o slight margin added to text bounds
	o an incorrect printf specification (%d instead of %ld) in gemp.c
	o "#include <varargs.h>" no longer needed (and is unsupported by gcc 3.3)
	o Not a bug, really but a workaround for programs that generate Fig files
	  with arcs that have coincident start and end points with the intent
	  of making a circle (TCM apparently does this).  Without this
	  workaround, such arcs have the same start and end angle, which
	  ghostcript and probably other PostScript interpreters take to mean
	  "don't draw anything".  This fix adds 0.01 degrees to the end angle
	  if it is identical to the start angle.
	o Exporting a file with a picture containing a path with blanks failed
	o Incorrect ISO translation was:
	      "\\.S", /* latin capital letter S with dot above */
	  Should be:
	      "\\.Z", /* latin capital letter Z with dot above */
	o LaTeX: Correction to the ISO-8859-2 ogonek diacritic mark now uses \k
	  instead of cedilla (\c).  If the macro \k isn't defined in your
	  situation or you don't see the ogonek then define the macro: \def\k#1{\c{#1}}
	  before the \begin{document}.
	  From Jerzy Sobczyk
	o Bug in user-defined colors when exporting to CGM. If color numbers
	  weren't contiguous, e.g. 32, 34, then it couldn't find color 34.
	o glyphs in the Symbol font that have descenders weren't taken into
	  account when calculating text bounds
	o missing blue and extra brown color in LaTeX driver
	o \smash directive added back to text objects in eepic driver (was removed
	  in 3.2.4)
	o Quotes in FIG2DEV_LIBDIR definition (fig2dev/Imakefile) interferred when
	  using $DESTDIR
	o Comments not inserted in EMF output anymore (not valid in language)
	o float/int mixup in printf in pic driver for font size caused default
	  font size to be 0
	o bug in hp/gl (ibmgl) driver produced incorrect JCL code to enter HP/GL
	  mode when using -k option
	o point size factor changed from 72.27 to 72 points per inch as specified
	  by HP tech notes
	o change in 3.2.4 which included all "special" (LaTeX) texts in the
	  bounding box that don't have any backslashes ("\") in them failed to
	  take into account inline equations using the "$".  Now those special
	  texts are also excluded from the bounding box calculation.
	o various man page format errors fixed

7 files changed, 88 insertions, 98 deletions

diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 2514271101c..95beab3149f 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.28 2005/09/07 14:10:56 adam Exp $
+# $NetBSD: Makefile,v 1.29 2005/11/10 14:29:01 itohy Exp $
 
-DISTNAME=	transfig.3.2.4
-PKGNAME=	transfig-3.2.4
-PKGREVISION=	2
+DISTNAME=	transfig.3.2.5_alpha7
+PKGNAME=	transfig-3.2.5alpha7
 CATEGORIES=	graphics print
-MASTER_SITES=	ftp://epb.lbl.gov/xfig/
+MASTER_SITES=	ftp://epb.lbl.gov/xfig/alpha/
 
 MAINTAINER=	root@garbled.net
+HOMEPAGE=	http://www.xfig.org/
 COMMENT=	TeX document creation tool utilizing portable graphics
 
 USE_IMAKE=		yes
@@ -23,6 +23,9 @@ MAKE_ENV+=		DDA4="-DA4"
 USE_TOOLS+=		gmake
 .endif
 
+MAKE_ENV+=		ICONVLIBS="${BUILDLINK_LDADD.iconv}"
+
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/distinfo b/print/transfig/distinfo
index c001aa04fbb..465605323fd 100644
--- a/print/transfig/distinfo
+++ b/print/transfig/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.11 2005/09/07 14:10:56 adam Exp $
+$NetBSD: distinfo,v 1.12 2005/11/10 14:29:01 itohy Exp $
 
-SHA1 (transfig.3.2.4.tar.gz) = edfec1865dbfe9e7a06ae8be016f1a489b3d307d
-RMD160 (transfig.3.2.4.tar.gz) = 7b1238f3d36c6dc30033dca43348e3c7d3116610
-Size (transfig.3.2.4.tar.gz) = 326284 bytes
-SHA1 (patch-aa) = efc4eb298f4c5871432569c041226127ee0527c1
-SHA1 (patch-ab) = f1193557969ca7f6cc9d507710348d38dbfb7bf6
-SHA1 (patch-ac) = ac0823470d4de6df7bd5e3ff0f87decf8b4c44b8
-SHA1 (patch-ad) = b3a0d55eca4defbec4276f9aa4ce8f1352c3f1fb
-SHA1 (patch-ae) = 6afb961c66ce594ac9044fb74364998219669d3f
+SHA1 (transfig.3.2.5_alpha7.tar.gz) = f9d53b374a588c577f6a7a883e7b257f38146ec4
+RMD160 (transfig.3.2.5_alpha7.tar.gz) = 741f48df50f79c57850c699ce8801f71585a425f
+Size (transfig.3.2.5_alpha7.tar.gz) = 393797 bytes
+SHA1 (patch-aa) = 1b3db8fdb7b93a8dc8efbd31680a72793938f923
+SHA1 (patch-ac) = 0258794cf6f6d22d3355ed01c2cc89c7ee0088d4
+SHA1 (patch-ae) = d3d0eeb08083092f717525914c64e72c7ceaa1fd
diff --git a/print/transfig/patches/patch-aa b/print/transfig/patches/patch-aa
index cced14a1b7a..3dcf0fafe96 100644
--- a/print/transfig/patches/patch-aa
+++ b/print/transfig/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $
+$NetBSD: patch-aa,v 1.10 2005/11/10 14:29:01 itohy Exp $
 
---- fig2dev/Imakefile.orig	Thu Dec 19 10:33:44 2002
-+++ fig2dev/Imakefile
-@@ -20,13 +20,13 @@
+--- fig2dev/Imakefile.orig	Fri Oct 28 01:56:02 2005
++++ fig2dev/Imakefile	Wed Nov  9 22:49:57 2005
+@@ -34,7 +34,7 @@
  XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
  XCOMM and installed xfig.
  
@@ -10,15 +10,8 @@ $NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $
 +XFIGLIBDIR =	$(PROJECTROOT)/lib/X11/xfig
  
  XCOMM ******
- XCOMM If your system has the strerror() function (doesn't have sys_errlist) then
- XCOMM comment out NEED_STRERROR with an XCOMM comment.
- 
--NEED_STRERROR = -DNEED_STRERROR
-+XCOMM NEED_STRERROR = -DNEED_STRERROR
- 
- XCOMM The following probably only applies to Windows 9x/NT:
- XCOMM If your system can open files in text and binary modes and has the
-@@ -39,7 +39,7 @@
+ XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
+@@ -53,7 +53,7 @@
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -27,43 +20,57 @@ $NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $
  
  XCOMM ****************
  XCOMM Change RGB if necessary, to point to your rgb.txt color database
-@@ -61,7 +61,7 @@
- 
+@@ -76,7 +76,7 @@
  #ifdef USEPNG
  PNGLIBDIR = $(USRLIBDIR)
+ ZLIBDIR = $(USRLIBDIR)
 -PNGINC = -I/usr/include/X11
 +PNGINC = -I$(LOCALBASE)/include
  #endif
  
  XCOMM ****************
-@@ -73,11 +73,11 @@
- XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
- XCOMM
- 
--XCOMM #define USEXPM
-+#define USEXPM
+@@ -92,7 +92,19 @@
  
  #ifdef USEXPM
  XPMLIBDIR = $(USRLIBDIR)
 -XPMINC = -I/usr/include/X11
 +XPMINC = -I$(LOCALBASE)/include/X11
++#endif
++
++XCOMM ****************
++XCOMM Uncomment the #define for USEICONV if you want to use the iconv(3). If the
++XCOMM iconv(3) is in separate library (-liconv), define USELIBICONV too.
++
++#define USEICONV
++XCOMM #define USELIBICONV
++
++#ifdef USEICONV
++ICONVLIBDIR = $(USRLIBDIR)
++ICONVINC = -I$(LOCALBASE)/include
  #endif
  
  XCOMM ****************
-@@ -126,7 +126,7 @@
+@@ -141,8 +153,8 @@
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
 -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
+-I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
 +FIG2DEV_LIBDIR = $(PROJECTROOT)/lib/fig2dev
- I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
++I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR)
+ 
+ #endif /* I18N */
  
- install::
-@@ -158,12 +158,12 @@
+@@ -150,30 +162,37 @@
+ XCOMM *** You shouldn't have to change anything below this point ***
+ XCOMM **************************************************************
+ 
+-DIR_DEFS=	-DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\"
++DIR_DEFS=	-DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\" -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
  
  #ifdef USEPNG
  DUSEPNG = -DUSE_PNG
--PNGLIBS = -L$(PNGLIBDIR) -lpng -lz
+-PNGLIBS = -L$(PNGLIBDIR) -lpng -L$(ZLIBDIR) -lz
 +PNGLIBS = -Wl,-R$(LOCALBASE)/lib -L$(PNGLIBDIR) -lpng -lz
  #endif /* USEPNG */
  
@@ -73,13 +80,40 @@ $NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $
 +XPMLIBS = -Wl,-R$(XPMLIBDIR) -L$(XPMLIBDIR) -lXpm -lX11
  #endif /* USEXPM */
  
++#ifdef USEICONV
++DUSEICONV = -DUSE_ICONV
++#ifdef USELIBICONV
++ICONVLIBS = -L$(ICONVLIBDIR) -liconv
++#endif /* USELIBICONV */
++#endif /* USEICONV */
++
  #if defined(NOSTRSTR) 
-@@ -177,7 +177,7 @@
+ STRSTRC=	strstr.c
+ STRSTRO=	strstr.o
+ #endif /* defined(NOSTRSTR) */
+ 
+ DEFINES = $(NEED_STRERROR) $(HAVE_NO_STRCASECMP) $(HAVE_NO_STRNCASECMP) $(DDNFSS) $(USEINLINE) \
+-	$(I18N_DEFS) $(HAVE_SETMODE) $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC)
++	$(I18N_DEFS) $(HAVE_SETMODE) $(DUSEPNG) $(DUSEXPM) $(DUSEICONV) $(PNGINC) $(XPMINC) $(ICONVINC)
+ 
  
- IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM)
+-IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) $(I18N_DEV_DEFS) 
++IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) $(I18N_DEV_DEFS) $(DUSEICONV)
  
--DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
-+DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
+-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
++DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(DUSEICONV) $(PNGINC) $(XPMINC) $(ICONVINC) $(DDNFSS) $(DDA4) \
  		$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
  
  #define IHaveSubdirs
+@@ -189,9 +208,9 @@
+ 
+ LOCAL_LIBRARIES = $(LIBTRANSFIG)
+ #if defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
+-SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) -lm -lcompat
++SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) $(ICONVLIBS) -lm -lcompat
+ #else
+-SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) -lm
++SYS_LIBRARIES = $(PNGLIBS) $(XPMLIBS) $(ICONVLIBS) -lm
+ #endif
+ DEPLIBS = $(LIBTRANSFIG)
+ 
diff --git a/print/transfig/patches/patch-ab b/print/transfig/patches/patch-ab
deleted file mode 100644
index 931200a3f7f..00000000000
--- a/print/transfig/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/01/07 06:19:07 rh Exp $
-
---- fig2dev/dev/genemf.h.orig	Wed Dec 18 15:42:05 2002
-+++ fig2dev/dev/genemf.h
-@@ -27,7 +27,7 @@
- typedef unsigned char  uchar;
- typedef unsigned short TCHAR;
- 
--#ifndef __USE_MISC
-+#if !defined(__USE_MISC) && !defined(__NetBSD__)
- /* Old compatibility names for C types.  */
- typedef unsigned long int ulong;
- typedef unsigned short int ushort;
diff --git a/print/transfig/patches/patch-ac b/print/transfig/patches/patch-ac
index d5e06145275..1ffb36d9c59 100644
--- a/print/transfig/patches/patch-ac
+++ b/print/transfig/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2003/01/07 06:19:07 rh Exp $
+$NetBSD: patch-ac,v 1.4 2005/11/10 14:29:01 itohy Exp $
 
---- transfig/Imakefile.orig	Wed Dec 18 15:44:03 2002
-+++ transfig/Imakefile
-@@ -18,7 +18,7 @@
+--- transfig/Imakefile.orig	Wed Mar 26 05:52:37 2003
++++ transfig/Imakefile	Wed Nov  9 21:44:38 2005
+@@ -32,7 +32,7 @@
  XCOMM \\usepackage{} command for LaTeX2e. 
  XCOMM The default is to use \\documentstyle{} for LaTeX209.
  
 -XCOMM USELATEX2E = -DLATEX2E
 +USELATEX2E = -DLATEX2E
  
- XCOMM ******* DON'T CHANGE ANYTHIN BELOW THIS POINT *******
+ XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT *******
  
diff --git a/print/transfig/patches/patch-ad b/print/transfig/patches/patch-ad
deleted file mode 100644
index 2936b3f05ab..00000000000
--- a/print/transfig/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/10/18 13:20:32 cjep Exp $
---- fig2dev/dev/gensvg.c.orig	2002-12-18 23:38:18.000000000 +0100
-+++ fig2dev/dev/gensvg.c	2003-09-24 15:50:52.000000000 +0200
-@@ -692,16 +692,16 @@
-     if (t->angle != 0) {
- 	fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n",
- 		 (int) (t->base_x * mag), (int) (t->base_y * mag), degrees (t->angle));
--	fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"  font-family=\"%s\" 
--		 font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
-+	fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"  font-family=\"%s\" "
-+		 "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
- 		 rgbColorVal (t->color), family[(int) ceil ((t->font + 1) / 4)],
- 		 (t->font % 2 == 0 ? "normal" : "italic"),
- 		 (t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)),
- 		 anchor[t->type]);
-     }
-     else
--	fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  font-family=\"%s\" 
--		 font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
-+	fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  font-family=\"%s\" "
-+		 "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
- 		 (int) (t->base_x * mag), (int) (t->base_y * mag), rgbColorVal (t->color),
- 		 family[(int) ceil ((t->font + 1) / 4)],
- 		 (t->font % 2 == 0 ? "normal" : "italic"),
diff --git a/print/transfig/patches/patch-ae b/print/transfig/patches/patch-ae
index 5032eaef109..2df1baeaabc 100644
--- a/print/transfig/patches/patch-ae
+++ b/print/transfig/patches/patch-ae
@@ -1,16 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2005/09/07 14:10:57 adam Exp $
+$NetBSD: patch-ae,v 1.4 2005/11/10 14:29:01 itohy Exp $
 
---- fig2dev/fig2dev.h.orig	2002-12-18 22:45:28.000000000 +0000
-+++ fig2dev/fig2dev.h	2005-09-02 14:20:02.000000000 +0100
-@@ -22,7 +22,6 @@
- #include <sys/file.h>
- #include <signal.h>
- #include <string.h>
--#include <varargs.h>
- #include <pwd.h>
- #include <errno.h>
- #include <time.h>
-@@ -210,13 +209,14 @@
+--- fig2dev/fig2dev.h.orig	Wed Jul 16 01:21:12 2003
++++ fig2dev/fig2dev.h	Wed Nov  9 21:52:22 2005
+@@ -213,13 +213,14 @@
  #endif /* MAXPATHLEN */
  #endif /* PATH_MAX */