diff options
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/xcircuit/Makefile | 8 | ||||
| -rw-r--r-- | cad/xcircuit/PLIST | 185 | ||||
| -rw-r--r-- | cad/xcircuit/distinfo | 14 | ||||
| -rw-r--r-- | cad/xcircuit/patches/patch-aa | 12 | ||||
| -rw-r--r-- | cad/xcircuit/patches/patch-ab | 12 | ||||
| -rw-r--r-- | cad/xcircuit/patches/patch-ac | 17 |
6 files changed, 125 insertions, 123 deletions
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 9780ee1c5a1..4ae70df39ab 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2004/10/03 00:13:13 tv Exp $ +# $NetBSD: Makefile,v 1.20 2004/11/19 13:24:11 adam Exp $ -DISTNAME= xcircuit-3.1.19 -PKGREVISION= 2 +DISTNAME= xcircuit-3.3.0 CATEGORIES= cad graphics MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/ -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tgz MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://bach.ece.jhu.edu/~tim/programs/xcircuit/ @@ -33,6 +32,5 @@ post-install: .include "../../graphics/xpm/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" -.include "../../lang/tcl/buildlink3.mk" .include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/xcircuit/PLIST b/cad/xcircuit/PLIST index 128ed3c41df..43b97734497 100644 --- a/cad/xcircuit/PLIST +++ b/cad/xcircuit/PLIST @@ -1,93 +1,107 @@ -@comment $NetBSD: PLIST,v 1.3 2003/07/10 08:03:57 jtb Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/11/19 13:24:11 adam Exp $ bin/xcircuit -lib/xcircuit-3.1/.wishrc -lib/xcircuit-3.1/analog.lps -lib/xcircuit-3.1/analoglib2.lps -lib/xcircuit-3.1/app-defaults/XCircuit -lib/xcircuit-3.1/avlsi.lps -lib/xcircuit-3.1/console.tcl -lib/xcircuit-3.1/digital.lps -lib/xcircuit-3.1/fonts/courier.lps -lib/xcircuit-3.1/fonts/courier.xfe -lib/xcircuit-3.1/fonts/courieriso.xfe -lib/xcircuit-3.1/fonts/courieriso2.lps -lib/xcircuit-3.1/fonts/courieriso2.xfe -lib/xcircuit-3.1/fonts/courieriso5.lps -lib/xcircuit-3.1/fonts/courieriso5.xfe -lib/xcircuit-3.1/fonts/helvetica.lps -lib/xcircuit-3.1/fonts/helvetica.xfe -lib/xcircuit-3.1/fonts/helveticaiso.xfe -lib/xcircuit-3.1/fonts/helveticaiso2.lps -lib/xcircuit-3.1/fonts/helveticaiso2.xfe -lib/xcircuit-3.1/fonts/helveticaiso5.lps -lib/xcircuit-3.1/fonts/helveticaiso5.xfe -lib/xcircuit-3.1/fonts/myfont.lps -lib/xcircuit-3.1/fonts/myfont.xfe -lib/xcircuit-3.1/fonts/symbol.lps -lib/xcircuit-3.1/fonts/symbol.xfe -lib/xcircuit-3.1/fonts/times_roman.lps -lib/xcircuit-3.1/fonts/times_roman.xfe -lib/xcircuit-3.1/fonts/times_romaniso.xfe -lib/xcircuit-3.1/fonts/times_romaniso2.lps -lib/xcircuit-3.1/fonts/times_romaniso2.xfe -lib/xcircuit-3.1/fonts/times_romaniso5.lps -lib/xcircuit-3.1/fonts/times_romaniso5.xfe -lib/xcircuit-3.1/generic.lps -lib/xcircuit-3.1/ic_templates.lps -lib/xcircuit-3.1/lgf.lps -lib/xcircuit-3.1/musiclib.lps -lib/xcircuit-3.1/pixmaps/a.xpm -lib/xcircuit-3.1/pixmaps/b.xpm -lib/xcircuit-3.1/pixmaps/bd.xpm -lib/xcircuit-3.1/pixmaps/ccw.xpm -lib/xcircuit-3.1/pixmaps/co.xpm -lib/xcircuit-3.1/pixmaps/cp.xpm -lib/xcircuit-3.1/pixmaps/cw.xpm -lib/xcircuit-3.1/pixmaps/d2.xpm -lib/xcircuit-3.1/pixmaps/e.xpm -lib/xcircuit-3.1/pixmaps/fi.xpm -lib/xcircuit-3.1/pixmaps/fx.xpm -lib/xcircuit-3.1/pixmaps/fy.xpm -lib/xcircuit-3.1/pixmaps/i.xpm -lib/xcircuit-3.1/pixmaps/li.xpm -lib/xcircuit-3.1/pixmaps/mk.xpm -lib/xcircuit-3.1/pixmaps/pl.xpm -lib/xcircuit-3.1/pixmaps/pm.xpm -lib/xcircuit-3.1/pixmaps/po2.xpm -lib/xcircuit-3.1/pixmaps/pu2.xpm -lib/xcircuit-3.1/pixmaps/pz.xpm -lib/xcircuit-3.1/pixmaps/q.xpm -lib/xcircuit-3.1/pixmaps/s.xpm -lib/xcircuit-3.1/pixmaps/solid.xbm -lib/xcircuit-3.1/pixmaps/stip12.xbm -lib/xcircuit-3.1/pixmaps/stip25.xbm -lib/xcircuit-3.1/pixmaps/stip38.xbm -lib/xcircuit-3.1/pixmaps/stip50.xbm -lib/xcircuit-3.1/pixmaps/stip62.xbm -lib/xcircuit-3.1/pixmaps/stip75.xbm -lib/xcircuit-3.1/pixmaps/stip88.xbm -lib/xcircuit-3.1/pixmaps/t.xpm -lib/xcircuit-3.1/pixmaps/uj.xpm -lib/xcircuit-3.1/pixmaps/xcircuit.xpm -lib/xcircuit-3.1/pixmaps/yp.xpm -lib/xcircuit-3.1/pixmaps/z4.xpm -lib/xcircuit-3.1/pixmaps/z5.xpm -lib/xcircuit-3.1/quadparts.lps -lib/xcircuit-3.1/signal.lps -lib/xcircuit-3.1/tkcon.tcl -lib/xcircuit-3.1/wrapper.tcl -lib/xcircuit-3.1/xcircps2.pro -lib/xcircuit-3.1/xcircuit.so -lib/xcircuit-3.1/xcircuit.tcl -lib/xcircuit-3.1/xcstartup.tcl +lib/xcircuit-3.3/analog.lps +lib/xcircuit-3.3/analoglib2.lps +lib/xcircuit-3.3/app-defaults/XCircuit +lib/xcircuit-3.3/asg_spice.lps +lib/xcircuit-3.3/avlsi.lps +lib/xcircuit-3.3/bparams.tcl +lib/xcircuit-3.3/console.tcl +lib/xcircuit-3.3/digital.lps +lib/xcircuit-3.3/fonts/courier.lps +lib/xcircuit-3.3/fonts/courier.xfe +lib/xcircuit-3.3/fonts/courieriso.xfe +lib/xcircuit-3.3/fonts/courieriso2.lps +lib/xcircuit-3.3/fonts/courieriso2.xfe +lib/xcircuit-3.3/fonts/courieriso5.lps +lib/xcircuit-3.3/fonts/courieriso5.xfe +lib/xcircuit-3.3/fonts/helvetica.lps +lib/xcircuit-3.3/fonts/helvetica.xfe +lib/xcircuit-3.3/fonts/helveticaiso.xfe +lib/xcircuit-3.3/fonts/helveticaiso2.lps +lib/xcircuit-3.3/fonts/helveticaiso2.xfe +lib/xcircuit-3.3/fonts/helveticaiso5.lps +lib/xcircuit-3.3/fonts/helveticaiso5.xfe +lib/xcircuit-3.3/fonts/myfont.lps +lib/xcircuit-3.3/fonts/myfont.xfe +lib/xcircuit-3.3/fonts/symbol.lps +lib/xcircuit-3.3/fonts/symbol.xfe +lib/xcircuit-3.3/fonts/times_roman.lps +lib/xcircuit-3.3/fonts/times_roman.xfe +lib/xcircuit-3.3/fonts/times_romaniso.xfe +lib/xcircuit-3.3/fonts/times_romaniso2.lps +lib/xcircuit-3.3/fonts/times_romaniso2.xfe +lib/xcircuit-3.3/fonts/times_romaniso5.lps +lib/xcircuit-3.3/fonts/times_romaniso5.xfe +lib/xcircuit-3.3/generic.lps +lib/xcircuit-3.3/ic_templates.lps +lib/xcircuit-3.3/lgf.lps +lib/xcircuit-3.3/library.tcl +lib/xcircuit-3.3/musiclib.lps +lib/xcircuit-3.3/ngspice.tcl +lib/xcircuit-3.3/panzoom.tcl +lib/xcircuit-3.3/pcb.lps +lib/xcircuit-3.3/pcb_layout.lps +lib/xcircuit-3.3/pcbout.tcl +lib/xcircuit-3.3/pixmaps/a.xpm +lib/xcircuit-3.3/pixmaps/b.xpm +lib/xcircuit-3.3/pixmaps/bd.xpm +lib/xcircuit-3.3/pixmaps/ccw.xpm +lib/xcircuit-3.3/pixmaps/co.xpm +lib/xcircuit-3.3/pixmaps/cp.xpm +lib/xcircuit-3.3/pixmaps/cw.xpm +lib/xcircuit-3.3/pixmaps/d2.xpm +lib/xcircuit-3.3/pixmaps/e.xpm +lib/xcircuit-3.3/pixmaps/fi.xpm +lib/xcircuit-3.3/pixmaps/fx.xpm +lib/xcircuit-3.3/pixmaps/fy.xpm +lib/xcircuit-3.3/pixmaps/i.xpm +lib/xcircuit-3.3/pixmaps/li.xpm +lib/xcircuit-3.3/pixmaps/mk.xpm +lib/xcircuit-3.3/pixmaps/pa.xpm +lib/xcircuit-3.3/pixmaps/pl.xpm +lib/xcircuit-3.3/pixmaps/pm.xpm +lib/xcircuit-3.3/pixmaps/po2.xpm +lib/xcircuit-3.3/pixmaps/pu2.xpm +lib/xcircuit-3.3/pixmaps/pz.xpm +lib/xcircuit-3.3/pixmaps/q.xpm +lib/xcircuit-3.3/pixmaps/s.xpm +lib/xcircuit-3.3/pixmaps/solid.xbm +lib/xcircuit-3.3/pixmaps/stip12.xbm +lib/xcircuit-3.3/pixmaps/stip25.xbm +lib/xcircuit-3.3/pixmaps/stip38.xbm +lib/xcircuit-3.3/pixmaps/stip50.xbm +lib/xcircuit-3.3/pixmaps/stip62.xbm +lib/xcircuit-3.3/pixmaps/stip75.xbm +lib/xcircuit-3.3/pixmaps/stip88.xbm +lib/xcircuit-3.3/pixmaps/t.xpm +lib/xcircuit-3.3/pixmaps/uj.xpm +lib/xcircuit-3.3/pixmaps/xcircuit.xpm +lib/xcircuit-3.3/pixmaps/yp.xpm +lib/xcircuit-3.3/pixmaps/z4.xpm +lib/xcircuit-3.3/pixmaps/z5.xpm +lib/xcircuit-3.3/quadparts.lps +lib/xcircuit-3.3/resource.tcl +lib/xcircuit-3.3/series74xx.lps +lib/xcircuit-3.3/signal.lps +lib/xcircuit-3.3/sue_xc.tcl +lib/xcircuit-3.3/tkcon.tcl +lib/xcircuit-3.3/wrapper.tcl +lib/xcircuit-3.3/xcircexec +lib/xcircuit-3.3/xcircps2.pro +lib/xcircuit-3.3/xcircuit.so +lib/xcircuit-3.3/xcircuit.tcl +lib/xcircuit-3.3/xcstartup.tcl share/examples/xcircuit/FlareLED.ps share/examples/xcircuit/USAflag.ps share/examples/xcircuit/analog1.ps share/examples/xcircuit/analog2.ps share/examples/xcircuit/analoglib1.lps share/examples/xcircuit/border.ps +share/examples/xcircuit/buses.ps share/examples/xcircuit/diffamp_test.ps share/examples/xcircuit/diffamp_test2.ps +share/examples/xcircuit/diffamp_test3.ps share/examples/xcircuit/envelope.ps share/examples/xcircuit/fourttest.ps share/examples/xcircuit/logic8.ps @@ -97,9 +111,10 @@ share/examples/xcircuit/systemd1.lgf share/examples/xcircuit/test.py share/examples/xcircuit/threestage.ps share/examples/xcircuit/vcoblock.ps +share/examples/xcircuit/xcclock.ps share/examples/xcircuit/xcircuitrc @dirrm share/examples/xcircuit -@dirrm lib/xcircuit-3.1/pixmaps -@dirrm lib/xcircuit-3.1/fonts -@dirrm lib/xcircuit-3.1/app-defaults -@dirrm lib/xcircuit-3.1 +@dirrm lib/xcircuit-3.3/pixmaps +@dirrm lib/xcircuit-3.3/fonts +@dirrm lib/xcircuit-3.3/app-defaults +@dirrm lib/xcircuit-3.3 diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo index 5044401e03b..b9fff7969a7 100644 --- a/cad/xcircuit/distinfo +++ b/cad/xcircuit/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.5 2003/08/31 02:02:30 jtb Exp $ +$NetBSD: distinfo,v 1.6 2004/11/19 13:24:11 adam Exp $ -SHA1 (xcircuit-3.1.19.tar.bz2) = cc45c073fd53ba457e142fe06e694409da83729e -Size (xcircuit-3.1.19.tar.bz2) = 650324 bytes -SHA1 (patch-aa) = 252824044a7bd55f7a09a345cba3bd2903d1caf0 -SHA1 (patch-ab) = fb9604f7c3efc09aa0db3f40bf7b951e26bd715a -SHA1 (patch-ac) = 9bb20a39445e532d1fbe4587eb39cdd0cc5a0e6a -SHA1 (patch-ae) = a65367b80369b1ba6aa22b71ab692b9705165764 -SHA1 (patch-af) = 51c1f03005cb237078f417a138e39a580e73cbcd +SHA1 (xcircuit-3.3.0.tgz) = ec3c0995fd4f8755a50d39e278ca0ab293705b38 +Size (xcircuit-3.3.0.tgz) = 1308602 bytes +SHA1 (patch-aa) = 83ac777b29b9e2979f3ff8e5ef04c0af8317f7b2 +SHA1 (patch-ab) = 3314749c7a09ea1cb5b617d3cf0742df99e1292c +SHA1 (patch-ac) = 1f84054174f790bd32d14eafa6a91444737795ff diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa index 5c70dd20259..2f27f0565a1 100644 --- a/cad/xcircuit/patches/patch-aa +++ b/cad/xcircuit/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.4 2003/08/04 07:17:37 jmc Exp $ +$NetBSD: patch-aa,v 1.5 2004/11/19 13:24:11 adam Exp $ ---- configure.in.orig Fri Jun 27 20:12:07 2003 -+++ configure.in Mon Aug 4 01:44:58 2003 -@@ -395,7 +395,7 @@ - fi +--- configure.in.orig 2004-10-01 04:24:09.000000000 +0000 ++++ configure.in +@@ -544,7 +544,7 @@ fi + if test "x$xc_with_tcl" != "x" ; then case $target in - *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*) + *-sunos4*|*-*-netbsd|*-*-netbsdelf|NetBSD-*|FreeBSD-*|OpenBSD-*) TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" ;; -@@ -718,9 +718,9 @@ +@@ -890,9 +890,9 @@ if test "x$xc_with_tcl" != "x" ; then # Not available on all versions: check for include file. AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no) if test "$test_ok" = yes; then diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab index 629fe44e05d..9d0b6d01d69 100644 --- a/cad/xcircuit/patches/patch-ab +++ b/cad/xcircuit/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.4 2003/08/04 07:17:37 jmc Exp $ +$NetBSD: patch-ab,v 1.5 2004/11/19 13:24:11 adam Exp $ ---- configure.orig Wed May 21 21:27:56 2003 -+++ configure Mon Aug 4 01:45:35 2003 -@@ -7466,7 +7466,7 @@ - fi +--- configure.orig 2004-10-01 04:25:07.000000000 +0000 ++++ configure +@@ -7704,7 +7704,7 @@ fi + if test "x$xc_with_tcl" != "x" ; then case $target in - *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*) + *-sunos4*|*-*-netbsd|*-*-netbsdelf|NetBSD-*|FreeBSD-*|OpenBSD-*) TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" ;; -@@ -7989,9 +7989,9 @@ +@@ -8244,9 +8244,9 @@ fi if test "$test_ok" = yes; then diff --git a/cad/xcircuit/patches/patch-ac b/cad/xcircuit/patches/patch-ac index 9590a6339f9..957b0686f97 100644 --- a/cad/xcircuit/patches/patch-ac +++ b/cad/xcircuit/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2003/07/10 08:03:58 jtb Exp $ +$NetBSD: patch-ac,v 1.2 2004/11/19 13:24:11 adam Exp $ ---- Makefile.in.orig +--- Makefile.in.orig 2004-10-01 04:25:06.000000000 +0000 +++ Makefile.in -@@ -48,7 +48,7 @@ +@@ -51,7 +51,7 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2003/07/10 08:03:58 jtb Exp $ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -@@ -77,6 +77,7 @@ +@@ -82,6 +82,7 @@ LIBS = @LIBS@ LIB_SPECS = @LIB_SPECS@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ @@ -19,12 +19,3 @@ $NetBSD: patch-ac,v 1.1 2003/07/10 08:03:58 jtb Exp $ # Man page M4_DEFS = @M4_DEFS@ @DEFS@ -@@ -748,7 +749,7 @@ - - lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} - $(RM) lib/xcircuit${SHDLIB_EXT} -- $(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \ -+ $(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} ${LDFLAGS} xcwrap.o ${xcircuit_OBJECTS} \ - ${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} - - tcl: lib/tcl/xcircuit${SHDLIB_EXT} |