19 files changed, 235 insertions, 27 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 450658a510d8..44eb77a75515 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xcircuit
-# Version required:	2.0b1
+# Version required:	2.0b3
 # Date created:		3 Apr 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcircuit-2.0b1
+DISTNAME=	xcircuit-2.0b3
 CATEGORIES=	cad
 MASTER_SITES=	ftp://bach.ece.jhu.edu/pub/tim/xcircuit/ \
 		http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
@@ -22,9 +22,7 @@ XMKMF=		xmkmf
 MAN1=		xcircuit.1
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/examples/xcircuit
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit
-.endif
 
 .include <bsd.port.mk>
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 923d07be4a31..8801b69ab991 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1 +1 @@
-MD5 (xcircuit-2.0b1.tar.bz2) = e3cd348d7221891dc693fe5cae3d6d0d
+MD5 (xcircuit-2.0b3.tar.bz2) = 3a471732d39e51b9689419337f4a66e5
diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa
index f732fba4d2d6..26c3811ba4eb 100644
--- a/cad/xcircuit/files/patch-aa
+++ b/cad/xcircuit/files/patch-aa
@@ -1,7 +1,7 @@
-*** Imakefile.orig	Thu Nov 25 07:05:35 1999
---- Imakefile	Tue Dec 14 04:46:02 1999
+*** Imakefile.orig	Thu Jan  6 03:15:52 2000
+--- Imakefile	Fri Jan 21 12:00:00 2000
 ***************
-*** 24,40 ****
+*** 26,44 ****
   #CCOPTIONS = -O2
   #
   # for debugging purposes uncomment the following line:
@@ -14,12 +14,14 @@
   #------------------------------------------------------------------------
   #
 ! PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b1/psfiles
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b2/psfiles
 ! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.0
-  XCIRCUIT_BIN_DIR = $(PREFIX)/bin
-  XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
+! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
+! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
   
---- 24,40 ----
+  #------------------------------------------------------------------------
+  # Support for graphics double-buffering (A memory hog, but yields fastest
+--- 26,44 ----
   #CCOPTIONS = -O2
   #
   # for debugging purposes uncomment the following line:
@@ -31,14 +33,16 @@
   # Change the following as desired to suit your environment:
   #------------------------------------------------------------------------
   #
-! PREFIX ?= /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b1/psfiles
-! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/X11/xcircuit
-  XCIRCUIT_BIN_DIR = $(PREFIX)/bin
-  XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
+! #PREFIX = /usr/local
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b2/psfiles
+! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
+! XCIRCUIT_BIN_DIR = $(BINDIR)
+! XCIRCUIT_MAN_DIR = $(MANDIR)
   
+  #------------------------------------------------------------------------
+  # Support for graphics double-buffering (A memory hog, but yields fastest
 ***************
-*** 87,95 ****
+*** 89,97 ****
   # DEC Alpha, Solaris and other SVR4 systems need the following,
   # or if you have compilation errors about "dp->d_name" being
   # undefined:
@@ -48,7 +52,7 @@
   
   # My DECstation (Ultrix) has something funny going on in XLib. . . if there
   # is a compile-time error "ld: Undefined: XUniqueContext *** Error code 1"
---- 87,95 ----
+--- 89,97 ----
   # DEC Alpha, Solaris and other SVR4 systems need the following,
   # or if you have compilation errors about "dp->d_name" being
   # undefined:
diff --git a/cad/xcircuit/files/patch-ab b/cad/xcircuit/files/patch-ab
index 6ee29df6739c..a4bd87d732ae 100644
--- a/cad/xcircuit/files/patch-ab
+++ b/cad/xcircuit/files/patch-ab
@@ -1,8 +1,16 @@
-*** xcircuit.c.orig	Fri Jun 25 23:25:12 1999
---- xcircuit.c	Tue Sep  7 00:48:01 1999
+*** xcircuit.c.orig	Fri Jan 14 00:21:21 2000
+--- xcircuit.c	Fri Jan 21 12:00:00 2000
 ***************
