*** xfig.3.2.5.orig/Imakefile	Mon Apr  7 13:25:26 2008
--- xfig.3.2.5/Imakefile	Fri Sep  5 19:30:16 2008
***************
*** 31,37 ****
  XCOMM for it relative to the BINDIR variable.
  XCOMM
! BINDIR = /usr/bin
  XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
! MKDIRHIER = mkdirhier 
  
  XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
--- 31,37 ----
  XCOMM for it relative to the BINDIR variable.
  XCOMM
! BINDIR = /opt/xfig-3.2.5/bin
  XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
! MKDIRHIER = /bin/sh /usr/openwin/bin/mkdirhier
  
  XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
***************
*** 46,50 ****
  XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
  
! XCOMM XAPPLOADDIR = /home/user/xfig
  
  XCOMM Uncomment the following definition for XAW3D if you want to use
--- 46,50 ----
  XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
  
! XAPPLOADDIR = //opt/xfig-3.2.5/app-defaults
  
  XCOMM Uncomment the following definition for XAW3D if you want to use
***************
*** 65,70 ****
      XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
  #   ifdef XAW3D
! 	DUSEXAW3D = -DXAW3D
! 	XAWLIB = -lXaw3d
  #   endif /* XAW3D */
  #endif /* XAW3D1_5E */
--- 65,70 ----
      XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
  #   ifdef XAW3D
! 	DUSEXAW3D = -I/opt/sfw/include -DXAW3D
! 	XAWLIB = -R/opt/sfw/lib -L/opt/sfw/lib -lXaw3d
  #   endif /* XAW3D */
  #endif /* XAW3D1_5E */
***************
*** 73,78 ****
  XCOMM are in different places
  
! PNGLIBDIR = $(USRLIBDIR)
! PNGINC = -I/usr/local/include
  ZLIBDIR = $(USRLIBDIR)
  
--- 73,78 ----
  XCOMM are in different places
  
! PNGLIBDIR = /usr/lib
! PNGINC = -I/usr/include
  ZLIBDIR = $(USRLIBDIR)
  
***************
*** 94,99 ****
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
! JPEGLIBDIR = /usr/local/lib
! JPEGINC = -I/usr/include/X11
  #else
  JPEGLIBDIR = ../jpeg
--- 94,99 ----
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
! JPEGLIBDIR = /usr/lib
! JPEGINC = -I/usr/include
  #else
  JPEGLIBDIR = ../jpeg
***************
*** 117,122 ****
  
  #ifdef USEXPM
! XPMLIBDIR = /usr/local/lib
! XPMINC = -I/usr/local/include/X11
  #endif
  
--- 117,122 ----
  
  #ifdef USEXPM
! XPMLIBDIR = /usr/lib
! XPMINC = -I/usr/include/X11
  #endif
  
***************
*** 167,175 ****
  
  XCOMM use this if you want the multi-key data base file in the standard X11 tree
! XFIGLIBDIR = $(LIBDIR)/xfig
  
  XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
  XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
