update to 3.2.5b

This is a security update.
changes:
-fix some unsecure tmpfile writing (CVE-2009-1962)
-more bugfixes
-symbol library extensions
-changed default browser to firefox and default pdf viewer to xpdf
-HTML MAP export (fig2dev) produces reference to .png file instead
 of .gif now
-minor UI improvements

11 files changed, 131 insertions, 131 deletions

diff --git a/graphics/xfig/patches/patch-aa b/graphics/xfig/patches/patch-aa
index 74acecc8f7f..68e8c50dc72 100644
--- a/graphics/xfig/patches/patch-aa
+++ b/graphics/xfig/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.9 2003/01/07 06:30:35 rh Exp $
+$NetBSD: patch-aa,v 1.10 2009/06/22 18:29:33 drochner Exp $
 
---- Fig.ad.orig	Wed Dec 18 17:05:41 2002
+--- Fig.ad.orig	2009-05-07 01:11:09.000000000 +0200
 +++ Fig.ad
-@@ -24,7 +24,7 @@
+@@ -29,7 +29,7 @@ Fig.browser:	firefox -remote 'openFile(%
  
  ! 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
 +Fig.pdfviewer:			gv %f
  
  ! Spell check program - put your favorite spelling check program here.
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index 8ca6ed9e2fa..b0cbef90e22 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,34 +1,21 @@
-$NetBSD: patch-ab,v 1.12 2006/02/04 13:17:51 markd Exp $
+$NetBSD: patch-ab,v 1.13 2009/06/22 18:29:33 drochner Exp $
 
---- Imakefile.orig	2004-04-27 08:24:41.000000000 +1200
+--- Imakefile.orig	2009-03-30 17:53:05.000000000 +0200
 +++ Imakefile
-@@ -45,6 +45,7 @@ XCOMM different tree than the "correct" 
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
- 
- XCOMM XAPPLOADDIR = /home/user/xfig
-+      XAPPLOADDIR = $(LIBDIR)/app-defaults
- 
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -58,21 +59,24 @@ XCOMM #define XAW3D1_5E
- 
+@@ -65,18 +65,21 @@ XCOMM #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
  #   ifdef XAW3D
 -	DUSEXAW3D = -DXAW3D
--	XAWLIB = -lXaw3d
-+      DUSEXAW3D = -DXAW3D
-+      XAWLIB = -lXaw3d
-+      XAW_SRC = SmeCascade.c
-+      XAW_OBJ = SmeCascade.o
-+#   else
-+      XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
-+      XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
++        DUSEXAW3D = -DXAW3D
++        XAW_SRC = SmeCascade.c
++        XAW_OBJ = SmeCascade.o
++#else
++        XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
++        XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
  #   endif /* XAW3D */
  #endif /* XAW3D1_5E */
  
@@ -42,29 +29,34 @@ $NetBSD: patch-ab,v 1.12 2006/02/04 13:17:51 markd Exp $
  ZLIBDIR = $(USRLIBDIR)
  
  XCOMM If don't want JPEG support, comment out the #define USEJPEG line
-@@ -92,8 +96,8 @@ XCOMM You must have version 5b or newer 
+@@ -96,11 +99,11 @@ XCOMM You must have version 5b or newer 
  
  #ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
--JPEGLIBDIR = /usr/local/lib
--JPEGINC = -I/usr/include/X11
-+JPEGLIBDIR = $(LOCALBASE)/lib
-+JPEGINC = -I$(LOCALBASE)/include
- #else
- JPEGLIBDIR = ../jpeg
- JPEGINC = -I$(JPEGLIBDIR)
-@@ -115,8 +119,8 @@ XCOMM Change XPMINC if necessary to poin
+     #ifdef USEINSTALLEDJPEG
+-	JPEGLIBDIR = /usr/local/lib
+-	JPEGINC = -I/usr/include/X11
++        JPEGLIBDIR = $(LOCALBASE)/lib
++        JPEGINC = -I$(LOCALBASE)/include
+     #else
+-	JPEGLIBDIR = ../jpeg
+-	JPEGINC = -I$(JPEGLIBDIR)
++        JPEGLIBDIR = ../jpeg
++        JPEGINC = -I$(JPEGLIBDIR)
+     #endif /* USEINSTALLEDJPEG */
+ #endif /* USEJPEG */
+ 
+@@ -119,8 +122,8 @@ XCOMM Change XPMINC if necessary to poin
  #define USEXPM_ICON
  
  #ifdef USEXPM
