diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 44eb77a75515..dd4c19b49843 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xcircuit
-# Version required:	2.0b3
+# Version required:	2.0b4
 # Date created:		3 Apr 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcircuit-2.0b3
+DISTNAME=	xcircuit-2.0b4
 CATEGORIES=	cad
 MASTER_SITES=	ftp://bach.ece.jhu.edu/pub/tim/xcircuit/ \
 		http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://bach.ece.jhu.edu/pub/tim/xcircuit/ \
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55
 
 USE_BZIP2=	yes
 USE_IMAKE=	yes
@@ -21,6 +22,9 @@ XMKMF=		xmkmf
 
 MAN1=		xcircuit.1
 
+post-patch:
+	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/Imakefile
+
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/xcircuit
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 020438ed6e39..d81115fd05ed 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1 +1 @@
-MD5 (xcircuit-2.0b3.tar.bz2) = d32f448022a535222ae09f8b8b643667
+MD5 (xcircuit-2.0b4.tar.bz2) = 3ffe684a0cba7ab92a54be19c8f762a8
diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa
index 26c3811ba4eb..93057f530b9d 100644
--- a/cad/xcircuit/files/patch-aa
+++ b/cad/xcircuit/files/patch-aa
@@ -1,5 +1,5 @@
-*** Imakefile.orig	Thu Jan  6 03:15:52 2000
---- Imakefile	Fri Jan 21 12:00:00 2000
+*** Imakefile.orig	Wed Mar  1 00:41:35 2000
+--- Imakefile	Mon Mar 13 01:45:29 2000
 ***************
 *** 26,44 ****
   #CCOPTIONS = -O2
@@ -26,7 +26,7 @@
   #
   # for debugging purposes uncomment the following line:
 ! #CDEBUGFLAGS = -g
-! #STD_INCLUDES = -I. -I/usr/X11R6/include/X11
+! STD_INCLUDES = -I. -I$(INCDIR)/X11
   
   #------------------------------------------------------------------------
   # Installation directories:
@@ -42,23 +42,19 @@
   #------------------------------------------------------------------------
   # Support for graphics double-buffering (A memory hog, but yields fastest
 ***************
-*** 89,97 ****
-  # DEC Alpha, Solaris and other SVR4 systems need the following,
-  # or if you have compilation errors about "dp->d_name" being
-  # undefined:
-! #DIRENT = -DSVR4_DIRENT
-  # Otherwise,
-! DIRENT =
+*** 56,62 ****
+  # 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
+! GS_EXEC= /usr/bin/gs
   
-  # My DECstation (Ultrix) has something funny going on in XLib. . . if there
-  # is a compile-time error "ld: Undefined: XUniqueContext *** Error code 1"
---- 89,97 ----
-  # DEC Alpha, Solaris and other SVR4 systems need the following,
-  # or if you have compilation errors about "dp->d_name" being
-  # undefined:
-! DIRENT = -DSVR4_DIRENT
-  # Otherwise,
-! #DIRENT =
+  #------------------------------------------------------------------------
+  # Window manager bug workaround---If you don't like xcircuit grabbing kbd
+--- 56,62 ----
+  # 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
+! GS_EXEC= %%LOCALBASE%%/bin/gs
   
-  # My DECstation (Ultrix) has something funny going on in XLib. . . if there
-  # is a compile-time error "ld: Undefined: XUniqueContext *** Error code 1"
+  #------------------------------------------------------------------------
+  # Window manager bug workaround---If you don't like xcircuit grabbing kbd
diff --git a/cad/xcircuit/files/patch-ae b/cad/xcircuit/files/patch-ae
index d54161f178c1..f50f1bce8e18 100644
--- a/cad/xcircuit/files/patch-ae
+++ b/cad/xcircuit/files/patch-ae
@@ -1,8 +1,8 @@
-*** filelist.c.orig	Thu Jan  6 03:16:39 2000
---- filelist.c	Fri Jan 21 12:00:00 2000
+*** filelist.c.orig	Tue Feb 29 23:35:01 2000
+--- filelist.c	Mon Mar 13 02:23:41 2000
 ***************
-*** 5,11 ****
---- 5,13 ----
+*** 5,12 ****
+--- 5,19 ----
   
   #include <stdio.h>
   #include <string.h>
@@ -10,5 +10,11 @@
   #include <malloc.h>
 + #endif
   #include <sys/types.h>
++ #ifdef __FreeBSD__
++ #include <dirent.h>
++ #include <unistd.h>
++ #define direct dirent
++ #endif
   #ifdef linux
   #include <dirent.h>
+  #include <linux/unistd.h>
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index 17d31834e503..a2f2bdc8a0e8 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -4,7 +4,6 @@ lib/X11/xcircuit/analog.lps
 lib/X11/xcircuit/avlsi.lps
 lib/X11/xcircuit/builtins.lps
 lib/X11/xcircuit/digital.lps
-lib/X11/xcircuit/generic.lps
 lib/X11/xcircuit/fonts/courier.lps
 lib/X11/xcircuit/fonts/courier.xfe
 lib/X11/xcircuit/fonts/courieriso.xfe
@@ -30,6 +29,7 @@ lib/X11/xcircuit/fonts/times_romaniso2.lps
 lib/X11/xcircuit/fonts/times_romaniso2.xfe
 lib/X11/xcircuit/fonts/times_romaniso5.lps
 lib/X11/xcircuit/fonts/times_romaniso5.xfe
+lib/X11/xcircuit/generic.lps
 lib/X11/xcircuit/lgf.lps
 lib/X11/xcircuit/musiclib.lps
 lib/X11/xcircuit/signal.lps