From a521884136f7621f31488baa82262bf5816467c1 Mon Sep 17 00:00:00 2001 From: jtb Date: Fri, 19 Jan 2001 23:24:33 +0000 Subject: Updated xcircuit to version 2.2.0. The schematic capture code is now considered stable. Xcircuit now has the ability to pass parameters to objects. For the moment, this only works with string parameters. Integral parameters will be added in upcoming versions. --- cad/xcircuit/Makefile | 18 ++++++---- cad/xcircuit/files/md5 | 4 +-- cad/xcircuit/files/patch-sum | 6 ++-- cad/xcircuit/patches/patch-aa | 27 +++++++++------ cad/xcircuit/patches/patch-ab | 11 +++---- cad/xcircuit/pkg/PLIST | 76 +++++++++++++++++++++---------------------- 6 files changed, 77 insertions(+), 65 deletions(-) (limited to 'cad') diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 7054676197d..56ae7a5cb25 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,24 +1,30 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/11/02 13:59:54 dmcmahill Exp $ -# +# $NetBSD: Makefile,v 1.2 2001/01/19 23:24:33 jtb Exp $ -DISTNAME= xcircuit-2.1b7 +DISTNAME= xcircuit-2.2.0 CATEGORIES= cad graphics MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/ -MAINTAINER= jasontd@indigo.ie +MAINTAINER= jtb@netbsd.org HOMEPAGE= http://bach.ece.jhu.edu/~tim/programs/xcircuit/ +DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript + WRKSRC= ${WRKDIR}/${DISTNAME} USE_IMAKE= yes USE_X11BASE= yes USE_XPM= yes +EVAL_PREFIX+= GS_PREFIX=ghostscript -post-build: +post-extract: ${RM} -fr ${WRKSRC}/examples/CVS ${MV} -f ${WRKSRC}/examples/.xcircuitrc ${WRKSRC}/examples/xcircuitrc + ${TOUCH} ${WRKSRC}/menudep.h post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xcircuit/ - ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit + @for f in ${WRKSRC}/examples/*; do \ + c="${INSTALL_DATA} $$f ${PREFIX}/share/examples/xcircuit/"; \ + ${ECHO} $$c; $$c; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/cad/xcircuit/files/md5 b/cad/xcircuit/files/md5 index 0562ce4b093..a3061b539b9 100644 --- a/cad/xcircuit/files/md5 +++ b/cad/xcircuit/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/11/02 13:59:55 dmcmahill Exp $ +$NetBSD: md5,v 1.2 2001/01/19 23:24:34 jtb Exp $ -MD5 (xcircuit-2.1b7.tar.gz) = 9a18fc6e454a2001abbfad6cd04e7304 +MD5 (xcircuit-2.2.0.tar.gz) = 12ce1ff6e585f08a72844df0b805d9fb diff --git a/cad/xcircuit/files/patch-sum b/cad/xcircuit/files/patch-sum index 24248052d8d..7227b5e95c5 100644 --- a/cad/xcircuit/files/patch-sum +++ b/cad/xcircuit/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/11/02 13:59:55 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.2 2001/01/19 23:24:34 jtb Exp $ -MD5 (patch-aa) = cac22dadff9bdc419e25c679a0053952 -MD5 (patch-ab) = e6ec2881a57bab8c4c956a1ce43489d4 +MD5 (patch-aa) = 72073798f10765a26b53430b5bc88c03 +MD5 (patch-ab) = b4a04dcce07e1b6299420ab6a28fa386 diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa index cb79e6e3c50..cea45cf3b81 100644 --- a/cad/xcircuit/patches/patch-aa +++ b/cad/xcircuit/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/11/02 13:59:55 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2001/01/19 23:24:34 jtb Exp $ ---- Imakefile.orig Tue Oct 3 11:33:52 2000 -+++ Imakefile Thu Nov 2 08:22:31 2000 -@@ -29,6 +29,6 @@ +--- Imakefile.orig Tue Dec 19 18:43:58 2000 ++++ Imakefile +@@ -28,15 +28,15 @@ + #CCOPTIONS = -O2 # # for debugging purposes uncomment the following line: -CDEBUGFLAGS = -g @@ -11,23 +12,29 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/02 13:59:55 dmcmahill Exp $ +STD_INCLUDES = -I. -I${X11BASE}/include -I${LOCALBASE}/include #------------------------------------------------------------------------ -@@ -37,5 +37,5 @@ + # Installation directories: + # Change the following as desired to suit your environment: #------------------------------------------------------------------------ # -PREFIX = /usr/local +# PREFIX = /usr/local - # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.1b5/psfiles - XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.1 -@@ -59,5 +59,5 @@ + # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.2.0/psfiles + XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.2 + XCIRCUIT_BIN_DIR = $(PREFIX)/bin +@@ -58,7 +58,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 ++GS_EXEC= ${GS_PREFIX}/bin/gs #------------------------------------------------------------------------ -@@ -186,4 +186,5 @@ + # Window manager bug workaround---If you don't like xcircuit grabbing kbd +@@ -186,6 +186,7 @@ + MakeNsubdirMakefiles() #endif +MakefileSubdirs(Xw) MakeMakeSubdirs(Xw,libxcXw.a) MakeSubdirs(Xw) + DependSubdirs(Xw) diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab index ec8265f769b..ab129b4cf53 100644 --- a/cad/xcircuit/patches/patch-ab +++ b/cad/xcircuit/patches/patch-ab @@ -1,12 +1,11 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/11/02 13:59:55 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2001/01/19 23:24:34 jtb Exp $ -use the 'standard' netbsd config rather than overriding CC. - ---- Xw/Imakefile.orig Thu Aug 3 16:10:52 2000 -+++ Xw/Imakefile Thu Nov 2 08:32:51 2000 -@@ -1,4 +1,4 @@ +--- Xw/Imakefile.orig Thu Aug 3 20:10:52 2000 ++++ Xw/Imakefile +@@ -1,5 +1,5 @@ # Compile flags -CC = cc +#CC = cc # If you wish to compile with gcc: #CC = gcc + diff --git a/cad/xcircuit/pkg/PLIST b/cad/xcircuit/pkg/PLIST index a044b67b35b..56c51a291e8 100644 --- a/cad/xcircuit/pkg/PLIST +++ b/cad/xcircuit/pkg/PLIST @@ -1,46 +1,46 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/02 13:59:54 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/01/19 23:24:34 jtb Exp $ bin/xcircuit lib/X11/app-defaults/XCircuit -lib/xcircuit-2.1/analog.lps -lib/xcircuit-2.1/avlsi.lps -lib/xcircuit-2.1/builtins.lps -lib/xcircuit-2.1/digital.lps -lib/xcircuit-2.1/fonts/courier.lps -lib/xcircuit-2.1/fonts/courier.xfe -lib/xcircuit-2.1/fonts/courieriso.xfe -lib/xcircuit-2.1/fonts/courieriso2.lps -lib/xcircuit-2.1/fonts/courieriso2.xfe -lib/xcircuit-2.1/fonts/courieriso5.lps -lib/xcircuit-2.1/fonts/courieriso5.xfe -lib/xcircuit-2.1/fonts/helvetica.lps -lib/xcircuit-2.1/fonts/helvetica.xfe -lib/xcircuit-2.1/fonts/helveticaiso.xfe -lib/xcircuit-2.1/fonts/helveticaiso2.lps -lib/xcircuit-2.1/fonts/helveticaiso2.xfe -lib/xcircuit-2.1/fonts/helveticaiso5.lps -lib/xcircuit-2.1/fonts/helveticaiso5.xfe -lib/xcircuit-2.1/fonts/myfont.lps -lib/xcircuit-2.1/fonts/myfont.xfe -lib/xcircuit-2.1/fonts/symbol.lps -lib/xcircuit-2.1/fonts/symbol.xfe -lib/xcircuit-2.1/fonts/times_roman.lps -lib/xcircuit-2.1/fonts/times_roman.xfe -lib/xcircuit-2.1/fonts/times_romaniso.xfe -lib/xcircuit-2.1/fonts/times_romaniso2.lps -lib/xcircuit-2.1/fonts/times_romaniso2.xfe -lib/xcircuit-2.1/fonts/times_romaniso5.lps -lib/xcircuit-2.1/fonts/times_romaniso5.xfe -lib/xcircuit-2.1/generic.lps -lib/xcircuit-2.1/lgf.lps -lib/xcircuit-2.1/musiclib.lps -lib/xcircuit-2.1/signal.lps -lib/xcircuit-2.1/xcircps2.pro +lib/xcircuit-2.2/analog.lps +lib/xcircuit-2.2/analoglib2.lps +lib/xcircuit-2.2/avlsi.lps +lib/xcircuit-2.2/digital.lps +lib/xcircuit-2.2/fonts/courier.lps +lib/xcircuit-2.2/fonts/courier.xfe +lib/xcircuit-2.2/fonts/courieriso.xfe +lib/xcircuit-2.2/fonts/courieriso2.lps +lib/xcircuit-2.2/fonts/courieriso2.xfe +lib/xcircuit-2.2/fonts/courieriso5.lps +lib/xcircuit-2.2/fonts/courieriso5.xfe +lib/xcircuit-2.2/fonts/helvetica.lps +lib/xcircuit-2.2/fonts/helvetica.xfe +lib/xcircuit-2.2/fonts/helveticaiso.xfe +lib/xcircuit-2.2/fonts/helveticaiso2.lps +lib/xcircuit-2.2/fonts/helveticaiso2.xfe +lib/xcircuit-2.2/fonts/helveticaiso5.lps +lib/xcircuit-2.2/fonts/helveticaiso5.xfe +lib/xcircuit-2.2/fonts/myfont.lps +lib/xcircuit-2.2/fonts/myfont.xfe +lib/xcircuit-2.2/fonts/symbol.lps +lib/xcircuit-2.2/fonts/symbol.xfe +lib/xcircuit-2.2/fonts/times_roman.lps +lib/xcircuit-2.2/fonts/times_roman.xfe +lib/xcircuit-2.2/fonts/times_romaniso.xfe +lib/xcircuit-2.2/fonts/times_romaniso2.lps +lib/xcircuit-2.2/fonts/times_romaniso2.xfe +lib/xcircuit-2.2/fonts/times_romaniso5.lps +lib/xcircuit-2.2/fonts/times_romaniso5.xfe +lib/xcircuit-2.2/generic.lps +lib/xcircuit-2.2/lgf.lps +lib/xcircuit-2.2/musiclib.lps +lib/xcircuit-2.2/signal.lps +lib/xcircuit-2.2/startup.script +lib/xcircuit-2.2/xcircps2.pro man/man1/xcircuit.0 share/examples/xcircuit/USAflag.ps share/examples/xcircuit/analog1.ps share/examples/xcircuit/analog2.ps share/examples/xcircuit/analoglib1.lps -share/examples/xcircuit/analoglib2.lps share/examples/xcircuit/border.ps share/examples/xcircuit/diffamp_test.ps share/examples/xcircuit/logic8.ps @@ -50,5 +50,5 @@ share/examples/xcircuit/threestage.ps share/examples/xcircuit/vcoblock.ps share/examples/xcircuit/xcircuitrc @dirrm share/examples/xcircuit -@dirrm lib/xcircuit-2.1/fonts -@dirrm lib/xcircuit-2.1 +@dirrm lib/xcircuit-2.2/fonts +@dirrm lib/xcircuit-2.2 -- cgit v1.2.3