Update to 3.2.3d (3.2.3.4) provided by Jim Bernard in pkg/13324.

Major changes since 3.2.3:
o X11 Color database ASCII file (/usr/lib/X11/rgb.txt) is now used,
  removing the need for the dbm_xxx functions.
o The \special code for colors in genlatex (LaTeX driver) replaced with
  the \color code to be compatible with pdflatex and not require dvips
  From Klaus Guntermann (guntermann@iti.informatik.tu-darmstadt.de)
o PCX image reader now handles 24-bit color which means that TIFF images
  (which are converted to PCX first) may also be 24-bit
o MetaPost driver (-L mp or -L mmp) ported from fig2MP by Klaus
  Guntermann (guntermann@iti.informatik.tu-darmstadt.de).  fig2MP was
  written by Dane Dwyer (dwyer@geisel.csl.uiuc.edu)
o Support for importing PNG image files added
o Transparent color in imported GIF files now honored
o You may use "-M -" to send the Makefile output to standard output from
  TransFig, and "-T -" to send the Texfile to standard output.
o (The following feature was really added in 3.2.3, but I forgot to update
  this file): -S option added for smoothing bitmap output.
o eps added as a language for TransFig
o Support for Czech font encoding for PostScript (cs_CZ.ps)
  From Radim Gelner <gelnerr@suse.cz>
And lots of bugfixes.
Package change: buildlinkified.

6 files changed, 89 insertions, 74 deletions

diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 9edaaa76c5e..b6a85102dcc 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2001/02/17 17:51:58 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/06 15:41:13 wiz Exp $
 #
 
-DISTNAME=		transfig.3.2.3
-PKGNAME=		transfig-3.2.3
+DISTNAME=		transfig.3.2.3d
+PKGNAME=		transfig-3.2.3.4
 WRKSRC=			${WRKDIR}/${DISTNAME}
 CATEGORIES=		graphics print
-MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/drawing_tools/transfig/}
+MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/drawing_tools/transfig/} \
+			ftp://www-epb.lbl.gov/xfig/
 
 MAINTAINER=		root@garbled.net
 COMMENT=		TeX document creation tool utilizing portable graphics
 
-DEPENDS+=		jpeg-6b:../../graphics/jpeg
-
 USE_IMAKE=		YES
-USE_XPM=		YES
 
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/distinfo b/print/transfig/distinfo
index b774432eab6..2dce844588c 100644
--- a/print/transfig/distinfo
+++ b/print/transfig/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:41:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/06 15:41:14 wiz Exp $
 
-SHA1 (transfig.3.2.3.tar.gz) = 3b8c59c2dec59565c73e10404d10db5733cd8f53
-Size (transfig.3.2.3.tar.gz) = 239280 bytes
-SHA1 (patch-aa) = 33cf460111e37068662aaf3ccc791282ca1e8b8d
-SHA1 (patch-ab) = 5aa077b2e3a2e424130fa03f03e7f410718517eb
-SHA1 (patch-ac) = ee7b0ef77fd60daa756c9730b7fcdfc5ced6d089
+SHA1 (transfig.3.2.3d.tar.gz) = b3e1e27b3115b18ba5dbd8db5d68415c3b7aa7a6
+Size (transfig.3.2.3d.tar.gz) = 256075 bytes
+SHA1 (patch-aa) = be3fcd0cf7e8ef6e4be11141ca98c711a6905060
+SHA1 (patch-ab) = 348f734c3213abf73fbdd5f7d73b76484aae2b7a
diff --git a/print/transfig/patches/patch-aa b/print/transfig/patches/patch-aa
index 01eac97b076..3c65e246a89 100644
--- a/print/transfig/patches/patch-aa
+++ b/print/transfig/patches/patch-aa
@@ -1,17 +1,42 @@
-$NetBSD: patch-aa,v 1.5 2000/06/22 08:11:35 itohy Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/06 15:41:14 wiz Exp $
 
