. Update to 3.2.5b.

43 files changed, 99 insertions, 1140 deletions

diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 23e5fbe4e4f2..fe2527edd4b9 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	xfig
-PORTVERSION=	3.2.5
-PORTREVISION=	6
+PORTVERSION=	3.2.5b
 CATEGORIES=	graphics
-MASTER_SITES=	SF/mcj//mcj_dist_src/3.0/
-
+MASTER_SITES=	SF/mcj/mcj_dist_src/3.0/
 DISTNAME=	${PORTNAME}.${PORTVERSION}.full
 
 MAINTAINER=	ports@FreeBSD.org
@@ -52,8 +50,10 @@ PLIST_SUB=	JPORTDOCS=""
 .endif
 
 post-extract:
+	@cd ${WRKSRC}/Doc && ${FIND} -s . -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx
 	@cd ${WRKSRC}/Doc && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x
-	@${CHMOD} -R +rX ${WRKSRC}/Libraries/Fasteners
+	@${CHMOD} a+rx ${WRKSRC}/Libraries
+	@cd ${WRKSRC}/Libraries && ${FIND} -s . -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx
 	@cd ${WRKSRC}/Libraries && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x
 	@${CP} ${WRKSRC}/Doc/xfig.man ${WRKSRC}
 
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index 4b8d36cc59b0..820fb7dad16f 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfig.3.2.5.full.tar.gz) = fae0c67a3951bd41c057deb63b6aa47a
-SHA256 (xfig.3.2.5.full.tar.gz) = 62e43d5ef483acdb74d0b6dcdf5f8a12e545201048db33ffb5d573d74ae72c9a
-SIZE (xfig.3.2.5.full.tar.gz) = 5794801
+SHA256 (xfig.3.2.5b.full.tar.gz) = 5c01cf6d79f4de04e3d9efc9f3e4ea046e880d6610f210c8551bb0a713e985c2
+SIZE (xfig.3.2.5b.full.tar.gz) = 5821049
diff --git a/graphics/xfig/files/patch-Fig-color.ad b/graphics/xfig/files/patch-Fig-color.ad
deleted file mode 100644
index c14be8a116d5..000000000000
--- a/graphics/xfig/files/patch-Fig-color.ad
+++ /dev/null
@@ -1,17 +0,0 @@
---- Fig-color.ad.orig	Wed Oct 26 19:25:06 2005
-+++ Fig-color.ad	Wed Oct 26 19:27:02 2005
-@@ -100,14 +100,6 @@
- Fig*button_form.update*foreground:	red
- Fig*upd_ctrl_form.upd_ctrl_btns*shadowWidth:	2
- 
--!##### Shadows
--Fig*shadowWidth:			1
--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 
- 
diff --git a/graphics/xfig/files/patch-Fig.ad b/graphics/xfig/files/patch-Fig.ad
deleted file mode 100644
index 065a356f1350..000000000000
--- a/graphics/xfig/files/patch-Fig.ad
+++ /dev/null
@@ -1,31 +0,0 @@
---- Fig.ad.orig	Wed Mar 16 10:25:01 2005
-+++ Fig.ad
-@@ -20,11 +20,11 @@
- ! 		This is for viewing the xfig html reference.
- ! 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:	firefox -remote 'openFile(%f)' || firefox %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.
-@@ -164,6 +164,14 @@
- !  This background resource shows between the buttons like a border
- 	Fig*mode_panel.background:	black
- 	Fig*mode_panel.foreground:	black
-+
-+!##### Shadows
-+Fig*shadowWidth:			1
-+Fig*Label.shadowWidth:			1
-+Fig*horizontal.shadowWidth:		2
-+Fig*Scrollbar.shadowWidth:		2
-+! no shadows for update indicators
-+Fig*button_form.update.shadowWidth:	0
- 
- ! Specify a private Compose key database file.  If this resource contains a "/"
- ! then the wired-in name of the xfig global directory won't be prefixed to it.
diff --git a/graphics/xfig/files/patch-Imakefile b/graphics/xfig/files/patch-Imakefile
index 1399963611e3..9ec7531caa34 100644
--- a/graphics/xfig/files/patch-Imakefile
+++ b/graphics/xfig/files/patch-Imakefile
@@ -1,14 +1,16 @@
---- Imakefile.orig	2006-10-10 16:19:22.000000000 -0700
-+++ Imakefile	2008-11-28 17:11:28.000000000 -0800
+$FreeBSD$
+
+--- Imakefile.orig	2009-03-30 08:53:05.000000000 -0700
++++ Imakefile	2011-06-18 21:04:40.000000000 -0700
 @@ -30,9 +30,9 @@
  XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks
  XCOMM for it relative to the BINDIR variable.
  XCOMM
--BINDIR = /usr/bin
+-XCOMM BINDIR = /usr/bin
 +BINDIR = $(PREFIX)/bin
  XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
 -MKDIRHIER = mkdirhier 
-+MKDIRHIER = ${LOCALBASE}/bin/mkdirhier 
++MKDIRHIER = ${LOCALBASE}/bin/mkdirhier
  
  XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
  XCOMM app-defaults resource files to go.  You will have to use the environment
@@ -19,23 +21,18 @@
 -XCOMM XAPPLOADDIR = /home/user/xfig
 +XAPPLOADDIR = ${LOCALBASE}/lib/X11/app-defaults
  
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -55,11 +55,11 @@
- XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
+ XCOMM Comment out the following definition for XAW3D if you don't to want to use
+ XCOMM the 3d Athena Widget Set
+@@ -60,7 +60,7 @@
  XCOMM some new features, including "Tips", which replace xfig's "help balloons"
+ XCOMM NOTE: This is the default for many X systems now.
  
 -XCOMM #define XAW3D1_5E
 +#define XAW3D1_5E
  
  #ifdef XAW3D1_5E
      DUSEXAW3D = -DXAW3D -DXAW3D1_5E
--    XAWLIB = -lXaw3d15e
-+    XAWLIB = -lXaw3d
- #else
-     XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
-     XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
-@@ -72,9 +72,9 @@
+@@ -75,9 +75,9 @@
  XCOMM Redefine the following if your PNG library, zlib library and/or include file
  XCOMM are in different places
  
@@ -44,33 +41,52 @@
 -ZLIBDIR = $(USRLIBDIR)
 +PNGLIBDIR = ${LOCALBASE}/lib
 +PNGINC = -I${LOCALBASE}/include/libpng
-+/* ZLIBDIR = $(USRLIBDIR) */
++XCOMM ZLIBDIR = $(USRLIBDIR)
  
  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
-@@ -93,8 +93,8 @@
+@@ -95,13 +95,13 @@
+ #define USEINSTALLEDJPEG
  
  #ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
--JPEGLIBDIR = /usr/local/lib
--JPEGINC = -I/usr/include/X11
+-    #ifdef USEINSTALLEDJPEG
+-	JPEGLIBDIR = /usr/local/lib
+-	JPEGINC = -I/usr/include/X11
+-    #else
+-	JPEGLIBDIR = ../jpeg
+-	JPEGINC = -I$(JPEGLIBDIR)
+-    #endif /* USEINSTALLEDJPEG */
++#ifdef USEINSTALLEDJPEG
 +JPEGLIBDIR = ${LOCALBASE}/lib
 +JPEGINC = -I${LOCALBASE}/include
- #else
- JPEGLIBDIR = ../jpeg
- JPEGINC = -I$(JPEGLIBDIR)
-@@ -116,8 +116,8 @@
++#else
++JPEGLIBDIR = ../jpeg
++JPEGINC = -I$(JPEGLIBDIR)
++#endif /* USEINSTALLEDJPEG */
+ #endif /* USEJPEG */
+ 
+ XCOMM Uncomment the #define for USEXPM if you want to use the XPM
+@@ -119,8 +119,8 @@
  #define USEXPM_ICON
  
  #ifdef USEXPM
 -XPMLIBDIR = /usr/local/lib
 -XPMINC = -I/usr/local/include/X11
-+XPMLIBDIR = $(USRLIBDIR)
-+XPMINC = -I$(INCDIR)/X11
++XPMLIBDIR = ${LOCALBASE}/lib
++XPMINC = -I${LOCALBASE}/include/X11
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -158,7 +158,7 @@
+@@ -150,7 +150,7 @@
+ XCOMM If your setlocale() doesn't support the locale, you should
+ XCOMM add -DSETLOCALE to I18N_DEFS.
+ 
+-XCOMM #define I18N
++#define I18N
+ 
+ XCOMM If using an input tablet uncomment the following
+ 
+@@ -161,7 +161,7 @@
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -79,7 +95,7 @@
  
  XCOMM use (and change) the following if you want the multi-key data base file
  XCOMM somewhere other than the standard X11 library directory
-@@ -170,12 +170,11 @@
+@@ -173,11 +173,11 @@
  
  XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
  XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
@@ -88,35 +104,21 @@
  
  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
- XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
--MANDIR = /usr/local/xfig/man
+-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
++XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+ XCOMM MANDIR = /usr/local/xfig/man
  
  XCOMM If your system doesn't have strstr undefine the following definition
- XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
-@@ -241,7 +240,7 @@
+@@ -251,7 +251,7 @@
  #endif /* USEJPEG */
  
  #ifdef I18N
 -I18N_DEFS = -DI18N -DSETLOCALE
-+I18N_DEFS = -DI18N /* -DSETLOCALE */
++I18N_DEFS = -DI18N
  I18N_SRC = w_i18n.c
  I18N_OBJ = w_i18n.o
  #endif
