diff -ruN transfig.3.2.3d/fig2dev/Imakefile transfig.3.2.3d-patched/fig2dev/Imakefile
--- transfig.3.2.3d/fig2dev/Imakefile	2001-04-19 13:19:38.000000000 -0400
+++ transfig.3.2.3d-patched/fig2dev/Imakefile	2005-04-02 18:59:27.000000000 -0500
@@ -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 =	$(PREFIX)/share/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
@@ -65,8 +65,8 @@
 #define USEPNG
 
 #ifdef USEPNG
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/include/X11
+PNGLIBDIR = $(PREFIX)/lib
+PNGINC = -I$(PREFIX)/include
 #endif
 
 XCOMM ****************
@@ -78,11 +78,11 @@
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
 XCOMM
 
-XCOMM #define USEXPM
+#define USEXPM
 
 #ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = /usr/X11R6/lib
+XPMINC = -I/usr/X11R6/include/X11
 #endif
 
 XCOMM ****************
@@ -104,8 +104,8 @@
 
 #ifdef USEJPEG
 #ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11
+JPEGLIBDIR = $(PREFIX)/lib
+JPEGINCDIR = $(PREFIX)/include
 #else
 JPEGLIBDIR = ../jpeg
 JPEGINCDIR = $(JPEGLIBDIR)
@@ -134,7 +134,7 @@
 
 DDNFSS = -DNFSS
 DDLATEX2E_GRAPHICS = -DLATEX2E_GRAPHICS
-XCOMM DDEPSFIG = -DEPSFIG
+DDEPSFIG = -DEPSFIG
 
 XCOMM ****************
 XCOMM Comment out the DDDVIPS to NOT use dvips for the DVI-to-PostScript driver
@@ -158,11 +158,11 @@
 
 #ifdef I18N
 I18N_DEFS = -DI18N 
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
+FIG2DEV_LIBDIR = $(PREFIX)/lib/fig2dev
 I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
 
 install::
-	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR)
+	[ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir -p $(DESTDIR)$(FIG2DEV_LIBDIR)
 	$(INSTALL) -m 644 -c dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
 	( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \
 	  rm -f ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps; \
diff -ruN transfig.3.2.3d/fig2dev/dev/genepic.c transfig.3.2.3d-patched/fig2dev/dev/genepic.c
--- transfig.3.2.3d/fig2dev/dev/genepic.c	2000-07-11 17:50:28.000000000 -0400
+++ transfig.3.2.3d-patched/fig2dev/dev/genepic.c	2005-04-02 19:00:20.000000000 -0500
@@ -79,7 +79,7 @@
 ====================================================================*/
 
   
-#include <varargs.h>
+#include <stdarg.h>
 #include <ctype.h>
 #include "fig2dev.h"
 #include "object.h"
diff -ruN transfig.3.2.3d/fig2dev/fig2dev.h transfig.3.2.3d-patched/fig2dev/fig2dev.h
--- transfig.3.2.3d/fig2dev/fig2dev.h	2001-01-12 17:12:09.000000000 -0500
+++ transfig.3.2.3d-patched/fig2dev/fig2dev.h	2005-04-02 18:59:27.000000000 -0500
@@ -186,12 +186,12 @@
 #endif /* MAXPATHLEN */
 #endif /* PATH_MAX */
 
-#ifndef __NetBSD__
+#if ( !defined(__NetBSD__) && !defined(__DARWIN__))
 extern int		sys_nerr, errno;
 #endif
 
 #if ( !(defined(BSD) && (BSD >= 199306)) && !defined(__NetBSD__) && \
-	!defined(__GNU_LIBRARY__) && !defined(__FreeBSD__) && !defined(__GLIBC__))
+	!defined(__GNU_LIBRARY__) && !defined(__FreeBSD__) && !defined(__GLIBC__) && !defined(__DARWIN__))
 	    extern char *sys_errlist[];
 #endif
 
diff -ruN transfig.3.2.3d/transfig/Imakefile transfig.3.2.3d-patched/transfig/Imakefile
--- transfig.3.2.3d/transfig/Imakefile	2001-03-21 14:32:22.000000000 -0500
+++ transfig.3.2.3d-patched/transfig/Imakefile	2005-04-02 18:59:27.000000000 -0500
@@ -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 *******