--XPMLIBDIR = $(USRLIBDIR)
--XPMINC = -I/usr/include/X11
+-XPMLIBDIR = /usr/local/lib
+-XPMINC = -I/usr/local/include/X11
 +XPMLIBDIR = $(X11BASE)/lib
 +XPMINC = -I$(X11BASE)/include/X11
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -157,7 +161,7 @@ XCOMM uncomment the following line if yo
+@@ -161,7 +164,7 @@ XCOMM uncomment the following line if yo
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -73,16 +65,16 @@ $NetBSD: patch-ab,v 1.12 2006/02/04 13:17:51 markd Exp $
  
  XCOMM use (and change) the following if you want the multi-key data base file
  XCOMM somewhere other than the standard X11 library directory
-@@ -169,7 +173,7 @@ XFIGLIBDIR = $(LIBDIR)/xfig
+@@ -173,7 +176,7 @@ 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/local/xfig/doc
 +XFIGDOCDIR = $(PREFIX)/share/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
-@@ -229,7 +233,7 @@ INSTDATFLAGS = -m 0644
+@@ -241,7 +244,7 @@ INSTDATFLAGS = -m 0644
  #ifdef USEJPEG
  
  #ifdef USEINSTALLEDJPEG
@@ -91,7 +83,7 @@ $NetBSD: patch-ab,v 1.12 2006/02/04 13:17:51 markd Exp $
  #else
  JPEGCONF = configure
  JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
-@@ -266,7 +270,7 @@ InstallManPageLong(file,dest,file)
+@@ -278,7 +281,7 @@ InstallManPageLong(file,dest,file)
  DUSESMALLICONS = -DUSE_SMALL_ICONS
  #endif /* USESMALLICONS */
  
@@ -100,7 +92,7 @@ $NetBSD: patch-ab,v 1.12 2006/02/04 13:17:51 markd Exp $
  
  #ifdef USEJPEG
  DUSEJPEG = -DUSE_JPEG
-@@ -276,7 +280,7 @@ READJPEGO = f_readjpg.o
+@@ -288,7 +291,7 @@ READJPEGO = f_readjpg.o
  
  #ifdef USEXPM
  DUSEXPM = -DUSE_XPM
@@ -109,30 +101,3 @@ $NetBSD: patch-ab,v 1.12 2006/02/04 13:17:51 markd Exp $
  READXPMS = f_readxpm.c
  READXPMO = f_readxpm.o
  #ifdef USEXPM_ICON
-@@ -411,6 +415,8 @@ install.html::
- install.rhtml::
- 	@(cd Doc ; \
- 	echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
-+	if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \
-+	   else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ); 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) ; \
-@@ -469,13 +475,13 @@ install.libs::
- 						else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ); fi ; \
- 					    (cd $$l ; \
- 						for m in * ; do \
--						    $(INSTALL) -m 644 -c $$m $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \
-+						    $(INSTALL) -m 644 -c ./$$m $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \
- 						done ) ) ; \
--					else ( $(INSTALL) -m 644 -c $$l $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \
-+					else ( $(INSTALL) -m 644 -c ./$$l $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \
- 				done) ) ; \
--			    else ( $(INSTALL) -m 644 -c $$dd $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ) ; fi ; \
-+			    else ( $(INSTALL) -m 644 -c ./$$dd $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ) ; fi ; \
- 			done) ); \
--		else ($(INSTALL) -m 644 -c $$f $(DESTDIR)$(OBJLIBDIR)/$$d ) ; fi ; \
-+		else ($(INSTALL) -m 644 -c ./$$f $(DESTDIR)$(OBJLIBDIR)/$$d ) ; fi ; \
- 	    done ) ; \
- 	done ; ) ; \
- 	else echo No Object Libraries to install ; \
diff --git a/graphics/xfig/patches/patch-ac b/graphics/xfig/patches/patch-ac
index b4e4a18d589..0fd67a14516 100644
--- a/graphics/xfig/patches/patch-ac
+++ b/graphics/xfig/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.6 2006/11/16 02:28:58 markd Exp $
+$NetBSD: patch-ac,v 1.7 2009/06/22 18:29:33 drochner Exp $
 
