diff options
Diffstat (limited to 'cad')
-rw-r--r-- | cad/xcircuit/Makefile | 19 | ||||
-rw-r--r-- | cad/xcircuit/PLIST | 131 | ||||
-rw-r--r-- | cad/xcircuit/distinfo | 14 | ||||
-rw-r--r-- | cad/xcircuit/patches/patch-aa | 53 | ||||
-rw-r--r-- | cad/xcircuit/patches/patch-ab | 24 | ||||
-rw-r--r-- | cad/xcircuit/patches/patch-ac | 30 | ||||
-rw-r--r-- | cad/xcircuit/patches/patch-ad | 18 | ||||
-rw-r--r-- | cad/xcircuit/patches/patch-ae | 13 | ||||
-rw-r--r-- | cad/xcircuit/patches/patch-af | 13 |
9 files changed, 218 insertions, 97 deletions
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index e800b73c280..023e5d0d2cc 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,17 +1,25 @@ -# $NetBSD: Makefile,v 1.11 2003/06/02 01:21:27 jschauma Exp $ +# $NetBSD: Makefile,v 1.12 2003/07/10 08:03:57 jtb Exp $ -DISTNAME= xcircuit-2.2.0 -PKGREVISION= 2 +DISTNAME= xcircuit-3.1.16 WRKSRC= ${WRKDIR}/${DISTNAME} CATEGORIES= cad graphics MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://bach.ece.jhu.edu/~tim/programs/xcircuit/ COMMENT= Drawing program for X11 (especially for circuits) USE_BUILDLINK2= yes -USE_IMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--with-tcl +CONFIGURE_ARGS+=--with-tclincls=${BUILDLINK_PREFIX.tcl}/include +CONFIGURE_ARGS+=--with-tcllibs=${BUILDLINK_PREFIX.tcl}/lib +CONFIGURE_ARGS+=--with-tkincls=${BUILDLINK_PREFIX.tk}/include +CONFIGURE_ARGS+=--with-tklibs=${BUILDLINK_PREFIX.tk}/lib + +ALL_TARGET= tcl +INSTALL_TARGET= install-tcl post-extract: ${RM} -fr ${WRKSRC}/examples/CVS @@ -23,6 +31,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit/ .include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/tk/buildlink2.mk" +.include "../../lang/tcl/buildlink2.mk" .include "../../mk/ghostscript.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/cad/xcircuit/PLIST b/cad/xcircuit/PLIST index f75b969b590..128ed3c41df 100644 --- a/cad/xcircuit/PLIST +++ b/cad/xcircuit/PLIST @@ -1,54 +1,105 @@ -@comment $NetBSD: PLIST,v 1.2 2003/02/26 03:40:54 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/07/10 08:03:57 jtb Exp $ bin/xcircuit -lib/X11/app-defaults/XCircuit -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.${IMAKE_MANNEWSUFFIX} +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 +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/diffamp_test.ps +share/examples/xcircuit/diffamp_test2.ps +share/examples/xcircuit/envelope.ps +share/examples/xcircuit/fourttest.ps share/examples/xcircuit/logic8.ps +share/examples/xcircuit/panzoom.py share/examples/xcircuit/prelude.ps share/examples/xcircuit/systemd1.lgf +share/examples/xcircuit/test.py share/examples/xcircuit/threestage.ps share/examples/xcircuit/vcoblock.ps share/examples/xcircuit/xcircuitrc @dirrm share/examples/xcircuit -@dirrm lib/xcircuit-2.2/fonts -@dirrm lib/xcircuit-2.2 +@dirrm lib/xcircuit-3.1/pixmaps +@dirrm lib/xcircuit-3.1/fonts +@dirrm lib/xcircuit-3.1/app-defaults +@dirrm lib/xcircuit-3.1 diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo index 836cb8ac3c4..fb9fc0ed24e 100644 --- a/cad/xcircuit/distinfo +++ b/cad/xcircuit/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.2 2001/04/29 15:15:16 jtb Exp $ +$NetBSD: distinfo,v 1.3 2003/07/10 08:03:57 jtb Exp $ -SHA1 (xcircuit-2.2.0.tar.gz) = 8c7b04b4247486dd7de4ba3f1bcc33b21684024f -Size (xcircuit-2.2.0.tar.gz) = 483533 bytes -SHA1 (patch-aa) = ed0f98c1540a0ec079801675ae4964cde0102dc2 -SHA1 (patch-ab) = 40bf15d3609ddd6b457556690f26de5882372d5c +SHA1 (xcircuit-3.1.16.tar.bz2) = 1602c066e415cc1a0501222c66da94aee5ecb10c +Size (xcircuit-3.1.16.tar.bz2) = 652104 bytes +SHA1 (patch-aa) = e195793b41aff00c04305eb1be071b5e913bb018 +SHA1 (patch-ab) = 53f54b9d3b0ddc6772ecb1c5e25655339cb5be74 +SHA1 (patch-ac) = 9bb20a39445e532d1fbe4587eb39cdd0cc5a0e6a +SHA1 (patch-ad) = 45a2f28f140eaff81a22c2cdda9733801c91dbb4 +SHA1 (patch-ae) = a65367b80369b1ba6aa22b71ab692b9705165764 +SHA1 (patch-af) = 51c1f03005cb237078f417a138e39a580e73cbcd diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa index cea45cf3b81..5045bfc27c1 100644 --- a/cad/xcircuit/patches/patch-aa +++ b/cad/xcircuit/patches/patch-aa @@ -1,40 +1,17 @@ -$NetBSD: patch-aa,v 1.2 2001/01/19 23:24:34 jtb Exp $ +$NetBSD: patch-aa,v 1.3 2003/07/10 08:03:58 jtb Exp $ ---- 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 --STD_INCLUDES = -I. -I/usr/X11R6/include/X11 -+#CDEBUGFLAGS = -g -+STD_INCLUDES = -I. -I${X11BASE}/include -I${LOCALBASE}/include +--- configure.in.orig ++++ configure.in +@@ -718,9 +718,9 @@ + # 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 +- SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld" +- LDDL_FLAGS="-Bshareable -x ${LIB_SPEC}" ++ SHLIB_CFLAGS="-fPIC" ++ SHLIB_LD=$CC ++ LDDL_FLAGS="-shared" + fi + ;; - #------------------------------------------------------------------------ - # Installation directories: - # Change the following as desired to suit your environment: - #------------------------------------------------------------------------ - # --PREFIX = /usr/local -+# PREFIX = /usr/local - # 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= ${GS_PREFIX}/bin/gs - - #------------------------------------------------------------------------ - # 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 ab129b4cf53..a2c8f0c9254 100644 --- a/cad/xcircuit/patches/patch-ab +++ b/cad/xcircuit/patches/patch-ab @@ -1,11 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2001/01/19 23:24:34 jtb Exp $ +$NetBSD: patch-ab,v 1.3 2003/07/10 08:03:58 jtb Exp $ ---- 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 +--- configure.orig ++++ configure +@@ -7989,9 +7989,9 @@ + + + if test "$test_ok" = yes; then +- SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld" +- LDDL_FLAGS="-Bshareable -x ${LIB_SPEC}" ++ SHLIB_CFLAGS="-fPIC" ++ SHLIB_LD=$CC ++ LDDL_FLAGS="-shared" + fi + ;; diff --git a/cad/xcircuit/patches/patch-ac b/cad/xcircuit/patches/patch-ac new file mode 100644 index 00000000000..9590a6339f9 --- /dev/null +++ b/cad/xcircuit/patches/patch-ac @@ -0,0 +1,30 @@ +$NetBSD: patch-ac,v 1.1 2003/07/10 08:03:58 jtb Exp $ + +--- Makefile.in.orig ++++ Makefile.in +@@ -48,7 +48,7 @@ + AWK = @AWK@ + CC = @CC@ + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ @SHLIB_CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ +@@ -77,6 +77,7 @@ + LIB_SPECS = @LIB_SPECS@ + LTLIBOBJS = @LTLIBOBJS@ + M4 = @M4@ ++RM ?= rm -f + + # 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} diff --git a/cad/xcircuit/patches/patch-ad b/cad/xcircuit/patches/patch-ad new file mode 100644 index 00000000000..628d560d09b --- /dev/null +++ b/cad/xcircuit/patches/patch-ad @@ -0,0 +1,18 @@ +$NetBSD: patch-ad,v 1.1 2003/07/10 08:03:58 jtb Exp $ + +--- netlist.c.orig ++++ netlist.c +@@ -2045,11 +2045,11 @@ + break; + case 'x': + sout = (char *)realloc(sout, strlen(sout) + 7); +- strcat(sout, "%d", clist->callinst->position.x); ++ strncat(sout, "%d", clist->callinst->position.x); + break; + case 'y': + sout = (char *)realloc(sout, strlen(sout) + 7); +- strcat(sout, "%d", clist->callinst->position.y); ++ strncat(sout, "%d", clist->callinst->position.y); + break; + case 'p': + /* Pin name either has no spaces or is in quotes */ diff --git a/cad/xcircuit/patches/patch-ae b/cad/xcircuit/patches/patch-ae new file mode 100644 index 00000000000..1b29d0f5d80 --- /dev/null +++ b/cad/xcircuit/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2003/07/10 08:03:58 jtb Exp $ + +--- elements.c.orig ++++ elements.c +@@ -436,7 +436,7 @@ + freelabel(labelbuf); + labelbuf = NULL; + resolveparams(areastruct.topinstance); +- if (do_all >= 0) ++ if (do_all > 0) + updateinstparam(areastruct.topinstance, do_all); + else /* do_all == -1 */ + calcbbox(areastruct.topinstance); diff --git a/cad/xcircuit/patches/patch-af b/cad/xcircuit/patches/patch-af new file mode 100644 index 00000000000..607848e3d16 --- /dev/null +++ b/cad/xcircuit/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2003/07/10 08:03:58 jtb Exp $ + +--- keybindings.c.orig ++++ keybindings.c +@@ -64,7 +64,7 @@ + /* xcircuit.h! */ + /*--------------------------------------------------------------*/ + +-static char *function_names[NUM_FUNCTIONS] = { ++static char *function_names[] = { + "Page", "Justify", "Superscript", "Subscript", "Normalscript", + "Nextfont", "Boldfont", "Italicfont", "Normalfont", "Underline", + "Overline", "ISO Encoding", "Return", "Halfspace", "Quarterspace", |