--- ./Imakefile	Thu Dec 19 12:57:11 2002
+++ ../xfig.3.2.4/./Imakefile	Fri Jun  6 12:34:27 2003
@@ -41,15 +41,15 @@
 XCOMM different tree than the "correct" tree that your X system expects. The usual
 XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
 
-XCOMM BINDIR = /usr/bin/X11
+BINDIR = /usr/freeware/bin
 XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier
-XCOMM XAPPLOADDIR = /home/user/xfig
+XAPPLOADDIR = /usr/freeware/lib/X11/app-defaults
 
 XCOMM Redefine the following if your PNG library and/or include file
 XCOMM are in different places
 
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/local/include
+PNGLIBDIR = $(ROOT)/usr/freeware/lib32
+PNGINC = -I$(ROOT)/usr/freeware/include
 
 XCOMM If don't want JPEG support, comment out the #define USEJPEG line
 XCOMM Uncomment the #define for USEJPEG if you want to be able to import
@@ -68,8 +68,8 @@
 
 #ifdef USEJPEG
 #ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINC = -I/usr/include/X11
+JPEGLIBDIR = $(ROOT)/usr/freeware/lib32
+JPEGINC = -I$(ROOT)/usr/freeware/include
 #else
 JPEGLIBDIR = ../jpeg
 JPEGINC = -I$(JPEGLIBDIR)
@@ -87,12 +87,12 @@
 XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
 
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
 
 #ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = $(ROOT)/usr/freeware/lib32
+XPMINC = -I$(ROOT)/usr/freeware/include/X11
 #endif
 
 XCOMM Uncomment the following definiton if you want to use the small icons
@@ -105,10 +105,10 @@
 XCOMM Then be sure to change the XAW3DINC to point to the directory where your
 XCOMM 3D Athena widget headers are located
 
-XCOMM #define XAW3D
+#define XAW3D
 
 #ifdef XAW3D
-XAW3DINC = -I/usr/include/X11/Xaw3d
+XAW3DINC = -I$(ROOT)/usr/freeware/include/X11/Xaw3d
 DUSEXAW3D = -DXAW3D
 XAWLIB = -lXaw3d
 #endif
@@ -154,19 +154,19 @@
 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 use (and change) the following if you want the multi-key data base file
 XCOMM somewhere other than the standard X11 library directory
 XCOMM be sure to comment out the second copy of XFIGLIBDIR if you use this one
-XCOMM XFIGLIBDIR = /usr/local/lib/xfig
+XFIGLIBDIR = /usr/freeware/lib/xfig
 
 XCOMM use this if you want the multi-key data base file in the standard X11 tree
-XFIGLIBDIR = $(LIBDIR)/xfig
+XCOMM XFIGLIBDIR = $(LIBDIR)/xfig
 
 XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
 XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/share/doc/xfig
+XFIGDOCDIR = /usr/freeware/doc/xfig
 
 XCOMM MANDIR tells where the standard man pages should go (no need to change it
 XCOMM if you want the man pages installed in the standard place on your system
--- ./Fig.ad	Wed Dec 18 19:05:41 2002
+++ ../xfig.3.2.4/./Fig.ad	Fri Jun  6 13:55:27 2003
@@ -11,7 +11,8 @@
 Fig*AllowShellResize: false
 
 ! Image editor - can edit imported image
-Fig.image_editor:		xv
+!Fig.image_editor:		xv
+Fig.image_editor:		gimp
 
 ! name of ghostscript (not ghostview)
 Fig.ghostscript:		gs
@@ -21,15 +22,17 @@
 ! For netscape, this command will open the help pages in a running netscape,
 !     or start a new netscape if one isn't already running
 Fig.browser:	netscape -remote 'openFile(%f)' || netscape %f
+!Fig.browser:	mozilla -remote 'openFile(%f)' || mozilla %f
 
 ! pdfviewer - put your favorite pdf viewer here.  
 !		This is for viewing the xfig how-to guide and man pages
 Fig.pdfviewer:			acroread %f
+!Fig.pdfviewer:			xpdf %f
 
 ! Spell check program - put your favorite spelling check program here.
 !		It must write the misspelled words to standard output.
-
 Fig.spellcheckcommand:	spell %f
+!Fig.spellcheckcommand:	ispell %f
 
 ! delay before spinner automatically counts when pressed (milliseconds)
 Fig.spinner_delay:		1000
--- ./e_measure.c	Fri Nov  8 17:17:46 2002
+++ ../xfig.3.2.4/./e_measure.c	Fri Jun  6 12:22:05 2003
@@ -24,6 +24,7 @@
 #include "w_canvas.h"
 #include "w_mousefun.h"
 #include "w_setup.h"
+#include "w_msgpanel.h"		/* for put_msg() prototype */
 
 /* Measuring angles, lengths and areas */