From 71e41985f52b2209feb79091604135f14c7ee7de Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Wed, 1 Dec 2004 04:47:53 +0000 Subject: update to electric-7.00 This is a major version bump and represents many many bug fixes and lots of improvements. The scope is fairly broad and can't really be summarized. See the ChangeLog in the distfile for a complete list of changes. --- cad/electric/Makefile | 6 +- cad/electric/PLIST | 785 ++++++++++++++++++++++-------------------- cad/electric/distinfo | 11 +- cad/electric/patches/patch-aa | 62 ++-- cad/electric/patches/patch-ab | 81 +++-- cad/electric/patches/patch-ac | 35 ++ 6 files changed, 527 insertions(+), 453 deletions(-) create mode 100644 cad/electric/patches/patch-ac diff --git a/cad/electric/Makefile b/cad/electric/Makefile index dd11dab1bd5..f75adaa9fb9 100644 --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:12 tv Exp $ +# $NetBSD: Makefile,v 1.9 2004/12/01 04:47:53 dmcmahill Exp $ # -DISTNAME= electric-6.05 -PKGREVISION= 2 +DISTNAME= electric-7.00 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_GNU:=electric/} @@ -25,4 +24,5 @@ post-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install.html .include "../../mk/motif.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/electric/PLIST b/cad/electric/PLIST index 6b4544d2fff..efe47dfdd09 100644 --- a/cad/electric/PLIST +++ b/cad/electric/PLIST @@ -1,380 +1,409 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/13 01:39:19 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/12/01 04:47:53 dmcmahill Exp $ bin/electric -share/electric/.cadrc -share/electric/ALS.help -share/electric/AllDialogs.c -share/electric/CL.help -share/electric/EVE.help -share/electric/QUISC.help -share/electric/evemenus.mac -share/electric/evetutor.mac -share/electric/international/fr/LC_MESSAGES/electric.mo -share/electric/international/fr/LC_MESSAGES/license.txt -share/electric/international/messages.po -share/electric/pads4u.txt -share/electric/pla_mocmos.txt -share/electric/sclib.txt -share/electric/spiceparts.txt -share/electric/tsmc25.txt -share/electric/umc18.txt -share/doc/electric/html/images/chap01-01.png -share/doc/electric/html/images/chap01-02.png -share/doc/electric/html/images/chap01-03.png -share/doc/electric/html/images/chap01-04.png -share/doc/electric/html/images/chap01-05.png -share/doc/electric/html/images/chap01-06.png -share/doc/electric/html/images/chap01-07.png -share/doc/electric/html/images/chap01-08.png -share/doc/electric/html/images/chap01-09.png -share/doc/electric/html/images/chap01-10.png -share/doc/electric/html/images/chap01-11.png -share/doc/electric/html/images/chap01-12.png -share/doc/electric/html/images/chap01-13.png -share/doc/electric/html/images/chap01-14.png -share/doc/electric/html/images/chap01-15.png -share/doc/electric/html/images/chap01-16.png -share/doc/electric/html/images/chap01-17.png -share/doc/electric/html/images/chap01-18.png -share/doc/electric/html/images/chap01-19.png -share/doc/electric/html/images/chap01-20.png -share/doc/electric/html/images/chap01-21.png -share/doc/electric/html/images/chap01-22.png -share/doc/electric/html/images/chap01-23.png -share/doc/electric/html/images/chap01-24.png -share/doc/electric/html/images/chap01-25.png -share/doc/electric/html/images/chap02-01.png -share/doc/electric/html/images/chap02-02.png -share/doc/electric/html/images/chap02-03.png -share/doc/electric/html/images/chap02-04.png -share/doc/electric/html/images/chap02-05.png -share/doc/electric/html/images/chap02-06.png -share/doc/electric/html/images/chap02-07.png -share/doc/electric/html/images/chap02-08.png -share/doc/electric/html/images/chap02-09.png -share/doc/electric/html/images/chap02-10.png -share/doc/electric/html/images/chap02-11.png -share/doc/electric/html/images/chap02-12.png -share/doc/electric/html/images/chap03-01.png -share/doc/electric/html/images/chap03-02.png -share/doc/electric/html/images/chap03-03.png -share/doc/electric/html/images/chap03-04.png -share/doc/electric/html/images/chap03-05.png -share/doc/electric/html/images/chap03-06.png -share/doc/electric/html/images/chap03-07.png -share/doc/electric/html/images/chap03-08.png -share/doc/electric/html/images/chap03-09.png -share/doc/electric/html/images/chap03-10.png -share/doc/electric/html/images/chap03-11.png -share/doc/electric/html/images/chap03-12.png -share/doc/electric/html/images/chap03-14.png -share/doc/electric/html/images/chap03-15.png -share/doc/electric/html/images/chap03-16.png -share/doc/electric/html/images/chap03-17.png -share/doc/electric/html/images/chap03-18.png -share/doc/electric/html/images/chap03-19.png -share/doc/electric/html/images/chap03-20.png -share/doc/electric/html/images/chap04-01.png -share/doc/electric/html/images/chap04-02.png -share/doc/electric/html/images/chap04-03.png -share/doc/electric/html/images/chap04-04.png -share/doc/electric/html/images/chap04-05.png -share/doc/electric/html/images/chap04-06.png -share/doc/electric/html/images/chap04-07.png -share/doc/electric/html/images/chap04-08.png -share/doc/electric/html/images/chap04-09.png -share/doc/electric/html/images/chap04-10.png -share/doc/electric/html/images/chap04-11.png -share/doc/electric/html/images/chap04-12.png -share/doc/electric/html/images/chap04-13.png -share/doc/electric/html/images/chap04-14.png -share/doc/electric/html/images/chap05-01.png -share/doc/electric/html/images/chap05-02.png -share/doc/electric/html/images/chap05-03.png -share/doc/electric/html/images/chap05-04.png -share/doc/electric/html/images/chap05-05.png -share/doc/electric/html/images/chap05-06.png -share/doc/electric/html/images/chap06-01.png -share/doc/electric/html/images/chap06-02.png -share/doc/electric/html/images/chap06-03.png -share/doc/electric/html/images/chap06-04.png -share/doc/electric/html/images/chap06-06.png -share/doc/electric/html/images/chap06-07.png -share/doc/electric/html/images/chap06-08.png -share/doc/electric/html/images/chap06-09.png -share/doc/electric/html/images/chap06-10.png -share/doc/electric/html/images/chap06-11.png -share/doc/electric/html/images/chap06-12.png -share/doc/electric/html/images/chap06-13.png -share/doc/electric/html/images/chap06-14.png -share/doc/electric/html/images/chap06-15.png -share/doc/electric/html/images/chap06-16.png -share/doc/electric/html/images/chap06-17.png -share/doc/electric/html/images/chap06-18.png -share/doc/electric/html/images/chap06-19.png -share/doc/electric/html/images/chap06-20.png -share/doc/electric/html/images/chap07-01.png -share/doc/electric/html/images/chap07-02.png -share/doc/electric/html/images/chap07-03.png -share/doc/electric/html/images/chap07-04.png -share/doc/electric/html/images/chap07-05.png -share/doc/electric/html/images/chap07-06.png -share/doc/electric/html/images/chap07-07.png -share/doc/electric/html/images/chap07-08.png -share/doc/electric/html/images/chap07-09.png -share/doc/electric/html/images/chap07-10.png -share/doc/electric/html/images/chap07-11.png -share/doc/electric/html/images/chap07-12.png -share/doc/electric/html/images/chap07-13.png -share/doc/electric/html/images/chap07-14.png -share/doc/electric/html/images/chap07-15.png -share/doc/electric/html/images/chap07-16.png -share/doc/electric/html/images/chap07-17.png -share/doc/electric/html/images/chap07-18.png -share/doc/electric/html/images/chap07-19.png -share/doc/electric/html/images/chap07-20.png -share/doc/electric/html/images/chap07-21.png -share/doc/electric/html/images/chap08-01.png -share/doc/electric/html/images/chap08-02.png -share/doc/electric/html/images/chap08-03.png -share/doc/electric/html/images/chap08-04.png -share/doc/electric/html/images/chap08-05.png -share/doc/electric/html/images/chap08-06.png -share/doc/electric/html/images/chap08-07.png -share/doc/electric/html/images/chap08-08.png -share/doc/electric/html/images/chap08-09.png -share/doc/electric/html/images/chap08-10.png -share/doc/electric/html/images/chap08-11.png -share/doc/electric/html/images/chap08-12.png -share/doc/electric/html/images/chap08-13.png -share/doc/electric/html/images/chap08-14.png -share/doc/electric/html/images/chap08-15.png -share/doc/electric/html/images/chap08-16.png -share/doc/electric/html/images/chap08-17.png -share/doc/electric/html/images/chap08-18.png -share/doc/electric/html/images/chap08-19.png -share/doc/electric/html/images/chap08-20.png -share/doc/electric/html/images/chap08-21.png -share/doc/electric/html/images/chap08-22.png -share/doc/electric/html/images/chap08-23.png -share/doc/electric/html/images/chap09-01.png -share/doc/electric/html/images/chap09-02.png -share/doc/electric/html/images/chap09-03.png -share/doc/electric/html/images/chap09-04.png -share/doc/electric/html/images/chap09-05.png -share/doc/electric/html/images/chap09-06.png -share/doc/electric/html/images/chap09-07.png -share/doc/electric/html/images/chap09-08.png -share/doc/electric/html/images/chap09-09.png -share/doc/electric/html/images/chap09-10.png -share/doc/electric/html/images/chap09-11.png -share/doc/electric/html/images/chap09-12.png -share/doc/electric/html/images/chap09-13.png -share/doc/electric/html/images/chap09-14.png -share/doc/electric/html/images/chap09-15.png -share/doc/electric/html/images/chap09-16.png -share/doc/electric/html/images/chap09-17.png -share/doc/electric/html/images/chap09-18.png -share/doc/electric/html/images/chap09-19.png -share/doc/electric/html/images/chap09-20.png -share/doc/electric/html/images/chap09-21.png -share/doc/electric/html/images/chap09-22.png -share/doc/electric/html/images/chap09-23.png -share/doc/electric/html/images/chap10-01.png -share/doc/electric/html/images/chap10-02.png -share/doc/electric/html/images/chap10-03.png -share/doc/electric/html/images/chap10-04.png -share/doc/electric/html/images/chap10-05.png -share/doc/electric/html/images/chap10-06.png -share/doc/electric/html/images/chap11-01.png -share/doc/electric/html/images/chap11-02.png -share/doc/electric/html/images/chap11-03.png -share/doc/electric/html/images/chap11-04.png -share/doc/electric/html/images/chap11-05.png -share/doc/electric/html/images/chap11-06.png -share/doc/electric/html/images/chap12-01.png -share/doc/electric/html/images/chap12-02.png -share/doc/electric/html/images/chap12-03.png -share/doc/electric/html/images/chap12-04.png -share/doc/electric/html/images/chap12-05.png -share/doc/electric/html/images/chap12-06.png -share/doc/electric/html/images/chap12-07.png -share/doc/electric/html/images/chap12-08.png -share/doc/electric/html/images/chap12-09.png -share/doc/electric/html/images/chap12-10.png -share/doc/electric/html/images/chap12-11.png -share/doc/electric/html/images/chap12-12.png -share/doc/electric/html/images/chap12-13.png -share/doc/electric/html/images/chap12-14.png -share/doc/electric/html/images/chap12-15.png -share/doc/electric/html/images/chap12-16.png -share/doc/electric/html/images/chap12-17.png -share/doc/electric/html/images/chap12-18.png -share/doc/electric/html/images/chap12-19.png -share/doc/electric/html/images/chap12-20.png -share/doc/electric/html/images/chap12-21.png -share/doc/electric/html/images/chap12-22.png -share/doc/electric/html/images/chap12-23.png -share/doc/electric/html/images/chap12-24.png -share/doc/electric/html/images/chap12-25.png -share/doc/electric/html/images/chap12-26.png -share/doc/electric/html/images/chap12-27.png -share/doc/electric/html/images/chap12-28.png -share/doc/electric/html/images/chap12-29.png -share/doc/electric/html/images/chap12-30.png -share/doc/electric/html/images/chap12-31.png -share/doc/electric/html/images/chap12-32.png -share/doc/electric/html/images/chap12-33.png -share/doc/electric/html/images/chap12-34.png -share/doc/electric/html/images/chap12-35.png -share/doc/electric/html/images/chap12-36.png -share/doc/electric/html/images/chap12-37.png -share/doc/electric/html/images/chap12-38.png -share/doc/electric/html/images/chap12-39.png -share/doc/electric/html/images/chap12-40.png -share/doc/electric/html/images/chap12-41.png -share/doc/electric/html/images/chap12-42.png -share/doc/electric/html/images/chap12-43.png -share/doc/electric/html/images/chap12-44.png -share/doc/electric/html/images/chap12-45.png -share/doc/electric/html/images/chap12-46.png -share/doc/electric/html/images/chap12-47.png -share/doc/electric/html/images/chap12-48.png -share/doc/electric/html/images/chap12-49.png -share/doc/electric/html/images/chap12-50.png -share/doc/electric/html/images/chap12-51.png -share/doc/electric/html/images/chap12-52.png -share/doc/electric/html/images/chap12-53.png -share/doc/electric/html/images/chap12-54.png -share/doc/electric/html/images/chap12-55.png -share/doc/electric/html/images/chap12-56.png -share/doc/electric/html/images/chap12-57.png -share/doc/electric/html/images/chap12-58.png -share/doc/electric/html/images/iconbackarrow.png -share/doc/electric/html/images/iconcommand.png -share/doc/electric/html/images/iconcontarrow.png -share/doc/electric/html/images/iconforearrow.png -share/doc/electric/html/images/iconplug.png -share/doc/electric/html/images/iconwindows.png -share/doc/electric/html/images/indent.png -share/doc/electric/html/images/screenshotbusy.png -share/doc/electric/html/index.html -share/doc/electric/html/text/chap01-01.html -share/doc/electric/html/text/chap01-02.html -share/doc/electric/html/text/chap01-03.html -share/doc/electric/html/text/chap01-04.html -share/doc/electric/html/text/chap01-05.html -share/doc/electric/html/text/chap01-06.html -share/doc/electric/html/text/chap01-07.html -share/doc/electric/html/text/chap01-08.html -share/doc/electric/html/text/chap01-09.html -share/doc/electric/html/text/chap01-10.html -share/doc/electric/html/text/chap01-11.html -share/doc/electric/html/text/chap02-01.html -share/doc/electric/html/text/chap02-02.html -share/doc/electric/html/text/chap02-03.html -share/doc/electric/html/text/chap02-04.html -share/doc/electric/html/text/chap02-05.html -share/doc/electric/html/text/chap02-06.html -share/doc/electric/html/text/chap03-01.html -share/doc/electric/html/text/chap03-02.html -share/doc/electric/html/text/chap03-03.html -share/doc/electric/html/text/chap03-04.html -share/doc/electric/html/text/chap03-05.html -share/doc/electric/html/text/chap03-06.html -share/doc/electric/html/text/chap03-07.html -share/doc/electric/html/text/chap03-08.html -share/doc/electric/html/text/chap03-09.html -share/doc/electric/html/text/chap03-10.html -share/doc/electric/html/text/chap03-11.html -share/doc/electric/html/text/chap03-12.html -share/doc/electric/html/text/chap04-01.html -share/doc/electric/html/text/chap04-02.html -share/doc/electric/html/text/chap04-03.html -share/doc/electric/html/text/chap04-04.html -share/doc/electric/html/text/chap04-05.html -share/doc/electric/html/text/chap04-06.html -share/doc/electric/html/text/chap04-07.html -share/doc/electric/html/text/chap04-08.html -share/doc/electric/html/text/chap04-09.html -share/doc/electric/html/text/chap04-10.html -share/doc/electric/html/text/chap04-11.html -share/doc/electric/html/text/chap05-01.html -share/doc/electric/html/text/chap05-02.html -share/doc/electric/html/text/chap05-03.html -share/doc/electric/html/text/chap05-04.html -share/doc/electric/html/text/chap05-05.html -share/doc/electric/html/text/chap06-01.html -share/doc/electric/html/text/chap06-02.html -share/doc/electric/html/text/chap06-03.html -share/doc/electric/html/text/chap06-04.html -share/doc/electric/html/text/chap06-05.html -share/doc/electric/html/text/chap06-06.html -share/doc/electric/html/text/chap06-07.html -share/doc/electric/html/text/chap06-08.html -share/doc/electric/html/text/chap06-09.html -share/doc/electric/html/text/chap06-10.html -share/doc/electric/html/text/chap06-11.html -share/doc/electric/html/text/chap06-12.html -share/doc/electric/html/text/chap07-01.html -share/doc/electric/html/text/chap07-02.html -share/doc/electric/html/text/chap07-03.html -share/doc/electric/html/text/chap07-04.html -share/doc/electric/html/text/chap07-05.html -share/doc/electric/html/text/chap07-06.html -share/doc/electric/html/text/chap07-07.html -share/doc/electric/html/text/chap07-08.html -share/doc/electric/html/text/chap07-09.html -share/doc/electric/html/text/chap08-01.html -share/doc/electric/html/text/chap08-02.html -share/doc/electric/html/text/chap08-03.html -share/doc/electric/html/text/chap08-04.html -share/doc/electric/html/text/chap08-05.html -share/doc/electric/html/text/chap08-06.html -share/doc/electric/html/text/chap08-07.html -share/doc/electric/html/text/chap08-08.html -share/doc/electric/html/text/chap08-09.html -share/doc/electric/html/text/chap08-10.html -share/doc/electric/html/text/chap09-01.html -share/doc/electric/html/text/chap09-02.html -share/doc/electric/html/text/chap09-03.html -share/doc/electric/html/text/chap09-04.html -share/doc/electric/html/text/chap09-05.html -share/doc/electric/html/text/chap09-06.html -share/doc/electric/html/text/chap09-07.html -share/doc/electric/html/text/chap09-08.html -share/doc/electric/html/text/chap09-09.html -share/doc/electric/html/text/chap09-10.html -share/doc/electric/html/text/chap09-11.html -share/doc/electric/html/text/chap09-12.html -share/doc/electric/html/text/chap10-01.html -share/doc/electric/html/text/chap10-02.html -share/doc/electric/html/text/chap10-03.html -share/doc/electric/html/text/chap10-04.html -share/doc/electric/html/text/chap10-05.html -share/doc/electric/html/text/chap10-06.html -share/doc/electric/html/text/chap10-07.html -share/doc/electric/html/text/chap10-08.html -share/doc/electric/html/text/chap10-09.html -share/doc/electric/html/text/chap11-01.html -share/doc/electric/html/text/chap11-02.html -share/doc/electric/html/text/chap11-03.html -share/doc/electric/html/text/chap11-04.html -share/doc/electric/html/text/chap11-05.html -share/doc/electric/html/text/chap12-01.html -share/doc/electric/html/text/chap12-02.html -share/doc/electric/html/text/chap12-03.html -share/doc/electric/html/text/chap12-04.html -share/doc/electric/html/text/chap12-05.html -share/doc/electric/html/text/chap12-06.html -share/doc/electric/html/text/chap12-07.html -share/doc/electric/html/text/chap12-08.html -share/doc/electric/html/text/chap12-09.html -share/doc/electric/html/text/chap12-10.html -@dirrm share/doc/electric/html/text -@dirrm share/doc/electric/html/images -@dirrm share/doc/electric/html -@dirrm share/doc/electric -@dirrm share/electric/international/fr/LC_MESSAGES -@dirrm share/electric/international/fr -@dirrm share/electric/international +share/electric/doc/html/images/chap01-01.png +share/electric/doc/html/images/chap01-02.png +share/electric/doc/html/images/chap01-03.png +share/electric/doc/html/images/chap01-04.png +share/electric/doc/html/images/chap01-05.png +share/electric/doc/html/images/chap01-06.png +share/electric/doc/html/images/chap01-07.png +share/electric/doc/html/images/chap01-08.png +share/electric/doc/html/images/chap01-09.png +share/electric/doc/html/images/chap01-10.png +share/electric/doc/html/images/chap01-11.png +share/electric/doc/html/images/chap01-12.png +share/electric/doc/html/images/chap01-13.png +share/electric/doc/html/images/chap01-14.png +share/electric/doc/html/images/chap01-15.png +share/electric/doc/html/images/chap01-16.png +share/electric/doc/html/images/chap01-17.png +share/electric/doc/html/images/chap01-18.png +share/electric/doc/html/images/chap01-19.png +share/electric/doc/html/images/chap01-20.png +share/electric/doc/html/images/chap01-21.png +share/electric/doc/html/images/chap01-22.png +share/electric/doc/html/images/chap01-23.png +share/electric/doc/html/images/chap01-24.png +share/electric/doc/html/images/chap01-25.png +share/electric/doc/html/images/chap02-01.png +share/electric/doc/html/images/chap02-02.png +share/electric/doc/html/images/chap02-03.png +share/electric/doc/html/images/chap02-04.png +share/electric/doc/html/images/chap02-05.png +share/electric/doc/html/images/chap02-06.png +share/electric/doc/html/images/chap02-07.png +share/electric/doc/html/images/chap02-08.png +share/electric/doc/html/images/chap02-09.png +share/electric/doc/html/images/chap02-10.png +share/electric/doc/html/images/chap02-11.png +share/electric/doc/html/images/chap02-12.png +share/electric/doc/html/images/chap02-13.png +share/electric/doc/html/images/chap03-01.png +share/electric/doc/html/images/chap03-02.png +share/electric/doc/html/images/chap03-03.png +share/electric/doc/html/images/chap03-05.png +share/electric/doc/html/images/chap03-06.png +share/electric/doc/html/images/chap03-07.png +share/electric/doc/html/images/chap03-08.png +share/electric/doc/html/images/chap03-09.png +share/electric/doc/html/images/chap03-10.png +share/electric/doc/html/images/chap03-11.png +share/electric/doc/html/images/chap03-12.png +share/electric/doc/html/images/chap03-13.png +share/electric/doc/html/images/chap03-14.png +share/electric/doc/html/images/chap03-15.png +share/electric/doc/html/images/chap03-16.png +share/electric/doc/html/images/chap03-17.png +share/electric/doc/html/images/chap03-18.png +share/electric/doc/html/images/chap03-19.png +share/electric/doc/html/images/chap03-20.png +share/electric/doc/html/images/chap03-21.png +share/electric/doc/html/images/chap03-22.png +share/electric/doc/html/images/chap04-01.png +share/electric/doc/html/images/chap04-02.png +share/electric/doc/html/images/chap04-03.png +share/electric/doc/html/images/chap04-04.png +share/electric/doc/html/images/chap04-05.png +share/electric/doc/html/images/chap04-06.png +share/electric/doc/html/images/chap04-07.png +share/electric/doc/html/images/chap04-08.png +share/electric/doc/html/images/chap04-09.png +share/electric/doc/html/images/chap04-10.png +share/electric/doc/html/images/chap04-11.png +share/electric/doc/html/images/chap04-12.png +share/electric/doc/html/images/chap04-13.png +share/electric/doc/html/images/chap04-14.png +share/electric/doc/html/images/chap05-01.png +share/electric/doc/html/images/chap05-02.png +share/electric/doc/html/images/chap05-03.png +share/electric/doc/html/images/chap05-04.png +share/electric/doc/html/images/chap05-05.png +share/electric/doc/html/images/chap05-06.png +share/electric/doc/html/images/chap05-07.png +share/electric/doc/html/images/chap05-08.png +share/electric/doc/html/images/chap05-09.png +share/electric/doc/html/images/chap05-10.png +share/electric/doc/html/images/chap06-01.png +share/electric/doc/html/images/chap06-02.png +share/electric/doc/html/images/chap06-03.png +share/electric/doc/html/images/chap06-04.png +share/electric/doc/html/images/chap06-06.png +share/electric/doc/html/images/chap06-07.png +share/electric/doc/html/images/chap06-08.png +share/electric/doc/html/images/chap06-09.png +share/electric/doc/html/images/chap06-10.png +share/electric/doc/html/images/chap06-11.png +share/electric/doc/html/images/chap06-12.png +share/electric/doc/html/images/chap06-13.png +share/electric/doc/html/images/chap06-14.png +share/electric/doc/html/images/chap06-15.png +share/electric/doc/html/images/chap06-16.png +share/electric/doc/html/images/chap06-17.png +share/electric/doc/html/images/chap06-18.png +share/electric/doc/html/images/chap06-19.png +share/electric/doc/html/images/chap06-20.png +share/electric/doc/html/images/chap06-21.png +share/electric/doc/html/images/chap07-01.png +share/electric/doc/html/images/chap07-02.png +share/electric/doc/html/images/chap07-03.png +share/electric/doc/html/images/chap07-04.png +share/electric/doc/html/images/chap07-05.png +share/electric/doc/html/images/chap07-06.png +share/electric/doc/html/images/chap07-07.png +share/electric/doc/html/images/chap07-08.png +share/electric/doc/html/images/chap07-09.png +share/electric/doc/html/images/chap07-10.png +share/electric/doc/html/images/chap07-11.png +share/electric/doc/html/images/chap07-12.png +share/electric/doc/html/images/chap07-13.png +share/electric/doc/html/images/chap07-14.png +share/electric/doc/html/images/chap07-15.png +share/electric/doc/html/images/chap07-16.png +share/electric/doc/html/images/chap07-17.png +share/electric/doc/html/images/chap07-18.png +share/electric/doc/html/images/chap07-19.png +share/electric/doc/html/images/chap07-20.png +share/electric/doc/html/images/chap07-21.png +share/electric/doc/html/images/chap07-22.png +share/electric/doc/html/images/chap07-23.png +share/electric/doc/html/images/chap07-24.png +share/electric/doc/html/images/chap08-01.png +share/electric/doc/html/images/chap08-02.png +share/electric/doc/html/images/chap08-03.png +share/electric/doc/html/images/chap08-04.png +share/electric/doc/html/images/chap08-05.png +share/electric/doc/html/images/chap08-06.png +share/electric/doc/html/images/chap08-07.png +share/electric/doc/html/images/chap08-08.png +share/electric/doc/html/images/chap08-09.png +share/electric/doc/html/images/chap08-10.png +share/electric/doc/html/images/chap08-11.png +share/electric/doc/html/images/chap08-12.png +share/electric/doc/html/images/chap08-13.png +share/electric/doc/html/images/chap08-14.png +share/electric/doc/html/images/chap08-15.png +share/electric/doc/html/images/chap08-16.png +share/electric/doc/html/images/chap08-17.png +share/electric/doc/html/images/chap08-18.png +share/electric/doc/html/images/chap08-19.png +share/electric/doc/html/images/chap08-20.png +share/electric/doc/html/images/chap08-21.png +share/electric/doc/html/images/chap08-22.png +share/electric/doc/html/images/chap08-23.png +share/electric/doc/html/images/chap09-02.png +share/electric/doc/html/images/chap09-03.png +share/electric/doc/html/images/chap09-04.png +share/electric/doc/html/images/chap09-05.png +share/electric/doc/html/images/chap09-06.png +share/electric/doc/html/images/chap09-07.png +share/electric/doc/html/images/chap09-08.png +share/electric/doc/html/images/chap09-09.png +share/electric/doc/html/images/chap09-10.png +share/electric/doc/html/images/chap09-11.png +share/electric/doc/html/images/chap09-12.png +share/electric/doc/html/images/chap09-13.png +share/electric/doc/html/images/chap09-14.png +share/electric/doc/html/images/chap09-15.png +share/electric/doc/html/images/chap09-16.png +share/electric/doc/html/images/chap09-17.png +share/electric/doc/html/images/chap09-18.png +share/electric/doc/html/images/chap09-19.png +share/electric/doc/html/images/chap09-20.png +share/electric/doc/html/images/chap09-21.png +share/electric/doc/html/images/chap09-22.png +share/electric/doc/html/images/chap09-23.png +share/electric/doc/html/images/chap09-24.png +share/electric/doc/html/images/chap10-01.png +share/electric/doc/html/images/chap10-02.png +share/electric/doc/html/images/chap10-03.png +share/electric/doc/html/images/chap10-04.png +share/electric/doc/html/images/chap10-05.png +share/electric/doc/html/images/chap10-06.png +share/electric/doc/html/images/chap10-07.png +share/electric/doc/html/images/chap11-01.png +share/electric/doc/html/images/chap11-02.png +share/electric/doc/html/images/chap11-03.png +share/electric/doc/html/images/chap11-04.png +share/electric/doc/html/images/chap11-05.png +share/electric/doc/html/images/chap11-06.png +share/electric/doc/html/images/chap12-01.png +share/electric/doc/html/images/chap12-02.png +share/electric/doc/html/images/chap12-03.png +share/electric/doc/html/images/chap12-04.png +share/electric/doc/html/images/chap12-05.png +share/electric/doc/html/images/chap12-06.png +share/electric/doc/html/images/chap12-07.png +share/electric/doc/html/images/chap12-08.png +share/electric/doc/html/images/chap12-09.png +share/electric/doc/html/images/chap12-10.png +share/electric/doc/html/images/chap12-11.png +share/electric/doc/html/images/chap12-12.png +share/electric/doc/html/images/chap12-13.png +share/electric/doc/html/images/chap12-14.png +share/electric/doc/html/images/chap12-15.png +share/electric/doc/html/images/chap12-16.png +share/electric/doc/html/images/chap12-17.png +share/electric/doc/html/images/chap12-18.png +share/electric/doc/html/images/chap12-19.png +share/electric/doc/html/images/chap12-20.png +share/electric/doc/html/images/chap12-21.png +share/electric/doc/html/images/chap12-22.png +share/electric/doc/html/images/chap12-23.png +share/electric/doc/html/images/chap12-24.png +share/electric/doc/html/images/chap12-25.png +share/electric/doc/html/images/chap12-26.png +share/electric/doc/html/images/chap12-27.png +share/electric/doc/html/images/chap12-28.png +share/electric/doc/html/images/chap12-29.png +share/electric/doc/html/images/chap12-30.png +share/electric/doc/html/images/chap12-31.png +share/electric/doc/html/images/chap12-32.png +share/electric/doc/html/images/chap12-33.png +share/electric/doc/html/images/chap12-34.png +share/electric/doc/html/images/chap12-35.png +share/electric/doc/html/images/chap12-36.png +share/electric/doc/html/images/chap12-37.png +share/electric/doc/html/images/chap12-38.png +share/electric/doc/html/images/chap12-39.png +share/electric/doc/html/images/chap12-40.png +share/electric/doc/html/images/chap12-41.png +share/electric/doc/html/images/chap12-42.png +share/electric/doc/html/images/chap12-43.png +share/electric/doc/html/images/chap12-44.png +share/electric/doc/html/images/chap12-45.png +share/electric/doc/html/images/chap12-46.png +share/electric/doc/html/images/chap12-47.png +share/electric/doc/html/images/chap12-48.png +share/electric/doc/html/images/chap12-49.png +share/electric/doc/html/images/chap12-50.png +share/electric/doc/html/images/chap12-51.png +share/electric/doc/html/images/chap12-52.png +share/electric/doc/html/images/chap12-53.png +share/electric/doc/html/images/chap12-54.png +share/electric/doc/html/images/chap12-55.png +share/electric/doc/html/images/chap12-56.png +share/electric/doc/html/images/chap12-57.png +share/electric/doc/html/images/chap12-58.png +share/electric/doc/html/images/iconbackarrow.png +share/electric/doc/html/images/iconcommand.png +share/electric/doc/html/images/iconcontarrow.png +share/electric/doc/html/images/iconforearrow.png +share/electric/doc/html/images/iconplug.png +share/electric/doc/html/images/iconwindows.png +share/electric/doc/html/images/indent.png +share/electric/doc/html/images/screenshotbusy.png +share/electric/doc/html/index.html +share/electric/doc/html/text/chap01-01.html +share/electric/doc/html/text/chap01-02.html +share/electric/doc/html/text/chap01-03.html +share/electric/doc/html/text/chap01-04.html +share/electric/doc/html/text/chap01-05.html +share/electric/doc/html/text/chap01-06.html +share/electric/doc/html/text/chap01-07.html +share/electric/doc/html/text/chap01-08.html +share/electric/doc/html/text/chap01-09.html +share/electric/doc/html/text/chap01-10.html +share/electric/doc/html/text/chap01-11.html +share/electric/doc/html/text/chap02-01.html +share/electric/doc/html/text/chap02-02.html +share/electric/doc/html/text/chap02-03.html +share/electric/doc/html/text/chap02-04.html +share/electric/doc/html/text/chap02-05.html +share/electric/doc/html/text/chap02-06.html +share/electric/doc/html/text/chap03-01.html +share/electric/doc/html/text/chap03-02.html +share/electric/doc/html/text/chap03-03.html +share/electric/doc/html/text/chap03-04.html +share/electric/doc/html/text/chap03-05.html +share/electric/doc/html/text/chap03-06.html +share/electric/doc/html/text/chap03-07.html +share/electric/doc/html/text/chap03-08.html +share/electric/doc/html/text/chap03-09.html +share/electric/doc/html/text/chap03-10.html +share/electric/doc/html/text/chap03-11.html +share/electric/doc/html/text/chap03-12.html +share/electric/doc/html/text/chap04-01.html +share/electric/doc/html/text/chap04-02.html +share/electric/doc/html/text/chap04-03.html +share/electric/doc/html/text/chap04-04.html +share/electric/doc/html/text/chap04-05.html +share/electric/doc/html/text/chap04-06.html +share/electric/doc/html/text/chap04-07.html +share/electric/doc/html/text/chap04-08.html +share/electric/doc/html/text/chap04-09.html +share/electric/doc/html/text/chap04-10.html +share/electric/doc/html/text/chap04-11.html +share/electric/doc/html/text/chap05-01.html +share/electric/doc/html/text/chap05-02.html +share/electric/doc/html/text/chap05-03.html +share/electric/doc/html/text/chap05-04.html +share/electric/doc/html/text/chap05-05.html +share/electric/doc/html/text/chap06-01.html +share/electric/doc/html/text/chap06-02.html +share/electric/doc/html/text/chap06-03.html +share/electric/doc/html/text/chap06-04.html +share/electric/doc/html/text/chap06-05.html +share/electric/doc/html/text/chap06-06.html +share/electric/doc/html/text/chap06-07.html +share/electric/doc/html/text/chap06-08.html +share/electric/doc/html/text/chap06-09.html +share/electric/doc/html/text/chap06-10.html +share/electric/doc/html/text/chap06-11.html +share/electric/doc/html/text/chap06-12.html +share/electric/doc/html/text/chap07-01.html +share/electric/doc/html/text/chap07-02.html +share/electric/doc/html/text/chap07-03.html +share/electric/doc/html/text/chap07-04.html +share/electric/doc/html/text/chap07-05.html +share/electric/doc/html/text/chap07-06.html +share/electric/doc/html/text/chap07-07.html +share/electric/doc/html/text/chap07-08.html +share/electric/doc/html/text/chap07-09.html +share/electric/doc/html/text/chap08-01.html +share/electric/doc/html/text/chap08-02.html +share/electric/doc/html/text/chap08-03.html +share/electric/doc/html/text/chap08-04.html +share/electric/doc/html/text/chap08-05.html +share/electric/doc/html/text/chap08-06.html +share/electric/doc/html/text/chap08-07.html +share/electric/doc/html/text/chap08-08.html +share/electric/doc/html/text/chap08-09.html +share/electric/doc/html/text/chap08-10.html +share/electric/doc/html/text/chap09-01.html +share/electric/doc/html/text/chap09-02.html +share/electric/doc/html/text/chap09-03.html +share/electric/doc/html/text/chap09-04.html +share/electric/doc/html/text/chap09-05.html +share/electric/doc/html/text/chap09-06.html +share/electric/doc/html/text/chap09-07.html +share/electric/doc/html/text/chap09-08.html +share/electric/doc/html/text/chap09-09.html +share/electric/doc/html/text/chap09-10.html +share/electric/doc/html/text/chap09-11.html +share/electric/doc/html/text/chap09-12.html +share/electric/doc/html/text/chap10-01.html +share/electric/doc/html/text/chap10-02.html +share/electric/doc/html/text/chap10-03.html +share/electric/doc/html/text/chap10-04.html +share/electric/doc/html/text/chap10-05.html +share/electric/doc/html/text/chap10-06.html +share/electric/doc/html/text/chap10-07.html +share/electric/doc/html/text/chap10-08.html +share/electric/doc/html/text/chap10-09.html +share/electric/doc/html/text/chap11-01.html +share/electric/doc/html/text/chap11-02.html +share/electric/doc/html/text/chap11-03.html +share/electric/doc/html/text/chap11-04.html +share/electric/doc/html/text/chap11-05.html +share/electric/doc/html/text/chap12-01.html +share/electric/doc/html/text/chap12-02.html +share/electric/doc/html/text/chap12-03.html +share/electric/doc/html/text/chap12-04.html +share/electric/doc/html/text/chap12-05.html +share/electric/doc/html/text/chap12-06.html +share/electric/doc/html/text/chap12-07.html +share/electric/doc/html/text/chap12-08.html +share/electric/doc/html/text/chap12-09.html +share/electric/doc/html/text/chap12-10.html +share/electric/lib/.cadrc +share/electric/lib/ALS.help +share/electric/lib/AllDialogs.c +share/electric/lib/CL.help +share/electric/lib/EVE.help +share/electric/lib/QUISC.help +share/electric/lib/bsim3.spi +share/electric/lib/cadrc +share/electric/lib/click.wav +share/electric/lib/evemenus.mac +share/electric/lib/evetutor.mac +share/electric/lib/international/fr/LC_MESSAGES/electric.mo +share/electric/lib/international/fr/LC_MESSAGES/license.txt +share/electric/lib/international/messages.po +share/electric/lib/java/romgen.java +share/electric/lib/leparts.txt +share/electric/lib/pads4u.txt +share/electric/lib/pla_mocmos.txt +share/electric/lib/sclib.txt +share/electric/lib/spiceparts.mac +share/electric/lib/spiceparts.txt +share/electric/lib/spicepartsS3.mac +share/electric/lib/spicepartsS3.txt +share/electric/lib/t22t_param.spi +share/electric/lib/tsmc25.txt +share/electric/lib/ui/README +share/electric/lib/ui/electric.cw +share/electric/lib/ui/nccpre.ui +share/electric/lib/ui/shownode.ui +share/electric/lib/ui/shownode_ext.ui +share/electric/lib/ui/visiblelay.ui +share/electric/lib/umc18.txt +@dirrm share/electric/lib/ui +@dirrm share/electric/lib/java +@dirrm share/electric/lib/international/fr/LC_MESSAGES +@dirrm share/electric/lib/international +@dirrm share/electric/lib +@dirrm share/electric/doc/html/text +@dirrm share/electric/doc/html/images +@dirrm share/electric/doc/html +@dirrm share/electric/doc @dirrm share/electric diff --git a/cad/electric/distinfo b/cad/electric/distinfo index cc383474235..abeac8b456b 100644 --- a/cad/electric/distinfo +++ b/cad/electric/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/03/13 01:39:19 dmcmahill Exp $ +$NetBSD: distinfo,v 1.2 2004/12/01 04:47:53 dmcmahill Exp $ -SHA1 (electric-6.05.tar.gz) = b11eb18bcca5745a4f2f380ef563ce6abbd080a6 -Size (electric-6.05.tar.gz) = 3786505 bytes -SHA1 (patch-aa) = ba0a2a33dfec20a6f0c93f23f66072c83007eb96 -SHA1 (patch-ab) = b45e27726deddf517e6fa572691482cf0efe31e8 +SHA1 (electric-7.00.tar.gz) = 782652b078e81060928eadfae364cd74da07788e +Size (electric-7.00.tar.gz) = 4474722 bytes +SHA1 (patch-aa) = ca3aa5c28eef818dce61055daeedc1b7d2e9a8a7 +SHA1 (patch-ab) = f9c648dda476f1e7cd3c3e875236b76198fa317b +SHA1 (patch-ac) = bb5fe1469cf1dcee04f2350cca55bb2c086ecae0 diff --git a/cad/electric/patches/patch-aa b/cad/electric/patches/patch-aa index 182cb80e885..00663b09931 100644 --- a/cad/electric/patches/patch-aa +++ b/cad/electric/patches/patch-aa @@ -1,53 +1,41 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/03/13 01:39:20 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2004/12/01 04:47:53 dmcmahill Exp $ ---- Makefile.in.orig Mon Feb 25 21:20:07 2002 -+++ Makefile.in Tue Mar 5 15:33:22 2002 -@@ -811,9 +811,9 @@ +--- Makefile.in.orig Fri Jul 16 01:59:50 2004 ++++ Makefile.in +@@ -796,11 +796,11 @@ CORE_SRC = \ + BUILDOPTS = $(DEBUG) $(ARCHFLAGS) BUILDDIR = obj HDS = src/include --CFLAGS = $(GRAPH_FLAGS) $(DEBUG) $(ARCHFLAGS) -I$(HDS) \ -+CFLAGS = @CPPFLAGS@ $(GRAPH_FLAGS) $(DEBUG) $(ARCHFLAGS) -I$(HDS) \ - $(LANGLISPCFLAGS) $(LANGTCLCFLAGS) $(LANGJAVACFLAGS) $(IRSIMCFLAGS) \ - $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) --XCFLAGS = $(CFLAGS) $(TIFFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QTINC) --LIBS = @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(GRAPH_LIBS) -lX11 -lm @X_EXTRA_LIBS@ $(LANGJAVALIBS) -+XCFLAGS = @CPPFLAGS@ $(CFLAGS) $(TIFFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QTINC) -+LIBS = @LDFLAGS@ @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(GRAPH_LIBS) -lX11 -lm @X_EXTRA_LIBS@ $(LANGJAVALIBS) +-CFLAGS = $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \ ++CFLAGS = @CPPFLAGS@ $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \ + $(LANGLISPCFLAGS) $(LANGTCLCFLAGS) $(LANGJAVACFLAGS) $(SIMIRSIM_CFLAGS) \ + $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) @PTHREAD_CFLAGS@ +-XCFLAGS = $(CFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS) +-LIBS = @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(FSDB_LIBS) $(GRAPH_LIBS) -lm @X_EXTRA_LIBS@ \ ++XCFLAGS = @CPPFLAGS@ $(CFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS) ++LIBS = @LDFLAGS@ @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(FSDB_LIBS) $(GRAPH_LIBS) -lm @X_EXTRA_LIBS@ \ + $(LANGTCLLIBS) $(LANGJAVALIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ FIND = find INSTALL = install -@@ -931,25 +931,25 @@ - - install: all -- $(INSTALL) -d -m755 @bindir@ $(prefix)/lib/electric -+ $(INSTALL) -d -m755 @bindir@ $(prefix)/share/electric - $(INSTALL) -m755 $(PROGNAME) @bindir@/$(PROGNAME) -- $(INSTALL) -m644 lib/.cadrc $(prefix)/lib/electric -+ $(INSTALL) -m644 lib/.cadrc $(prefix)/share/electric - @(cd lib ; \ +@@ -943,8 +943,8 @@ install: all for d in `$(FIND) . -type d -print`; do \ -- $(INSTALL) -d -m755 $(prefix)/lib/electric/$$d ; \ -+ $(INSTALL) -d -m755 $(prefix)/share/electric/$$d ; \ + $(INSTALL) -d -m755 $(DESTDIR)@datadir@/electric/lib/$$d ; \ (cd $$d ; \ - for f in `$(FIND) . -type f -maxdepth 1 -print`; do \ -- install -m644 $$f $(prefix)/lib/electric/$$d/$$f ; \ -+ for f in `ls -1`; do \ -+ if [ -f $$f ] ; then install -m644 $$f $(prefix)/share/electric/$$d/$$f ; fi ; \ +- $(INSTALL) -m644 $$f $(DESTDIR)@datadir@/electric/lib/$$d/$$f ; \ ++ for f in * ; do \ ++ if test -f $$f ; then $(INSTALL) -m644 $$f $(DESTDIR)@datadir@/electric/lib/$$d/$$f ; fi ; \ done ) ; \ done ) ; - install.html: -- $(INSTALL) -d -m755 $(prefix)/doc/electric/html -+ $(INSTALL) -d -m755 $(prefix)/share/doc/electric/html - @(cd html/manual ; \ -- $(INSTALL) -m644 index.html $(prefix)/doc/electric/html ; \ -+ $(INSTALL) -m644 index.html $(prefix)/share/doc/electric/html ; \ +@@ -955,8 +955,8 @@ install.html: for d in `$(FIND) . -type d -print`; do \ -- $(INSTALL) -d -m755 $(prefix)/doc/electric/html/$$d ; \ -+ $(INSTALL) -d -m755 $(prefix)/share/doc/electric/html/$$d ; \ + $(INSTALL) -d -m755 $(DESTDIR)@datadir@/electric/doc/html/$$d ; \ (cd $$d ; \ - for f in `$(FIND) . -type f -maxdepth 1 -print`; do \ -- install -m644 $$f $(prefix)/doc/electric/html/$$d/$$f ; \ -+ for f in `ls -1`; do \ -+ if [ -f $$f ]; then install -m644 $$f $(prefix)/share/doc/electric/html/$$d/$$f ; fi ;\ +- $(INSTALL) -m644 $$f $(DESTDIR)@datadir@/electric/doc/html/$$d/$$f ; \ ++ for f in * ; do \ ++ if test -f $$f ; then $(INSTALL) -m644 $$f $(DESTDIR)@datadir@/electric/doc/html/$$d/$$f ; fi ; \ done ) ; \ done ) ; + diff --git a/cad/electric/patches/patch-ab b/cad/electric/patches/patch-ab index f9899f2e23c..9cd3865b472 100644 --- a/cad/electric/patches/patch-ab +++ b/cad/electric/patches/patch-ab @@ -1,48 +1,69 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/03/13 01:39:20 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2004/12/01 04:47:53 dmcmahill Exp $ - not all !sparcs are little endian. - don't assume /usr/local ---- src/include/config.h.orig Tue Mar 5 14:22:45 2002 -+++ src/include/config.h Tue Mar 5 15:01:41 2002 -@@ -32,4 +32,6 @@ +--- src/include/config.h.orig Fri Jul 16 01:59:53 2004 ++++ src/include/config.h +@@ -32,6 +32,8 @@ + #ifndef _CONFIG_H_ #define _CONFIG_H_ 1 +#include + /********************* MACHINE DETERMINATION *********************/ -@@ -112,5 +114,5 @@ + /* determine if it is Macintosh OS */ +@@ -135,7 +137,7 @@ + # ifndef USEQT # include # endif -# ifdef sparc +# if BYTE_ORDER == BIG_ENDIAN - # define BYTES_SWAPPED 1 /* bytes are MSB first */ + # define BYTES_SWAPPED 1 /* bytes are MSB first */ # endif -@@ -120,15 +122,15 @@ - # define NONFILECH '?' /* character that cannot be in file name */ - # define CADRCFILENAME ".cadrc" /* CAD startup file */ --# define LIBDIR "/usr/local/lib/electric/" /* location of library files */ --# define DOCDIR "/usr/local/doc/electric/html/" /* location of HTML files */ --# define ESIMLOC "/usr/local/bin/esim" --# define RSIMLOC "/usr/local/bin/rsim" --# define PRESIMLOC "/usr/local/bin/presim" --# define RNLLOC "/usr/local/bin/rnl" --# define SPICELOC "/usr/local/bin/spice" --# define FASTHENRYLOC "/usr/local/bin/fasthenry" -+# define LIBDIR "@prefix@/share/electric/" /* location of library files */ -+# define DOCDIR "@prefix@/share/doc/electric/html/" /* location of HTML files */ -+# define ESIMLOC "@prefix@/bin/esim" -+# define RSIMLOC "@prefix@/bin/rsim" -+# define PRESIMLOC "@prefix@/bin/presim" -+# define RNLLOC "@prefix@/bin/rnl" -+# define SPICELOC "@localbase@/bin/spice3" -+# define FASTHENRYLOC "@localbase@/bin/fasthenry" - # define SORTLOC "/usr/bin/sort" --# define FLATDRCLOC "/usr/local/bin/ffindshort" --# define SFLATDRCLOC "/usr/local/bin/findshort" -+# define FLATDRCLOC "@prefix@/bin/ffindshort" -+# define SFLATDRCLOC "@prefix@/bin/findshort" + # define DIRSEP '/' /* directory separator */ +@@ -143,31 +145,19 @@ + # define MACFSTAG(x) 0 + # define NONFILECH '?' /* character that cannot be in file name */ + # define CADRCFILENAME x_(".cadrc") /* CAD startup file */ ++# define LIBDIR x_("@prefix@/share/electric/lib/") /* location of library files */ ++# define DOCDIR x_("@prefix@/share/electric/doc/html/") /* location of HTML files */ ++# define ESIMLOC x_("@prefix@/bin/esim") ++# define RSIMLOC x_("@prefix@/bin/rsim") ++# define PRESIMLOC x_("@prefix@/bin/presim") ++# define RNLLOC x_("@prefix@/bin/rnl") ++# define SPICELOC x_("@prefix@/bin/spice3") ++# define FASTHENRYLOC x_("@localbase@/bin/fasthenry") ++# define SORTLOC x_("/usr/bin/sort") ++# define FLATDRCLOC x_("@prefix@/bin/ffindshort") ++# define SFLATDRCLOC x_("@prefix@/bin/findshort") # ifdef sun +-# define LIBDIR x_("/usr/local/share/electric/lib/") /* location of library files */ +-# define DOCDIR x_("/usr/local/share/electric/doc/html/") /* location of HTML files */ +-# define ESIMLOC x_("/usr/local/bin/esim") +-# define RSIMLOC x_("/usr/local/bin/rsim") +-# define PRESIMLOC x_("/usr/local/bin/presim") +-# define RNLLOC x_("/usr/local/bin/rnl") +-# define SPICELOC x_("/usr/local/bin/spice") +-# define FASTHENRYLOC x_("/usr/local/bin/fasthenry") +-# define SORTLOC x_("/usr/local/bin/sort") +-# define FLATDRCLOC x_("/usr/local/bin/ffindshort") +-# define SFLATDRCLOC x_("/usr/local/bin/findshort") # define u_int64_t uint64_t +-# else +-# define LIBDIR x_("/usr/share/electric/lib/") /* location of library files */ +-# define DOCDIR x_("/usr/share/electric/doc/html/") /* location of HTML files */ +-# define ESIMLOC x_("/usr/bin/esim") +-# define RSIMLOC x_("/usr/bin/rsim") +-# define PRESIMLOC x_("/usr/bin/presim") +-# define RNLLOC x_("/usr/bin/rnl") +-# define SPICELOC x_("/usr/bin/spice") +-# define FASTHENRYLOC x_("/usr/bin/fasthenry") +-# define SORTLOC x_("/usr/bin/sort") +-# define FLATDRCLOC x_("/usr/bin/ffindshort") +-# define SFLATDRCLOC x_("/usr/bin/findshort") + # endif + #endif + diff --git a/cad/electric/patches/patch-ac b/cad/electric/patches/patch-ac new file mode 100644 index 00000000000..0876f145c5a --- /dev/null +++ b/cad/electric/patches/patch-ac @@ -0,0 +1,35 @@ +$NetBSD: patch-ac,v 1.1 2004/12/01 04:47:53 dmcmahill Exp $ + +--- src/graph/graphunixx11.c.orig Fri Jul 16 01:59:53 2004 ++++ src/graph/graphunixx11.c +@@ -3085,11 +3085,30 @@ void ewait(INTBIG process) + /* + * Routine to return the number of processors on this machine. + */ ++ ++/* XXX there should really be some sort of autoconf test here... */ ++#ifdef __NetBSD__ ++#include ++#include ++#endif ++ + INTBIG enumprocessors(void) + { + INTBIG numproc; + ++#ifdef __NetBSD__ ++ int mib[2], ncpu; ++ size_t len; ++ ++ mib[0] = CTL_HW; ++ mib[1] = HW_NCPU; ++ len = sizeof(ncpu); ++ sysctl(mib, 2, &ncpu, &len, NULL, 0); ++ numproc = (INTBIG) ncpu; ++ ++#else + numproc = sysconf(_SC_NPROCESSORS_ONLN); ++#endif + return(numproc); + } + -- cgit v1.2.3