Update to version 2.2.1

PR: 25074
Submitted by: Ports Fury

22 files changed, 109 insertions, 228 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index c47f1a3a4d3d..f960ef5c7528 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcircuit
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	cad
 MASTER_SITES=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 
@@ -15,12 +15,14 @@ MAINTAINER=	ports@FreeBSD.org
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55
 
 USE_BZIP2=	yes
-USE_IMAKE=	yes
 USE_XPM=	yes
+USE_IMAKE=	yes
 XMKMF=		xmkmf
 
 MAN1=		xcircuit.1
 
+post-patch:
+	@find ${WRKSRC} -type f | xargs ${PERL} -pi -e "s|__DARWIN__|__STDC__|g" 
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/xcircuit
 	${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . | \
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 8bb0e83614fd..2672fd10a7b6 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1 +1 @@
-MD5 (xcircuit-2.2.0.tar.bz2) = 2bf570d7072bf1882feb317f2bd9fb68
+MD5 (xcircuit-2.2.1.tar.bz2) = d5830ac22de7b610a1f19fcb3f830b4c
diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa
index ce9cbf5c87cd..d20e7d3474a7 100644
--- a/cad/xcircuit/files/patch-aa
+++ b/cad/xcircuit/files/patch-aa
@@ -1,5 +1,5 @@
-*** Imakefile.orig	Tue Dec 19 06:19:13 2000
---- Imakefile	Wed Dec 20 02:58:57 2000
+*** Imakefile.orig	Wed Feb 14 04:52:30 2001
+--- Imakefile	Wed Feb 14 05:17:11 2001
 ***************
 *** 28,46 ****
   #CCOPTIONS = -O2
@@ -59,3 +59,20 @@
   
   #------------------------------------------------------------------------
   # Window manager bug workaround---If you don't like xcircuit grabbing kbd
+***************
+*** 85,91 ****
+  #------------------------------------------------------------------------
+  # Support for embedded Python interpreter (requires libpython2.0.a)
+  #
+! #define HAVE_PYTHON
+  
+  #------------------------------------------------------------------------
+  #
+--- 86,92 ----
+  #------------------------------------------------------------------------
+  # Support for embedded Python interpreter (requires libpython2.0.a)
+  #
+! /* #define HAVE_PYTHON */
+  
+  #------------------------------------------------------------------------
+  #
diff --git a/cad/xcircuit/files/patch-ab b/cad/xcircuit/files/patch-ab
index 78315e8e6738..2c1e11f04290 100644
--- a/cad/xcircuit/files/patch-ab
+++ b/cad/xcircuit/files/patch-ab
@@ -1,17 +1,8 @@
-*** xcircuit.c.orig	Tue Aug  8 06:08:18 2000
---- xcircuit.c	Thu Aug 17 05:00:16 2000
+*** xcircuit.c.orig	Fri Feb  9 23:51:53 2001
+--- xcircuit.c	Wed Feb 14 04:21:20 2001
 ***************
-*** 11,23 ****
---- 11,28 ----
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string.h>
-+ #ifndef __STDC__
-  #include <malloc.h>
-+ #endif
-  #include <signal.h>
-  #include <sys/types.h>
-  #include <sys/stat.h>
+*** 20,25 ****
+--- 20,28 ----
   #include <errno.h>
   #include <limits.h>
   #include <locale.h>
@@ -22,8 +13,8 @@
   #include <X11/Intrinsic.h>
   #include <X11/StringDefs.h>
 ***************
-*** 1701,1706 ****
---- 1706,1715 ----
+*** 1650,1655 ****
+--- 1653,1662 ----
      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/files/patch-ac b/cad/xcircuit/files/patch-ac
deleted file mode 100644
index ad038ccc3f0b..000000000000
--- a/cad/xcircuit/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
index a313f4807700..b826e92c1ab6 100644
--- a/cad/xcircuit/files/patch-ad
+++ b/cad/xcircuit/files/patch-ad
@@ -1,14 +1,29 @@
-*** 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>
+--- events.c.orig	Wed Feb 14 05:24:43 2001
++++ events.c	Wed Feb 14 05:32:51 2001
+@@ -102,7 +102,7 @@
+    if (eventmode == PRESS_MODE || eventmode == COPY2_MODE) {
+       short ps = objectdata->parts;
+       short *newsel;
+-      areastruct.selects = undelete(NULL, NORMAL, NULL);
++      areastruct.selects = startundelete(NULL, NORMAL, NULL);
+       areastruct.selectlist = (short *) malloc(areastruct.selects *
+ 	   sizeof(short));
+   
+@@ -1359,7 +1359,7 @@
+ 	 case XK_J: unjoin();			 break;
+ 	 case XK_s: splinebutton(bevent); 	 break;
+ 	 case XK_e: edit(bevent);	 	 break;
+-	 case XK_u: undelete(w, DRAW, bevent);	 break;
++	 case XK_u: startundelete(w, DRAW, bevent);	 break;
+ 	 case XK_m:
+ 	 case XK_M: selectsave(w, NULL, NULL);	 break;
+ 	 case XK_x: objectselect(-SEL_ANY);	 break;
+@@ -2926,7 +2926,7 @@
+ /* Undelete last deleted objects */
+ /*-------------------------------*/
+ 
+-short undelete(Widget w, u_int mode, XButtonEvent *event)
++short startundelete(Widget w, u_int mode, XButtonEvent *event)
+ {
+    objectptr delobj = *(xobjs.delbuffer.library + xobjs.delbuffer.number - 1);
+    genericptr *regen;
diff --git a/cad/xcircuit/files/patch-ae b/cad/xcircuit/files/patch-ae
deleted file mode 100644
index 0a7ec8d2c796..000000000000
--- a/cad/xcircuit/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-*** filelist.c.orig	Tue Dec 19 01:31:32 2000
---- filelist.c	Wed Dec 20 02:58:35 2000
-***************
-*** 5,11 ****
---- 5,13 ----
-  
-  #include <stdio.h>
-  #include <string.h>
-+ #ifndef __STDC__
-  #include <malloc.h>
-+ #endif
-  #include <sys/types.h>
-  
-  #ifdef HAVE_DIRENT_H
diff --git a/cad/xcircuit/files/patch-af b/cad/xcircuit/files/patch-af
deleted file mode 100644
index 6877aac4a66f..000000000000
--- a/cad/xcircuit/files/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
deleted file mode 100644
index ba0a1685f6f5..000000000000
--- a/cad/xcircuit/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
deleted file mode 100644
index ece167cf1d69..000000000000
--- a/cad/xcircuit/files/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
deleted file mode 100644
index 66eeb4d8640c..000000000000
--- a/cad/xcircuit/files/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
deleted file mode 100644
index 40ccba7c8f97..000000000000
--- a/cad/xcircuit/files/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
deleted file mode 100644
index fe4a3b436beb..000000000000
--- a/cad/xcircuit/files/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
deleted file mode 100644
index 7afdb3c2f7bf..000000000000
--- a/cad/xcircuit/files/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
deleted file mode 100644
index aa5854f85061..000000000000
--- a/cad/xcircuit/files/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
index eb62c93868bc..fa59717098d0 100644
--- a/cad/xcircuit/files/patch-an
+++ b/cad/xcircuit/files/patch-an
@@ -1,14 +1,13 @@
-*** rcfile.c.orig	Sat Jan  8 01:24:10 2000
---- rcfile.c	Fri Jan 21 12:00:00 2000
+*** rcfile.c.orig	Wed Feb 14 04:52:28 2001
+--- rcfile.c	Wed Feb 14 04:54:12 2001
 ***************
-*** 10,16 ****
---- 10,18 ----
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string.h>
-+ #ifndef __STDC__
-  #include <malloc.h>
-+ #endif
+*** 38,43 ****
+--- 38,45 ----
+  /*----------------------------------------------------------------------*/
   
-  #include <X11/Intrinsic.h>
-  #include <X11/StringDefs.h>
+  extern char _STR2[250], _STR[150];
++ extern Display *dpy;
++ extern Window win;
+  extern fontinfo *fonts;
+  extern short fontcount;
+  extern Clientdata areastruct;
diff --git a/cad/xcircuit/files/patch-ao b/cad/xcircuit/files/patch-ao
deleted file mode 100644
index 8317a7f63b97..000000000000
--- a/cad/xcircuit/files/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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
deleted file mode 100644
index c04578ad54c1..000000000000
--- a/cad/xcircuit/files/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-*** 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/files/patch-aq b/cad/xcircuit/files/patch-aq
deleted file mode 100644
index 2c2ade5235bc..000000000000
--- a/cad/xcircuit/files/patch-aq
+++ /dev/null
@@ -1,14 +0,0 @@
-*** render.c.orig	Thu May 11 00:29:51 2000
---- render.c	Thu Aug 17 05:25:28 2000
-***************
-*** 10,16 ****
---- 10,18 ----
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string.h>
-+ #ifndef __STDC__
-  #include <malloc.h>
-+ #endif
-  #include <time.h>
-  #include <sys/types.h>
-  #include <signal.h>
diff --git a/cad/xcircuit/files/patch-ar b/cad/xcircuit/files/patch-ar
new file mode 100644
index 000000000000..05dd61632b12
--- /dev/null
+++ b/cad/xcircuit/files/patch-ar
@@ -0,0 +1,19 @@
+*** menus.h.orig	Wed Feb 14 05:24:42 2001
+--- menus.h	Wed Feb 14 05:45:01 2001
+***************
+*** 297,303 ****
+  
+  menustruct EditMenu[] = {
+  	{"Delete (d)", action(startdelete, NULL)},
+! 	{"Undelete (u)", action(undelete, Number(DRAW))},
+  	{"Copy (c)", action(startcopy, NULL)},
+  	{"Edit (e)", action(startedit, NULL)},
+  	{"Rotate/Flip", submenu(RotateMenu)},
+--- 297,303 ----
+  
+  menustruct EditMenu[] = {
+  	{"Delete (d)", action(startdelete, NULL)},
+! 	{"Undelete (u)", action(startundelete, Number(DRAW))},
+  	{"Copy (c)", action(startcopy, NULL)},
+  	{"Edit (e)", action(startedit, NULL)},
+  	{"Rotate/Flip", submenu(RotateMenu)},
diff --git a/cad/xcircuit/files/patch-as b/cad/xcircuit/files/patch-as
new file mode 100644
index 000000000000..59e95acfbbed
--- /dev/null
+++ b/cad/xcircuit/files/patch-as
@@ -0,0 +1,19 @@
+*** prototypes.h.orig	Wed Feb 14 05:24:51 2001
+--- prototypes.h	Wed Feb 14 05:33:28 2001
+***************
+*** 94,100 ****
+  extern void reviseselect(short *);
+  extern void objectdelete(short);
+  extern void deletebutton(XButtonEvent *);
+! extern short undelete(Widget, u_int, XButtonEvent *);
+  extern void printname(objectptr);
+  extern void checkname(objectptr);
+  extern objectptr finddot();
+--- 94,100 ----
+  extern void reviseselect(short *);
+  extern void objectdelete(short);
+  extern void deletebutton(XButtonEvent *);
+! extern short startundelete(Widget, u_int, XButtonEvent *);
+  extern void printname(objectptr);
+  extern void checkname(objectptr);
+  extern objectptr finddot();
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index 0c6512c9a881..b610a3f6501c 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -45,6 +45,7 @@ share/examples/xcircuit/diffamp_test.ps
 share/examples/xcircuit/logic8.ps
 share/examples/xcircuit/prelude.ps
 share/examples/xcircuit/systemd1.lgf
+share/examples/xcircuit/test.py
 share/examples/xcircuit/threestage.ps
 share/examples/xcircuit/vcoblock.ps
 @dirrm share/examples/xcircuit