---- fig2dev/Imakefile.orig	Fri Jan 14 12:59:04 2000
-+++ fig2dev/Imakefile	Thu Jun 22 00:01:06 2000
-@@ -27,7 +27,7 @@
+--- fig2dev/Imakefile.orig	Thu Apr 19 19:19:38 2001
++++ fig2dev/Imakefile
+@@ -28,13 +28,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.
  
 -XFIGLIBDIR =	/usr/local/lib/X11/xfig
 +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.
-@@ -54,11 +54,11 @@
+ 
+-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
+@@ -47,7 +47,7 @@
+ XCOMM inline functions. With the "INLINE" keyword, you should notice that
+ XCOMM the display will be a bit faster in complex figures
+ 
+-XCOMM USEINLINE = -DUSE_INLINE
++USEINLINE = -DUSE_INLINE
+ 
+ XCOMM ****************
+ XCOMM Change RGB if necessary, to point to your rgb.txt color database
+@@ -66,7 +66,7 @@
+ 
+ #ifdef USEPNG
+ PNGLIBDIR = $(USRLIBDIR)
+-PNGINC = -I/usr/include/X11
++PNGINC = -I$(BUILDLINK_DIR)/include
+ #endif
+ 
+ XCOMM ****************
+@@ -78,11 +78,11 @@
  XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
  XCOMM
  
@@ -21,54 +46,60 @@ $NetBSD: patch-aa,v 1.5 2000/06/22 08:11:35 itohy Exp $
  #ifdef USEXPM
  XPMLIBDIR = $(USRLIBDIR)
 -XPMINC = -I/usr/include/X11
-+XPMINC = -I$(INCDIR)/X11
++XPMINC = -I$(BUILDLINK_DIR)/include/X11
  #endif
  
- XCOMM For Linux machines or any machines that have a separate library for
-@@ -87,8 +87,8 @@
+ XCOMM ****************
+@@ -104,8 +104,8 @@
  
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
 -JPEGLIBDIR = /usr/local/lib
 -JPEGINCDIR = /usr/include/X11
-+JPEGLIBDIR = $(LOCALBASE)/lib
-+JPEGINCDIR = $(LOCALBASE)/include
++JPEGLIBDIR = $(BUILDLINK_DIR)/lib
++JPEGINCDIR = $(BUILDLINK_DIR)/include
  #else
  JPEGLIBDIR = ../jpeg
  JPEGINCDIR = $(JPEGLIBDIR)
-@@ -127,12 +127,12 @@
- 
- XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
- 
--XCOMM #define I18N
-+#define I18N
+@@ -158,7 +158,7 @@
  
  #ifdef I18N
  I18N_DEFS = -DI18N 
 -FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
--I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"/usr/local/lib/fig2dev\"'
 +FIG2DEV_LIBDIR = $(PROJECTROOT)/lib/fig2dev
-+I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR='\"$(FIG2DEV_LIBDIR)\"'
+ I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
  
  install::
- 	[ -d $(FIG2DEV_LIBDIR) ] || mkdir $(FIG2DEV_LIBDIR)
-@@ -177,8 +177,8 @@
- DUSEJPEG = -DUSE_JPEG
+@@ -189,12 +189,12 @@
+ 
+ #ifdef USEPNG
+ DUSEPNG = -DUSE_PNG
+-PNGLIBS = -L$(PNGLIBDIR) -lpng -lz
++PNGLIBS = -Wl,-R$(PNGLIBDIR) -L$(PNGLIBDIR) -lpng -lz
+ #endif /* USEPNG */
+ 
+ #ifdef USEXPM
+ DUSEXPM = -DUSE_XPM
+-XPMLIBS = -L$(XPMLIBDIR) -lXpm -lX11
++XPMLIBS = -Wl,-R$(XPMLIBDIR) -L$(XPMLIBDIR) -lXpm -lX11
+ #endif
+ 
+ #if defined(NOSTRSTR) 
+@@ -207,7 +207,7 @@
+ JPEGINC = -I$(JPEGINCDIR)
  
  #ifdef USEINSTALLEDJPEG
--JPEGLIBDIR = /usr/local/lib
 -JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
-+JPEGLIBDIR = $(LOCALBASE)/lib
 +JPEGLIB = -Wl,-R$(JPEGLIBDIR) -L$(JPEGLIBDIR) -ljpeg
  #else