-@@ -258,11 +257,13 @@
- 		$(HAVE_NO_STRCASECMP) \
- 		$(NEED_STRERROR)
- 
-+/*
- #ifdef InstallManPage
- #undef InstallManPage
- #endif
- #define InstallManPage(file,dest)                                       @@\
- InstallManPageLong(file,dest,file)
-+*/
- 
- #ifdef USESMALLICONS
- DUSESMALLICONS = -DUSE_SMALL_ICONS
-@@ -381,8 +382,8 @@
+@@ -390,8 +390,8 @@
  install::
  	@if [ -d $(DESTDIR)$(XFIGLIBDIR) ]; then set +x; \
  		else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR) ; set +x; ); fi
@@ -127,7 +129,7 @@
  
  XCOMM Install program, libraries and documentation with "make install.all"
  install.all::
-@@ -396,11 +397,15 @@
+@@ -406,11 +406,14 @@
  XCOMM Install the documentation here with "make install.doc"
  install.doc::
  	@echo Installing man pages to $(MANDIR)
@@ -139,27 +141,26 @@
  
 +install.docdir::
 +	@if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \
-+		else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ; set +x; ); fi
-+	
++	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ; set +x; ); fi
 +
  XCOMM Install the HTML documentation here with "make install.html"
  
  #ifdef I18N
-@@ -413,25 +418,27 @@
+@@ -423,24 +426,26 @@
  #endif
  
  install.rhtml::
 +	@$(MAKE) install.docdir
  	@(cd Doc ; \
  	echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
+ 	if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \
+ 	   else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html ); fi ; \
 -	$(INSTALL) -m 644 -c xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \
 -	$(INSTALL) -m 644 -c xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
 -	$(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
 +	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \
 +	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
 +	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
- 	if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \
- 	   else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html ); fi ; \
  	if [ -d html ]; then \
 -	( cd html ; tar cf - *.* images ) | ( cd $(DESTDIR)$(XFIGDOCDIR)/html ; tar xf - ) ; fi ; \
 +	( cd html ; ${TAR} -cf - *.* images ) | ( cd $(DESTDIR)$(XFIGDOCDIR)/html ; exec ${TAR} -xpof - ) ; fi ; \
@@ -173,13 +174,11 @@
  	if [ -d $(DESTDIR)$(XFIGDOCDIR)/html/japanese ]; then set +x; \
  	   else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html/japanese ); fi ; \
 -	tar cf - * | ( cd $(DESTDIR)$(XFIGDOCDIR)/html/japanese ; tar xf - ) ; \
--	done) ;
 +	${TAR} -cf - * | ( cd $(DESTDIR)$(XFIGDOCDIR)/html/japanese ; exec ${TAR} -xpof - ) ; \
-+	) ;
+ 	) ;
  #endif
  
- XCOMM Install the object libraries here with "make install.libs"
-@@ -440,7 +447,7 @@
+@@ -450,7 +455,7 @@
  	@if [ -d $(DESTDIR)$(OBJLIBDIR) ]; then set +x; \
  		else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR) ; set +x; ); fi
  	@if [ -d Libraries ]; then \
