Attachment #17037 for bug #31070

View | Details | Raw Unified | Return to bug 31070
Collapse All | Expand All

Lines 6-15 Link Here

(-)cad/xcircuit/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= xcircuit	8	PORTNAME= xcircuit
9	PORTVERSION= 2.3.3.b9	9	PORTVERSION= 2.3.3.b15
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= cad	11	CATEGORIES= cad
12	MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/	12	MASTER_SITES= http://xcircuit.ece.jhu.edu/archive/
13	DISTNAME= ${PORTNAME}-${PORTVERSION:R}	13	DISTNAME= ${PORTNAME}-${PORTVERSION:R}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org

Line 1 Link Here

(-)cad/xcircuit/distinfo (-1 / +1 lines)
1	MD5 (xcircuit-2.3.3.tar.bz2) = 7721724439cdfddb6108b013fdc210b5	1	MD5 (xcircuit-2.3.3.tar.bz2) = c97b2effb309da614418090176310333




*** Imakefile.orig	Fri Sep  7 03:31:47 2001
--- Imakefile	Fri Sep  7 03:44:46 2001
***************
*** 28,50 ****
  #CCOPTIONS = -O2
  #
  # for debugging purposes uncomment the following line:
! CDEBUGFLAGS = -g
! STD_INCLUDES = -I. -I/usr/X11R6/include/X11
  
  # The "m4" macro processor is used to generate the man page such that
  # the man page reflects the configured options.
! M4 = m4
  
  #------------------------------------------------------------------------
  # Installation directories:
  # Change the following as desired to suit your environment:
  #------------------------------------------------------------------------
  #
! PREFIX = /usr/local
  # 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
  XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
  
  #------------------------------------------------------------------------
--- 28,51 ----
  #CCOPTIONS = -O2
  #
  # for debugging purposes uncomment the following line:
! # CDEBUGFLAGS = -g
! STD_INCLUDES = -I. -I$(INCDIR)/X11
! EXTRA_DEFINES = -DHAVE_DIRENT_H -DHAVE_PUTENV
  
  # The "m4" macro processor is used to generate the man page such that
  # the man page reflects the configured options.
! M4 = gm4
  
  #------------------------------------------------------------------------
  # Installation directories:
  # Change the following as desired to suit your environment:
  #------------------------------------------------------------------------
  #
! # PREFIX = /usr/local
  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
! XCIRCUIT_BIN_DIR = $(BINDIR)
! XCIRCUIT_MAN_DIR = $(MANDIR)
  XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
  
  #------------------------------------------------------------------------
***************
*** 63,69 ****
  # 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= /usr/bin/gs
  
  #------------------------------------------------------------------------
  # Window manager bug workaround---If you don't like xcircuit grabbing kbd
--- 64,70 ----
  # 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
  
  #------------------------------------------------------------------------
  # Window manager bug workaround---If you don't like xcircuit grabbing kbd
***************
*** 91,97 ****
  # Support for embedded Python interpreter
  # (requires libpython${PYTHON_VERSION}.a)
  #
! #define HAVE_PYTHON
  
  PYTHON_VERSION=2.1
  PYTHON_LIB_DIR=/usr/local/lib
--- 92,98 ----
  # Support for embedded Python interpreter
  # (requires libpython${PYTHON_VERSION}.a)
  #
! /* #define HAVE_PYTHON */
  
  PYTHON_VERSION=2.1
  PYTHON_LIB_DIR=/usr/local/lib




--- events.c.orig	Mon Mar  5 23:57:00 2001
+++ events.c	Thu Mar  8 02:47:52 2001
@@ -101,7 +101,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));
   
@@ -1396,7 +1396,7 @@
       else if (isbound(keywstate, XCF_Edit))
 	 edit(bevent);
       else if (isbound(keywstate, XCF_Undelete))
-	 undelete(w, DRAW, bevent);
+	 startundelete(w, DRAW, bevent);
       else if (isbound(keywstate, XCF_Select_Save))
 	 selectsave(w, NULL, NULL);
       else if (isbound(keywstate, XCF_Unselect))
@@ -2977,7 +2977,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;

Lines 1-13 Link Here

(-)cad/xcircuit/files/patch-an (-13 lines)
1	*** rcfile.c.orig Wed Feb 14 04:52:28 2001
2	--- rcfile.c Wed Feb 14 04:54:12 2001
3	***************
4	* 38,43 **
5	--- 38,45 ----
6	/----------------------------------------------------------------------/
7
8	extern char _STR2[250], _STR[150];
9	+ extern Display *dpy;
10	+ extern Window win;
11	extern fontinfo *fonts;
12	extern short fontcount;
13	extern Clientdata areastruct;




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




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

Lines 1-3 Link Here

(-)cad/xcircuit/pkg-descr (-1 / +1 lines)
1	xcircuit is software for drawing electrical circuits.	1	xcircuit is software for drawing electrical circuits.
2		2
3	WWW: http://bach.ece.jhu.edu/~tim/programs/xcircuit/	3	WWW: http://xcircuit.ece.jhu.edu/

