Update to version 3.2.3a.

PR:		16281
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

1 files changed, 37 insertions, 34 deletions

diff --git a/graphics/xfig-devel/files/patch-aa b/graphics/xfig-devel/files/patch-aa
index cb659e726f0b..55e88132aff4 100644
--- a/graphics/xfig-devel/files/patch-aa
+++ b/graphics/xfig-devel/files/patch-aa
@@ -1,31 +1,18 @@
---- Imakefile.orig	Fri Jul  3 02:37:09 1998
-+++ Imakefile	Mon Jan  3 13:19:34 2000
-@@ -40,7 +40,7 @@
+--- Imakefile.orig	Fri Jan 14 12:25:09 2000
++++ Imakefile	Sat Jan 22 01:20:28 2000
+@@ -40,8 +40,8 @@
  
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
 -JPEGLIBDIR = /usr/local/lib
+-JPEGINCDIR = /usr/include/X11
 +JPEGLIBDIR = %%LOCALBASE%%/lib
++JPEGINCDIR = %%LOCALBASE%%/include
  #else
  JPEGLIBDIR = ../jpeg
- #endif
-@@ -49,12 +49,12 @@
- XCOMM Uncomment the following definiton if you want to use the small icons
- XCOMM for the panel buttons.  Use this if you have a 800x600 or smaller screen.
- 
--XCOMM #define USESMALLICONS
-+#define USESMALLICONS
- 
- XCOMM Uncomment the following definition for XAWLIB if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
- 
--XCOMM XAWLIB = -lXaw3d
-+XAWLIB = -lXaw3d
- 
- XCOMM Uncomment the following if needed for DECstations running older X11R4
- XCOMM INCROOT=/usr/include/mit
-@@ -70,12 +70,12 @@
- XCOMM Change XPMLIBS if necessary to point to the xpm library (libXpm)
+ JPEGINCDIR = $(JPEGLIBDIR)
+@@ -59,18 +59,18 @@
+ XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
  XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
  
 -XCOMM #define USEXPM
@@ -35,12 +22,28 @@
  
  #ifdef USEXPM
  XPMLIBDIR = $(USRLIBDIR)
--XPMINC = -I$(INCDIR)
-+XPMINC = -I$(INCDIR)/X11 -I$(INCDIR)
- XPMLIBS = -L$(XPMLIBDIR) -lXpm
+-XPMINC = -I/usr/include/X11
++XPMINC = -I$(INCDIR)/X11
  #endif
  
-@@ -101,7 +101,7 @@
+ XCOMM Uncomment the following definiton if you want to use the small icons
+ XCOMM for the panel buttons.  Use this if you have a 800x600 or smaller screen.
+ 
+-XCOMM #define USESMALLICONS
++#define USESMALLICONS
+ 
+ XCOMM Uncomment the following definition for XAW3D if you want to use
+ XCOMM the 3d Athena Widget Set (highly recommended!)
+@@ -99,7 +99,7 @@
+ XCOMM Uncomment the next line if you want use Japanese (i18n) on xfig.
+ XCOMM If your setlocale() dosen'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
+ 
+@@ -110,7 +110,7 @@
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -49,12 +52,12 @@
  
  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 +169,7 @@
- 
- #ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
--JPEGINCDIR = -I/usr/include/X11
-+JPEGINCDIR = -I%%LOCALBASE%%/include
- JPEGLIB = -L$(JPEGLIBDIR) -ljpeg
- #else
- JPEGCONF = configure
+@@ -189,7 +189,7 @@
+ #endif /* USEJPEG */
+ 
+ #ifdef I18N
+-I18N_DEFS = -DI18N -DSETLOCALE
++I18N_DEFS = -DI18N #-DSETLOCALE
+ I18N_SRC = w_i18n.c
+ I18N_OBJ = w_i18n.o
+ #endif