-*** 17,22 ****
---- 17,25 ----
+*** 11,22 ****
+--- 11,27 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <sys/types.h>
+  #include <sys/stat.h>
   #include <errno.h>
   #include <limits.h>
   #include <locale.h>
@@ -13,11 +21,11 @@
   #include <X11/Intrinsic.h>
   #include <X11/StringDefs.h>
 ***************
-*** 1384,1389 ****
---- 1387,1396 ----
-     objectptr	*page;		/* -schem flag and renumbers argc! (bug?) */
-     Pixmap	icon, mask;
+*** 1435,1440 ****
+--- 1440,1449 ----
      char		*argv0;		/* find root of argv[0] */
+     short initargc = argc;	/* because XtInitialize() absorbs the     */
+     				/* -schem flag and renumbers argc! (bug?) */
 + 
 + #ifdef __FreeBSD__
 +    fpsetmask(0);
diff --git a/cad/xcircuit/files/patch-ac b/cad/xcircuit/files/patch-ac
new file mode 100644
index 000000000000..ad038ccc3f0b
--- /dev/null
+++ b/cad/xcircuit/files/patch-ac
@@ -0,0 +1,14 @@
+*** elements.c.orig	Sat Jan  8 01:32:22 2000
+--- elements.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff --git a/cad/xcircuit/files/patch-ad b/cad/xcircuit/files/patch-ad
new file mode 100644
index 000000000000..a313f4807700
--- /dev/null
+++ b/cad/xcircuit/files/patch-ad
@@ -0,0 +1,14 @@
+*** events.c.orig	Tue Jan 11 03:54:04 2000
+--- events.c	Fri Jan 2l 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <math.h>
+  
+  #include <X11/Intrinsic.h>
diff --git a/cad/xcircuit/files/patch-ae b/cad/xcircuit/files/patch-ae
new file mode 100644
index 000000000000..d54161f178c1
--- /dev/null
+++ b/cad/xcircuit/files/patch-ae
@@ -0,0 +1,14 @@
+*** filelist.c.orig	Thu Jan  6 03:16:39 2000
+--- filelist.c	Fri Jan 21 12:00:00 2000
+***************
+*** 5,11 ****
+--- 5,13 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <sys/types.h>
+  #ifdef linux
+  #include <dirent.h>
diff --git a/cad/xcircuit/files/patch-af b/cad/xcircuit/files/patch-af
new file mode 100644
index 000000000000..6877aac4a66f
--- /dev/null
+++ b/cad/xcircuit/files/patch-af
@@ -0,0 +1,14 @@
+*** files.c.orig	Tue Jan 11 03:57:52 2000
+--- files.c	Fri Jan 21 12:00:00 2000
+***************
+*** 6,12 ****
+--- 6,14 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <time.h>
+  #include <pwd.h>
+  #include <sys/types.h>
diff --git a/cad/xcircuit/files/patch-ag b/cad/xcircuit/files/patch-ag
new file mode 100644
index 000000000000..ba0a1685f6f5
--- /dev/null
+++ b/cad/xcircuit/files/patch-ag
@@ -0,0 +1,14 @@
+*** fontfile.c.orig	Fri Jan  7 12:11:03 2000
+--- fontfile.c	Fri Jan 21 12:00:00 2000
+***************
+*** 6,12 ****
+--- 6,14 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff --git a/cad/xcircuit/files/patch-ah b/cad/xcircuit/files/patch-ah
new file mode 100644
index 000000000000..ece167cf1d69
--- /dev/null
+++ b/cad/xcircuit/files/patch-ah
@@ -0,0 +1,14 @@
+*** formats.c.orig	Tue Jan 11 02:25:57 2000
+--- formats.c	Fri Jan 21 12:00:00 2000
+***************
+*** 5,11 ****
+--- 5,13 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
+  
diff --git a/cad/xcircuit/files/patch-ai b/cad/xcircuit/files/patch-ai
new file mode 100644
index 000000000000..66eeb4d8640c
--- /dev/null
+++ b/cad/xcircuit/files/patch-ai
@@ -0,0 +1,14 @@
+*** functions.c.orig	Tue Jan 11 04:40:36 2000
+--- functions.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <math.h>
+  
+  #include <X11/Intrinsic.h>
diff --git a/cad/xcircuit/files/patch-aj b/cad/xcircuit/files/patch-aj
new file mode 100644
index 000000000000..40ccba7c8f97
--- /dev/null
+++ b/cad/xcircuit/files/patch-aj
@@ -0,0 +1,14 @@
+*** libraries.c.orig	Tue Jan 11 03:26:12 2000
+--- libraries.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff --git a/cad/xcircuit/files/patch-ak b/cad/xcircuit/files/patch-ak
new file mode 100644
index 000000000000..fe4a3b436beb
--- /dev/null
+++ b/cad/xcircuit/files/patch-ak
@@ -0,0 +1,14 @@
+*** menucalls.c.orig	Tue Jan 11 01:41:59 2000
+--- menucalls.c	Fri Jan 21 12:00:00 2000
+***************
+*** 6,12 ****
+--- 6,14 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <sys/types.h>
+  #include <errno.h>
+  #include <limits.h>
diff --git a/cad/xcircuit/files/patch-al b/cad/xcircuit/files/patch-al
new file mode 100644
index 000000000000..7afdb3c2f7bf
--- /dev/null
+++ b/cad/xcircuit/files/patch-al
@@ -0,0 +1,14 @@
+*** netlist.c.orig	Thu Jan  6 05:09:34 2000
+--- netlist.c	Fri Jan 21 12:00:00 2000
+***************
+*** 10,16 ****
+--- 10,18 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff --git a/cad/xcircuit/files/patch-am b/cad/xcircuit/files/patch-am
new file mode 100644
index 000000000000..aa5854f85061
--- /dev/null
+++ b/cad/xcircuit/files/patch-am
@@ -0,0 +1,14 @@
+*** parameter.c.orig	Sat Jan  8 01:24:21 2000
+--- parameter.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff --git a/cad/xcircuit/files/patch-an b/cad/xcircuit/files/patch-an
new file mode 100644
index 000000000000..eb62c93868bc
--- /dev/null
+++ b/cad/xcircuit/files/patch-an
@@ -0,0 +1,14 @@
+*** rcfile.c.orig	Sat Jan  8 01:24:10 2000
+--- rcfile.c	Fri Jan 21 12:00:00 2000
+***************
+*** 10,16 ****
+--- 10,18 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff --git a/cad/xcircuit/files/patch-ao b/cad/xcircuit/files/patch-ao
new file mode 100644
index 000000000000..8317a7f63b97
--- /dev/null
+++ b/cad/xcircuit/files/patch-ao
@@ -0,0 +1,14 @@
+*** schema.c.orig	Tue Jan 11 03:53:16 2000
+--- schema.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff --git a/cad/xcircuit/files/patch-ap b/cad/xcircuit/files/patch-ap
new file mode 100644
index 000000000000..c04578ad54c1
--- /dev/null
+++ b/cad/xcircuit/files/patch-ap
@@ -0,0 +1,14 @@
+*** selection.c.orig	Tue Jan 11 04:27:36 2000
+--- selection.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <math.h>
+  
+  #include <X11/Intrinsic.h>
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index d7c88a47fa96..17d31834e503 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -4,6 +4,7 @@ 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
@@ -38,6 +39,7 @@ share/examples/xcircuit/analog1.ps
 share/examples/xcircuit/analog2.ps
 share/examples/xcircuit/analoglib.lps
 share/examples/xcircuit/border.ps
+share/examples/xcircuit/diffamp_test.ps
 share/examples/xcircuit/logic8.ps
 share/examples/xcircuit/prelude.ps
 share/examples/xcircuit/systemd1.lgf