o Update to 2.3.3.b15
o Update WWW tag in DESCR PR: 31070 Submitted by: KATO Tsuguru <tkato@prontomail.com>
This commit is contained in:
parent
68a4151e39
commit
971449d1b6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=48494
@ -6,10 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= xcircuit
|
||||
PORTVERSION= 2.3.3.b9
|
||||
PORTVERSION= 2.3.3.b15
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= cad
|
||||
MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
|
||||
MASTER_SITES= http://xcircuit.ece.jhu.edu/archive/
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
|
@ -1 +1 @@
|
||||
MD5 (xcircuit-2.3.3.tar.bz2) = 7721724439cdfddb6108b013fdc210b5
|
||||
MD5 (xcircuit-2.3.3.tar.bz2) = c97b2effb309da614418090176310333
|
||||
|
@ -1,51 +1,86 @@
|
||||
--- Imakefile.orig Fri Aug 31 21:56:34 2001
|
||||
+++ Imakefile Fri Aug 31 22:01:26 2001
|
||||
@@ -28,23 +28,23 @@
|
||||
#CCOPTIONS = -O2
|
||||
#
|
||||
# for debugging purposes uncomment the following line:
|
||||
-CDEBUGFLAGS = -g
|
||||
-STD_INCLUDES = -I. -I/usr/X11R6/include/X11
|
||||
+# CDEBUGFLAGS = -g
|
||||
+STD_INCLUDES = -I. -I$(INCDIR)/X11
|
||||
|
||||
# The "m4" macro processor is used to generate the man page such that
|
||||
# the man page reflects the configured options.
|
||||
-M4 = m4
|
||||
+M4 = gm4
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
# Installation directories:
|
||||
# Change the following as desired to suit your environment:
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
-PREFIX = /usr/local
|
||||
+# 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
|
||||
+XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
|
||||
+XCIRCUIT_BIN_DIR = $(BINDIR)
|
||||
+XCIRCUIT_MAN_DIR = $(MANDIR)
|
||||
XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
@@ -63,7 +63,7 @@
|
||||
# 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
|
||||
+GS_EXEC=${LOCALBASE}/bin/gs
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
# Window manager bug workaround---If you don't like xcircuit grabbing kbd
|
||||
@@ -91,7 +91,7 @@
|
||||
# Support for embedded Python interpreter
|
||||
# (requires libpython${PYTHON_VERSION}.a)
|
||||
#
|
||||
-#define HAVE_PYTHON
|
||||
+/* #define HAVE_PYTHON */
|
||||
|
||||
PYTHON_VERSION=2.1
|
||||
PYTHON_LIB_DIR=/usr/local/lib
|
||||
*** 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
|
||||
|
@ -1,29 +0,0 @@
|
||||
--- 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;
|
@ -1,13 +0,0 @@
|
||||
*** rcfile.c.orig Wed Feb 14 04:52:28 2001
|
||||
--- rcfile.c Wed Feb 14 04:54:12 2001
|
||||
***************
|
||||
*** 38,43 ****
|
||||
--- 38,45 ----
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
extern char _STR2[250], _STR[150];
|
||||
+ extern Display *dpy;
|
||||
+ extern Window win;
|
||||
extern fontinfo *fonts;
|
||||
extern short fontcount;
|
||||
extern Clientdata areastruct;
|
@ -1,19 +0,0 @@
|
||||
*** 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)},
|
@ -1,19 +0,0 @@
|
||||
*** 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,3 +1,3 @@
|
||||
xcircuit is software for drawing electrical circuits.
|
||||
|
||||
WWW: http://bach.ece.jhu.edu/~tim/programs/xcircuit/
|
||||
WWW: http://xcircuit.ece.jhu.edu/
|
||||
|
@ -49,6 +49,7 @@ share/examples/xcircuit/diffamp_test.ps
|
||||
share/examples/xcircuit/envelope.ps
|
||||
share/examples/xcircuit/fourttest.ps
|
||||
share/examples/xcircuit/gettext.py
|
||||
share/examples/xcircuit/loadlgf.py
|
||||
share/examples/xcircuit/logic8.ps
|
||||
share/examples/xcircuit/prelude.ps
|
||||
share/examples/xcircuit/systemd1.lgf
|
||||
|
Loading…
Reference in New Issue
Block a user