Update transfig to 3.2.4. Provided in PR pkg/19659 by Jim Bernard

<jbernard@mines.edu>

Changes include tons of bugfixes plus the following new features:

	o SVG (Scalable Vector Graphics) driver
	o ASCII and Binary (TIFF) preview bitmap options for PostScript
	o JPEG encoding (DCT) now used for EPS/PostScript output.
	o Background (-g) option for tk export honored now
	o Additional JPEG file format (EXIF) added. These usually come from
	  digital cameras.
	o -N Option to convert colors to grayscale on export.
	o -b option for CGM export to produce binary CGM using ralcgm.
	o Translations of LATEX.AND.XFIG document into two popular Chinese
	  encodings (GB2312 and Big5).
	o The default for multi-page output (PostScript) is to NOT overlap
          pages now.  This is to allow multiple, independent pages of
          figures.  The -O option has been added to force page overlap.
	o Added EMF (Enhanced MetaFile) conversion genemf.c
	o New grid option (-G) to draw grid on page.
	o Perk/Tk driver from Slaven Rezic (rezic@onlineoffice.de)
	o Added options -B and -R to the EPS driver.
	o New PostScript DSC directives to specify page size.
	o fig2dev now includes all "special" (LaTeX) texts that don't have
          any backslashes ("\") in them in the bounding box.
	o genepic and genpictex drivers updated for I18N
	o Glyphs for Hungarian, Polish, Romanian, Slovak and Slovenian
	  are essentially the same as Czech (ISO-Latin 2) so symbolic
          links are created for those .ps files
	o fig2dev prepends any path included in the .fig filename to
          imported image file paths (only if imported image path isn't
          already absolute).
	o transfig now reports when it is renaming an existing makefile
          or TeX macro file to a backup (e.g. Makefile to Makefile~)
	o now uses Thomas Merz' jpeg2ps for imported jpeg files when
          exporting to PS/EPS.  This is much more compact than the
          runlength encoding which is used for other bitmaps.
	o New option for binary CGM export.
	o New -E option to set encoding for pictex, latex, pstex_t and epic
	  text to ISO8859-1 (the default) or ISO8859-2
	o Added "install.all" option to make to install man pages in
          addition to executables etc.
	o If output file ends in ".fig", fig2dev prints error message to
          stderr and exits.
	o New encoding option (-E) for ISO-8859-1 or ISO-8859-2
	o Exporting to tk now supports imported PPM images in addition to
          GIF and XPM
	o Comments added to EPS and PostScript output so MetaPost can
          group parts of figure according to depths.
	o New -F, -R and -t options for epic output

7 files changed, 93 insertions, 66 deletions

diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 7ff6daf20a3..358284e0eaa 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2002/10/08 13:17:09 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/01/07 06:19:05 rh Exp $
 #
 
-DISTNAME=		transfig.3.2.3d
-PKGNAME=		transfig-3.2.3.4
-PKGREVISION=		1
-WRKSRC=			${WRKDIR}/${DISTNAME}
+DISTNAME=		transfig.3.2.4
+PKGNAME=		transfig-3.2.4
 CATEGORIES=		graphics print
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/drawing_tools/transfig/} \
-			ftp://www-epb.lbl.gov/xfig/
+			ftp://epb.lbl.gov/xfig/
 
 MAINTAINER=		root@garbled.net
 COMMENT=		TeX document creation tool utilizing portable graphics
@@ -15,7 +13,13 @@ COMMENT=		TeX document creation tool utilizing portable graphics
 USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
 
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../mk/bsd.prefs.mk"
+
+# A default paper size is used only in the IBM-GL/HP-GL driver:
+.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
+MAKE_ENV+=		DDA4="-DA4"
+.endif
+
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 
diff --git a/print/transfig/PLIST b/print/transfig/PLIST
index 99c781f6946..930ad3f0f67 100644
--- a/print/transfig/PLIST
+++ b/print/transfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:28:13 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/07 06:19:05 rh Exp $
 bin/fig2dev
 bin/fig2ps2tex
 bin/fig2ps2tex.sh
@@ -25,9 +25,9 @@ lib/X11/xfig/bitmaps/octagons.bmp
 lib/X11/xfig/bitmaps/p13.bmp
 lib/X11/xfig/bitmaps/right30.bmp
 lib/X11/xfig/bitmaps/right45.bmp