! XFIGDOCDIR = /usr/local/xfig/doc
  
  XCOMM MANDIR tells where the standard man pages should go (no need to change it
--- 167,175 ----
  
  XCOMM use this if you want the multi-key data base file in the standard X11 tree
! XFIGLIBDIR = /opt/xfig-3.2.5/lib
  
  XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
  XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
! XFIGDOCDIR = /opt/xfig-3.2.5/doc
  
  XCOMM MANDIR tells where the standard man pages should go (no need to change it
***************
*** 176,180 ****
  XCOMM if you want the man pages installed in the standard place on your system
  XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
! MANDIR = /usr/local/xfig/man
  
  XCOMM If your system doesn't have strstr undefine the following definition
--- 176,180 ----
  XCOMM if you want the man pages installed in the standard place on your system
  XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
! MANDIR = /opt/xfig-3.2.5/man/man1
  
  XCOMM If your system doesn't have strstr undefine the following definition
*** xfig.3.2.5.orig/u_quartic.c	Mon Apr  7 14:00:19 2008
--- xfig.3.2.5/u_quartic.c	Fri Sep  5 19:27:25 2008
***************
*** 21,24 ****
--- 21,27 ----
  #include <math.h>
  
+ #ifndef M_PI
+ # define M_PI 3.14159265358979323846
+ #endif
  
  static int
*** xfig.3.2.5.orig/w_keyboard.c	Mon Apr  7 14:04:47 2008
--- xfig.3.2.5/w_keyboard.c	Fri Sep  5 19:27:25 2008
***************
*** 38,41 ****
--- 38,46 ----
  #endif
  
+ /* Solaris regexec() and regcomp() return zero on success */
+ #ifndef REG_NOERROR
+ # define REG_NOERROR 0
+ #endif
+ 
  Boolean keyboard_input_available = False;
  int keyboard_x;
*** xfig.3.2.5.orig/w_drawprim.c	Mon Apr  7 19:38:59 2008
--- xfig.3.2.5/w_drawprim.c	Fri Sep  5 19:27:25 2008
***************
*** 129,148 ****
      openwinfonts = False;
      if (appres.scalablefonts) {
! 	/* first look for OpenWindow style font names (e.g. times-roman) */
! 	if ((fontlist = XListFonts(tool_d, ps_fontinfo[1].name, 1, &count))!=0) {
! 		openwinfonts = True;	/* yes, use them */
! 		for (f=0; f<NUM_FONTS; f++)	/* copy the OpenWindow font names */
! 		    x_fontinfo[f].template = ps_fontinfo[f+1].name;
! 	} else {
! 	    strcpy(template,x_fontinfo[0].template);  /* nope, check for font size 0 */
! 	    strcat(template,"0-0-*-*-*-*-");
! 	    /* add ISO8859 (if not Symbol font or ZapfDingbats) to font name */
! 	    if (strstr(template,"ymbol") == NULL &&
! 		strstr(template,"ingbats") == NULL)
! 		    strcat(template,"ISO8859-*");
! 	    else
! 		strcat(template,"*-*");
! 	    fontlist = XListFonts(tool_d, template, 1, &count);
! 	}
  	XFreeFontNames(fontlist); 
      }
--- 129,141 ----
      openwinfonts = False;
      if (appres.scalablefonts) {
! 	strcpy(template,x_fontinfo[0].template);
! 	strcat(template,"0-0-*-*-*-*-");
! 	/* add ISO8859 (if not Symbol font or ZapfDingbats) to font name */
! 	if (strstr(template,"ymbol") == NULL &&
! 	    strstr(template,"ingbats") == NULL)
! 	        strcat(template,"ISO8859-*");
! 	else
! 	    strcat(template,"*-*");
! 	fontlist = XListFonts(tool_d, template, 1, &count);
  	XFreeFontNames(fontlist); 
      }
*** xfig.3.2.5.orig/Fig.ad	Mon Apr  7 20:09:16 2008
--- xfig.3.2.5/Fig.ad	Fri Sep  5 19:27:25 2008
***************
*** 556,557 ****
--- 556,680 ----
  ! ----------------------------------------------------------------
  
+ ! This file is called Fig-color.bisque although the button colors are 
+ ! actually navajowhite.  I called it bisque because that is the color
+ ! scheme for the older tcl/tk.
+ Fig*beNiceToColormap:				False
+ 
+ Fig.internalborderwidth:			0
+ 
+ Fig*highlightThickness:				2
+ 
+ !##### Background, Foreground
+ 
+ Fig*canvas.background:				ivory
+ Fig*canvas.foreground:				black
+ 
+ ! all other fore/backgrounds not explicitely chosen
+ Fig*foreground:					black
+ Fig*background:					gray85
+ 
+ ! widget to turn on/off the balloon messages
+ Fig*msg_form.balloon_toggle*shadowWidth:	2
+ Fig*msg_form.balloon_toggle.topShadowContrast: 	-40	
+ Fig*msg_form.balloon_toggle.bottomShadowContrast: -10
+ 
+ ! balloon for current filename window
+ Fig.filename_balloon_popup*Label.background:	yellow
+ Fig.filename_balloon_popup*Label.foreground:	blue
+ 
+ ! balloon for balloon message window
+ Fig.toggle_balloon_popup*Label.background:	yellow
+ Fig.toggle_balloon_popup*Label.foreground:	blue
+ 
+ !balloon describing drawing/editing mode function
+ Fig.mode_balloon_popup*Label.background:	yellow
+ Fig.mode_balloon_popup*Label.foreground:	blue
+ 
+ !balloon describing indicator panel function
+ Fig.ind_balloon_popup*Label.background:		yellow
+ Fig.ind_balloon_popup*Label.foreground:		blue
+ 
+ !balloon describing command panel button function
+ Fig.cmd_balloon_popup*Label.background:		yellow
+ Fig.cmd_balloon_popup*Label.foreground:		blue
+ 
+ !balloon describing unit function
+ Fig.unit_balloon_popup*Label.background:	yellow
+ Fig.unit_balloon_popup*Label.foreground:	blue
+ 
+ !balloon describing mouse function
+ Fig.mouse_balloon_popup*Label.background:	yellow
+ Fig.mouse_balloon_popup*Label.foreground:	blue
+ 
+ Fig*Text*background:	 			linen
+ 
+ ! file preview form background (looks like a border)
+ Fig*preview_form.background:			gray70
+ 
+ ! library object preview comment window
+ Fig*library_panel.preview_comments*foreground: blue
+ 
+ ! "Updating" label in layer button area - this makes the
+ !		label look inactive
+ Fig*updating_layers.foreground:			gray70
+ 
+ Fig*Command*background:				navajowhite2
+ Fig*button.background:	 			navajowhite2
+ Fig*MenuButton*background:	 		navajowhite2
+ Fig*mixedEdit.background:	 		navajowhite2
+ 
+ Fig*topruler.background:	 		gray95
+ Fig*sideruler.background:	 		gray95
+ Fig*List*background:	 			gray95
+ Fig*Scrollbar.background:	 		gray95
+ 
+ Fig*cancel.background:	 			navajowhite1
+ Fig*dismiss.background:	 			navajowhite1
+ Fig*button_form.button*background:	 	navajowhite1
+ Fig*commands*background:	 		navajowhite1
+ Fig*horizontal.background:	 		navajowhite1
+ 
+ Fig*Label.background:	 			gray80
+ Fig*ind_box.background:				gray80
+ Fig*button_form.horizontal.background:		gray80
+ 
+ Fig*button_form.update*background:		black
+ Fig*button_form.update*foreground:		red
+ Fig*upd_ctrl_form.upd_ctrl_btns*shadowWidth:	2
+ 
+ ! label color for divider entry in menus (there is no background resource)
+ Fig*menu_divider.foreground:			red
+ 
+ !##### Shadows
+ Fig*shadowWidth:				2
+ Fig*Label.shadowWidth:				1
+ Fig*horizontal.shadowWidth:	 		2
+ Fig*Scrollbar.shadowWidth:			2
+ ! no shadows for update indicators
+ Fig*button_form.update.shadowWidth:		0
+ 
+ Fig*topShadowContrast:				40
+ Fig*bottomShadowContrast:	 		-90 
+ 
+ Fig*Label.topShadowContrast:	 		-40	
+ Fig*Label.bottomShadowContrast:	 		-10
+ 
+ ! shadows for color buttons in popup
+ Fig*form*stdForm*stdColor.shadowWidth:		2
+ Fig*form*stdForm*stdColor.topShadowContrast:    -40	
+ Fig*form*stdForm*stdColor.bottomShadowContrast: -10
+ 
+ ! shadows for picture types in edit box
+ Fig*pic_type_box.shadowWidth:			0
+ 
+ ! use gray shadows for popup color panel from edit popup so 
+ ! we don't use up all color cells
+ 
+ Fig*color_box*bottomShadowPixel:		gray50
+ Fig*color_box*topShadowPixel:			gray80
+ 
+ ! invert shadows for checkmarks in popup global settings so they
+ ! look depressed
+ 
+ Fig*toggle*bottomShadowPixel:			gray80
+ Fig*toggle*topShadowPixel:			gray50
*** xfig.3.2.5.orig/w_intersect.c	Wed Sep  3 18:43:06 2008
--- xfig.3.2.5/w_intersect.c	Fri Sep  5 19:27:25 2008
***************
*** 27,30 ****
--- 27,31 ----
  #include <math.h>
  #include <complex.h>
+ #include <alloca.h>
  #undef I