- XCOMM this is relative to this directory (transfig/fig2dev)
- JPEGLIBDIR = ../../jpeg-6a
-@@ -189,7 +189,7 @@
+ JPEGCONF = configure
+ JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
+@@ -218,7 +218,7 @@
  
- #endif /* USEJPEG */
+ IMAKE_DEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM)
  
--IMAKE_DEFINES = $(DUSEJPEG) $(DUSEXPM)
-+IMAKE_DEFINES = $(DUSEJPEG) $(DJPEGINC) $(DUSEXPM)
- 
- DEVDEFINES = $(DUSEJPEG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \
+-DEVDEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) $(XPMINC) $(JPEGINC) $(DDNFSS) $(DDA4) \
++DEVDEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(JPEGINC) $(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 d64cc1de575..91a508c0fe1 100644
--- a/print/transfig/patches/patch-ab
+++ b/print/transfig/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2000/06/22 08:13:14 itohy Exp $
+$NetBSD: patch-ab,v 1.2 2001/08/06 15:41:14 wiz Exp $
 
---- fig2dev/dev/Imakefile.orig	Thu Jan  6 03:30:09 2000
-+++ fig2dev/dev/Imakefile	Thu Jun 22 00:03:53 2000
-@@ -22,7 +22,7 @@
- XCOMM the party supplying this software to the X Consortium.
+--- 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.
  
- INCLUDES = -I.. -I../..
--#ifdef JPEGINCDIR
-+#ifdef USE_JPEG
- JPEGINC = -I$(JPEGINCDIR)
- #endif
+-XCOMM USELATEX2E = -DLATEX2E
++USELATEX2E = -DLATEX2E
+ 
+ XCOMM ******* DON'T CHANGE ANYTHIN BELOW THIS POINT *******
  
diff --git a/print/transfig/patches/patch-ac b/print/transfig/patches/patch-ac
deleted file mode 100644
index a33937697a4..00000000000
--- a/print/transfig/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/07/03 23:58:06 itohy Exp $
-
-PS/LaTeX fix from the author of transfig.
-This will be included in future releases.
-
---- fig2dev/dev/genpstex.c.orig	Wed Jan 12 10:15:26 2000
-+++ fig2dev/dev/genpstex.c	Mon Jun 12 12:30:21 2000
-@@ -136,7 +136,7 @@
- 	gendev_null,
- 	genpstex_t_text,
- 	genlatex_end,
--	EXCLUDE_TEXT
-+	INCLUDE_TEXT
- };
- 
- struct driver dev_pstex = {
diff --git a/print/transfig/pkg/PLIST b/print/transfig/pkg/PLIST
index 9b8bcc8a8cf..5dc8092aaf0 100644
--- a/print/transfig/pkg/PLIST
+++ b/print/transfig/pkg/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2000/06/22 08:11:36 itohy Exp $
-bin/transfig
+@comment $NetBSD: PLIST,v 1.4 2001/08/06 15:41:15 wiz Exp $
 bin/fig2dev
 bin/fig2ps2tex
 bin/fig2ps2tex.sh
 bin/pic2tpic
+bin/transfig
 lib/X11/xfig/bitmaps/bricks.bmp
 lib/X11/xfig/bitmaps/circles.bmp
 lib/X11/xfig/bitmaps/crosshatch.bmp
@@ -53,6 +53,7 @@ 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/ja.ps
 lib/fig2dev/ja_JP.EUC.ps
 lib/fig2dev/ja_JP.eucJP.ps
@@ -63,12 +64,11 @@ lib/fig2dev/ko.ps
 lib/fig2dev/ko_KR.EUC.ps
 lib/fig2dev/ko_KR.eucKR.ps
 lib/fig2dev/ko_KR.ps
-lib/fig2dev/ko_KR.ujis.ps
 lib/fig2dev/korean.ps
 man/cat1/fig2dev.0
 man/cat1/fig2ps2tex.0
 man/cat1/pic2tpic.0
 man/cat1/transfig.0
-@dirrm lib/X11/xfig/bitmaps
 @dirrm lib/fig2dev
+@dirrm lib/X11/xfig/bitmaps
 @dirrm lib/X11/xfig