Lines 49-54 Link Here

(-)cad/xcircuit/pkg-plist (+1 lines)
49	share/examples/xcircuit/envelope.ps	49	share/examples/xcircuit/envelope.ps
50	share/examples/xcircuit/fourttest.ps	50	share/examples/xcircuit/fourttest.ps
51	share/examples/xcircuit/gettext.py	51	share/examples/xcircuit/gettext.py
		52	share/examples/xcircuit/loadlgf.py
52	share/examples/xcircuit/logic8.ps	53	share/examples/xcircuit/logic8.ps
53	share/examples/xcircuit/prelude.ps	54	share/examples/xcircuit/prelude.ps
54	share/examples/xcircuit/systemd1.lgf	55	share/examples/xcircuit/systemd1.lgf

Return to bug 31070

Lines 1-51 Link Here

(-)cad/xcircuit/files/patch-aa (-51 / +86 lines)
1	--- Imakefile.orig Fri Aug 31 21:56:34 2001	1	*** Imakefile.orig Fri Sep 7 03:31:47 2001
2	+++ Imakefile Fri Aug 31 22:01:26 2001	2	--- Imakefile Fri Sep 7 03:44:46 2001
3	@@ -28,23 +28,23 @@	3	***************
4	#CCOPTIONS = -O2	4	* 28,50 **
5	#	5	#CCOPTIONS = -O2
6	# for debugging purposes uncomment the following line:	6	#
7	-CDEBUGFLAGS = -g	7	# for debugging purposes uncomment the following line:
8	-STD_INCLUDES = -I. -I/usr/X11R6/include/X11	8	! CDEBUGFLAGS = -g
9	+# CDEBUGFLAGS = -g	9	! STD_INCLUDES = -I. -I/usr/X11R6/include/X11
10	+STD_INCLUDES = -I. -I$(INCDIR)/X11	10
11		11	# The "m4" macro processor is used to generate the man page such that
12	# The "m4" macro processor is used to generate the man page such that	12	# the man page reflects the configured options.
13	# the man page reflects the configured options.	13	! M4 = m4
14	-M4 = m4	14
15	+M4 = gm4	15	#------------------------------------------------------------------------
16		16	# Installation directories:
17	#------------------------------------------------------------------------	17	# Change the following as desired to suit your environment:
18	# Installation directories:	18	#------------------------------------------------------------------------
19	# Change the following as desired to suit your environment:	19	#
20	#------------------------------------------------------------------------	20	! PREFIX = /usr/local
21	#	21	# XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
22	-PREFIX = /usr/local	22	! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3
23	+# PREFIX = /usr/local	23	! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
24	# XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles	24	! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
25	-XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3	25	XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
26	-XCIRCUIT_BIN_DIR = $(PREFIX)/bin	26
27	-XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1	27	#------------------------------------------------------------------------
28	+XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit	28	--- 28,51 ----
29	+XCIRCUIT_BIN_DIR = $(BINDIR)	29	#CCOPTIONS = -O2
30	+XCIRCUIT_MAN_DIR = $(MANDIR)	30	#
31	XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults	31	# for debugging purposes uncomment the following line:
32		32	! # CDEBUGFLAGS = -g
33	#------------------------------------------------------------------------	33	! STD_INCLUDES = -I. -I$(INCDIR)/X11
34	@@ -63,7 +63,7 @@	34	! EXTRA_DEFINES = -DHAVE_DIRENT_H -DHAVE_PUTENV
35	# Support for background rendering through ghostscript. Change this	35
36	# to the path where gs can be found.	36	# The "m4" macro processor is used to generate the man page such that
37	# GS_EXEC= /usr/local/src/gs5.50/obj/gs	37	# the man page reflects the configured options.
38	-GS_EXEC= /usr/bin/gs	38	! M4 = gm4
39	+GS_EXEC=${LOCALBASE}/bin/gs	39
40		40	#------------------------------------------------------------------------
41	#------------------------------------------------------------------------	41	# Installation directories:
42	# Window manager bug workaround---If you don't like xcircuit grabbing kbd	42	# Change the following as desired to suit your environment:
43	@@ -91,7 +91,7 @@	43	#------------------------------------------------------------------------
44	# Support for embedded Python interpreter	44	#
45	# (requires libpython${PYTHON_VERSION}.a)	45	! # PREFIX = /usr/local
46	#	46	# XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles
47	-#define HAVE_PYTHON	47	! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
48	+/* #define HAVE_PYTHON */	48	! XCIRCUIT_BIN_DIR = $(BINDIR)
49		49	! XCIRCUIT_MAN_DIR = $(MANDIR)
50	PYTHON_VERSION=2.1	50	XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
51	PYTHON_LIB_DIR=/usr/local/lib	51
		52	#------------------------------------------------------------------------
		53	***************
		54	* 63,69 **
		55	# Support for background rendering through ghostscript. Change this
		56	# to the path where gs can be found.
		57	# GS_EXEC= /usr/local/src/gs5.50/obj/gs
		58	! GS_EXEC= /usr/bin/gs
		59
		60	#------------------------------------------------------------------------
		61	# Window manager bug workaround---If you don't like xcircuit grabbing kbd
		62	--- 64,70 ----
		63	# Support for background rendering through ghostscript. Change this
		64	# to the path where gs can be found.
		65	# GS_EXEC= /usr/local/src/gs5.50/obj/gs
		66	! GS_EXEC=${LOCALBASE}/bin/gs
		67
		68	#------------------------------------------------------------------------
		69	# Window manager bug workaround---If you don't like xcircuit grabbing kbd
		70	***************
		71	* 91,97 **
		72	# Support for embedded Python interpreter
		73	# (requires libpython${PYTHON_VERSION}.a)
		74	#
		75	! #define HAVE_PYTHON
		76
		77	PYTHON_VERSION=2.1
		78	PYTHON_LIB_DIR=/usr/local/lib
		79	--- 92,98 ----
		80	# Support for embedded Python interpreter
		81	# (requires libpython${PYTHON_VERSION}.a)
		82	#
		83	! /* #define HAVE_PYTHON */
		84
		85	PYTHON_VERSION=2.1
		86	PYTHON_LIB_DIR=/usr/local/lib

