2 files changed, 14 insertions, 29 deletions

diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa
index 23621a65beba..ce9cbf5c87cd 100644
--- a/cad/xcircuit/files/patch-aa
+++ b/cad/xcircuit/files/patch-aa
@@ -1,5 +1,5 @@
-*** Imakefile.orig	Mon Oct  2 23:04:39 2000
---- Imakefile	Fri Oct 13 04:56:42 2000
+*** Imakefile.orig	Tue Dec 19 06:19:13 2000
+--- Imakefile	Wed Dec 20 02:58:57 2000
 ***************
 *** 28,46 ****
   #CCOPTIONS = -O2
@@ -14,19 +14,20 @@
   #------------------------------------------------------------------------
   #
 ! PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.1b5/psfiles
-! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.1
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.2.0/psfiles
+! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.2
 ! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
 ! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
   
   #------------------------------------------------------------------------
   # Support for graphics double-buffering (A memory hog, but yields fastest
---- 28,46 ----
+--- 28,47 ----
   #CCOPTIONS = -O2
   #
   # for debugging purposes uncomment the following line:
 ! #CDEBUGFLAGS = -g
 ! STD_INCLUDES = -I. -I$(INCDIR)/X11
+! EXTRA_DEFINES = -DHAVE_DIRENT_H -DHAVE_PUTENV
   
   #------------------------------------------------------------------------
   # Installation directories:
@@ -34,7 +35,7 @@
   #------------------------------------------------------------------------
   #
 ! #PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.1b5/psfiles
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.2.0/psfiles
 ! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
 ! XCIRCUIT_BIN_DIR = $(BINDIR)
 ! XCIRCUIT_MAN_DIR = $(MANDIR)
@@ -50,7 +51,7 @@
   
   #------------------------------------------------------------------------
   # Window manager bug workaround---If you don't like xcircuit grabbing kbd
---- 58,64 ----
+--- 59,65 ----
   # Support for background rendering through ghostscript.  Change this
   # to the path where gs can be found.
   # GS_EXEC= /usr/local/src/gs5.50/obj/gs
diff --git a/cad/xcircuit/files/patch-ae b/cad/xcircuit/files/patch-ae
index 7a9cd82919ee..0a7ec8d2c796 100644
--- a/cad/xcircuit/files/patch-ae
+++ b/cad/xcircuit/files/patch-ae
@@ -1,8 +1,8 @@
-*** filelist.c.orig	Thu May  4 06:58:52 2000
---- filelist.c	Fri Oct 13 04:55:01 2000
+*** filelist.c.orig	Tue Dec 19 01:31:32 2000
+--- filelist.c	Wed Dec 20 02:58:35 2000
 ***************
-*** 5,12 ****
---- 5,19 ----
+*** 5,11 ****
+--- 5,13 ----
   
   #include <stdio.h>
   #include <string.h>
@@ -10,21 +10,5 @@
   #include <malloc.h>
 + #endif
   #include <sys/types.h>
-+ #ifdef __FreeBSD__
-+ #include <dirent.h>
-+ #include <unistd.h>
-+ #define direct dirent
-+ #else
-  #ifdef linux
-  #include <dirent.h>
-  #include <linux/unistd.h>
-***************
-*** 19,24 ****
---- 26,32 ----
-  #else
-  #include <stdlib.h>
-  #include <sys/dir.h>
-+ #endif
-  #endif
-  #endif
-  #include <sys/stat.h>
+  
+  #ifdef HAVE_DIRENT_H