+lib/X11/xfig/bitmaps/sp0.bmp
 lib/X11/xfig/bitmaps/rightshingle.bmp
 lib/X11/xfig/bitmaps/small_fishscales.bmp
-lib/X11/xfig/bitmaps/sp0.bmp
 lib/X11/xfig/bitmaps/sp1.bmp
 lib/X11/xfig/bitmaps/sp10.bmp
 lib/X11/xfig/bitmaps/sp11.bmp
@@ -53,18 +53,24 @@ lib/X11/xfig/bitmaps/vert_leftshingle.bmp
 lib/X11/xfig/bitmaps/vert_rightshingle.bmp
 lib/X11/xfig/bitmaps/vert_saw.bmp
 lib/X11/xfig/bitmaps/vertical.bmp
-lib/fig2dev/cs_CZ.ps
+lib/fig2dev/japanese.ps
 lib/fig2dev/ja.ps
-lib/fig2dev/ja_JP.EUC.ps
-lib/fig2dev/ja_JP.eucJP.ps
 lib/fig2dev/ja_JP.ps
 lib/fig2dev/ja_JP.ujis.ps
-lib/fig2dev/japanese.ps
+lib/fig2dev/ja_JP.eucJP.ps
+lib/fig2dev/ja_JP.EUC.ps
+lib/fig2dev/korean.ps
 lib/fig2dev/ko.ps
-lib/fig2dev/ko_KR.EUC.ps
-lib/fig2dev/ko_KR.eucKR.ps
 lib/fig2dev/ko_KR.ps
-lib/fig2dev/korean.ps
+lib/fig2dev/ko_KR.eucKR.ps
+lib/fig2dev/ko_KR.EUC.ps
+lib/fig2dev/cs_CZ.ps
+lib/fig2dev/hr_HR.ps
+lib/fig2dev/hu_HU.ps
+lib/fig2dev/ro_RO.ps
+lib/fig2dev/pl_PL.ps
+lib/fig2dev/sk_SK.ps
+lib/fig2dev/sl_SI.ps
 man/cat1/fig2dev.0
 man/cat1/fig2ps2tex.0
 man/cat1/pic2tpic.0
diff --git a/print/transfig/buildlink2.mk b/print/transfig/buildlink2.mk
new file mode 100644
index 00000000000..1820b38c3b3
--- /dev/null
+++ b/print/transfig/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/01/07 06:19:05 rh Exp $
+#
+# This Makefile fragment is included by packages that use transfig.
+#
+
+.if !defined(TRANSFIG_BUILDLINK2_MK)
+TRANSFIG_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			transfig
+BUILDLINK_DEPENDS.transfig?=		transfig>=3.2.4
+BUILDLINK_PKGSRCDIR.transfig?=		../../print/transfig
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.transfig=transfig
+BUILDLINK_PREFIX.transfig_DEFAULT=	${X11PREFIX}
+
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	transfig-buildlink
+
+transfig-buildlink: _BUILDLINK_USE
+
+.endif	# TRANSFIG_BUILDLINK2_MK
diff --git a/print/transfig/distinfo b/print/transfig/distinfo
index 3c112018b2b..bf52a0a85b5 100644
--- a/print/transfig/distinfo
+++ b/print/transfig/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/10/08 13:14:02 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/01/07 06:19:06 rh Exp $
 
-SHA1 (transfig.3.2.3d.tar.gz) = b3e1e27b3115b18ba5dbd8db5d68415c3b7aa7a6
-Size (transfig.3.2.3d.tar.gz) = 256075 bytes
-SHA1 (patch-aa) = 3b5e16766248d977786ae9f6d0c466a9b79962fe
-SHA1 (patch-ab) = 348f734c3213abf73fbdd5f7d73b76484aae2b7a
+SHA1 (transfig.3.2.4.tar.gz) = edfec1865dbfe9e7a06ae8be016f1a489b3d307d
+Size (transfig.3.2.4.tar.gz) = 326284 bytes
+SHA1 (patch-aa) = efc4eb298f4c5871432569c041226127ee0527c1
+SHA1 (patch-ab) = f1193557969ca7f6cc9d507710348d38dbfb7bf6
+SHA1 (patch-ac) = ac0823470d4de6df7bd5e3ff0f87decf8b4c44b8
diff --git a/print/transfig/patches/patch-aa b/print/transfig/patches/patch-aa
index 06592d59b40..cced14a1b7a 100644
--- a/print/transfig/patches/patch-aa
+++ b/print/transfig/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $
 