---- f_util.c.orig	2004-01-07 08:46:08.000000000 +1300
+--- f_util.c.orig	2007-01-16 18:58:18.000000000 +0100
 +++ f_util.c
-@@ -111,15 +111,15 @@ change_directory(path)
- get_directory(direct)
-     char	   *direct;
+@@ -119,15 +119,15 @@ change_directory(char *path)
+ 
+ int get_directory(char *direct)
  {
 -#if defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE)
 +#if defined(SYSV) || defined(SVR4) || defined(_POSIX_SOURCE) || defined(__NetBSD__)
-     extern char	   *getcwd();
+     extern char	   *getcwd(char *, size_t);
  
  #else
      extern char	   *getwd();
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.6 2006/11/16 02:28:58 markd Exp $
      if (getcwd(direct, PATH_MAX) == NULL) {	/* get current working dir */
  	file_msg("Can't get current directory");
  	beep();
-@@ -127,7 +127,7 @@ get_directory(direct)
+@@ -135,7 +135,7 @@ int get_directory(char *direct)
      if (getwd(direct) == NULL) {		/* get current working dir */
  	file_msg("%s", direct);			/* err msg is in direct var */
  	beep();
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.6 2006/11/16 02:28:58 markd Exp $
  	*direct = '\0';
  	return 0;
      }
-@@ -782,7 +782,7 @@ uncompress_file(name)
+@@ -781,7 +781,7 @@ uncompress_file(char *name)
      else strcpy(dirname, ".");
  
      if (access(dirname, W_OK) == 0) {  /* OK - the directory is writable */
@@ -39,7 +39,7 @@ $NetBSD: patch-ac,v 1.6 2006/11/16 02:28:58 markd Exp $
        if (system(unc) != 0)
  	file_msg("Couldn't uncompress the file: \"%s\"", unc);
        strcpy(name, plainname);
-@@ -793,7 +793,7 @@ uncompress_file(name)
+@@ -792,7 +792,7 @@ uncompress_file(char *name)
  	  sprintf(tmpfile, "%s%s", TMPDIR, c);
        else
  	  sprintf(tmpfile, "%s/%s", TMPDIR, plainname);
diff --git a/graphics/xfig/patches/patch-ad b/graphics/xfig/patches/patch-ad
index c19fbed048a..34d5d447137 100644
--- a/graphics/xfig/patches/patch-ad
+++ b/graphics/xfig/patches/patch-ad
@@ -1,22 +1,22 @@
-$NetBSD: patch-ad,v 1.4 2005/11/12 16:08:21 itohy Exp $
+$NetBSD: patch-ad,v 1.5 2009/06/22 18:29:33 drochner Exp $
 
---- w_cmdpanel.c.orig	Wed Mar 17 09:53:55 2004
-+++ w_cmdpanel.c	Sat Nov 12 19:55:19 2005
-@@ -349,7 +349,7 @@ rebuild_file_menu(menu)
+--- w_cmdpanel.c.orig	2008-07-17 17:50:06.000000000 +0200
++++ w_cmdpanel.c
+@@ -375,7 +375,7 @@ rebuild_file_menu(Widget menu)
+ 	for (j = 0; j < MAX_RECENT_FILES; j++) {
  	    sprintf(id, "%1d", j + 1);
  	    FirstArg(XtNvertSpace, 10);
- 	    NextArg(XtNunderline, 0); /* underline # digit */
 -#ifndef XAW3D1_5E
 +#ifndef XAW3D
+ 	    NextArg(XtNunderline, 0); /* underline # digit */
  	    entry = XtCreateWidget(id, figSmeBSBObjectClass, menu, Args, ArgCount);
  #else
- 	    entry = XtCreateWidget(id, smeBSBObjectClass, menu, Args, ArgCount);
-@@ -407,7 +407,7 @@ create_menu_item(menup)
+@@ -432,7 +432,7 @@ create_menu_item(main_menu_info *menup)
+ 		if (menup->menu[i].checkmark) {
  		    NextArg(XtNleftMargin, 12);
  		}
- 		NextArg(XtNunderline, menup->menu[i].u_line); /* any underline */
 -#ifndef XAW3D1_5E
 +#ifndef XAW3D
+ 		NextArg(XtNunderline, menup->menu[i].u_line); /* any underline */
  		entry = XtCreateManagedWidget(menup->menu[i].name, figSmeBSBObjectClass, 
  					menu, Args, ArgCount);
- #else
diff --git a/graphics/xfig/patches/patch-ae b/graphics/xfig/patches/patch-ae
index e45188616a2..1c71778a381 100644
--- a/graphics/xfig/patches/patch-ae
+++ b/graphics/xfig/patches/patch-ae
@@ -1,10 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2006/06/02 12:13:03 rillig Exp $
+$NetBSD: patch-ae,v 1.4 2009/06/22 18:29:33 drochner Exp $
 
-SunPro does not understand __inline, only inline.
-
---- fig.h.orig	2004-01-06 20:47:36.000000000 +0100
-+++ fig.h	2006-06-02 12:41:17.122524864 +0200
-@@ -353,7 +353,11 @@ extern char *getenv();
+--- fig.h.orig	2006-02-24 21:15:16.000000000 +0100
++++ fig.h
+@@ -356,7 +356,11 @@ extern char *getenv();
  #define		signof(a)	(((a) < 0) ? -1 : 1)
  
  #ifdef USE_INLINE
@@ -16,3 +14,12 @@ SunPro does not understand __inline, only inline.
  #else
  #define INLINE
  #endif /* USE_INLINE */
+@@ -374,7 +378,7 @@ extern	double		drand48();
+ #define	random()	lrand48()
+ #define	frandom()	drand48()
+ 
+-#elif defined(BSD)  /* not SYSV/SVR4, check for BSD */
++#elif defined(BSD) || defined(__NetBSD__)  /* not SYSV/SVR4, check for BSD */
+ #define	srandom(seed)	srand48((long)(seed))
+ #define	random()	lrand48()
+ #define	frandom()	drand48()
diff --git a/graphics/xfig/patches/patch-af b/graphics/xfig/patches/patch-af
deleted file mode 100644
index 573cf9ac11a..00000000000
--- a/graphics/xfig/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/06/30 18:59:34 tron Exp $
-
---- u_fonts.h.orig	2004-01-06 19:47:45.000000000 +0000
-+++ u_fonts.h	2006-06-30 19:55:40.000000000 +0100
-@@ -32,9 +32,6 @@
- 
- extern int		psfontnum();
- extern int		latexfontnum();
--extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
--extern struct _fstruct	ps_fontinfo[];
--extern struct _fstruct	latex_fontinfo[];
- 
- /* element of linked list for each font
-    The head of list is for the different font NAMES,
-@@ -61,5 +58,9 @@
- 				 * sizes */
- };
- 
-+extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
-+extern struct _fstruct	ps_fontinfo[];
-+extern struct _fstruct	latex_fontinfo[];
-+
- int		x_fontnum();
- #endif /* U_FONTS_H */
diff --git a/graphics/xfig/patches/patch-ah b/graphics/xfig/patches/patch-ah
deleted file mode 100644
index 62c309d3ff8..00000000000
--- a/graphics/xfig/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/02/06 23:33:01 smb Exp $
-
---- w_drawprim.c.orig	2004-02-09 13:32:56.000000000 -0500
-+++ w_drawprim.c	2008-02-06 18:28:34.000000000 -0500
-@@ -36,6 +36,7 @@
- #include "mode.h"
- #include "object.h"
- #include "u_fonts.h"
-+#include "u_create.h"
- #include "w_canvas.h"
- #include "w_drawprim.h"
- #include "w_indpanel.h"
diff --git a/graphics/xfig/patches/patch-ai b/graphics/xfig/patches/patch-ai
new file mode 100644
index 00000000000..bff888f4cd9
--- /dev/null
+++ b/graphics/xfig/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2009/06/22 18:29:33 drochner Exp $
+
+--- e_chop.c.orig	2009-03-30 17:52:10.000000000 +0200
++++ e_chop.c
+@@ -19,9 +19,6 @@
+ /* >>>>>>>>>>>>>>>>>>> fixme -- don't forget undo ! <<<<<<<<<<<<<<<< */
+ 
+ #include <stdlib.h>
+-#ifndef __FreeBSD__
+-#include <alloca.h>
+-#endif
+ #include <math.h>
+ #include "fig.h"
+ #include "resources.h"
diff --git a/graphics/xfig/patches/patch-ak b/graphics/xfig/patches/patch-ak
new file mode 100644
index 00000000000..d370b79a594
--- /dev/null
+++ b/graphics/xfig/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2009/06/22 18:29:33 drochner Exp $
+
+--- w_snap.c.orig	2009-03-30 17:52:10.000000000 +0200
++++ w_snap.c
+@@ -32,9 +32,6 @@
+ #include "u_search.h"
+ #include "f_util.h"
+ #include <math.h>
+-#ifndef __FreeBSD__
+-#include <alloca.h>
+-#endif
+ 
+ int snap_gx;
+ int snap_gy;
diff --git a/graphics/xfig/patches/patch-al b/graphics/xfig/patches/patch-al
new file mode 100644
index 00000000000..82970c95556
--- /dev/null
+++ b/graphics/xfig/patches/patch-al
@@ -0,0 +1,24 @@
+$NetBSD: patch-al,v 1.1 2009/06/22 18:29:33 drochner Exp $
+
+--- w_keyboard.c.orig	2008-05-20 21:38:18.000000000 +0200
++++ w_keyboard.c
+@@ -18,9 +18,7 @@
+ 
+ #include <sys/types.h>
+ #include <regex.h>
+-#ifndef __FreeBSD__
+-#include <alloca.h>
+-#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+ 
+@@ -244,7 +242,7 @@ handle_keyboard_input(w, event)
+     origin_y = fix_y;
+   }
+   
+-  if (REG_NOERROR == (rc = regexec(&preg, val, preg.re_nsub, pmatch, 0))) {
++  if (!(rc = regexec(&preg, val, preg.re_nsub, pmatch, 0))) {
+ #if 0    
+     int i;
+     for (i = 0; i < 1 + preg.re_nsub; i++) {
diff --git a/graphics/xfig/patches/patch-am b/graphics/xfig/patches/patch-am
new file mode 100644
index 00000000000..cb279fbfe2e
--- /dev/null
+++ b/graphics/xfig/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2009/06/22 18:29:33 drochner Exp $
+
+--- w_intersect.c.orig	2009-06-05 21:22:32.000000000 +0200
++++ w_intersect.c
+@@ -26,7 +26,6 @@
+ #include "w_msgpanel.h"
+ #include "f_util.h"
+ #include "u_quartic.h"
+-#include <alloca.h>
+ #include <math.h>
+ #undef I
+