5 files changed, 24 insertions, 22 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index e612695324aa..d585765ff397 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcircuit
-PORTVERSION=	2.3
+PORTVERSION=	2.3.3 
 CATEGORIES=	cad
 MASTER_SITES=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 4d9cb83747c0..0efec78ff0cc 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1 +1 @@
-MD5 (xcircuit-2.3.tar.bz2) = accf7f6f915e304c8c0e40986e959add
+MD5 (xcircuit-2.3.3.tar.bz2) = b98ddbca4da7bf4413438cd2296a01fb
diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa
index d5bdbde3e6ed..050a45a7d1d0 100644
--- a/cad/xcircuit/files/patch-aa
+++ b/cad/xcircuit/files/patch-aa
@@ -1,5 +1,5 @@
-*** Imakefile.orig	Wed May 16 02:27:29 2001
---- Imakefile	Sat May 26 05:53:06 2001
+*** Imakefile.orig	Wed Jun 13 00:43:27 2001
+--- Imakefile	Sat Jun 16 09:43:29 2001
 ***************
 *** 28,46 ****
   #CCOPTIONS = -O2
@@ -14,7 +14,7 @@
   #------------------------------------------------------------------------
   #
 ! PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.0/psfiles
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
 ! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3
 ! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
 ! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
@@ -35,7 +35,7 @@
   #------------------------------------------------------------------------
   #
 ! #PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.0/psfiles
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
 ! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
 ! XCIRCUIT_BIN_DIR = $(BINDIR)
 ! XCIRCUIT_MAN_DIR = $(MANDIR)
@@ -55,24 +55,24 @@
   # 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
+! GS_EXEC=${LOCALBASE}/bin/gs
   
   #------------------------------------------------------------------------
   # Window manager bug workaround---If you don't like xcircuit grabbing kbd
 ***************
-*** 85,91 ****
-  #------------------------------------------------------------------------
-  # Support for embedded Python interpreter (requires libpython2.0.a)
+*** 86,92 ****
+  # Support for embedded Python interpreter
+  # (requires libpython${PYTHON_VERSION}.a)
   #
 ! #define HAVE_PYTHON
   
-  PYTHON_VERSION=2.0
+  PYTHON_VERSION=2.1
   PYTHON_LIB_DIR=/usr/local/lib
---- 86,92 ----
-  #------------------------------------------------------------------------
-  # Support for embedded Python interpreter (requires libpython2.0.a)
+--- 87,93 ----
+  # Support for embedded Python interpreter
+  # (requires libpython${PYTHON_VERSION}.a)
   #
 ! /* #define HAVE_PYTHON */
   
-  PYTHON_VERSION=2.0
+  PYTHON_VERSION=2.1
   PYTHON_LIB_DIR=/usr/local/lib
diff --git a/cad/xcircuit/files/patch-ab b/cad/xcircuit/files/patch-ab
index 2c1e11f04290..fffcdea367fd 100644
--- a/cad/xcircuit/files/patch-ab
+++ b/cad/xcircuit/files/patch-ab
@@ -1,11 +1,11 @@
-*** xcircuit.c.orig	Fri Feb  9 23:51:53 2001
---- xcircuit.c	Wed Feb 14 04:21:20 2001
+*** xcircuit.c.orig	Tue Jun 26 22:34:15 2001
+--- xcircuit.c	Sat Jun 30 12:53:00 2001
 ***************
-*** 20,25 ****
---- 20,28 ----
-  #include <errno.h>
+*** 21,26 ****
+--- 21,29 ----
   #include <limits.h>
   #include <locale.h>
+  #include <unistd.h>   /* for unlink() */
 + #ifdef __FreeBSD__
 + #include <machine/floatingpoint.h>
 + #endif
@@ -13,8 +13,8 @@
   #include <X11/Intrinsic.h>
   #include <X11/StringDefs.h>
 ***************
-*** 1650,1655 ****
---- 1653,1662 ----
+*** 1685,1690 ****
+--- 1688,1697 ----
      char		*argv0;		/* find root of argv[0] */
      short initargc = argc;	/* because XtInitialize() absorbs the     */
      				/* -schem flag and renumbers argc! (bug?) */
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index 65f462c964fd..11ba0a5a31d8 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -30,12 +30,14 @@ 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/ic_templates.lps
 lib/X11/xcircuit/lgf.lps
 lib/X11/xcircuit/musiclib.lps
 lib/X11/xcircuit/signal.lps
 lib/X11/xcircuit/startup.script
 lib/X11/xcircuit/xcircps2.pro
 share/examples/xcircuit/.xcircuitrc
+share/examples/xcircuit/FlareLED.ps
 share/examples/xcircuit/USAflag.ps
 share/examples/xcircuit/analog1.ps
 share/examples/xcircuit/analog2.ps