---- fig2dev/Imakefile.orig	Thu Apr 19 19:19:38 2001
+--- fig2dev/Imakefile.orig	Thu Dec 19 10:33:44 2002
 +++ fig2dev/Imakefile
-@@ -28,13 +28,13 @@
+@@ -20,13 +20,13 @@
  XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
- XCOMM and installed xfig.  This will be made automatic in the future.
+ XCOMM and installed xfig.
  
 -XFIGLIBDIR =	/usr/local/lib/X11/xfig
 +XFIGLIBDIR =	$(PROJECTROOT)/lib/X11/xfig
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $
  
  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
-@@ -47,7 +47,7 @@
+@@ -39,7 +39,7 @@
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $
  
  XCOMM ****************
  XCOMM Change RGB if necessary, to point to your rgb.txt color database
-@@ -66,7 +66,7 @@
+@@ -61,7 +61,7 @@
  
  #ifdef USEPNG
  PNGLIBDIR = $(USRLIBDIR)
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $
  #endif
  
  XCOMM ****************
-@@ -78,11 +78,11 @@
+@@ -73,11 +73,11 @@
  XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
  XCOMM
  
@@ -50,18 +50,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $
  #endif
  
  XCOMM ****************
-@@ -104,8 +104,8 @@
- 
- #ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
--JPEGLIBDIR = /usr/local/lib
--JPEGINCDIR = /usr/include/X11
-+JPEGLIBDIR = $(LOCALBASE)/lib
-+JPEGINCDIR = $(LOCALBASE)/include
- #else
- JPEGLIBDIR = ../jpeg
- JPEGINCDIR = $(JPEGLIBDIR)
-@@ -158,7 +158,7 @@
+@@ -126,7 +126,7 @@
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
@@ -70,7 +59,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $
  I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
  
  install::
-@@ -189,12 +189,12 @@
+@@ -158,12 +158,12 @@
  
  #ifdef USEPNG
  DUSEPNG = -DUSE_PNG
@@ -82,24 +71,15 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $
  DUSEXPM = -DUSE_XPM
 -XPMLIBS = -L$(XPMLIBDIR) -lXpm -lX11
 +XPMLIBS = -Wl,-R$(XPMLIBDIR) -L$(XPMLIBDIR) -lXpm -lX11
- #endif
+ #endif /* USEXPM */
  
  #if defined(NOSTRSTR) 
-@@ -207,7 +207,7 @@
- JPEGINC = -I$(JPEGINCDIR)
- 
- #ifdef USEINSTALLEDJPEG
--JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
-+JPEGLIB = -Wl,-R$(LOCALBASE)/lib -L$(JPEGLIBDIR) -ljpeg
- #else
- JPEGCONF = configure
- JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
-@@ -218,7 +218,7 @@
+@@ -177,7 +177,7 @@
  
- IMAKE_DEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM)
+ IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM)
  
--DEVDEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) $(XPMINC) $(JPEGINC) $(DDNFSS) $(DDA4) \
-+DEVDEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(JPEGINC) $(DDNFSS) $(DDA4) \
+-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
++DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \
  		$(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS)
  
  #define IHaveSubdirs
diff --git a/print/transfig/patches/patch-ab b/print/transfig/patches/patch-ab
index 91a508c0fe1..931200a3f7f 100644
--- a/print/transfig/patches/patch-ab
+++ b/print/transfig/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2001/08/06 15:41:14 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2003/01/07 06:19:07 rh Exp $
 
---- transfig/Imakefile.orig	Wed Mar 21 12:32:22 2001
-+++ transfig/Imakefile
-@@ -26,7 +26,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 *******
+--- 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
new file mode 100644
index 00000000000..d5e06145275
--- /dev/null
+++ b/print/transfig/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2003/01/07 06:19:07 rh Exp $
+
+--- transfig/Imakefile.orig	Wed Dec 18 15:44:03 2002
++++ transfig/Imakefile
+@@ -18,7 +18,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 *******
+