Lines 1-29 Link Here

(-)cad/xcircuit/files/patch-ad (-29 lines)
1	--- events.c.orig Mon Mar 5 23:57:00 2001
2	+++ events.c Thu Mar 8 02:47:52 2001
3	@@ -101,7 +101,7 @@
4	if (eventmode == PRESS_MODE \|\| eventmode == COPY2_MODE) {
5	short ps = objectdata->parts;
6	short *newsel;
7	- areastruct.selects = undelete(NULL, NORMAL, NULL);
8	+ areastruct.selects = startundelete(NULL, NORMAL, NULL);
9	areastruct.selectlist = (short ) malloc(areastruct.selects
10	sizeof(short));
11
12	@@ -1396,7 +1396,7 @@
13	else if (isbound(keywstate, XCF_Edit))
14	edit(bevent);
15	else if (isbound(keywstate, XCF_Undelete))
16	- undelete(w, DRAW, bevent);
17	+ startundelete(w, DRAW, bevent);
18	else if (isbound(keywstate, XCF_Select_Save))
19	selectsave(w, NULL, NULL);
20	else if (isbound(keywstate, XCF_Unselect))
21	@@ -2977,7 +2977,7 @@
22	/* Undelete last deleted objects */
23	/-------------------------------/
24
25	-short undelete(Widget w, u_int mode, XButtonEvent *event)
26	+short startundelete(Widget w, u_int mode, XButtonEvent *event)
27	{
28	objectptr delobj = *(xobjs.delbuffer.library + xobjs.delbuffer.number - 1);
29	genericptr *regen;

Lines 1-19 Link Here

(-)cad/xcircuit/files/patch-ar (-19 lines)
1	*** menus.h.orig Wed Feb 14 05:24:42 2001
2	--- menus.h Wed Feb 14 05:45:01 2001
3	***************
4	* 297,303 **
5
6	menustruct EditMenu[] = {
7	{"Delete (d)", action(startdelete, NULL)},
8	! {"Undelete (u)", action(undelete, Number(DRAW))},
9	{"Copy (c)", action(startcopy, NULL)},
10	{"Edit (e)", action(startedit, NULL)},
11	{"Rotate/Flip", submenu(RotateMenu)},
12	--- 297,303 ----
13
14	menustruct EditMenu[] = {
15	{"Delete (d)", action(startdelete, NULL)},
16	! {"Undelete (u)", action(startundelete, Number(DRAW))},
17	{"Copy (c)", action(startcopy, NULL)},
18	{"Edit (e)", action(startedit, NULL)},
19	{"Rotate/Flip", submenu(RotateMenu)},

Lines 1-19 Link Here

(-)cad/xcircuit/files/patch-as (-19 lines)
1	*** prototypes.h.orig Wed Feb 14 05:24:51 2001
2	--- prototypes.h Wed Feb 14 05:33:28 2001
3	***************
4	* 94,100 **
5	extern void reviseselect(short *);
6	extern void objectdelete(short);
7	extern void deletebutton(XButtonEvent *);
8	! extern short undelete(Widget, u_int, XButtonEvent *);
9	extern void printname(objectptr);
10	extern void checkname(objectptr);
11	extern objectptr finddot();
12	--- 94,100 ----
13	extern void reviseselect(short *);
14	extern void objectdelete(short);
15	extern void deletebutton(XButtonEvent *);
16	! extern short startundelete(Widget, u_int, XButtonEvent *);
17	extern void printname(objectptr);
18	extern void checkname(objectptr);
19	extern objectptr finddot();