Date: Tue, 13 Feb 2001 14:19:22 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/25074: Update port: cad/xcircuit to 2.2.1 Message-ID: <200102132219.f1DMJMs80296@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 25074 >Category: ports >Synopsis: Update port: cad/xcircuit to 2.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 13 14:20:00 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.2.1 New file: files/patch-ar files/patch-as Remove file: files/patch-ac files/patch-ae files/patch-af files/patch-ag files/patch-ah files/patch-ai files/patch-aj files/patch-ak files/patch-al files/patch-am files/patch-ao files/patch-ap files/patch-aq >How-To-Repeat: >Fix: diff -urN /usr/ports/cad/xcircuit/Makefile cad/xcircuit/Makefile --- /usr/ports/cad/xcircuit/Makefile Sat Dec 23 06:44:36 2000 +++ cad/xcircuit/Makefile Sat Feb 10 17:05:11 2001 @@ -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 @@ 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 -urN /usr/ports/cad/xcircuit/distinfo cad/xcircuit/distinfo --- /usr/ports/cad/xcircuit/distinfo Sat Dec 23 06:44:36 2000 +++ cad/xcircuit/distinfo Sat Feb 10 16:50:36 2001 @@ -1 +1 @@ -MD5 (xcircuit-2.2.0.tar.bz2) = 2bf570d7072bf1882feb317f2bd9fb68 +MD5 (xcircuit-2.2.1.tar.bz2) = d5830ac22de7b610a1f19fcb3f830b4c diff -urN /usr/ports/cad/xcircuit/files/patch-aa cad/xcircuit/files/patch-aa --- /usr/ports/cad/xcircuit/files/patch-aa Sat Dec 23 06:44:42 2000 +++ cad/xcircuit/files/patch-aa Wed Feb 14 05:50:22 2001 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ab cad/xcircuit/files/patch-ab --- /usr/ports/cad/xcircuit/files/patch-ab Sat Sep 9 17:55:46 2000 +++ cad/xcircuit/files/patch-ab Wed Feb 14 06:45:18 2001 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ac cad/xcircuit/files/patch-ac --- /usr/ports/cad/xcircuit/files/patch-ac Mon Jan 24 15:04:05 2000 +++ cad/xcircuit/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ad cad/xcircuit/files/patch-ad --- /usr/ports/cad/xcircuit/files/patch-ad Mon Jan 24 15:04:05 2000 +++ cad/xcircuit/files/patch-ad Wed Feb 14 05:51:25 2001 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ae cad/xcircuit/files/patch-ae --- /usr/ports/cad/xcircuit/files/patch-ae Sat Dec 23 06:44:42 2000 +++ cad/xcircuit/files/patch-ae Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-af cad/xcircuit/files/patch-af --- /usr/ports/cad/xcircuit/files/patch-af Mon Jan 24 15:04:05 2000 +++ cad/xcircuit/files/patch-af Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ag cad/xcircuit/files/patch-ag --- /usr/ports/cad/xcircuit/files/patch-ag Mon Jan 24 15:04:05 2000 +++ cad/xcircuit/files/patch-ag Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ah cad/xcircuit/files/patch-ah --- /usr/ports/cad/xcircuit/files/patch-ah Mon Jan 24 15:04:05 2000 +++ cad/xcircuit/files/patch-ah Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ai cad/xcircuit/files/patch-ai --- /usr/ports/cad/xcircuit/files/patch-ai Mon Jan 24 15:04:06 2000 +++ cad/xcircuit/files/patch-ai Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-aj cad/xcircuit/files/patch-aj --- /usr/ports/cad/xcircuit/files/patch-aj Mon Jan 24 15:04:06 2000 +++ cad/xcircuit/files/patch-aj Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ak cad/xcircuit/files/patch-ak --- /usr/ports/cad/xcircuit/files/patch-ak Mon Jan 24 15:04:06 2000 +++ cad/xcircuit/files/patch-ak Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-al cad/xcircuit/files/patch-al --- /usr/ports/cad/xcircuit/files/patch-al Mon Jan 24 15:04:06 2000 +++ cad/xcircuit/files/patch-al Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-am cad/xcircuit/files/patch-am --- /usr/ports/cad/xcircuit/files/patch-am Mon Jan 24 15:04:06 2000 +++ cad/xcircuit/files/patch-am Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-an cad/xcircuit/files/patch-an --- /usr/ports/cad/xcircuit/files/patch-an Mon Jan 24 15:04:06 2000 +++ cad/xcircuit/files/patch-an Wed Feb 14 04:54:24 2001 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ao cad/xcircuit/files/patch-ao --- /usr/ports/cad/xcircuit/files/patch-ao Mon Jan 24 15:04:07 2000 +++ cad/xcircuit/files/patch-ao Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ap cad/xcircuit/files/patch-ap --- /usr/ports/cad/xcircuit/files/patch-ap Mon Jan 24 15:04:07 2000 +++ cad/xcircuit/files/patch-ap Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-aq cad/xcircuit/files/patch-aq --- /usr/ports/cad/xcircuit/files/patch-aq Sat Sep 9 17:55:46 2000 +++ cad/xcircuit/files/patch-aq Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-ar cad/xcircuit/files/patch-ar --- /usr/ports/cad/xcircuit/files/patch-ar Thu Jan 1 09:00:00 1970 +++ cad/xcircuit/files/patch-ar Wed Feb 14 05:51:41 2001 @@ -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 -urN /usr/ports/cad/xcircuit/files/patch-as cad/xcircuit/files/patch-as --- /usr/ports/cad/xcircuit/files/patch-as Thu Jan 1 09:00:00 1970 +++ cad/xcircuit/files/patch-as Wed Feb 14 05:51:59 2001 @@ -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 -urN /usr/ports/cad/xcircuit/pkg-plist cad/xcircuit/pkg-plist --- /usr/ports/cad/xcircuit/pkg-plist Sat Dec 23 06:44:43 2000 +++ cad/xcircuit/pkg-plist Wed Feb 14 06:08:20 2001 @@ -45,6 +45,7 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200102132219.f1DMJMs80296>