cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to version 2.2.1

Browse Source 
PR: 25074
Submitted by: Ports Fury
This commit is contained in:
Kevin Lo 2001-02-14 12:41:38 +00:00
parent 35340321b7
commit 634fd57ed1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=38329
22 changed files with 109 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cad/xcircuit/Makefile
View File

@ -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 - . | \

2
cad/xcircuit/distinfo
View File

@ -1 +1 @@
MD5 (xcircuit-2.2.0.tar.bz2) = 2bf570d7072bf1882feb317f2bd9fb68
MD5 (xcircuit-2.2.1.tar.bz2) = d5830ac22de7b610a1f19fcb3f830b4c

21
cad/xcircuit/files/patch-aa
View File

@ -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 */
#------------------------------------------------------------------------
#

21
cad/xcircuit/files/patch-ab
View File

@ -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?) */

14
cad/xcircuit/files/patch-ac
View File

@ -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>

43
cad/xcircuit/files/patch-ad
View File

@ -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;

14
cad/xcircuit/files/patch-ae
View File

@ -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

14
cad/xcircuit/files/patch-af
View File

@ -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>

14
cad/xcircuit/files/patch-ag
View File

@ -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>

14
cad/xcircuit/files/patch-ah
View File

@ -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>

14
cad/xcircuit/files/patch-ai
View File

@ -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>

14
cad/xcircuit/files/patch-aj
View File

@ -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>

14
cad/xcircuit/files/patch-ak
View File

@ -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>

14
cad/xcircuit/files/patch-al
View File

@ -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>

14
cad/xcircuit/files/patch-am
View File

@ -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>

23
cad/xcircuit/files/patch-an
View File

@ -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;

14
cad/xcircuit/files/patch-ao
View File

@ -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>

14
cad/xcircuit/files/patch-ap
View File

@ -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>

14
cad/xcircuit/files/patch-aq
View File

@ -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>

19
cad/xcircuit/files/patch-ar Normal file
View File

@ -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)},

19
cad/xcircuit/files/patch-as Normal file
View File

@ -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();

1
cad/xcircuit/pkg-plist
View File

@ -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