diff --git a/graphics/xfig/files/patch-d_arc.c b/graphics/xfig/files/patch-d_arc.c
deleted file mode 100644
index 21446645e94d..000000000000
--- a/graphics/xfig/files/patch-d_arc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- d_arc.c.orig	Fri May  5 07:40:15 2006
-+++ d_arc.c
-@@ -308,7 +308,7 @@
-     if (num_point == 0)
- 	length_msg(MSG_RADIUS);
-     else {
--	compute_3p_angle(&tpoint[0], &center_point, &p3, &alpha);
-+	compute_3p_angle((F_point *)&tpoint[0], (F_point *)&center_point, &p3, &alpha);
- 	put_msg("1st angle = %.2f degrees", (float) alpha*180.0/M_PI);
-     }
-     elastic_arc();
diff --git a/graphics/xfig/files/patch-d_picobj.c b/graphics/xfig/files/patch-d_picobj.c
deleted file mode 100644
index 4c512179f75b..000000000000
--- a/graphics/xfig/files/patch-d_picobj.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- d_picobj.c.orig	Tue Jul 26 09:39:58 2005
-+++ d_picobj.c
-@@ -127,7 +127,7 @@
-     /* draw it and anything on top of it */
-     redisplay_line(box);
-     put_msg("Please enter name of Picture Object file in EDIT window");
--    edit_item((char *) box, O_POLYLINE, 0, 0);
-+    edit_item(box, O_POLYLINE, 0, 0);
-     picobj_drawing_selected();
-     draw_mousefun_canvas();
- }
diff --git a/graphics/xfig/files/patch-d_text.c b/graphics/xfig/files/patch-d_text.c
deleted file mode 100644
index d22dc7e56a45..000000000000
--- a/graphics/xfig/files/patch-d_text.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- d_text.c.orig	Tue Jul 26 09:39:58 2005
-+++ d_text.c
-@@ -112,7 +112,7 @@
- static void	move_text(int dir, unsigned char c, float div);
- static void	reload_compoundfont(F_compound *compounds);
- static int	prefix_length(char *string, int where_p);
--static void	initialize_char_handler(Window w, int (*cr) (/* ??? */), int bx, int by);
-+static void	initialize_char_handler(Window w, void (*cr) (/* ??? */), int bx, int by);
- static void	terminate_char_handler(void);
- static void	turn_on_blinking_cursor(void (*draw_cursor) (/* ??? */), void (*erase_cursor) (/* ??? */), int x, int y, long unsigned int msec);
- static void	turn_off_blinking_cursor(void);
-@@ -336,7 +336,7 @@
-     set_mousefun("new text", "finish text", "cancel", "", "paste text", "");
-     draw_mousefun_kbd();
-     draw_mousefun_canvas();
--    canvas_kbd_proc = char_handler;
-+    canvas_kbd_proc = (void (*)())char_handler;
-     canvas_middlebut_proc = finish_text_input;
-     canvas_leftbut_proc = finish_n_start;
-     canvas_rightbut_proc = cancel_text_input;
-@@ -463,7 +463,7 @@
-     set_mousefun("new text", "finish text", "cancel", "", "paste text", "");
-     draw_mousefun_kbd();
-     draw_mousefun_canvas();
--    canvas_kbd_proc = char_handler;
-+    canvas_kbd_proc = (void (*)())char_handler;
-     canvas_middlebut_proc = finish_text_input;
-     canvas_leftbut_proc = finish_n_start;
-     canvas_rightbut_proc = cancel_text_input;
-@@ -782,7 +782,7 @@
- static int	cbase_x, cbase_y;
- static float	rbase_x, rbase_y, rcur_x, rcur_y;
- 
--static int	(*cr_proc) ();
-+static void	(*cr_proc) ();
- 
- static void
- draw_cursor(int x, int y)
-@@ -794,7 +794,7 @@
- }
- 
- static void
--initialize_char_handler(Window w, int (*cr) (/* ??? */), int bx, int by)
-+initialize_char_handler(Window w, void (*cr) (/* ??? */), int bx, int by)
- {
-     pw = w;
-     cr_proc = cr;
diff --git a/graphics/xfig/files/patch-e_chop.c b/graphics/xfig/files/patch-e_chop.c
deleted file mode 100644
index 351959ae2460..000000000000
--- a/graphics/xfig/files/patch-e_chop.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- e_chop.c.orig	Tue Jul 26 09:56:28 2005
-+++ e_chop.c
-@@ -19,7 +19,9 @@
- /* >>>>>>>>>>>>>>>>>>> fixme -- don't forget undo ! <<<<<<<<<<<<<<<< */
- 
- #include <stdlib.h>
-+#ifndef __FreeBSD__
- #include <alloca.h>
-+#endif
- #include "fig.h"
- #include "resources.h"
- #include "mode.h"
diff --git a/graphics/xfig/files/patch-e_edit.c b/graphics/xfig/files/patch-e_edit.c
deleted file mode 100644
index 344ba0d004d2..000000000000
--- a/graphics/xfig/files/patch-e_edit.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- e_edit.c.orig	Tue Oct 10 16:57:20 2006
-+++ e_edit.c
-@@ -603,7 +603,7 @@
- 	}
- }
- 
--void	edit_item(F_line *p, int type, int x, int y);
-+void	edit_item(void *p, int type, int x, int y);
- void	edit_spline_point(F_spline *spline, int type, int x, int y, F_point *previous_point, F_point *the_point);
- void	edit_figure_comments(int x, int y, unsigned int shift);
- 
-@@ -738,7 +738,7 @@
- 	XtDestroyWidget(comment_popup);
- }
- 
--void edit_item(F_line *p, int type, int x, int y)
-+void edit_item(void *p, int type, int x, int y)
- {
-     XtWidgetGeometry xtgeom,comp;
-     int		    llx, lly, urx, ury, dum;
-@@ -3963,7 +3963,7 @@
- 
- static XtCallbackRec f_sel_callback[] =
- {
--    {f_menu_popup, NULL},
-+    {(XtCallbackProc)f_menu_popup, NULL},
-     {NULL, NULL},
- };
- 
diff --git a/graphics/xfig/files/patch-e_edit.h b/graphics/xfig/files/patch-e_edit.h
deleted file mode 100644
index 6d3ff0a1631a..000000000000
--- a/graphics/xfig/files/patch-e_edit.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- e_edit.h.orig	Tue Jul 26 09:39:58 2005
-+++ e_edit.h
-@@ -24,7 +24,7 @@
- extern void	paste_panel_key(Widget w, XKeyEvent *event);
- extern Widget	color_selection_panel(char *label, char *wname, char *name, Widget parent, Widget below, Widget beside, Widget *button, Widget *popup, int color, XtCallbackProc callback);
- extern void	color_select(Widget w, Color color);
--extern void edit_item (F_line *p, int type, int x, int y);
-+extern void edit_item (void *p, int type, int x, int y);
- extern void edit_item_selected (void);
- extern void push_apply_button (void);
- 
diff --git a/graphics/xfig/files/patch-e_placelib.c b/graphics/xfig/files/patch-e_placelib.c
deleted file mode 100644
index 391da5dddc2a..000000000000
--- a/graphics/xfig/files/patch-e_placelib.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- e_placelib.c.orig	Tue Jul 26 09:39:59 2005
-+++ e_placelib.c
-@@ -162,7 +162,7 @@
- void
- sel_place_lib_obj(void)
- {
--    canvas_kbd_proc = transform_lib_obj;
-+    canvas_kbd_proc = (void (*)())transform_lib_obj;
-     canvas_locmove_proc = null_proc;
-     canvas_ref_proc = null_proc;
-     canvas_leftbut_proc = null_proc;
diff --git a/graphics/xfig/files/patch-e_scale.c b/graphics/xfig/files/patch-e_scale.c
deleted file mode 100644
index ec61a6bfedab..000000000000
--- a/graphics/xfig/files/patch-e_scale.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- e_scale.c.orig	Tue Jul 26 09:39:59 2005
-+++ e_scale.c
-@@ -460,7 +460,7 @@
-     oldd = sqrt(oldx * oldx + oldy * oldy);
-     scalefact = newd / oldd;
-     /* scale any arrowheads */
--    scale_arrows(new_a,scalefact,scalefact);
-+    scale_arrows((F_line *)new_a,scalefact,scalefact);
- 
-     relocate_arcpoint(new_a, x, y);
-     change_arc(cur_a, new_a);
-@@ -567,7 +567,7 @@
-     set_action_object(F_EDIT, O_SPLINE);
-     old_s->next = cur_s;
-     /* now change the original to become the new object */
--    rescale_points(cur_s, x, y);
-+    rescale_points((F_line *)cur_s, x, y);
-     wrapup_scale();
-     /* redraw anything under the old spline */
-     redisplay_spline(old_s);
-@@ -1048,7 +1048,7 @@
- 	p->y = round(refy + (p->y - refy) * sy);
-     }
-     /* scale any arrowheads */
--    scale_arrows(s,sx,sy);
-+    scale_arrows((F_line *)s,sx,sy);
- }
- 
- static void
-@@ -1090,7 +1090,7 @@
-     }
-     a->direction = compute_direction(a->point[0], a->point[1], a->point[2]);
-     /* scale any arrowheads */
--    scale_arrows(a,sx,sy);
-+    scale_arrows((F_line *)a,sx,sy);
- }
- 
- static void
diff --git a/graphics/xfig/files/patch-e_update.h b/graphics/xfig/files/patch-e_update.h
deleted file mode 100644
index 102ba54e42bb..000000000000
--- a/graphics/xfig/files/patch-e_update.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- e_update.h.orig	Tue Jul 26 10:29:34 2005
-+++ e_update.h
-@@ -14,6 +14,6 @@
-  *
-  */
- 
--extern int update_text(F_text *text);
-+extern void update_text(F_text *text);
- extern void fix_fillstyle (void *object);
- extern void update_selected (void);
diff --git a/graphics/xfig/files/patch-f_readgif.c b/graphics/xfig/files/patch-f_readgif.c
deleted file mode 100644
index 9e090586c805..000000000000
--- a/graphics/xfig/files/patch-f_readgif.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- f_readgif.c.orig	Tue Jul 26 09:39:59 2005
-+++ f_readgif.c
-@@ -175,7 +175,7 @@
- 	/* make name for temp output file */
- 	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
- 	/* make command to convert gif to pcx into temp file */
--	sprintf(buf, "giftopnm | ppmtopcx > %s 2> /dev/null", pcxname);
-+	sprintf(buf, "giftopnm -quiet | ppmtopcx -quiet > %s", pcxname);
- 	if ((giftopcx = popen(buf,"w" )) == 0) {
- 	    file_msg("Cannot open pipe to giftopnm or ppmtopcx\n");
- 	    close_picfile(file,filetype);
diff --git a/graphics/xfig/files/patch-f_readjpg.c b/graphics/xfig/files/patch-f_readjpg.c
deleted file mode 100644
index f94fc8fbf334..000000000000
--- a/graphics/xfig/files/patch-f_readjpg.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- f_readjpg.c.orig	Tue Jul 26 09:39:59 2005
-+++ f_readjpg.c
-@@ -178,8 +178,10 @@
- 	pict->pic_cache->bit_size.x = cinfo.image_width;
- 	pict->pic_cache->bit_size.y = cinfo.image_height;
- 	if ((pict->pic_cache->bitmap = (unsigned char *) 
--	     malloc(cinfo.image_width * cinfo.image_height)) == NULL)
--		error_exit("Can't alloc memory for JPEG image");
-+	  malloc(cinfo.image_width * cinfo.image_height)) == NULL) {
-+	    file_msg("Can't alloc memory for JPEG image");
-+	    longjmp(jerr.setjmp_buffer, 1);
-+	}
- 	bitmapptr = pict->pic_cache->bitmap;
- 
- 	/* Step 4: set parameters for decompression */
diff --git a/graphics/xfig/files/patch-fig.h b/graphics/xfig/files/patch-fig.h
deleted file mode 100644
index 164639102fb8..000000000000
--- a/graphics/xfig/files/patch-fig.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- fig.h.orig	Fri Feb 24 12:15:16 2006
-+++ fig.h
-@@ -383,7 +383,7 @@
- extern	long		random();
- extern	void		srandom(unsigned int);
- 
--#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux)
-+#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__)
- extern	void		srandom(int);
- 
- #endif
diff --git a/graphics/xfig/files/patch-main.c b/graphics/xfig/files/patch-main.c
index aaa76c6211c4..ecf8c39e9338 100644
--- a/graphics/xfig/files/patch-main.c
+++ b/graphics/xfig/files/patch-main.c
@@ -1,18 +1,17 @@
---- main.c.orig	Sun Jan 14 16:24:26 2007
-+++ main.c
-@@ -267,9 +267,9 @@
-     {"pageborder", "Color",   XtRString, sizeof(char *),
-       XtOffset(appresPtr, pageborder), XtRString, (caddr_t) "lightblue"},
+$FreeBSD$
+
+--- main.c.orig	2011-06-18 20:50:16.000000000 -0700
++++ main.c	2011-06-18 20:50:52.000000000 -0700
+@@ -273,7 +273,7 @@
      {"browser", "Browser", XtRString, sizeof(char *),
--      XtOffset(appresPtr, browser), XtRString, (caddr_t) "netscape"},
-+      XtOffset(appresPtr, browser), XtRString, (caddr_t) "firefox"},
+       XtOffset(appresPtr, browser), XtRString, (caddr_t) "firefox"},
      {"pdfviewer", "Viewer", XtRString, sizeof(char *),
 -      XtOffset(appresPtr, pdf_viewer), XtRString, (caddr_t) "acroread"},
 +      XtOffset(appresPtr, pdf_viewer), XtRString, (caddr_t) "xpdf"},
      {"spinner_delay", "spinnerDelay",   XtRInt, sizeof(int),
        XtOffset(appresPtr, spinner_delay), XtRImmediate, (caddr_t) 500},
      {"spinner_rate", "spinnerRate",   XtRInt, sizeof(int),
-@@ -623,7 +623,7 @@
+@@ -629,7 +629,7 @@
  int setup_visual (int *argc_p, char **argv, Arg *args);
  void get_pointer_mapping (void);
  
@@ -21,12 +20,3 @@
  {
      Widget	    children[NCHILDREN];
      XEvent	    event;
-@@ -1515,7 +1515,7 @@
- 	    if (XK_F1 <= key && key <= XK_F35) {
- 	      XtDispatchEvent(&event);
- 	    } else {
--	      canvas_selected(canvas_sw, &event, NULL, NULL);
-+	      canvas_selected(canvas_sw, (XButtonEvent *)&event, NULL, NULL);
- 	    }
- 	  } else {
- 	    XtDispatchEvent(&event);
diff --git a/graphics/xfig/files/patch-u_draw.c b/graphics/xfig/files/patch-u_draw.c
deleted file mode 100644
index a886419f9667..000000000000
--- a/graphics/xfig/files/patch-u_draw.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- u_draw.c.orig	Tue Jul 26 09:40:00 2005
-+++ u_draw.c
-@@ -282,7 +282,7 @@
- 
-     /* setup clipping so that spline doesn't protrude beyond arrowhead */
-     /* also create the arrowheads */
--    clip_arrows(a,O_ARC,op,0);
-+    clip_arrows((F_line *)a,O_ARC,op,0);
- 
-     /* draw the arc itself */
-     draw_point_array(canvas_win, op, a->depth, a->thickness,
-@@ -296,10 +296,10 @@
-     /* draw the arrowheads, if any */
-     if (a->type != T_PIE_WEDGE_ARC) {
-       if (a->for_arrow) {
--	    draw_arrow(a, a->for_arrow, farpts, nfpts, farfillpts, nffillpts, op);
-+	    draw_arrow((F_line *)a, a->for_arrow, farpts, nfpts, farfillpts, nffillpts, op);
-       }
-       if (a->back_arrow) {
--	    draw_arrow(a, a->back_arrow, barpts, nbpts, barfillpts, nbfillpts, op);
-+	    draw_arrow((F_line *)a, a->back_arrow, barpts, nbpts, barfillpts, nbfillpts, op);
-       }
-     }
-     /* write the depth on the object */
-@@ -2067,7 +2067,7 @@
-     if (success) {
- 	/* setup clipping so that spline doesn't protrude beyond arrowhead */
- 	/* also create the arrowheads */
--	clip_arrows(spline,O_SPLINE,op,4);
-+	clip_arrows((F_line *)spline,O_SPLINE,op,4);
- 
- 	draw_point_array(canvas_win, op, spline->depth, spline->thickness,
- 		       spline->style, spline->style_val,
-@@ -2078,9 +2078,9 @@
- 	set_clip_window(clip_xmin, clip_ymin, clip_xmax, clip_ymax);
- 
- 	if (spline->for_arrow)	/* forward arrow  */
--	    draw_arrow(spline, spline->for_arrow, farpts, nfpts, farfillpts, nffillpts, op);
-+	    draw_arrow((F_line *)spline, spline->for_arrow, farpts, nfpts, farfillpts, nffillpts, op);
- 	if (spline->back_arrow)	/* backward arrow  */
--	    draw_arrow(spline, spline->back_arrow, barpts, nbpts, barfillpts, nbfillpts, op);
-+	    draw_arrow((F_line *)spline, spline->back_arrow, barpts, nbpts, barfillpts, nbfillpts, op);
- 	/* write the depth on the object */
- 	debug_depth(spline->depth,spline->points->x,spline->points->y);
-     }
diff --git a/graphics/xfig/files/patch-u_error.c b/graphics/xfig/files/patch-u_error.c
deleted file mode 100644
index 04513055f00c..000000000000
--- a/graphics/xfig/files/patch-u_error.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- u_error.c.orig	Tue Jul 26 09:40:00 2005
-+++ u_error.c
-@@ -59,7 +59,7 @@
-     emergency_quit(True);
- }
- 
--void X_error_handler(Display *d, XErrorEvent *err_ev)
-+int X_error_handler(Display *d, XErrorEvent *err_ev)
- {
-     char	    err_msg[MAXERRMSGLEN];
-     char	    ernum[10];
-@@ -75,6 +75,7 @@
-     XGetErrorDatabaseText(tool_d, "XRequest", ernum, "<Unknown>", err_msg, MAXERRMSGLEN);
-     (void) fprintf(stderr, "Request code: %s\n",err_msg);
-     emergency_quit(True);
-+    return 0;
- }
- 
- void emergency_quit(Boolean abortflag)
diff --git a/graphics/xfig/files/patch-u_error.h b/graphics/xfig/files/patch-u_error.h
deleted file mode 100644
index 7a718a857020..000000000000
--- a/graphics/xfig/files/patch-u_error.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- u_error.h.orig	Tue Jul 26 09:40:00 2005
-+++ u_error.h
-@@ -15,6 +15,6 @@
-  *
-  */
- 
--extern void	X_error_handler(Display *d, XErrorEvent *err_ev);
-+extern int	X_error_handler(Display *d, XErrorEvent *err_ev);
- extern void	error_handler(int err_sig);
- extern void	my_quit(Widget w, XEvent *event, String *params, Cardinal *num_params);
diff --git a/graphics/xfig/files/patch-u_fonts.c b/graphics/xfig/files/patch-u_fonts.c
deleted file mode 100644
index 4ea1704b38cc..000000000000
--- a/graphics/xfig/files/patch-u_fonts.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- u_fonts.c.old	2007-10-17 12:22:24.000000000 -0700
-+++ u_fonts.c	2007-10-17 12:23:36.000000000 -0700
-@@ -107,7 +107,7 @@
- /* PostScript font names matched with X11 font names in x_fontinfo */
- 
- struct _fstruct ps_fontinfo[NUM_FONTS + 1] = {
--    {"Default", -1},
-+    {"Default", 0},
-     {"Times-Roman",			0},
-     {"Times-Italic",			1},
-     {"Times-Bold",			2},
diff --git a/graphics/xfig/files/patch-u_search.c b/graphics/xfig/files/patch-u_search.c
deleted file mode 100644
index 4eb286a12667..000000000000
--- a/graphics/xfig/files/patch-u_search.c
+++ /dev/null
@@ -1,161 +0,0 @@
---- u_search.c.orig	Tue Jul 26 09:40:00 2005
-+++ u_search.c
-@@ -33,10 +33,10 @@
- #define TOLERANCE ((int)((display_zoomscale < 20.0? 4: 14) * \
- 			PIX_PER_INCH/DISPLAY_PIX_PER_INCH/display_zoomscale))
- 
--static int	(*manipulate) ();
--static int 	(*handlerproc_left) ();
--static int	(*handlerproc_middle) ();
--static int	(*handlerproc_right) ();
-+static void	(*manipulate) ();
-+static void 	(*handlerproc_left) ();
-+static void	(*handlerproc_middle) ();
-+static void	(*handlerproc_right) ();
- static int	type;
- static long	objectcount;
- static long	n;
-@@ -61,7 +61,7 @@
- void toggle_objecthighlight (void);
- 
- Boolean
--next_arc_found(int x, int y, int tolerance, int *px, int *py, int shift)
-+next_arc_found(int x, int y, int tolerance, int *px, int *py, unsigned int shift)
- {
-     int		    i;
- 
-@@ -141,7 +141,7 @@
- }
- 
- Boolean
--next_ellipse_found(int x, int y, int tolerance, int *px, int *py, int shift)
-+next_ellipse_found(int x, int y, int tolerance, int *px, int *py, unsigned int shift)
- {
-     double	    a, b, dx, dy;
-     double	    dis, r, tol;
-@@ -207,7 +207,7 @@
-  */
- 
- Boolean
--next_line_found(int x, int y, int tolerance, int *px, int *py, int shift)
-+next_line_found(int x, int y, int tolerance, int *px, int *py, unsigned int shift)
- {
-     F_point	   *point;
-     int		    x1, y1, x2, y2;
-@@ -257,7 +257,7 @@
-  */
- 
- Boolean
--next_spline_found(int x, int y, int tolerance, int *px, int *py, int shift)
-+next_spline_found(int x, int y, int tolerance, int *px, int *py, unsigned int shift)
- {
-     F_point	   *point;
-     int		    x1, y1, x2, y2;
-@@ -297,7 +297,7 @@
- }
- 
- Boolean
--next_text_found(int x, int y, int tolerance, int *px, int *py, int shift)
-+next_text_found(int x, int y, int tolerance, int *px, int *py, unsigned int shift)
- {
-     int		    dum;
- 
-@@ -326,7 +326,7 @@
- }
- 
- Boolean
--next_compound_found(int x, int y, int tolerance, int *px, int *py, int shift)
-+next_compound_found(int x, int y, int tolerance, int *px, int *py, unsigned int shift)
- {
-     float	    tol2;
- 
-@@ -561,7 +561,7 @@
- }
- 
- Boolean
--next_arc_point_found(int x, int y, int tol, int *point_num, int shift)
-+next_arc_point_found(int x, int y, int tol, int *point_num, unsigned int shift)
-        		                                 
- /* dirty trick - point_num is called as a `F_point *point_num' */
- {
-@@ -592,7 +592,7 @@
- }
- 
- Boolean
--next_ellipse_point_found(int x, int y, int tol, int *point_num, int shift)
-+next_ellipse_point_found(int x, int y, int tol, int *point_num, unsigned int shift)
-        		                                 
- /* dirty trick - point_num is called as a `F_point *point_num' */
- {
-@@ -623,7 +623,7 @@
- }
- 
- Boolean
--next_line_point_found(int x, int y, int tol, F_point **p, F_point **q, int shift)
-+next_line_point_found(int x, int y, int tol, F_point **p, F_point **q, unsigned int shift)
- {
-     F_point	   *a, *b;
- 
-@@ -655,7 +655,7 @@
- }
- 
- Boolean
--next_spline_point_found(int x, int y, int tol, F_point **p, F_point **q, int shift)
-+next_spline_point_found(int x, int y, int tol, F_point **p, F_point **q, unsigned int shift)
- {
-     if (!anyspline_in_mask())
- 	return False;
-@@ -683,7 +683,7 @@
- }
- 
- Boolean
--next_compound_point_found(int x, int y, int tol, int *p, int *q, int shift)
-+next_compound_point_found(int x, int y, int tol, int *p, int *q, unsigned int shift)
-        		                             
- /* dirty trick - p and q are called with type `F_point' */
- {
-@@ -729,19 +729,19 @@
- }
- 
- void
--init_searchproc_left(int (*handlerproc) (/* ??? */))
-+init_searchproc_left(void (*handlerproc) (/* ??? */))
- {
-     handlerproc_left = handlerproc;
- }
- 
- void
--init_searchproc_middle(int (*handlerproc) (/* ??? */))
-+init_searchproc_middle(void (*handlerproc) (/* ??? */))
- {
-     handlerproc_middle = handlerproc;
- }
- 
- void
--init_searchproc_right(int (*handlerproc) (/* ??? */))
-+init_searchproc_right(void (*handlerproc) (/* ??? */))
- {
-     handlerproc_right = handlerproc;
- }
-@@ -761,7 +761,7 @@
- 	switch (type) {
- 	case O_ELLIPSE:
- 	    /* dirty trick - px returns point_num */
--	    found = next_ellipse_point_found(x, y, TOLERANCE, &px, shift);
-+	    found = next_ellipse_point_found(x, y, TOLERANCE, (int *)&px, shift);
- 	    break;
- 	case O_POLYLINE:
- 	    found = next_line_point_found(x, y, TOLERANCE, &px, &py, shift);
-@@ -771,10 +771,10 @@
- 	    break;
- 	case O_ARC:
- 	    /* dirty trick - px returns point_num */
--	    found = next_arc_point_found(x, y, TOLERANCE, &px, shift);
-+	    found = next_arc_point_found(x, y, TOLERANCE, (int *)&px, shift);
- 	    break;
- 	case O_COMPOUND:
--	    found = next_compound_point_found(x, y, TOLERANCE, &px, &py, shift);
-+	    found = next_compound_point_found(x, y, TOLERANCE, (int *)&px, (int *)&py, shift);
- 	    break;
- 	}
- 	if (found) {
diff --git a/graphics/xfig/files/patch-u_search.h b/graphics/xfig/files/patch-u_search.h
deleted file mode 100644
index 74d2695a15c7..000000000000
--- a/graphics/xfig/files/patch-u_search.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- u_search.h.orig	Tue Jul 26 09:40:00 2005
-+++ u_search.h
-@@ -20,9 +20,9 @@
- 
- Boolean		in_text_bound(F_text *t, int x, int y, int *posn, Boolean extra);
- 
--void		init_searchproc_left(int (*handlerproc) (/* ??? */));
--void		init_searchproc_middle(int (*handlerproc) (/* ??? */));
--void		init_searchproc_right(int (*handlerproc) (/* ??? */));
-+void		init_searchproc_left(void (*handlerproc) (/* ??? */));
-+void		init_searchproc_middle(void (*handlerproc) (/* ??? */));
-+void		init_searchproc_right(void (*handlerproc) (/* ??? */));
- 
- void		point_search_left(int x, int y, unsigned int shift);
- void		point_search_middle(int x, int y, unsigned int shift);
diff --git a/graphics/xfig/files/patch-u_smartsearch.c b/graphics/xfig/files/patch-u_smartsearch.c
deleted file mode 100644
index 053daea933f7..000000000000
--- a/graphics/xfig/files/patch-u_smartsearch.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- u_smartsearch.c.orig	Tue Jul 26 09:40:00 2005
-+++ u_smartsearch.c
-@@ -51,10 +51,10 @@
- F_point  smart_point1, smart_point2;
- 
- /* locals: */
--static int	(*manipulate) ();
--static int	(*handlerproc_left) ();
--static int	(*handlerproc_middle) ();
--static int	(*handlerproc_right) ();
-+static void	(*manipulate) ();
-+static void	(*handlerproc_left) ();
-+static void	(*handlerproc_middle) ();
-+static void	(*handlerproc_right) ();
- static int	type;
- static long	objectcount;
- static long	n;
-@@ -74,19 +74,19 @@
- 
- 
- void
--init_smart_searchproc_left(int (*handlerproc) (/* ??? */))
-+init_smart_searchproc_left(void (*handlerproc) (/* ??? */))
- {
-     handlerproc_left = handlerproc;
- }
- 
- void
--init_smart_searchproc_middle(int (*handlerproc) (/* ??? */))
-+init_smart_searchproc_middle(void (*handlerproc) (/* ??? */))
- {
-     handlerproc_middle = handlerproc;
- }
- 
- void
--init_smart_searchproc_right(int (*handlerproc) (/* ??? */))
-+init_smart_searchproc_right(void (*handlerproc) (/* ??? */))
- {
-     handlerproc_right = handlerproc;
- }
diff --git a/graphics/xfig/files/patch-u_smartsearch.h b/graphics/xfig/files/patch-u_smartsearch.h
deleted file mode 100644
index f261e4855a45..000000000000
--- a/graphics/xfig/files/patch-u_smartsearch.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- u_smartsearch.h.orig	Tue Jul 26 09:40:00 2005
-+++ u_smartsearch.h
-@@ -15,9 +15,9 @@
-  *
-  */
- 
--void		init_smart_searchproc_left(int (*handlerproc) (/* ??? */));
--void		init_smart_searchproc_middle(int (*handlerproc) (/* ??? */));
--void		init_smart_searchproc_right(int (*handlerproc) (/* ??? */));
-+void		init_smart_searchproc_left(void (*handlerproc) (/* ??? */));
-+void		init_smart_searchproc_middle(void (*handlerproc) (/* ??? */));
-+void		init_smart_searchproc_right(void (*handlerproc) (/* ??? */));
- 
- void		smart_object_search_left(int x, int y, unsigned int shift);
- void		smart_object_search_middle(int x, int y, unsigned int shift);
diff --git a/graphics/xfig/files/patch-w_canvas.c b/graphics/xfig/files/patch-w_canvas.c
deleted file mode 100644
index 3d849a89bdd4..000000000000
--- a/graphics/xfig/files/patch-w_canvas.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- w_canvas.c.orig	Tue Jul 26 09:40:00 2005
-+++ w_canvas.c
-@@ -558,7 +558,7 @@
- 			       }
- 			       lbuf[len] = '\0';
- 			       if (0 < len) {
--				 if (2 <= len && canvas_kbd_proc == char_handler) {
-+				 if (2 <= len && canvas_kbd_proc == (void (*)())char_handler) {
- 				   i18n_char_handler(lbuf);
- 				 } else {
- 				   for (i = 0; i < len; i++) {
-@@ -663,7 +663,7 @@
- {
- 	Time event_time;
- 
--	if (canvas_kbd_proc != char_handler)
-+	if (canvas_kbd_proc != (void (*)())char_handler)
- 		return;
- 
- 	if (paste_event != NULL)
-@@ -710,7 +710,7 @@
- 	    if (ret_status == Success || 0 < num_values) {
- 	      for (i = 0; i < num_values; i++) {
- 		for (c = tmp[i]; *c; c++) {
--		  if (canvas_kbd_proc == char_handler && ' ' <= *c && *(c + 1)) {
-+		  if (canvas_kbd_proc == (void (*)())char_handler && ' ' <= *c && *(c + 1)) {
- 		    prefix_append_char(*c);
- 		  } else {
- 		    canvas_kbd_proc((XKeyEvent *) 0, *c, (KeySym) 0);
-@@ -937,7 +937,7 @@
-   active_mode_panel = None;
- }
- 
--void static mode_panel_button_selected(Widget w, char *icon, char *call_data)
-+void static mode_panel_button_selected(Widget w, icon_struct *icon, char *call_data)
- {
-   change_mode(icon);
-   popdown_mode_panel();
diff --git a/graphics/xfig/files/patch-w_cmdpanel.c b/graphics/xfig/files/patch-w_cmdpanel.c
deleted file mode 100644
index 14551644baa4..000000000000
--- a/graphics/xfig/files/patch-w_cmdpanel.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- w_cmdpanel.c.orig	Tue Jul 26 09:46:46 2005
-+++ w_cmdpanel.c
-@@ -1614,12 +1614,12 @@
- static void
- paste_char(Widget w, XtPointer client_data, XtPointer call_data)
- {
--    unsigned char *chr = (unsigned char *) client_data;
-+    unsigned char chr = (unsigned char) client_data;
- 
-     /* only allow during text input */
--    if (canvas_kbd_proc != char_handler)
-+    if (canvas_kbd_proc != (void (*)())char_handler)
- 	return;
--    char_handler((XKeyEvent *) 0, *chr, (KeySym) 0);
-+    char_handler((XKeyEvent *) 0, chr, (KeySym) 0);
- }
- 
- /* add or remove a checkmark to a menu entry to show that it
diff --git a/graphics/xfig/files/patch-w_color.c b/graphics/xfig/files/patch-w_color.c
deleted file mode 100644
index b7da4a13a5d0..000000000000
--- a/graphics/xfig/files/patch-w_color.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- w_color.c.orig	Thu Oct 27 10:39:18 2005
-+++ w_color.c
-@@ -144,13 +144,13 @@
- 			mixed_color[color_el+2].rgb/256: user_colors[color_el].rgb/256)
- #define CHANGE_RED(element) \
- 		pass_value = 1.0 - (float)(COLOR(element,red)/255.0); \
--		Thumbed(redScroll, S_RED, (XtPointer)(&pass_value))
-+		Thumbed(redScroll, (XtPointer)S_RED, (XtPointer)(&pass_value))
- #define CHANGE_GREEN(element) \
- 		pass_value = 1.0 - (float)(COLOR(element,green)/255.0); \
--		Thumbed(greenScroll, S_GREEN, (XtPointer)(&pass_value))
-+		Thumbed(greenScroll, (XtPointer)S_GREEN, (XtPointer)(&pass_value))
- #define CHANGE_BLUE(element) \
- 		pass_value = 1.0 - (float)(COLOR(element,blue)/255.0); \
--		Thumbed(blueScroll, S_BLUE, (XtPointer)(&pass_value))
-+		Thumbed(blueScroll, (XtPointer)S_BLUE, (XtPointer)(&pass_value))
- 
- static RGB	rgb_values[2];
- static HSV	hsv_values;
-@@ -192,8 +192,8 @@
- 	{"pick_memory", _pick_memory},
- 	{"update_scrl_triple", update_scrl_triple},
- 	{"update_from_triple", update_from_triple},
--	{"set_std_color", _set_std_color},
--	{"set_color_ok", set_color_ok},
-+	{"set_std_color", (XtActionProc)_set_std_color},
-+	{"set_color_ok", (XtActionProc)set_color_ok},
- };
- 
- static String set_panel_translations =
-@@ -1864,17 +1864,17 @@
- 
- 	if (buttons_down & S_RED)	{
- 		pass_value = 1.0 - (float) red_pos/255;
--		Thumbed(redScroll, S_RED, (XtPointer)(&pass_value));
-+		Thumbed(redScroll, (XtPointer)S_RED, (XtPointer)(&pass_value));
- 	}
- 
- 	if (buttons_down & S_GREEN)	{
- 		pass_value = 1.0 - (float) green_pos/255;
--		Thumbed(greenScroll, S_GREEN, (XtPointer)(&pass_value));
-+		Thumbed(greenScroll, (XtPointer)S_GREEN, (XtPointer)(&pass_value));
- 	}
- 
- 	if (buttons_down & S_BLUE)	{
- 		pass_value = 1.0 - (float) blue_pos/255;
--		Thumbed(blueScroll, S_BLUE, (XtPointer)(&pass_value));
-+		Thumbed(blueScroll, (XtPointer)S_BLUE, (XtPointer)(&pass_value));
- 	}
- 
- 	do_change = True;
diff --git a/graphics/xfig/files/patch-w_drawprim.c b/graphics/xfig/files/patch-w_drawprim.c
deleted file mode 100644
index c35b530ed4a7..000000000000
--- a/graphics/xfig/files/patch-w_drawprim.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- w_drawprim.c.orig	Sun Jan 14 16:51:46 2007
-+++ w_drawprim.c
-@@ -512,7 +512,7 @@
-     gccache[ERASE] = makegc(ERASE, x_fg_color.pixel, x_bg_color.pixel);
-     gccache[INV_PAINT] = makegc(INV_PAINT, x_fg_color.pixel, x_bg_color.pixel);
-     /* parse any grid color spec */
--fprintf(stderr,"color = '%s'\n",appres.grid_color);
-+if (appres.DEBUG) fprintf(stderr,"color = '%s'\n",appres.grid_color);
-     XParseColor(tool_d, tool_cm, appres.grid_color, &tmp_color);
-     if (XAllocColor(tool_d, tool_cm, &tmp_color)==0) {
- 	fprintf(stderr,"Can't allocate color for grid \n");
diff --git a/graphics/xfig/files/patch-w_export.c b/graphics/xfig/files/patch-w_export.c
deleted file mode 100644
index 83c80d909309..000000000000
--- a/graphics/xfig/files/patch-w_export.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- w_export.c.orig	Tue Jul 26 09:40:01 2005
-+++ w_export.c
-@@ -1115,7 +1115,7 @@
- 	sprintf(buf, "%.1f", appres.magnification);
- 	/* we want to track typing here to update figure size label */
- 	mag_spinner = MakeFloatSpinnerEntry(export_panel, &export_mag_text, "magnification",
--			(Widget) NULL, mag_lab, update_mag, buf, 0.0, 10000.0, 1.0, 45);
-+			(Widget) NULL, mag_lab, (XtCallbackProc)update_mag, buf, 0.0, 10000.0, 1.0, 45);
- 	FirstArg(XtNfromVert, lang_panel);
- 	NextArg(XtNtop, XtChainTop);
- 	NextArg(XtNbottom, XtChainTop);
diff --git a/graphics/xfig/files/patch-w_fontpanel.c b/graphics/xfig/files/patch-w_fontpanel.c
deleted file mode 100644
index cc1275714a74..000000000000
--- a/graphics/xfig/files/patch-w_fontpanel.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- w_fontpanel.c.orig	Fri Feb 24 12:23:06 2006
-+++ w_fontpanel.c
-@@ -143,7 +143,7 @@
- 	ps_fontmenu_items[i].type = MENU_IMAGESTRING;		/* put the fontnames in
- 								 * menu */
- 	ps_fontmenu_items[i].label = ps_fontinfo[i].name;
--	ps_fontmenu_items[i].info = (caddr_t) (i - 1);		/* index for font # */
-+	ps_fontmenu_items[i].info = (caddr_t) i;		/* index for font # */
-     }
- 
-     for (i = 0; i < NUM_LATEX_FONTS; i++) {
-@@ -183,7 +183,7 @@
-     ps_cancel = XtCreateManagedWidget("cancel", commandWidgetClass,
- 				    ps_form, Args, ArgCount);
-     XtAddEventHandler(ps_cancel, ButtonReleaseMask, False,
--		      fontpane_cancel, (XtPointer) NULL);
-+		      (XtEventHandler)fontpane_cancel, (XtPointer) NULL);
- 
-     /* button to switch to the LaTeX fonts */
-     FirstArg(XtNlabel, " Use LaTex Fonts ");
-@@ -197,7 +197,7 @@
-     tmp_but = XtCreateManagedWidget("use_latex_fonts", commandWidgetClass,
- 				    ps_form, Args, ArgCount);
-     XtAddEventHandler(tmp_but, ButtonReleaseMask, False,
--		      fontpane_swap, (XtPointer) NULL);
-+		      (XtEventHandler)fontpane_swap, (XtPointer) NULL);
- 
-     /* now make the LaTeX font image buttons */
-     FirstArg(XtNwidth, LATEX_FONTPANE_WD);
-@@ -227,7 +227,7 @@
-     latex_cancel = XtCreateManagedWidget("cancel", commandWidgetClass,
- 				    latex_form, Args, ArgCount);
-     XtAddEventHandler(latex_cancel, ButtonReleaseMask, False,
--		      fontpane_cancel, (XtPointer) NULL);
-+		      (XtEventHandler)fontpane_cancel, (XtPointer) NULL);
- 
-     /* button to switch to the PostScript fonts */
-     FirstArg(XtNlabel, " Use PostScript Fonts ");
-@@ -241,7 +241,7 @@
-     tmp_but = XtCreateManagedWidget("use_postscript_fonts", commandWidgetClass,
- 				    latex_form, Args, ArgCount);
-     XtAddEventHandler(tmp_but, ButtonReleaseMask, False,
--		      fontpane_swap, (XtPointer) NULL);
-+		      (XtEventHandler)fontpane_swap, (XtPointer) NULL);
- 
-     XtInstallAccelerators(ps_form, ps_cancel);
-     XtInstallAccelerators(latex_form, latex_cancel);
-@@ -359,7 +359,7 @@
-     char	   *font_name = mi->label;
- 
-     if (*flag_sel)
--	*font_ps_sel = (int) mi->info;	/* set ps font to one selected */
-+	*font_ps_sel = (int) mi->info - 1;	/* set ps font to one selected */
-     else
- 	*font_latex_sel = (int) mi->info;	/* set latex font to one
- 						 * selected */
diff --git a/graphics/xfig/files/patch-w_indpanel.c b/graphics/xfig/files/patch-w_indpanel.c
deleted file mode 100644
index bd4c9aecd613..000000000000
--- a/graphics/xfig/files/patch-w_indpanel.c
+++ /dev/null
@@ -1,128 +0,0 @@
---- w_indpanel.c.orig	Thu Apr  6 12:45:36 2006
-+++ w_indpanel.c
-@@ -56,7 +56,7 @@
- void	show_depth(ind_sw_info *sw), show_zoom(ind_sw_info *sw);
- void	show_fillstyle(ind_sw_info *sw);
- void	fontpane_popup(int *psfont_adr, int *latexfont_adr, int *psflag_adr, void (*showfont_fn) (/* ??? */), Widget show_widget);
--void	make_pulldown_menu_images(choice_info *entries, Cardinal nent, Pixmap **images, char **texts, Widget parent, XtCallbackProc callback);
-+void	make_pulldown_menu_images(choice_info *entries, Cardinal nent, Pixmap *images, char **texts, Widget parent, XtCallbackProc callback);
- void	tog_selective_update(long unsigned int mask);
- unsigned long cur_indmask;	/* mask showing which indicator buttons are mapped */
- void	inc_zoom(ind_sw_info *sw), dec_zoom(ind_sw_info *sw), fit_zoom(ind_sw_info *sw);
-@@ -581,7 +581,7 @@
-     set_upd = XtCreateManagedWidget("set_upd", commandWidgetClass,
- 			upd_ctrl_btns, Args, ArgCount);
-     XtAddEventHandler(set_upd, ButtonReleaseMask, False,
--			set_all_update, (XtPointer) 0);
-+			(XtEventHandler)set_all_update, (XtPointer) 0);
- 
-     strcpy(upd_set_sw_info.line1,"Sets all update flags");
-     upd_set_sw_info.line2[0] = '\0';
-@@ -596,7 +596,7 @@
-     clr_upd = XtCreateManagedWidget("clr_upd", commandWidgetClass,
- 			upd_ctrl_btns, Args, ArgCount);
-     XtAddEventHandler(clr_upd, ButtonReleaseMask, False,
--			clr_all_update, (XtPointer) 0);
-+			(XtEventHandler)clr_all_update, (XtPointer) 0);
- 
-     strcpy(upd_clr_sw_info.line1,"Clears all update flags");
-     upd_clr_sw_info.line2[0] = '\0';
-@@ -611,7 +611,7 @@
-     tog_upd = XtCreateManagedWidget("tog_upd", commandWidgetClass,
- 			upd_ctrl_btns, Args, ArgCount);
-     XtAddEventHandler(tog_upd, ButtonReleaseMask, False,
--			tog_all_update, (XtPointer) 0);
-+			(XtEventHandler)tog_all_update, (XtPointer) 0);
- 
-     strcpy(upd_tog_sw_info.line1,"Toggles all update flags");
-     upd_tog_sw_info.line2[0] = '\0';
-@@ -2513,7 +2513,7 @@
-     /* thickness spinner */
-     sprintf(indbuf,"%d",dimline_thick);
-     beside = MakeIntSpinnerEntry(lineform, &line_thick_w, "line_thickness", 
--		below, beside, dimline_panel_preview, indbuf, 0, MAX_LINE_WIDTH, 1, 30);
-+		below, beside, (XtCallbackProc)dimline_panel_preview, indbuf, 0, MAX_LINE_WIDTH, 1, 30);
- 
-     below = beside;
- 
-@@ -2567,7 +2567,7 @@
-     /* thickness spinner */
-     sprintf(indbuf,"%d",dimline_boxthick);
-     beside = MakeIntSpinnerEntry(boxform, &box_thick_w, "box_line_thickness", 
--		below, beside, dimline_panel_preview, indbuf, 0, MAX_LINE_WIDTH, 1, 30);
-+		below, beside, (XtCallbackProc)dimline_panel_preview, indbuf, 0, MAX_LINE_WIDTH, 1, 30);
- 
-     below = beside;
- 
-@@ -2649,7 +2649,7 @@
-     /* length spinner */
-     sprintf(indbuf,"%.1f",dimline_arrowlength);
-     beside = MakeFloatSpinnerEntry(arrowform, &arrow_length_w, "arrow_length", 
--		below, beside, dimline_panel_preview, indbuf, 0.1, 200.0, 1.0, 50);
-+		below, beside, (XtCallbackProc)dimline_panel_preview, indbuf, 0.1, 200.0, 1.0, 50);
- 
-     below = beside;
- 
-@@ -2663,7 +2663,7 @@
-     /* width spinner */
-     sprintf(indbuf,"%.1f",dimline_arrowwidth);
-     beside = MakeFloatSpinnerEntry(arrowform, &arrow_width_w, "arrow_width", 
--		below, beside, dimline_panel_preview, indbuf, 0.1, 200.0, 1.0, 50);
-+		below, beside, (XtCallbackProc)dimline_panel_preview, indbuf, 0.1, 200.0, 1.0, 50);
- 
-     /****************************/
-     /* now frame for Ticks info */
-@@ -2688,7 +2688,7 @@
-     /* "Ticks" checkbutton */
-     below = CreateCheckbutton("Show ticks", "ticks", tickform, below, (Widget) NULL,
- 				MANAGE, LARGE_CHK, &dimline_ticks,
--				dimline_panel_preview, (Widget) NULL);
-+				(XtCallbackProc)dimline_panel_preview, (Widget *) NULL);
- 
-     /* Tick Thickness label */
-     FirstArg(XtNlabel, "Thickness");
-@@ -2700,7 +2700,7 @@
-     /* thickness spinner */
-     sprintf(indbuf,"%d",dimline_tickthick);
-     (void) MakeIntSpinnerEntry(tickform, &tick_thick_w, "tick_line_thickness", 
--		below, beside, dimline_panel_preview, indbuf, 0, MAX_LINE_WIDTH, 1, 28);
-+		below, beside, (XtCallbackProc)dimline_panel_preview, indbuf, 0, MAX_LINE_WIDTH, 1, 28);
- 
-     /***************************/
-     /* now frame for Text info */
-@@ -2737,7 +2737,7 @@
- 			psfont_menu_bitmaps[dimline_font + 1] :
- 			latexfont_menu_bitmaps[dimline_font]);
-     font_button = XtCreateManagedWidget("font", commandWidgetClass, textform, Args, ArgCount);
--    XtAddCallback(font_button, XtNcallback, dimline_font_popup, (XtPointer) NULL);
-+    XtAddCallback(font_button, XtNcallback, (XtCallbackProc)dimline_font_popup, (XtPointer) NULL);
- 
-     below = font_button;
- 
-@@ -2752,7 +2752,7 @@
-     /* size spinner */
-     sprintf(indbuf,"%d",dimline_fontsize);
-     beside = MakeIntSpinnerEntry(textform, &font_size_w, "font_size", 
--		below, beside, dimline_panel_preview, indbuf, 
-+		below, beside, (XtCallbackProc)dimline_panel_preview, indbuf, 
- 		MIN_FONT_SIZE, MAX_FONT_SIZE, 1, 30);
- 
-     below = beside;
-@@ -2796,7 +2796,7 @@
-     /* number of decimal places spinner */
-     sprintf(indbuf,"%d",dimline_prec);
-     below = MakeIntSpinnerEntry(stringform, &dimline_precw, "precision", 
--		below, beside, dimline_panel_preview, indbuf, 
-+		below, beside, (XtCallbackProc)dimline_panel_preview, indbuf, 
- 		0, 10, 1, 30);
- 
-     /* Fixed text checkbutton */
-@@ -4776,7 +4776,7 @@
-  */
- 
- void
--make_pulldown_menu_images(choice_info *entries, Cardinal nent, Pixmap **images, char **texts, Widget parent, XtCallbackProc callback)
-+make_pulldown_menu_images(choice_info *entries, Cardinal nent, Pixmap *images, char **texts, Widget parent, XtCallbackProc callback)
- {
-     Widget	    pulldown_menu, entry;
-     char	    buf[64];
diff --git a/graphics/xfig/files/patch-w_indpanel.h b/graphics/xfig/files/patch-w_indpanel.h
deleted file mode 100644
index 8084c5c280c6..000000000000
--- a/graphics/xfig/files/patch-w_indpanel.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- w_indpanel.h.orig	Tue Jul 26 09:40:01 2005
-+++ w_indpanel.h
-@@ -164,7 +164,7 @@
- extern void	show_depth(ind_sw_info *sw), show_zoom(ind_sw_info *sw);
- extern void	show_fillstyle(ind_sw_info *sw);
- extern void	fontpane_popup(int *psfont_adr, int *latexfont_adr, int *psflag_adr, void (*showfont_fn) (/* ??? */), Widget show_widget);
--extern void	make_pulldown_menu_images(choice_info *entries, Cardinal nent, Pixmap **images, char **texts, Widget parent, XtCallbackProc callback);
-+extern void	make_pulldown_menu_images(choice_info *entries, Cardinal nent, Pixmap *images, char **texts, Widget parent, XtCallbackProc callback);
- extern void	tog_selective_update(long unsigned int mask);
- extern unsigned long cur_indmask;	/* mask showing which indicator buttons are mapped */
- extern void	inc_zoom(ind_sw_info *sw), dec_zoom(ind_sw_info *sw), fit_zoom(ind_sw_info *sw);
diff --git a/graphics/xfig/files/patch-w_intersect.c b/graphics/xfig/files/patch-w_intersect.c
new file mode 100644
index 000000000000..ca3aca987a66
--- /dev/null
+++ b/graphics/xfig/files/patch-w_intersect.c
@@ -0,0 +1,14 @@
+$FreeBSD$
+
+--- w_intersect.c.orig	2011-06-18 21:05:55.000000000 -0700
++++ w_intersect.c	2011-06-18 21:06:18.000000000 -0700
+@@ -26,7 +26,9 @@
+ #include "w_msgpanel.h"
+ #include "f_util.h"
+ #include "u_quartic.h"
++#ifndef __FreeBSD__
+ #include <alloca.h>
++#endif
+ #include <math.h>
+ #undef I
+   
diff --git a/graphics/xfig/files/patch-w_keyboard.c b/graphics/xfig/files/patch-w_keyboard.c
deleted file mode 100644
index 04b6029dd89d..000000000000
--- a/graphics/xfig/files/patch-w_keyboard.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- w_keyboard.c.orig	Tue Nov  9 13:10:22 2004
-+++ w_keyboard.c	Mon Apr  2 22:29:31 2007
-@@ -18,7 +18,9 @@
- 
- #include <sys/types.h>
- #include <regex.h>
-+#ifndef __FreeBSD__
- #include <alloca.h>
-+#endif
- #include <string.h>
- #include <math.h>
- 
-@@ -35,6 +37,9 @@
- 
- #if defined(__CYGWIN__)
- #define REG_NOERROR REG_OKAY
-+#endif
-+#if defined(__FreeBSD__) && !defined(REG_NOERROR)
-+#define REG_NOERROR 0
- #endif
- 
- Boolean keyboard_input_available = False;
diff --git a/graphics/xfig/files/patch-w_library.c b/graphics/xfig/files/patch-w_library.c
deleted file mode 100644
index 349083ffa4e9..000000000000
--- a/graphics/xfig/files/patch-w_library.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- w_library.c.orig	Mon Apr  3 09:27:30 2006
-+++ w_library.c
-@@ -1029,6 +1029,7 @@
-     Widget	     menu, entry;
- #ifndef XAW3D1_5E
-     Widget	     submenu;
-+#else
-     char	     submenu_name[200];
- #endif /* XAW3D1_5E */
-     char	     menu_name[200];
-@@ -1371,7 +1372,7 @@
- 	return 0;
-     } else if (S_ISDIR(st.st_mode)) {
- 	/* if it is directory, scan the sub-directories and search libraries */
--	(void) ScanLibraryDirectory(True, &library_rec, path, "", "", &dum, &numlibs);
-+	(void) ScanLibraryDirectory(True, library_rec, path, "", "", &dum, &numlibs);
- 	return numlibs;
-     } else {
- 	/* if it is a file, it must contain list of libraries */
diff --git a/graphics/xfig/files/patch-w_print.c b/graphics/xfig/files/patch-w_print.c
deleted file mode 100644
index 78076946cf3d..000000000000
--- a/graphics/xfig/files/patch-w_print.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- w_print.c.orig	Tue Jul 26 09:40:01 2005
-+++ w_print.c
-@@ -100,7 +100,7 @@
-         "<Message>WM_PROTOCOLS: DismissPrint()\n";
- static void     print_panel_dismiss(Widget w, XButtonEvent *ev), do_clear_batch(Widget w);
- static void	get_magnif(void);
--static void update_mag(Widget widget, XtPointer *item, XtPointer *event);
-+static void update_mag(Widget widget, XtPointer item, XtPointer event);
- void		do_print(Widget w), do_print_batch(Widget w);
- static XtCallbackProc switch_print_layers(Widget w, XtPointer closure, XtPointer call_data);
- 
-@@ -263,7 +263,7 @@
- /* as the user types in a magnification, update the figure size */
- 
- static void
--update_mag(Widget widget, XtPointer *item, XtPointer *event)
-+update_mag(Widget widget, XtPointer item, XtPointer event)
- {
-     char	   *buf;
- 
diff --git a/graphics/xfig/files/patch-w_setup.c b/graphics/xfig/files/patch-w_setup.c
deleted file mode 100644
index 8868e0f2b374..000000000000
--- a/graphics/xfig/files/patch-w_setup.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- w_setup.c.orig	Tue Jul 26 09:40:02 2005
-+++ w_setup.c
-@@ -23,7 +23,7 @@
- #include "w_setup.h"
- #include "w_util.h"
- 
--#define	NUM_DRAW_SW 17 /* kludge - shouldn't have to edit this by hand */
-+#define	NUM_DRAW_SW 15 /* kludge - shouldn't have to edit this by hand */
- 
- int		TOOL_WD, TOOL_HT;
- int		CMDFORM_WD, CMDFORM_HT = CMD_BUT_HT;
-@@ -94,7 +94,7 @@
- 
-     /* space for both modepanel titles (Drawing modes and Editing modes) */
-     MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD - 
--	(MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) +
-+	(MODE_SW_HT + INTERNAL_BW) * (ceil((double)(NUM_DRAW_SW+1)/SW_PER_ROW) +
- 			ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
-     if (MODEPANEL_SPACE < 2)
- 	MODEPANEL_SPACE = 2;
diff --git a/graphics/xfig/files/patch-w_snap.c b/graphics/xfig/files/patch-w_snap.c
deleted file mode 100644
index a2b0eeff964c..000000000000
--- a/graphics/xfig/files/patch-w_snap.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- w_snap.c.orig	Wed Sep 29 14:52:16 2004
-+++ w_snap.c
-@@ -29,7 +29,9 @@
- #include "w_util.h"
- #include "u_quartic.h"
- #include <math.h>
-+#ifndef __FreeBSD__
- #include <alloca.h>
-+#endif
- 
- int snap_gx;
- int snap_gy;
-@@ -878,7 +880,7 @@
-   dt = (dx * (double)(a->point[0].y - y))
-     -  (dy * (double)(a->point[0].x - x));
-   
--  return (signbit(d1) == signbit(dt)) ? True : False;
-+  return (signbit_(d1) == signbit_(dt)) ? True : False;
- }
- 
- /*                                      */
diff --git a/graphics/xfig/files/patch-w_snap.h b/graphics/xfig/files/patch-w_snap.h
deleted file mode 100644
index d676036b9171..000000000000
--- a/graphics/xfig/files/patch-w_snap.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- w_snap.h.orig	Tue Nov  9 13:14:42 2004
-+++ w_snap.h
-@@ -63,7 +63,7 @@
- extern Widget snap_indicator_panel;  
- extern Widget snap_indicator_label;
- 
--#  define signbit(x) \
-+#  define signbit_(x) \
-     ((0.0 >  (x)) ? 1 : 0)
- 
- 
diff --git a/graphics/xfig/files/patch-w_style.c b/graphics/xfig/files/patch-w_style.c
deleted file mode 100644
index e76101909cdc..000000000000
--- a/graphics/xfig/files/patch-w_style.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- w_style.c.orig	Tue Jul 26 09:40:02 2005
-+++ w_style.c
-@@ -696,7 +696,7 @@
-     if (style_dirty_flag) {
- 	status = popup_query(QUERY_YESNOCAN, "Do you wish to save the changes you made to the styles?");
- 	if (status == RESULT_YES)
--	    save_style((Widget) 0, (XEvent *) 0);
-+	    save_style((Widget) 0, (XButtonEvent *) 0);
- 	return status;
-     }
-     return RESULT_YES;
diff --git a/graphics/xfig/pkg-plist b/graphics/xfig/pkg-plist
index de4f3748a3e7..81a80c5ebccc 100644
--- a/graphics/xfig/pkg-plist
+++ b/graphics/xfig/pkg-plist
@@ -1,6 +1,5 @@
 bin/xfig
 lib/X11/app-defaults/Fig
-lib/X11/app-defaults/Fig-color
 lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Arrows/3darrow1.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Arrows/3darrow2.fig
@@ -76,15 +75,16 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/desktop4.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/desktop5.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/disk-array.fig
-%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/disk-array.fig.bak
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/film_digitizer.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/floppy_lg.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/floppy_sm.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/fujitsu-siemens.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/generic_hardware.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/high_speed_disk.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/laptop.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/laptop2.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/minitower.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/mirapoint.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/printer.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/printer2.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/printer3.fig
@@ -93,6 +93,10 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/scanner.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/server.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/sparc5.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/sun_d1000.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/sunfire_v120.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/sunfire_v240.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/sunfire_v440.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/tapedrive.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/telephone.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/terminal.fig
@@ -175,10 +179,12 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/bal_mike.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_db15.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_db25.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_db37.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_db9.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_molex_4pin.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_molex_5pin.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_molex_6pin.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_ribbon_50pin.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/dip_08pin.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/dip_14pin.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/dip_16pin.fig
@@ -1199,6 +1205,8 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/pushbutton_nc.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/pushbutton_no.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/relay.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/relay_dpdt.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/relay_spdt.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/resistor.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/sine-source.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/sine.fig
@@ -1257,6 +1265,7 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/housecheck.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/icebergs.jpg
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/illusion.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Examples/isometric_drawing.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/lidar.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/lists.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/logic.fig
@@ -1269,7 +1278,6 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/poster.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/ps-foil.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/ps-schematic.fig
-%%PORTDOCS%%lib/X11/xfig/Libraries/Examples/ps-schematic.fig.bak
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/pumpkin.xbm
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/recycle.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Examples/rfxc.fig
@@ -1298,7 +1306,6 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Machinescrews/Panhead_Slotted_screw.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Machinescrews/Panhead_Slotted_screw2.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Machinescrews/Panhead_screw.fig
-%%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Machinescrews/Panhead_screw.fig.bak
 %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/README
 %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Springs/Spring.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Springs/Spring_wi_hooks.fig
@@ -1468,6 +1475,7 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Flags/NorthAmerica/USA/texas.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Flags/NorthAmerica/USA/usa.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Flags/NorthAmerica/canada.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Flags/NorthAmerica/mexico.ps
 %%PORTDOCS%%lib/X11/xfig/Libraries/Flags/Oceania/australia.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Flags/Oceania/marshall_islands.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Flags/Oceania/micronesia.fig
@@ -2091,7 +2099,6 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Miscellaneous/brace_right.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Miscellaneous/brace_under.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Miscellaneous/candle.fig
-%%PORTDOCS%%lib/X11/xfig/Libraries/Miscellaneous/candle.fig.bak
 %%PORTDOCS%%lib/X11/xfig/Libraries/Miscellaneous/gradient1.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Miscellaneous/gradient2.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Miscellaneous/magnifying_glass1.fig
@@ -2133,6 +2140,8 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/half-down.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/half-up.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/natural.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/piano_keyboard.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/piano_keyboard_perspect.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/quarter-dotted-down.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/quarter-dotted-up.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/quarter-down.fig
@@ -2211,6 +2220,7 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/VideoPlayers/mmedia_explorer.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/OfficeEquip/filecabinet.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/OfficeEquip/overhead.fig
+%%PORTDOCS%%lib/X11/xfig/Libraries/OfficeEquip/scissors.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/OfficeEquip/telephone.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/OfficeEquip/walloutlets.fig
 %%PORTDOCS%%lib/X11/xfig/Libraries/Optics/Fiber/collimator.fig
@@ -2514,15 +2524,6 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%%%DOCSDIR%%/html/animate.js
 %%PORTDOCS%%%%DOCSDIR%%/html/attributes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/authors.html
-%%PORTDOCS%%%%DOCSDIR%%/html/authors.html.orig
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.3.2.1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.3.2.2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.3.2.3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.3.2.3a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.3.2.3b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.3.2.3c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.3.2.3d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.3.2.4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bugs_fixed.html
 %%PORTDOCS%%%%DOCSDIR%%/html/but_frm_accelerators.html
 %%PORTDOCS%%%%DOCSDIR%%/html/but_frm_attributes.html
@@ -2543,12 +2544,9 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%%%DOCSDIR%%/html/but_frm_panning.html
 %%PORTDOCS%%%%DOCSDIR%%/html/but_frm_printing.html
 %%PORTDOCS%%%%DOCSDIR%%/html/contents.html
-%%PORTDOCS%%%%DOCSDIR%%/html/contents.html.orig
 %%PORTDOCS%%%%DOCSDIR%%/html/drawing.html
 %%PORTDOCS%%%%DOCSDIR%%/html/editing.html
-%%PORTDOCS%%%%DOCSDIR%%/html/editing.html.orig
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html.orig
 %%PORTDOCS%%%%DOCSDIR%%/html/fig-format.html
 %%PORTDOCS%%%%DOCSDIR%%/html/frm_accelerators.html
 %%PORTDOCS%%%%DOCSDIR%%/html/frm_attributes.html
@@ -2685,7 +2683,6 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%%%DOCSDIR%%/html/images/export-panel-postscript.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/export-panel.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/file-accel.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/file-accel.png.orig
 %%PORTDOCS%%%%DOCSDIR%%/html/images/file-menu-button.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/file-panel.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/fill-color-button.png
@@ -2823,7 +2820,6 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%%%DOCSDIR%%/html/images/vertical-align-none.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/vertical-align-top.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/view-accel.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/view-accel.png.orig
 %%PORTDOCS%%%%DOCSDIR%%/html/images/view-menu-button.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/watch.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/watch_sm.png
@@ -2907,18 +2903,8 @@ lib/X11/xfig/CompKeyDB
 %%PORTDOCS%%%%DOCSDIR%%/html/latex_and_xfig.html
 %%PORTDOCS%%%%DOCSDIR%%/html/layers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/main_menus.html
-%%PORTDOCS%%%%DOCSDIR%%/html/main_menus.html.orig
 %%PORTDOCS%%%%DOCSDIR%%/html/miscellaneous.html
-%%PORTDOCS%%%%DOCSDIR%%/html/miscellaneous.html.orig
-%%PORTDOCS%%%%DOCSDIR%%/html/new_features.3.2.1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/new_features.3.2.3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/new_features.3.2.3a.html
-%%PORTDOCS%%%%DOCSDIR%%/html/new_features.3.2.3b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/new_features.3.2.3c.html
-%%PORTDOCS%%%%DOCSDIR%%/html/new_features.3.2.3d.html
-%%PORTDOCS%%%%DOCSDIR%%/html/new_features.3.2.4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/new_features.html
-%%PORTDOCS%%%%DOCSDIR%%/html/new_features.html.orig
 %%PORTDOCS%%%%DOCSDIR%%/html/options.html
 %%PORTDOCS%%%%DOCSDIR%%/html/panning.html
 %%PORTDOCS%%%%DOCSDIR%%/html/printing.html