Make this compile and install cleanly under Linux.

2 files changed, 20 insertions, 15 deletions

diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index 540f5dfe2bd..901b558b331 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2003/01/15 07:11:43 rh Exp $
+$NetBSD: distinfo,v 1.10 2003/04/01 04:50:46 jschauma Exp $
 
 SHA1 (xfig.3.2.4.full.tar.gz) = 723bf10355a92c079be08cd7be18b75baaccfbdc
 Size (xfig.3.2.4.full.tar.gz) = 5163150 bytes
 SHA1 (patch-aa) = 3ff914bd2ca913f7c4e2ea2a648a0776cd5098bf
-SHA1 (patch-ab) = 7f9006c8ea4151d6811e907eb91b77e1d1a9c7c6
+SHA1 (patch-ab) = 49812d181584294de1975dc3462c9721d316bbe8
 SHA1 (patch-ac) = 2c562f7956700d7382cb3576ecf15473bb750779
 SHA1 (patch-ad) = acf393046af68be92031895a06e76d3d86a2a4aa
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index 06492607095..65f749a195b 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,8 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
+$NetBSD: patch-ab,v 1.9 2003/04/01 04:50:47 jschauma Exp $
 
---- Imakefile.orig	Thu Dec 19 10:57:11 2002
-+++ Imakefile
-@@ -48,8 +48,8 @@
+--- Imakefile.orig	Thu Dec 19 12:57:11 2002
++++ Imakefile	Mon Mar 31 23:19:46 2003
+@@ -44,12 +44,13 @@
+ XCOMM BINDIR = /usr/bin/X11
+ XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier
+ XCOMM XAPPLOADDIR = /home/user/xfig
++      XAPPLOADDIR      = $(LIBDIR)/app-defaults
+ 
  XCOMM Redefine the following if your PNG library and/or include file
  XCOMM are in different places
  
@@ -13,7 +18,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
  
  XCOMM If don't want JPEG support, comment out the #define USEJPEG line
  XCOMM Uncomment the #define for USEJPEG if you want to be able to import
-@@ -68,8 +68,8 @@
+@@ -68,8 +69,8 @@
  
  #ifdef USEJPEG
  #ifdef USEINSTALLEDJPEG
@@ -24,7 +29,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
  #else
  JPEGLIBDIR = ../jpeg
  JPEGINC = -I$(JPEGLIBDIR)
-@@ -87,12 +87,12 @@
+@@ -87,12 +88,12 @@
  XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
  XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
  
@@ -41,7 +46,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons
-@@ -105,10 +105,10 @@
+@@ -105,10 +106,10 @@
  XCOMM Then be sure to change the XAW3DINC to point to the directory where your
  XCOMM 3D Athena widget headers are located
  
@@ -54,7 +59,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
  DUSEXAW3D = -DXAW3D
  XAWLIB = -lXaw3d
  #endif
-@@ -154,7 +154,7 @@
+@@ -154,7 +155,7 @@
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
  
@@ -63,7 +68,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh 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
-@@ -166,7 +166,7 @@
+@@ -166,7 +167,7 @@
  
  XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
  XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
@@ -72,7 +77,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
  
  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
-@@ -224,7 +224,7 @@
+@@ -224,7 +225,7 @@
  #ifdef USEJPEG
  
  #ifdef USEINSTALLEDJPEG
@@ -81,7 +86,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
  #else
  JPEGCONF = configure
  JPEGLIB = $(JPEGLIBDIR)/libjpeg.a
-@@ -261,7 +261,7 @@
+@@ -261,7 +262,7 @@
  DUSESMALLICONS = -DUSE_SMALL_ICONS
  #endif /* USESMALLICONS */
  
@@ -90,7 +95,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
  
  #ifdef USEJPEG
  DUSEJPEG = -DUSE_JPEG
-@@ -271,7 +271,7 @@
+@@ -271,7 +272,7 @@
  
  #ifdef USEXPM
  DUSEXPM = -DUSE_XPM
@@ -99,7 +104,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/07 06:30:36 rh Exp $
  READXPMS = f_readxpm.c
  READXPMO = f_readxpm.o
  #ifdef USEXPM_ICON
-@@ -407,6 +407,8 @@
+@@ -407,6 +408,8 @@
  install.rhtml::
  	@(cd Doc ; \
  	echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \