diff options
| author | seb <seb> | 2002-08-28 13:49:35 +0000 |
|---|---|---|
| committer | seb <seb> | 2002-08-28 13:49:35 +0000 |
| commit | f23d3c7ddd8b34d01987dae6aa538bf698e04753 (patch) | |
| tree | 5b17cf784de4f0fbf23fe65ae295bc04ce98a7d1 /graphics | |
| parent | 8b24abf7163b293722189df8dc81026c94270c8f (diff) | |
| download | pkgsrc-f23d3c7ddd8b34d01987dae6aa538bf698e04753.tar.gz | |
Update to version 1.8.9.
Buildlink1 -> buildlink2. Update homepage.
* Changes in version 1.8.9
August 2, 2002
- declare this version 1.8.9
- general
- split rpm into:
graphviz, graphviz-tcl, graphviz-graphs, graphviz-devel
- gcc3 warning cleanup
- Install lincdt, libgraph, libagraph, libgd, libpathplan, libexp,
and libpack so that they can be used by other programs.
Headers and man3 in graphviz-devel
- dynagraph, graphsearch
- New tools based on libagraph and written in C++
- dot, neato, twopi
- Add node and edge tooltips for use with -Tcmap
\N,\E,\H,\T substitutions also work in tooltips.
- Add alt="label_string" to -Tcmap
- Add edge-label and port mappings to -Tps and -Tps2 so
that edges can be hyperlinked in PDF documents.
- Add support for \E (edge name), \H (head-node name),
\T (tail-node name) substitutions in edge labels and edge URLs
- Add support for stylesheet="file.css" for use in -Tsvg
- Fix -Tpic to work with recent gpic (Bruce Lilly)
- Fix alignment of imagemaps to images.
- Fix "transparent" color support in -Tsvg
- Fix support for graph [URL="default.html"] in -Tsvg and -Tcmap.
- Fix '&' escaping in URLs in -Tsvg
- Fix infinite loop in dot layout algorithm
- Fix text rotations again (hopefully freetype is stable now.)
- Cluster layout improvements
- Clean up warning messages from pathplan
- Consolidation of mapping code from imapgen.c and ismapgen.c into mapgen.c
- gpr
- Added additional mode to extract components based sharing an
edge or a cluster
- Fix test for getopt
- tcl-based tools
- Disable tcl-based tool building if tcl/tk not available
with stubs support.
- documentation updates: FAQ, dotguide, dot.1
* Changes in version 1.8.8
July 5, 2002
- declare 1.8.7 a "brown bag" release
and declare this version 1.8.8
- remove wrong assert in gdgen.c
- fix graph centering in bitmap outputs
- provide enough margins
- fix line widths after scaling
(test with directed/proc3d.dot)
- fix text rotations (requires libfreetype.so.6.3.1)
(test with directed/NaN.dot)
* Changes in version 1.8.7
July 5, 2002
- declare this version 1.8.7
- Fix missing "]" in ihi demo.
July 2, 2002
- Add URL mappings for clusters: svg,svgz,ps,ismap,imap,cmap.
- Fix to avoid white edges in bitmap outputs when bgcolor is set.
- Improve sizing and position of strings in bitmap outputs
when using builtin fonts (when font file not found).
- Fix \N substitution in edge URLs in imap and cmap outputs.
- Add -Tcmap for client-side imagemaps.
- Generate warnings instead of access violation for EPSF file problems.
- Various spline fixes in neato.
- Fixes to pack.c
- Add feature to ccomps to allow extraction of individual component
by number or node.
- Cdt make to use iffe provided in the tools directory.
- Various Makefile.old fixes.
- Use HAVE_LIBZ to remove GD2 format if libz not available.
Now bare-bones programs can be built without any add-on libraries.
- Modified dot grammar to allow simple name attributes in attribute
lists. Thus, [splines] is equivalent to [splines=true]. Adopted
the same convention for command line attributes -G, -E and -N.
In addition, such command line attributes now override any
competing initial attribute statements.
- HP-UX 11.11 build fixes for struct dioattr.
- Fix for bug #158 "Nodes disappear with ports"
- Various Windows-specific #ifdefs
- Fix edge coordinates in -Tplain.
* Changes in version 1.8.6
May 24, 2002
- declare this version 1.8.6
May 19, 2002
- Fixed segfault from use of bgcolor in clusters.
May 15, 2002
- Changed install location of architecture-independent demo
scripts and graphs to <prefix>/share/graphviz/ to conform to FHS.
- Avoid multiple linking of libfreetype (and others) which caused
problems on SunOS-2.8.
May 6, 2002
- Factored out some duplicated arrow code from dotgen/splines.c
and neatorgen/splines.c into common/arrows.c.
- Added new arrow types: halfopen, box, obox, crow.
- Touched up the arrow designs so that they look better at default size.
- Modified/extended graphs/directed/newarrows.dot to show new arrows.
May 3, 2002
- Added some UML arrow types from Diomidis Spinellis <dds@aueb.gr>
empty, invempty, open, diamond, odiamond.
May 2, 2002
- Added new pack option to neato. This causes each connected component
to be laid out separately, and then the resulting graphs are packed
together in a single layout.
- Amended neato to accept new tee arrowhead.
April 19, 2002
- Coords of rectangles changed to left/top right/bottom in -Timap.
- Generate COPYING from LICENSE.html during ./authogen.sh,
remove COPYING from CVS.
April 16, 2002
- Minor license file patches.
- Corrected one of those reversed flat edge bugs again.
Diffstat (limited to 'graphics')
32 files changed, 445 insertions, 474 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index d93b0f75444..d7c547bde40 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,27 +1,31 @@ -# $NetBSD: Makefile,v 1.5 2002/04/19 18:42:33 seb Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/28 13:49:35 seb Exp $ # -DISTNAME= graphviz-1.8.5 +DISTNAME= graphviz-1.8.9 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.research.att.com/sw/tools/graphviz/ +HOMEPAGE= http://www.graphviz.org/ COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs LICENSE= graphviz-license -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES -USE_LIBTOOL= YES +GNU_CONFIGURE= yes +USE_BUILDLINK2= yes +USE_LIBTOOL= yes +USE_X11= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -CONFIGURE_ENV+= TCLCONFIG=${BUILDLINK_DIR}/lib/tclConfig.sh -CONFIGURE_ENV+= TKCONFIG=${BUILDLINK_DIR}/lib/tkConfig.sh +CONFIGURE_ENV+= TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh +CONFIGURE_ENV+= TKCONFIG=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE} +CONFIGURE_ENV+= BUILDLINK_PREFIX_TCL=${BUILDLINK_PREFIX.tcl} +CONFIGURE_ENV+= BUILDLINK_PREFIX_TK=${BUILDLINK_PREFIX.tk} -CONFIGURE_ARGS+= --with-extraincludedir=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --with-extralibdir=${BUILDLINK_DIR}/lib +# Not yet... +#CONFIGURE_ARGS+= --with-dynagraph +#UNLIMIT_RESOURCES= datasize stacksize memorysize # clean up a bit to help package maintainer produce patch files post-extract: @@ -37,11 +41,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/graphviz ${INSTALL_DATA} ${WRKSRC}/MINTERMS.txt ${PREFIX}/share/doc/graphviz -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/freetype2/buildlink.mk" -.include "../../x11/tk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" -.include "../../mk/xaw.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../x11/tk/buildlink2.mk" +.include "../../mk/xaw.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST index 3f837c50e76..2054762e81d 100644 --- a/graphics/graphviz/PLIST +++ b/graphics/graphviz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/04/19 18:42:33 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/28 13:49:35 seb Exp $ bin/acyclic bin/ccomps bin/colorize @@ -15,76 +15,80 @@ bin/sccmap bin/tred bin/twopi bin/unflatten -lib/graphviz/graphs/directed/KW91.dot -lib/graphviz/graphs/directed/Latin1.dot -lib/graphviz/graphs/directed/NaN.dot -lib/graphviz/graphs/directed/abstract.dot -lib/graphviz/graphs/directed/alf.dot -lib/graphviz/graphs/directed/awilliams.dot -lib/graphviz/graphs/directed/clust.dot -lib/graphviz/graphs/directed/clust1.dot -lib/graphviz/graphs/directed/clust2.dot -lib/graphviz/graphs/directed/clust3.dot -lib/graphviz/graphs/directed/clust4.dot -lib/graphviz/graphs/directed/clust5.dot -lib/graphviz/graphs/directed/crazy.dot -lib/graphviz/graphs/directed/ctext.dot -lib/graphviz/graphs/directed/dfa.dot -lib/graphviz/graphs/directed/fig6.dot -lib/graphviz/graphs/directed/fsm.dot -lib/graphviz/graphs/directed/grammar.dot -lib/graphviz/graphs/directed/hashtable.dot -lib/graphviz/graphs/directed/honda-tokoro.dot -lib/graphviz/graphs/directed/jcctree.dot -lib/graphviz/graphs/directed/jsort.dot -lib/graphviz/graphs/directed/ldbxtried.dot -lib/graphviz/graphs/directed/longflat.dot -lib/graphviz/graphs/directed/mike.dot -lib/graphviz/graphs/directed/newarrows.dot -lib/graphviz/graphs/directed/nhg.dot -lib/graphviz/graphs/directed/pgram.dot -lib/graphviz/graphs/directed/pm2way.dot -lib/graphviz/graphs/directed/pmpipe.dot -lib/graphviz/graphs/directed/polypoly.dot -lib/graphviz/graphs/directed/proc3d.dot -lib/graphviz/graphs/directed/record2.dot -lib/graphviz/graphs/directed/records.dot -lib/graphviz/graphs/directed/rowe.dot -lib/graphviz/graphs/directed/shells.dot -lib/graphviz/graphs/directed/states.dot -lib/graphviz/graphs/directed/structs.dot -lib/graphviz/graphs/directed/train11.dot -lib/graphviz/graphs/directed/trapeziumlr.dot -lib/graphviz/graphs/directed/tree.dot -lib/graphviz/graphs/directed/triedds.dot -lib/graphviz/graphs/directed/try.dot -lib/graphviz/graphs/directed/unix.dot -lib/graphviz/graphs/directed/unix2.dot -lib/graphviz/graphs/directed/unix2k.dot -lib/graphviz/graphs/directed/viewfile.dot -lib/graphviz/graphs/directed/world.dot -lib/graphviz/graphs/undirected/ER.dot -lib/graphviz/graphs/undirected/Heawood.dot -lib/graphviz/graphs/undirected/Petersen.dot -lib/graphviz/graphs/undirected/ngk10_4.dot -lib/graphviz/graphs/undirected/process.dot -lib/graphviz/lefty/box.lefty -lib/graphviz/lefty/def.lefty -lib/graphviz/lefty/dotty.lefty -lib/graphviz/lefty/dotty_draw.lefty -lib/graphviz/lefty/dotty_edit.lefty -lib/graphviz/lefty/dotty_layout.lefty -lib/graphviz/lefty/dotty_ui.lefty -lib/graphviz/lefty/fractal.lefty -lib/graphviz/lefty/fractal2.lefty -lib/graphviz/lefty/lefty.psp -lib/graphviz/lefty/slides.lefty -lib/graphviz/lefty/tree.lefty +include/graphviz/aghdr.h +include/graphviz/agraph.h +include/graphviz/cdt.h +include/graphviz/dthdr.h +include/graphviz/exgram.h +include/graphviz/exlib.h +include/graphviz/expr.h +include/graphviz/gd.h +include/graphviz/gd_io.h +include/graphviz/gdcache.h +include/graphviz/gdfontg.h +include/graphviz/gdfontl.h +include/graphviz/gdfontmb.h +include/graphviz/gdfonts.h +include/graphviz/gdfontt.h +include/graphviz/gdhelpers.h +include/graphviz/grammar.h +include/graphviz/graph.h +include/graphviz/jisx0208.h +include/graphviz/libgraph.h +include/graphviz/malloc.h +include/graphviz/pack.h +include/graphviz/parser.h +include/graphviz/pathgeom.h +include/graphviz/pathplan.h +include/graphviz/pathutil.h +include/graphviz/pointset.h +include/graphviz/solvers.h +include/graphviz/tri.h +include/graphviz/triefa.h +include/graphviz/vis.h +include/graphviz/vispath.h +include/graphviz/vmstub.h +include/graphviz/wbmp.h +lib/graphviz/libagraph.a +lib/graphviz/libagraph.la +lib/graphviz/libagraph.so +lib/graphviz/libagraph.so.0 +lib/graphviz/libagraph.so.0.0 +lib/graphviz/libcdt.a +lib/graphviz/libcdt.la +lib/graphviz/libcdt.so +lib/graphviz/libcdt.so.0 +lib/graphviz/libcdt.so.0.0 +lib/graphviz/libexpr.a +lib/graphviz/libexpr.la +lib/graphviz/libexpr.so +lib/graphviz/libexpr.so.0 +lib/graphviz/libexpr.so.0.0 +lib/graphviz/libgd.a +lib/graphviz/libgd.la +lib/graphviz/libgd.so +lib/graphviz/libgd.so.0 +lib/graphviz/libgd.so.0.0 lib/graphviz/libgdtclft.a lib/graphviz/libgdtclft.la lib/graphviz/libgdtclft.so lib/graphviz/libgdtclft.so.0 lib/graphviz/libgdtclft.so.0.0 +lib/graphviz/libgraph.a +lib/graphviz/libgraph.la +lib/graphviz/libgraph.so +lib/graphviz/libgraph.so.0 +lib/graphviz/libgraph.so.0.0 +lib/graphviz/libpack.a +lib/graphviz/libpack.la +lib/graphviz/libpack.so +lib/graphviz/libpack.so.0 +lib/graphviz/libpack.so.0.0 +lib/graphviz/libpathplan.a +lib/graphviz/libpathplan.la +lib/graphviz/libpathplan.so +lib/graphviz/libpathplan.so.0 +lib/graphviz/libpathplan.so.0.0 lib/graphviz/libtcldgl.a lib/graphviz/libtcldgl.la lib/graphviz/libtcldgl.so @@ -130,6 +134,7 @@ man/man3/agraph.3 man/man3/cdt.3 man/man3/expr.3 man/man3/graph.3 +man/man3/pack.3 man/man3/pathplan.3 man/mann/gdtclft.n man/mann/tcldgl.n @@ -176,11 +181,78 @@ share/examples/graphviz/pathplan_data/u.dat share/examples/graphviz/pathplan_data/unknown.dat share/examples/graphviz/spline share/examples/graphviz/spline.README +share/graphviz/graphs/directed/KW91.dot +share/graphviz/graphs/directed/Latin1.dot +share/graphviz/graphs/directed/NaN.dot +share/graphviz/graphs/directed/abstract.dot +share/graphviz/graphs/directed/alf.dot +share/graphviz/graphs/directed/awilliams.dot +share/graphviz/graphs/directed/clust.dot +share/graphviz/graphs/directed/clust1.dot +share/graphviz/graphs/directed/clust2.dot +share/graphviz/graphs/directed/clust3.dot +share/graphviz/graphs/directed/clust4.dot +share/graphviz/graphs/directed/clust5.dot +share/graphviz/graphs/directed/crazy.dot +share/graphviz/graphs/directed/ctext.dot +share/graphviz/graphs/directed/dfa.dot +share/graphviz/graphs/directed/fig6.dot +share/graphviz/graphs/directed/fsm.dot +share/graphviz/graphs/directed/grammar.dot +share/graphviz/graphs/directed/hashtable.dot +share/graphviz/graphs/directed/honda-tokoro.dot +share/graphviz/graphs/directed/jcctree.dot +share/graphviz/graphs/directed/jsort.dot +share/graphviz/graphs/directed/ldbxtried.dot +share/graphviz/graphs/directed/longflat.dot +share/graphviz/graphs/directed/mike.dot +share/graphviz/graphs/directed/newarrows.dot +share/graphviz/graphs/directed/nhg.dot +share/graphviz/graphs/directed/pgram.dot +share/graphviz/graphs/directed/pm2way.dot +share/graphviz/graphs/directed/pmpipe.dot +share/graphviz/graphs/directed/polypoly.dot +share/graphviz/graphs/directed/proc3d.dot +share/graphviz/graphs/directed/record2.dot +share/graphviz/graphs/directed/records.dot +share/graphviz/graphs/directed/rowe.dot +share/graphviz/graphs/directed/shells.dot +share/graphviz/graphs/directed/states.dot +share/graphviz/graphs/directed/structs.dot +share/graphviz/graphs/directed/train11.dot +share/graphviz/graphs/directed/trapeziumlr.dot +share/graphviz/graphs/directed/tree.dot +share/graphviz/graphs/directed/triedds.dot +share/graphviz/graphs/directed/try.dot +share/graphviz/graphs/directed/unix.dot +share/graphviz/graphs/directed/unix2.dot +share/graphviz/graphs/directed/unix2k.dot +share/graphviz/graphs/directed/viewfile.dot +share/graphviz/graphs/directed/world.dot +share/graphviz/graphs/undirected/ER.dot +share/graphviz/graphs/undirected/Heawood.dot +share/graphviz/graphs/undirected/Petersen.dot +share/graphviz/graphs/undirected/ngk10_4.dot +share/graphviz/graphs/undirected/process.dot +share/graphviz/lefty/box.lefty +share/graphviz/lefty/def.lefty +share/graphviz/lefty/dotty.lefty +share/graphviz/lefty/dotty_draw.lefty +share/graphviz/lefty/dotty_edit.lefty +share/graphviz/lefty/dotty_layout.lefty +share/graphviz/lefty/dotty_ui.lefty +share/graphviz/lefty/fractal.lefty +share/graphviz/lefty/fractal2.lefty +share/graphviz/lefty/lefty.psp +share/graphviz/lefty/slides.lefty +share/graphviz/lefty/tree.lefty +@dirrm share/graphviz/lefty +@dirrm share/graphviz/graphs/undirected +@dirrm share/graphviz/graphs/directed +@dirrm share/graphviz/graphs +@dirrm share/graphviz @dirrm share/examples/graphviz/pathplan_data @dirrm share/examples/graphviz @dirrm share/doc/graphviz -@dirrm lib/graphviz/lefty -@dirrm lib/graphviz/graphs/undirected -@dirrm lib/graphviz/graphs/directed -@dirrm lib/graphviz/graphs @dirrm lib/graphviz +@dirrm include/graphviz diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 1a7b8d44594..90e605cc069 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,33 +1,33 @@ -$NetBSD: distinfo,v 1.4 2002/04/19 18:42:33 seb Exp $ +$NetBSD: distinfo,v 1.5 2002/08/28 13:49:35 seb Exp $ -SHA1 (graphviz-1.8.5.tar.gz) = 7265ca893d0757c41e6094bf545a49d7a1b39fbd -Size (graphviz-1.8.5.tar.gz) = 2624079 bytes -SHA1 (patch-aa) = 1284ea4e38bdf2022bc9e270668f57b4f2953f03 -SHA1 (patch-ab) = 8ee64f8cca79a92b1d6d20b42fdfdb042d1b8226 -SHA1 (patch-ac) = e3cb1850be1ab26cd7cc4d7283e85593b8c36487 -SHA1 (patch-ad) = 10926226514d44eb653d4a2006a14dc60e72f143 -SHA1 (patch-ae) = f428fe4761e49c09b6f8c381ca65ffcbcb61c3d3 -SHA1 (patch-af) = 96c1f98a5b1fce31c596435c879af326604da077 -SHA1 (patch-ag) = 74d616f071023511603b403e8279c7b46a437025 -SHA1 (patch-ah) = 4177be8269252663a3bedb4b243ce77de6f8f444 -SHA1 (patch-ai) = 91c3c87864805fcd825026f806f2e993a7025c00 -SHA1 (patch-aj) = 25f1dff8fe277346bdd44b540cf559a4f8809ac5 -SHA1 (patch-ak) = aa33e17048945494ffcd8104aa0d77946de17a4e -SHA1 (patch-al) = ecb44648b9887d11d39488dd558f53586701fb4c -SHA1 (patch-am) = 0d2dba58d1d446e8743867fb1df515d0e7c179a5 -SHA1 (patch-an) = 8102be5b12b374b041ca5a41665cc4a47a33d13f -SHA1 (patch-ao) = 740068e1cce2287dac43b0221541d8c0b45e2e7d -SHA1 (patch-ap) = bc9e733bfdbbde196f1f851aa8943453430d5dea -SHA1 (patch-aq) = 873eb8cb47cd591ef64e71ddbfbcbbe39b9b5257 -SHA1 (patch-ar) = cf60597ae99232500da469762f979dc3a2e6073e -SHA1 (patch-as) = 5671de07cb19e74514994ec5011fa5ab29708b44 -SHA1 (patch-at) = 121bbd25a83967aaf976a23c818e7526c2a91ff2 -SHA1 (patch-au) = a0cbbd33e19623b8e53427ff2de3b0a7e323c78b -SHA1 (patch-av) = bfcb35ddc2814d304bb2c31923335ea3757bd6ff -SHA1 (patch-aw) = 19a832710cce1fdaffc7ac6166ffcf8e4bcbbfbd -SHA1 (patch-ax) = 7ed8b5e8cfce5bed4c764e8f4855b774f3bfa519 -SHA1 (patch-ay) = 6221dcfbafe787399bec890abdcdef27353ab7d0 -SHA1 (patch-az) = ddbe55931ab479c30cd7d3ec52ea6f4d61df6d98 -SHA1 (patch-ba) = a88d9a6bb9dcc335bf364aa28dbec6d6786aa480 -SHA1 (patch-bb) = 4ea6f919c39c05923ef2312cc3de78d9ea21ec7a -SHA1 (patch-bc) = c634e7626e751082fb7061bc9ab6bd1604469bba +SHA1 (graphviz-1.8.9.tar.gz) = 0bee65fc6685947bd8ee8ecdb20f5c87eb9bee64 +Size (graphviz-1.8.9.tar.gz) = 2775329 bytes +SHA1 (patch-aa) = d60925921fa7daa753ee04e267fce6f978644ea2 +SHA1 (patch-ab) = 4f726e7f8c5c61fd73b53c83e348b503ed2c5299 +SHA1 (patch-ac) = 8f9fb5adc0a9e3613766c5c7b073facd444f45ec +SHA1 (patch-ad) = 81f77ec2d25c1c8e8c12f73891dcdcd67f260e17 +SHA1 (patch-ae) = 40c123397384368504d2d4930f1c52d4a4826350 +SHA1 (patch-af) = dcb086b86e33d534a462e3e82feb07153375b153 +SHA1 (patch-ag) = 05faa990eed1ddf65f5c8c61e75d9421332782e6 +SHA1 (patch-ah) = 6846b255517c91a912adb05c38abce3c0069ea6c +SHA1 (patch-ai) = d7f30a8976f17fe4c961a14eb9209f7b2edc1d0c +SHA1 (patch-aj) = e3f0d660b878d552e078c7715bbbf7789b689559 +SHA1 (patch-ak) = 26f82e552f45968893c5c07476ac4dd49c2b2ae4 +SHA1 (patch-al) = 673b060b1c10feadd2c6e1b1cf4e20f8676a0a9a +SHA1 (patch-am) = b6337716d48c52a5603f2b80dcb1deced5fec748 +SHA1 (patch-an) = 605f2ed8b0c81500e9cc76407fa00ce8c7cd7658 +SHA1 (patch-ao) = ef6e508e153bc6191d41deeec1ae9cc6913ea4a8 +SHA1 (patch-ap) = b4202a993ad6989698506e2caecc358bbf85b3b8 +SHA1 (patch-aq) = 012280cbf551c39839735fcfc94a223cc0701291 +SHA1 (patch-ar) = fa77ff1193866c333157e528f8f27f210476c5e5 +SHA1 (patch-as) = 28452cc8d007c6489f97adcda5ba7d9fd1386f26 +SHA1 (patch-at) = 007f961b06bf60016497d1cc60cca6b98d260e81 +SHA1 (patch-au) = 1a502172dab1cc798794e18bcf4dd931c41ddf09 +SHA1 (patch-av) = b7e5f709cd84cecaa198fe764a54868b4b0cc5d8 +SHA1 (patch-aw) = a2c391c1a1189d320e2eaca3aad572262f8c0079 +SHA1 (patch-ax) = a604b5d45e4a0d1df89de1b55f0e13346144fe44 +SHA1 (patch-ay) = a175c1adbd0dfc235bc23e94d8c4562a09951d3f +SHA1 (patch-az) = 87f9ccec2349a60cd58b9797f14641d803b25c0a +SHA1 (patch-ba) = 67b34a674120c175dd66ce57044056a7079d2d9b +SHA1 (patch-bb) = a92de630d37ce562c3bd87978a9a8fb248d475f1 +SHA1 (patch-bc) = d3215051807a24d1258cd7355f4443d731398267 diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa index 440d9059144..c4af813b0bd 100644 --- a/graphics/graphviz/patches/patch-aa +++ b/graphics/graphviz/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/28 13:49:36 seb Exp $ ---- MINTERMS.txt.orig Fri Oct 6 18:10:34 2000 +--- MINTERMS.txt.orig Tue Apr 16 22:37:02 2002 +++ MINTERMS.txt @@ -2,7 +2,7 @@ Appendix A - Minimum Terms diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab index a39e7831067..d804468e82b 100644 --- a/graphics/graphviz/patches/patch-ab +++ b/graphics/graphviz/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-ab,v 1.5 2002/08/28 13:49:36 seb Exp $ ---- configure.in.orig Fri Apr 12 00:09:14 2002 +--- configure.in.orig Fri Aug 2 22:55:20 2002 +++ configure.in -@@ -45,7 +45,10 @@ +@@ -48,7 +48,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI PATHSEPARATOR=";" else # This sucks! Whatever happened to standards for file system layout? @@ -14,35 +14,25 @@ $NetBSD: patch-ab,v 1.4 2002/04/19 18:42:34 seb Exp $ PATHSEPARATOR=":" fi fi -@@ -166,12 +169,11 @@ - - # Some systems don't have Tcl. Don't build - # the Tcl products if we don't have the library. --TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh - if test -f $TCLCONFIG; then - AC_MSG_RESULT([using $TCLCONFIG]) - file=${TCLCONFIG} +@@ -177,7 +180,7 @@ if test -f $TCLCONFIG; then . $file -- TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" -+ TCL_SUBDIRS="tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" - TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" - else - AC_MSG_WARN([Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built]) -@@ -242,12 +244,11 @@ - - # Some systems have Tcl, but not TK. Don't build - # the Tk products if we don't have the library. --TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh - if test -f $TKCONFIG; then - AC_MSG_RESULT([using $TKCONFIG]) + # TCL STUBS support is required + if test "${TCL_SUPPORTS_STUBS}" = "1"; then +- TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" ++ TCL_SUBDIRS="tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" + TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" + else + AC_MSG_WARN([Tcl does not have STUBs support, perhaps it is too old? The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built]) +@@ -266,7 +269,7 @@ if test -f $TKCONFIG; then file=${TKCONFIG} . $file -- TK_SUBDIRS="tkstubs tkspline" -+ TK_SUBDIRS="tkspline" - TK_PKGINDEX="tkspline/pkgIndex.tcl" - else - AC_MSG_WARN([Unable to find tkConfig.sh. The package "tkspline" will not be built]) -@@ -568,36 +569,12 @@ + if test "${TCL_SUPPORTS_STUBS}" = "1"; then +- TK_SUBDIRS="tkstubs tkspline" ++ TK_SUBDIRS="tkspline" + TK_PKGINDEX="tkspline/pkgIndex.tcl" + else + AC_MSG_WARN([Tcl does not have STUBs support, so neither does Tk. The packages: "tkspline" will not be built]) +@@ -610,36 +613,12 @@ AC_MSG_RESULT(no)]) # ----------------------------------- # tclInt.h @@ -50,7 +40,7 @@ $NetBSD: patch-ab,v 1.4 2002/04/19 18:42:34 seb Exp $ -TCLINT_INCLUDES="-I$TCL_SRC_DIR/generic" -else -if test -f "/usr/include/tclInt.h"; then --TCLINT_INCLUDES="-I/usr/include" +-TCLINT_INCLUDES="" -else -if test -f "/usr/local/include/tclInt.h"; then -TCLINT_INCLUDES="-I/usr/local/include" @@ -59,7 +49,7 @@ $NetBSD: patch-ab,v 1.4 2002/04/19 18:42:34 seb Exp $ -fi -fi -fi -+TCLINT_INCLUDES="-I${BUILDLINK_DIR}/include/tcl/generic" ++TCLINT_INCLUDES="-I${BUILDLINK_PREFIX_TCL}/include/tcl/generic" AC_SUBST(TCLINT_INCLUDES) # ----------------------------------- @@ -68,7 +58,7 @@ $NetBSD: patch-ab,v 1.4 2002/04/19 18:42:34 seb Exp $ -TKINT_INCLUDES="-I$TK_SRC_DIR/generic" -else -if test -f "/usr/include/tkInt.h"; then --TKINT_INCLUDES="-I/usr/include" +-TKINT_INCLUDES="" -else -if test -f "/usr/local/include/tkInt.h"; then -TKINT_INCLUDES="-I/usr/local/include" @@ -77,7 +67,7 @@ $NetBSD: patch-ab,v 1.4 2002/04/19 18:42:34 seb Exp $ -fi -fi -fi -+TKINT_INCLUDES="-I${BUILDLINK_DIR}/include/tk/generic" ++TKINT_INCLUDES="-I${BUILDLINK_PREFIX_TK}/include/tk/generic" AC_SUBST(TKINT_INCLUDES) # ----------------------------------- diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac index 94beda500a5..ddd165a4aab 100644 --- a/graphics/graphviz/patches/patch-ac +++ b/graphics/graphviz/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-ac,v 1.5 2002/08/28 13:49:36 seb Exp $ ---- configure.orig Fri Apr 12 00:09:37 2002 +--- configure.orig Mon Aug 5 05:08:48 2002 +++ configure -@@ -1475,60 +1475,9 @@ +@@ -1479,60 +1479,9 @@ else fi fi @@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ - 'void exit (int);' -do - cat > conftest.$ac_ext <<EOF --#line 1489 "configure" +-#line 1493 "configure" -#include "confdefs.h" -#include <stdlib.h> -$ac_declaration @@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ -exit (42); -; return 0; } -EOF --if { (eval echo configure:1497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 @@ -34,14 +34,14 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ -fi -rm -f conftest* - cat > conftest.$ac_ext <<EOF --#line 1507 "configure" +-#line 1511 "configure" -#include "confdefs.h" -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF --if { (eval echo configure:1514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else @@ -59,12 +59,12 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ - echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 --echo "configure:1532: checking for strerror in -lcposix" >&5 -+echo "configure:1481: checking for strerror in -lcposix" >&5 +-echo "configure:1536: checking for strerror in -lcposix" >&5 ++echo "configure:1485: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1860,7 +1809,7 @@ +@@ -1864,7 +1813,7 @@ test -n "$YACC" && break done test -n "$YACC" || YACC="yacc" @@ -73,7 +73,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -5893,7 +5842,10 @@ +@@ -5897,7 +5846,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI PATHSEPARATOR=";" else # This sucks! Whatever happened to standards for file system layout? @@ -85,35 +85,25 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ PATHSEPARATOR=":" fi fi -@@ -6101,12 +6053,11 @@ - - # Some systems don't have Tcl. Don't build - # the Tcl products if we don't have the library. --TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh - if test -f $TCLCONFIG; then - echo "$ac_t""using $TCLCONFIG" 1>&6 - file=${TCLCONFIG} +@@ -6113,7 +6065,7 @@ if test -f $TCLCONFIG; then . $file -- TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" -+ TCL_SUBDIRS="tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" - TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" - else - echo "configure: warning: Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built" 1>&2 -@@ -6178,12 +6129,11 @@ - - # Some systems have Tcl, but not TK. Don't build - # the Tk products if we don't have the library. --TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh - if test -f $TKCONFIG; then - echo "$ac_t""using $TKCONFIG" 1>&6 + # TCL STUBS support is required + if test "${TCL_SUPPORTS_STUBS}" = "1"; then +- TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" ++ TCL_SUBDIRS="tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" + TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" + else + echo "configure: warning: Tcl does not have STUBs support, perhaps it is too old? The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built" 1>&2 +@@ -6203,7 +6155,7 @@ if test -f $TKCONFIG; then file=${TKCONFIG} . $file -- TK_SUBDIRS="tkstubs tkspline" -+ TK_SUBDIRS="tkspline" - TK_PKGINDEX="tkspline/pkgIndex.tcl" - else - echo "configure: warning: Unable to find tkConfig.sh. The package "tkspline" will not be built" 1>&2 -@@ -8673,36 +8623,12 @@ + if test "${TCL_SUPPORTS_STUBS}" = "1"; then +- TK_SUBDIRS="tkstubs tkspline" ++ TK_SUBDIRS="tkspline" + TK_PKGINDEX="tkspline/pkgIndex.tcl" + else + echo "configure: warning: Tcl does not have STUBs support, so neither does Tk. The packages: "tkspline" will not be built" 1>&2 +@@ -8736,36 +8688,12 @@ rm -f conftest* # ----------------------------------- # tclInt.h @@ -121,7 +111,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ -TCLINT_INCLUDES="-I$TCL_SRC_DIR/generic" -else -if test -f "/usr/include/tclInt.h"; then --TCLINT_INCLUDES="-I/usr/include" +-TCLINT_INCLUDES="" -else -if test -f "/usr/local/include/tclInt.h"; then -TCLINT_INCLUDES="-I/usr/local/include" @@ -130,7 +120,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ -fi -fi -fi -+TCLINT_INCLUDES="-I${BUILDLINK_DIR}/include/tcl/generic" ++TCLINT_INCLUDES="-I${BUILDLINK_PREFIX_TCL}/include/tcl/generic" # ----------------------------------- @@ -139,7 +129,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ -TKINT_INCLUDES="-I$TK_SRC_DIR/generic" -else -if test -f "/usr/include/tkInt.h"; then --TKINT_INCLUDES="-I/usr/include" +-TKINT_INCLUDES="" -else -if test -f "/usr/local/include/tkInt.h"; then -TKINT_INCLUDES="-I/usr/local/include" @@ -148,7 +138,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/19 18:42:34 seb Exp $ -fi -fi -fi -+TKINT_INCLUDES="-I${BUILDLINK_DIR}/include/tk/generic" ++TKINT_INCLUDES="-I${BUILDLINK_PREFIX_TK}/include/tk/generic" # ----------------------------------- diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad index 83e7e312a60..100c5dea492 100644 --- a/graphics/graphviz/patches/patch-ad +++ b/graphics/graphviz/patches/patch-ad @@ -1,21 +1,11 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/28 13:49:36 seb Exp $ ---- gdtclft/Makefile.am.orig Thu Feb 21 23:16:53 2002 +--- gdtclft/Makefile.am.orig Thu Aug 1 17:43:30 2002 +++ gdtclft/Makefile.am -@@ -4,8 +4,7 @@ - - INCLUDES = @TCL_CFLAGS@ \ - -I$(top_srcdir)/tclhandle \ -- -I$(top_srcdir)/gd \ -- -I@TCLSH_EXEC_PREFIX@/include -+ -I$(top_srcdir)/gd - - LIBS = ${FT_LIBS} \ - ${PNG_LIBS} \ -@@ -23,7 +22,7 @@ +@@ -18,7 +18,7 @@ libgdtclft_la_SOURCES = gdtclft.c libgdtclft_la_LIBADD = \ ../tclhandle/libtclhandle.la \ - ../gd/libgd.la \ + ../gd/libgdconvenience.la \ - ../tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae index a43d4351301..0e289463d44 100644 --- a/graphics/graphviz/patches/patch-ae +++ b/graphics/graphviz/patches/patch-ae @@ -1,49 +1,40 @@ -$NetBSD: patch-ae,v 1.3 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-ae,v 1.4 2002/08/28 13:49:36 seb Exp $ ---- gdtclft/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- gdtclft/Makefile.in.orig Mon Aug 5 05:11:26 2002 +++ gdtclft/Makefile.in -@@ -183,17 +183,10 @@ +@@ -185,9 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --INCLUDES = @TCL_CFLAGS@ \ +-INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \ - -I$(top_srcdir)/tclhandle \ -- -I$(top_srcdir)/gd \ -- -I@TCLSH_EXEC_PREFIX@/include -+INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/tclhandle -I$(top_srcdir)/gd +- -I$(top_srcdir)/gd ++INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ -I$(top_srcdir)/tclhandle -I$(top_srcdir)/gd --LIBS = ${FT_LIBS} \ -- ${PNG_LIBS} \ -- ${JPEG_LIBS} \ -- ${XPM_LIBS} \ -- ${Z_LIBS} -lc -+LIBS = ${FT_LIBS} ${PNG_LIBS} ${JPEG_LIBS} ${XPM_LIBS} ${Z_LIBS} -lc - - - SUBDIRS = demo -@@ -203,10 +196,7 @@ + LIBS = @LIBS@ -lc +@@ -199,10 +197,7 @@ man_MANS = gdtclft.n libgdtclft_la_SOURCES = gdtclft.c -libgdtclft_la_LIBADD = \ - ../tclhandle/libtclhandle.la \ -- ../gd/libgd.la \ +- ../gd/libgdconvenience.la \ - ../tclstubs/libtclstubs.la -+libgdtclft_la_LIBADD = ../tclhandle/libtclhandle.la ../gd/libgd.la ${TCL_STUB_LIB_SPEC} ++libgdtclft_la_LIBADD = ../tclhandle/libtclhandle.la ../gd/libgdconvenience.la ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -227,7 +217,7 @@ +@@ -223,7 +218,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ libgdtclft_la_LDFLAGS = libgdtclft_la_DEPENDENCIES = ../tclhandle/libtclhandle.la \ --../gd/libgd.la ../tclstubs/libtclstubs.la -+../gd/libgd.la +-../gd/libgdconvenience.la ../tclstubs/libtclstubs.la ++../gd/libgdconvenience.la libgdtclft_la_OBJECTS = gdtclft.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -243,7 +233,7 @@ +@@ -239,7 +234,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -52,7 +43,7 @@ $NetBSD: patch-ae,v 1.3 2002/04/19 18:42:34 seb Exp $ GZIP_ENV = --best SOURCES = $(libgdtclft_la_SOURCES) OBJECTS = $(libgdtclft_la_OBJECTS) -@@ -484,7 +474,6 @@ +@@ -480,7 +475,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af index 69e09cb36fd..c09e837b5c0 100644 --- a/graphics/graphviz/patches/patch-af +++ b/graphics/graphviz/patches/patch-af @@ -1,12 +1,12 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-af,v 1.2 2002/08/28 13:49:37 seb Exp $ ---- gdtclft/demo/Makefile.am.orig Thu May 4 15:12:32 2000 +--- gdtclft/demo/Makefile.am.orig Wed May 15 23:55:30 2002 +++ gdtclft/demo/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = entities demo_DATA = entities.README entities.html diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag index 3c41f2521f9..dd63e57e5a0 100644 --- a/graphics/graphviz/patches/patch-ag +++ b/graphics/graphviz/patches/patch-ag @@ -1,17 +1,17 @@ -$NetBSD: patch-ag,v 1.3 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-ag,v 1.4 2002/08/28 13:49:37 seb Exp $ ---- gdtclft/demo/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- gdtclft/demo/Makefile.in.orig Mon Aug 5 05:11:27 2002 +++ gdtclft/demo/Makefile.in -@@ -183,7 +183,7 @@ +@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = entities demo_DATA = entities.README entities.html EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) -@@ -199,7 +199,7 @@ +@@ -201,7 +201,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah index 02884d335d6..044e1d9e879 100644 --- a/graphics/graphviz/patches/patch-ah +++ b/graphics/graphviz/patches/patch-ah @@ -1,23 +1,13 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-ah,v 1.2 2002/08/28 13:49:37 seb Exp $ ---- tcldgl/Makefile.am.orig Thu Feb 21 23:16:54 2002 +--- tcldgl/Makefile.am.orig Thu Aug 1 17:43:30 2002 +++ tcldgl/Makefile.am -@@ -7,8 +7,7 @@ - -I$(top_srcdir)/cdt \ - -I$(top_srcdir)/tclhandle \ - -I$(top_srcdir)/incr \ -- -I$(top_srcdir)/shape \ -- -I@TCLSH_EXEC_PREFIX@/include -+ -I$(top_srcdir)/shape - - LIBS = - -@@ -32,7 +31,7 @@ +@@ -32,7 +32,7 @@ libtcldgl_la_LIBADD = \ ../agutil/libagutil.la \ ../shape/libshape.la \ ../ns/libns.la \ -- ../tclstubs/libtclstubs.la \ -+ ${TCL_STUB_LIB_SPEC} \ - -lc -lm +- ../tclstubs/libtclstubs.la ++ ${TCL_STUB_LIB_SPEC} all-local: pkgIndex.tcl + diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai index 908e93086b7..710c26881c8 100644 --- a/graphics/graphviz/patches/patch-ai +++ b/graphics/graphviz/patches/patch-ai @@ -1,54 +1,54 @@ -$NetBSD: patch-ai,v 1.3 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-ai,v 1.4 2002/08/28 13:49:37 seb Exp $ ---- tcldgl/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tcldgl/Makefile.in.orig Mon Aug 5 05:11:30 2002 +++ tcldgl/Makefile.in -@@ -183,13 +183,7 @@ +@@ -185,12 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --INCLUDES = @TCL_CFLAGS@ \ +-INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \ - -I$(top_srcdir)/agraph \ - -I$(top_srcdir)/cdt \ - -I$(top_srcdir)/tclhandle \ - -I$(top_srcdir)/incr \ -- -I$(top_srcdir)/shape \ -- -I@TCLSH_EXEC_PREFIX@/include -+INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/agraph -I$(top_srcdir)/cdt -I$(top_srcdir)/tclhandle -I$(top_srcdir)/incr -I$(top_srcdir)/shape +- -I$(top_srcdir)/shape ++INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ -I$(top_srcdir)/agraph -I$(top_srcdir)/cdt -I$(top_srcdir)/tclhandle -I$(top_srcdir)/incr -I$(top_srcdir)/shape - LIBS = -@@ -202,20 +196,7 @@ + LIBS = @LIBS@ +@@ -203,20 +198,7 @@ man_MANS = tcldgl.n libtcldgl_la_SOURCES = dgl.c dglayout.c dglshape.c dglutil.c dgl.h --libtcldgl_la_LIBADD = ../tclhandle/libtclhandle.la \ -- ../agraph/libagraph.la \ -- ../cdt/libcdt.la \ +-libtcldgl_la_LIBADD = \ +- ../tclhandle/libtclhandle.la \ +- ../agraph/libagraphconvenience.la \ +- ../cdt/libcdtconvenience.la \ - ../fdp/libfdp.la \ - ../dag/libdag.la \ - ../geo/libgeo.la \ - ../grid/libgrid.la \ - ../incr/libincr.la \ -- ../pathplan/libpathplan.la \ +- ../pathplan/libpathplanconvenience.la \ - ../agutil/libagutil.la \ - ../shape/libshape.la \ - ../ns/libns.la \ -- ../tclstubs/libtclstubs.la \ -- -lc -lm -+libtcldgl_la_LIBADD = ../tclhandle/libtclhandle.la ../agraph/libagraph.la ../cdt/libcdt.la ../fdp/libfdp.la ../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la ../incr/libincr.la ../pathplan/libpathplan.la ../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la ${TCL_STUB_LIB_SPEC} -lc -lm +- ../tclstubs/libtclstubs.la ++libtcldgl_la_LIBADD = ../tclhandle/libtclhandle.la ../agraph/libagraphconvenience.la ../cdt/libcdtconvenience.la ../fdp/libfdp.la ../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la ../incr/libincr.la ../pathplan/libpathplanconvenience.la ../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -239,7 +220,7 @@ - ../agraph/libagraph.la ../cdt/libcdt.la ../fdp/libfdp.la \ - ../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la ../incr/libincr.la \ - ../pathplan/libpathplan.la ../agutil/libagutil.la ../shape/libshape.la \ --../ns/libns.la ../tclstubs/libtclstubs.la -+../ns/libns.la +@@ -240,8 +222,7 @@ libtcldgl_la_DEPENDENCIES = ../tclhandl + ../agraph/libagraphconvenience.la ../cdt/libcdtconvenience.la \ + ../fdp/libfdp.la ../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la \ + ../incr/libincr.la ../pathplan/libpathplanconvenience.la \ +-../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la \ +-../tclstubs/libtclstubs.la ++../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la libtcldgl_la_OBJECTS = dgl.lo dglayout.lo dglshape.lo dglutil.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -257,7 +238,7 @@ +@@ -259,7 +240,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -57,7 +57,7 @@ $NetBSD: patch-ai,v 1.3 2002/04/19 18:42:34 seb Exp $ GZIP_ENV = --best SOURCES = $(libtcldgl_la_SOURCES) OBJECTS = $(libtcldgl_la_OBJECTS) -@@ -498,7 +479,6 @@ +@@ -500,7 +481,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj index e40f0ebc9ae..ba99707eefa 100644 --- a/graphics/graphviz/patches/patch-aj +++ b/graphics/graphviz/patches/patch-aj @@ -1,12 +1,12 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-aj,v 1.2 2002/08/28 13:49:37 seb Exp $ ---- tcldgl/demo/Makefile.am.orig Thu May 4 15:12:32 2000 +--- tcldgl/demo/Makefile.am.orig Wed May 15 23:55:31 2002 +++ tcldgl/demo/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = dge demo_DATA = dge.README dge.example1.dot dge.example2.dot diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak index 13d456cb3cd..524f2901d67 100644 --- a/graphics/graphviz/patches/patch-ak +++ b/graphics/graphviz/patches/patch-ak @@ -1,17 +1,17 @@ -$NetBSD: patch-ak,v 1.3 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-ak,v 1.4 2002/08/28 13:49:37 seb Exp $ ---- tcldgl/demo/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tcldgl/demo/Makefile.in.orig Mon Aug 5 05:11:31 2002 +++ tcldgl/demo/Makefile.in -@@ -183,7 +183,7 @@ +@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = dge demo_DATA = dge.README dge.example1.dot dge.example2.dot EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) -@@ -199,7 +199,7 @@ +@@ -201,7 +201,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al index 1ebcda2924a..af3ebaf323e 100644 --- a/graphics/graphviz/patches/patch-al +++ b/graphics/graphviz/patches/patch-al @@ -1,23 +1,13 @@ -$NetBSD: patch-al,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-al,v 1.2 2002/08/28 13:49:37 seb Exp $ ---- tcldgr/Makefile.am.orig Thu Feb 21 23:16:54 2002 +--- tcldgr/Makefile.am.orig Thu Aug 1 17:43:31 2002 +++ tcldgr/Makefile.am -@@ -5,8 +5,7 @@ - INCLUDES = @TCL_CFLAGS@ \ - -I$(top_srcdir)/agraph \ - -I$(top_srcdir)/cdt \ -- -I$(top_srcdir)/tclhandle \ -- -I@TCLSH_EXEC_PREFIX@/include -+ -I$(top_srcdir)/tclhandle - - LIBS = - -@@ -21,7 +20,7 @@ - libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la \ - ../agraph/libagraph.la \ - ../cdt/libcdt.la \ +@@ -21,7 +21,7 @@ libtcldgr_la_LIBADD = \ + ../tclhandle/libtclhandle.la \ + ../agraph/libagraphconvenience.la \ + ../cdt/libcdtconvenience.la \ - ../tclstubs/libtclstubs.la -+ ${TCL_STUB_LIB_SPEC} ++ ${TCL_STUB_LIB_SPEC} all-local: pkgIndex.tcl diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am index 90d41d2ed56..265bee06c06 100644 --- a/graphics/graphviz/patches/patch-am +++ b/graphics/graphviz/patches/patch-am @@ -1,42 +1,43 @@ -$NetBSD: patch-am,v 1.3 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-am,v 1.4 2002/08/28 13:49:37 seb Exp $ ---- tcldgr/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tcldgr/Makefile.in.orig Mon Aug 5 05:11:29 2002 +++ tcldgr/Makefile.in -@@ -183,11 +183,7 @@ +@@ -185,10 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --INCLUDES = @TCL_CFLAGS@ \ +-INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \ - -I$(top_srcdir)/agraph \ - -I$(top_srcdir)/cdt \ -- -I$(top_srcdir)/tclhandle \ -- -I@TCLSH_EXEC_PREFIX@/include -+INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/agraph -I$(top_srcdir)/cdt -I$(top_srcdir)/tclhandle +- -I$(top_srcdir)/tclhandle ++INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ -I$(top_srcdir)/agraph -I$(top_srcdir)/cdt -I$(top_srcdir)/tclhandle - LIBS = -@@ -200,10 +196,7 @@ + LIBS = @LIBS@ +@@ -201,11 +198,7 @@ man_MANS = tcldgr.n libtcldgr_la_SOURCES = dgedge.c dgnode.c dgr.c dgraph.c dgrutil.c dgr.h --libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la \ -- ../agraph/libagraph.la \ -- ../cdt/libcdt.la \ +-libtcldgr_la_LIBADD = \ +- ../tclhandle/libtclhandle.la \ +- ../agraph/libagraphconvenience.la \ +- ../cdt/libcdtconvenience.la \ - ../tclstubs/libtclstubs.la -+libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la ../agraph/libagraph.la ../cdt/libcdt.la ${TCL_STUB_LIB_SPEC} ++libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la ../agraph/libagraphconvenience.la ../cdt/libcdtconvenience.la ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -224,7 +217,7 @@ +@@ -226,8 +219,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ libtcldgr_la_LDFLAGS = libtcldgr_la_DEPENDENCIES = ../tclhandle/libtclhandle.la \ --../agraph/libagraph.la ../cdt/libcdt.la ../tclstubs/libtclstubs.la -+../agraph/libagraph.la ../cdt/libcdt.la +-../agraph/libagraphconvenience.la ../cdt/libcdtconvenience.la \ +-../tclstubs/libtclstubs.la ++../agraph/libagraphconvenience.la ../cdt/libcdtconvenience.la libtcldgr_la_OBJECTS = dgedge.lo dgnode.lo dgr.lo dgraph.lo dgrutil.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -242,7 +235,7 @@ +@@ -245,7 +237,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -45,7 +46,7 @@ $NetBSD: patch-am,v 1.3 2002/04/19 18:42:34 seb Exp $ GZIP_ENV = --best SOURCES = $(libtcldgr_la_SOURCES) OBJECTS = $(libtcldgr_la_OBJECTS) -@@ -483,7 +476,6 @@ +@@ -486,7 +478,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an index 8dad2488770..fde3d1e5178 100644 --- a/graphics/graphviz/patches/patch-an +++ b/graphics/graphviz/patches/patch-an @@ -1,12 +1,12 @@ -$NetBSD: patch-an,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-an,v 1.2 2002/08/28 13:49:37 seb Exp $ ---- tcldgr/demo/Makefile.am.orig Thu May 4 15:12:32 2000 +--- tcldgr/demo/Makefile.am.orig Wed May 15 23:55:31 2002 +++ tcldgr/demo/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = ihi demo_DATA = ihi.README ihi.testdata diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao index 3ba29be3036..9cf395cd062 100644 --- a/graphics/graphviz/patches/patch-ao +++ b/graphics/graphviz/patches/patch-ao @@ -1,17 +1,17 @@ -$NetBSD: patch-ao,v 1.3 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-ao,v 1.4 2002/08/28 13:49:37 seb Exp $ ---- tcldgr/demo/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tcldgr/demo/Makefile.in.orig Mon Aug 5 05:11:29 2002 +++ tcldgr/demo/Makefile.in -@@ -183,7 +183,7 @@ +@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = ihi demo_DATA = ihi.README ihi.testdata EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) -@@ -199,7 +199,7 @@ +@@ -201,7 +201,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap index a191002de75..6c737931a7c 100644 --- a/graphics/graphviz/patches/patch-ap +++ b/graphics/graphviz/patches/patch-ap @@ -1,20 +1,10 @@ -$NetBSD: patch-ap,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-ap,v 1.2 2002/08/28 13:49:37 seb Exp $ ---- tcldot/Makefile.am.orig Thu Feb 21 23:16:54 2002 +--- tcldot/Makefile.am.orig Fri Aug 2 22:54:46 2002 +++ tcldot/Makefile.am -@@ -10,8 +10,7 @@ - -I$(top_srcdir)/graph \ - -I$(top_srcdir)/cdt \ - -I$(top_srcdir)/pathplan \ -- -I$(top_srcdir)/tclhandle \ -- -I@TCLSH_EXEC_PREFIX@/include -+ -I$(top_srcdir)/tclhandle - - LIBS = ${FT_LIBS} \ - ${PNG_LIBS} \ -@@ -39,7 +38,7 @@ - ../cdt/libcdt.la \ - ../gd/libgd.la \ +@@ -36,7 +36,7 @@ libtcldot_la_LIBADD = \ + ../cdt/libcdtconvenience.la \ + ../gd/libgdconvenience.la \ ../gdtclft/gdtclft.lo \ - ../tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq index 797464a7c53..27781f4f745 100644 --- a/graphics/graphviz/patches/patch-aq +++ b/graphics/graphviz/patches/patch-aq @@ -1,12 +1,12 @@ -$NetBSD: patch-aq,v 1.3 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-aq,v 1.4 2002/08/28 13:49:38 seb Exp $ ---- tcldot/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tcldot/Makefile.in.orig Mon Aug 5 05:11:27 2002 +++ tcldot/Makefile.in -@@ -183,23 +183,10 @@ +@@ -185,15 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --INCLUDES = @TCL_CFLAGS@ \ +-INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \ - -I$(top_srcdir)/dotneato/dotgen \ - -I$(top_srcdir)/dotneato/neatogen \ - -I$(top_srcdir)/dotneato/twopigen \ @@ -14,39 +14,29 @@ $NetBSD: patch-aq,v 1.3 2002/04/19 18:42:34 seb Exp $ - -I$(top_srcdir)/graph \ - -I$(top_srcdir)/cdt \ - -I$(top_srcdir)/pathplan \ -- -I$(top_srcdir)/tclhandle \ -- -I@TCLSH_EXEC_PREFIX@/include -- -- --LIBS = ${FT_LIBS} \ -- ${PNG_LIBS} \ -- ${JPEG_LIBS} \ -- ${XPM_LIBS} \ -- ${Z_LIBS} -lc -+INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/dotneato/dotgen -I$(top_srcdir)/dotneato/neatogen -I$(top_srcdir)/dotneato/twopigen -I$(top_srcdir)/dotneato/common -I$(top_srcdir)/graph -I$(top_srcdir)/cdt -I$(top_srcdir)/pathplan -I$(top_srcdir)/tclhandle -+ -+ -+LIBS = ${FT_LIBS} ${PNG_LIBS} ${JPEG_LIBS} ${XPM_LIBS} ${Z_LIBS} -lc +- -I$(top_srcdir)/tclhandle ++INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ -I$(top_srcdir)/dotneato/dotgen -I$(top_srcdir)/dotneato/neatogen -I$(top_srcdir)/dotneato/twopigen -I$(top_srcdir)/dotneato/common -I$(top_srcdir)/graph -I$(top_srcdir)/cdt -I$(top_srcdir)/pathplan -I$(top_srcdir)/tclhandle - CFLAGS = @CFLAGS@ -DDATE="\"`date`\"" -@@ -212,24 +199,12 @@ + LIBS = @LIBS@ -lc +@@ -208,25 +200,12 @@ man_MANS = tcldot.n libtcldot_la_SOURCES = tcldot.c tkgen.c tcldot.h --libtcldot_la_LIBADD = ../tclhandle/libtclhandle.la \ +-libtcldot_la_LIBADD = \ +- ../tclhandle/libtclhandle.la \ - ../dotneato/common/libdotneato.la \ - ../dotneato/dotgen/libdot.la \ - ../dotneato/neatogen/libneato.la \ - ../dotneato/twopigen/libtwopi.la \ -- ../dotneato/pack/libpack.la \ -- ../pathplan/libpathplan.la \ -- ../graph/libgraph.la \ -- ../cdt/libcdt.la \ -- ../gd/libgd.la \ +- ../dotneato/pack/libpackconvenience.la \ +- ../pathplan/libpathplanconvenience.la \ +- ../graph/libgraphconvenience.la \ +- ../cdt/libcdtconvenience.la \ +- ../gd/libgdconvenience.la \ - ../gdtclft/gdtclft.lo \ - ../tclstubs/libtclstubs.la -+libtcldot_la_LIBADD = ../tclhandle/libtclhandle.la ../dotneato/common/libdotneato.la ../dotneato/dotgen/libdot.la ../dotneato/neatogen/libneato.la ../dotneato/twopigen/libtwopi.la ../dotneato/pack/libpack.la ../pathplan/libpathplan.la ../graph/libgraph.la ../cdt/libcdt.la ../gd/libgd.la ../gdtclft/gdtclft.lo ${TCL_STUB_LIB_SPEC} ++libtcldot_la_LIBADD = ../tclhandle/libtclhandle.la ../dotneato/common/libdotneato.la ../dotneato/dotgen/libdot.la ../dotneato/neatogen/libneato.la ../dotneato/twopigen/libtwopi.la ../dotneato/pack/libpackconvenience.la ../pathplan/libpathplanconvenience.la ../graph/libgraphconvenience.la ../cdt/libcdtconvenience.la ../gd/libgdconvenience.la ../gdtclft/gdtclft.lo ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl @@ -57,16 +47,16 @@ $NetBSD: patch-aq,v 1.3 2002/04/19 18:42:34 seb Exp $ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../gvconfig.h -@@ -250,7 +225,7 @@ - ../dotneato/neatogen/libneato.la ../dotneato/twopigen/libtwopi.la \ - ../dotneato/pack/libpack.la ../pathplan/libpathplan.la \ - ../graph/libgraph.la ../cdt/libcdt.la ../gd/libgd.la \ +@@ -248,7 +227,7 @@ libtcldot_la_DEPENDENCIES = ../tclhandl + ../dotneato/pack/libpackconvenience.la \ + ../pathplan/libpathplanconvenience.la ../graph/libgraphconvenience.la \ + ../cdt/libcdtconvenience.la ../gd/libgdconvenience.la \ -../gdtclft/gdtclft.lo ../tclstubs/libtclstubs.la +../gdtclft/gdtclft.lo libtcldot_la_OBJECTS = tcldot.lo tkgen.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -267,7 +242,7 @@ +@@ -265,7 +244,7 @@ DIST_COMMON = README Makefile.am Makefi DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -75,7 +65,7 @@ $NetBSD: patch-aq,v 1.3 2002/04/19 18:42:34 seb Exp $ GZIP_ENV = --best SOURCES = $(libtcldot_la_SOURCES) OBJECTS = $(libtcldot_la_OBJECTS) -@@ -508,7 +483,6 @@ +@@ -506,7 +485,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done diff --git a/graphics/graphviz/patches/patch-ar b/graphics/graphviz/patches/patch-ar index 3f2307d31eb..676c83d3dee 100644 --- a/graphics/graphviz/patches/patch-ar +++ b/graphics/graphviz/patches/patch-ar @@ -1,12 +1,12 @@ -$NetBSD: patch-ar,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-ar,v 1.2 2002/08/28 13:49:38 seb Exp $ ---- tcldot/demo/Makefile.am.orig Fri Jul 27 18:30:40 2001 +--- tcldot/demo/Makefile.am.orig Wed May 15 23:55:31 2002 +++ tcldot/demo/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = doted gcat demo_DATA = doted.README gcat.README diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as index 7260c6769e8..dbb7f508060 100644 --- a/graphics/graphviz/patches/patch-as +++ b/graphics/graphviz/patches/patch-as @@ -1,17 +1,17 @@ -$NetBSD: patch-as,v 1.3 2002/04/19 18:42:34 seb Exp $ +$NetBSD: patch-as,v 1.4 2002/08/28 13:49:38 seb Exp $ ---- tcldot/demo/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tcldot/demo/Makefile.in.orig Mon Aug 5 05:11:28 2002 +++ tcldot/demo/Makefile.in -@@ -183,7 +183,7 @@ +@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = doted gcat demo_DATA = doted.README gcat.README EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) -@@ -199,7 +199,7 @@ +@@ -201,7 +201,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/graphics/graphviz/patches/patch-at b/graphics/graphviz/patches/patch-at index 4ae4c13c505..d9cd7c9f26b 100644 --- a/graphics/graphviz/patches/patch-at +++ b/graphics/graphviz/patches/patch-at @@ -1,23 +1,13 @@ -$NetBSD: patch-at,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-at,v 1.2 2002/08/28 13:49:38 seb Exp $ ---- tclpathplan/Makefile.am.orig Thu Feb 21 23:16:54 2002 +--- tclpathplan/Makefile.am.orig Thu Aug 1 17:43:31 2002 +++ tclpathplan/Makefile.am -@@ -4,8 +4,7 @@ - - INCLUDES = @TCL_CFLAGS@ \ - -I$(top_srcdir)/tclhandle \ -- -I$(top_srcdir)/pathplan \ -- -I@TCLSH_EXEC_PREFIX@/include -+ -I$(top_srcdir)/pathplan - - LIBS = - -@@ -20,7 +19,7 @@ +@@ -19,7 +19,7 @@ libtclplan_la_SOURCES = find_ints.c inte libtclplan_la_LIBADD = \ ../tclhandle/libtclhandle.la \ - ../pathplan/libpathplan.la \ -- ../tclstubs/libtclstubs.la -lm -+ ${TCL_STUB_LIB_SPEC} -lm + ../pathplan/libpathplanconvenience.la \ +- ../tclstubs/libtclstubs.la ++ ${TCL_STUB_LIB_SPEC} all-local: pkgIndex.tcl diff --git a/graphics/graphviz/patches/patch-au b/graphics/graphviz/patches/patch-au index 06b85f4b357..281b8440ebe 100644 --- a/graphics/graphviz/patches/patch-au +++ b/graphics/graphviz/patches/patch-au @@ -1,20 +1,19 @@ -$NetBSD: patch-au,v 1.3 2002/04/19 18:42:35 seb Exp $ +$NetBSD: patch-au,v 1.4 2002/08/28 13:49:38 seb Exp $ ---- tclpathplan/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tclpathplan/Makefile.in.orig Mon Aug 5 05:11:31 2002 +++ tclpathplan/Makefile.in -@@ -183,10 +183,7 @@ +@@ -185,9 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --INCLUDES = @TCL_CFLAGS@ \ +-INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ \ - -I$(top_srcdir)/tclhandle \ -- -I$(top_srcdir)/pathplan \ -- -I@TCLSH_EXEC_PREFIX@/include -+INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/tclhandle -I$(top_srcdir)/pathplan +- -I$(top_srcdir)/pathplan ++INCLUDES = @TCL_CFLAGS@ @TCL_INCLUDES@ -I$(top_srcdir)/tclhandle -I$(top_srcdir)/pathplan - LIBS = -@@ -196,14 +193,10 @@ + LIBS = @LIBS@ +@@ -197,14 +195,10 @@ pkglib_LTLIBRARIES = libtclplan.la SUBDIRS = demo @@ -25,22 +24,22 @@ $NetBSD: patch-au,v 1.3 2002/04/19 18:42:35 seb Exp $ -libtclplan_la_LIBADD = \ - ../tclhandle/libtclhandle.la \ -- ../pathplan/libpathplan.la \ -- ../tclstubs/libtclstubs.la -lm -+libtclplan_la_LIBADD = ../tclhandle/libtclhandle.la ../pathplan/libpathplan.la ${TCL_STUB_LIB_SPEC} -lm +- ../pathplan/libpathplanconvenience.la \ +- ../tclstubs/libtclstubs.la ++libtclplan_la_LIBADD = ../tclhandle/libtclhandle.la ../pathplan/libpathplanconvenience.la ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -222,7 +215,7 @@ +@@ -223,7 +217,7 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ libtclplan_la_LDFLAGS = libtclplan_la_DEPENDENCIES = ../tclhandle/libtclhandle.la \ --../pathplan/libpathplan.la ../tclstubs/libtclstubs.la -+../pathplan/libpathplan.la +-../pathplan/libpathplanconvenience.la ../tclstubs/libtclstubs.la ++../pathplan/libpathplanconvenience.la libtclplan_la_OBJECTS = find_ints.lo intersect.lo makecw.lo \ tclpathplan.lo wrapper.lo CFLAGS = @CFLAGS@ -@@ -237,7 +230,7 @@ +@@ -238,7 +232,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -49,7 +48,7 @@ $NetBSD: patch-au,v 1.3 2002/04/19 18:42:35 seb Exp $ GZIP_ENV = --best SOURCES = $(libtclplan_la_SOURCES) OBJECTS = $(libtclplan_la_OBJECTS) -@@ -439,7 +432,6 @@ +@@ -440,7 +434,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done diff --git a/graphics/graphviz/patches/patch-av b/graphics/graphviz/patches/patch-av index e250c0757ed..1f3716c2c1c 100644 --- a/graphics/graphviz/patches/patch-av +++ b/graphics/graphviz/patches/patch-av @@ -1,12 +1,12 @@ -$NetBSD: patch-av,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-av,v 1.2 2002/08/28 13:49:38 seb Exp $ ---- tclpathplan/demo/Makefile.am.orig Thu Nov 2 20:10:05 2000 +--- tclpathplan/demo/Makefile.am.orig Wed May 15 23:55:31 2002 +++ tclpathplan/demo/Makefile.am -@@ -4,7 +4,7 @@ +@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 SUBDIRS = pathplan_data --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = pathplan demo_DATA = pathplan.README diff --git a/graphics/graphviz/patches/patch-aw b/graphics/graphviz/patches/patch-aw index 2035666d89d..5f7707acceb 100644 --- a/graphics/graphviz/patches/patch-aw +++ b/graphics/graphviz/patches/patch-aw @@ -1,17 +1,17 @@ -$NetBSD: patch-aw,v 1.3 2002/04/19 18:42:35 seb Exp $ +$NetBSD: patch-aw,v 1.4 2002/08/28 13:49:38 seb Exp $ ---- tclpathplan/demo/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tclpathplan/demo/Makefile.in.orig Mon Aug 5 05:11:33 2002 +++ tclpathplan/demo/Makefile.in -@@ -185,7 +185,7 @@ +@@ -187,7 +187,7 @@ AUTOMAKE_OPTIONS = 1.4 SUBDIRS = pathplan_data --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = pathplan demo_DATA = pathplan.README -@@ -202,7 +202,7 @@ +@@ -204,7 +204,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/graphics/graphviz/patches/patch-ax b/graphics/graphviz/patches/patch-ax index 0be788dc301..13fb1bad255 100644 --- a/graphics/graphviz/patches/patch-ax +++ b/graphics/graphviz/patches/patch-ax @@ -1,12 +1,12 @@ -$NetBSD: patch-ax,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-ax,v 1.2 2002/08/28 13:49:40 seb Exp $ ---- tclpathplan/demo/pathplan_data/Makefile.am.orig Thu Nov 2 20:10:05 2000 +--- tclpathplan/demo/pathplan_data/Makefile.am.orig Wed May 15 23:55:31 2002 +++ tclpathplan/demo/pathplan_data/Makefile.am -@@ -5,7 +5,7 @@ +@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat \ obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat --pathplanexampledir = $(libdir)/@PACKAGE@/demo/pathplan_data +-pathplanexampledir = $(datadir)/@PACKAGE@/demo/pathplan_data +pathplanexampledir = $(prefix)/share/examples/@PACKAGE@/pathplan_data pathplanexample_DATA = $(EXAMPLES) diff --git a/graphics/graphviz/patches/patch-ay b/graphics/graphviz/patches/patch-ay index 62efb46b0e6..cae30bafcb6 100644 --- a/graphics/graphviz/patches/patch-ay +++ b/graphics/graphviz/patches/patch-ay @@ -1,8 +1,8 @@ -$NetBSD: patch-ay,v 1.3 2002/04/19 18:42:35 seb Exp $ +$NetBSD: patch-ay,v 1.4 2002/08/28 13:49:40 seb Exp $ ---- tclpathplan/demo/pathplan_data/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tclpathplan/demo/pathplan_data/Makefile.in.orig Mon Aug 5 05:11:33 2002 +++ tclpathplan/demo/pathplan_data/Makefile.in -@@ -183,11 +183,10 @@ +@@ -185,11 +185,10 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 @@ -11,12 +11,12 @@ $NetBSD: patch-ay,v 1.3 2002/04/19 18:42:35 seb Exp $ +EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat --pathplanexampledir = $(libdir)/@PACKAGE@/demo/pathplan_data +-pathplanexampledir = $(datadir)/@PACKAGE@/demo/pathplan_data +pathplanexampledir = $(prefix)/share/examples/@PACKAGE@/pathplan_data pathplanexample_DATA = $(EXAMPLES) EXTRA_DIST = $(EXAMPLES) -@@ -201,7 +200,7 @@ +@@ -203,7 +202,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/graphics/graphviz/patches/patch-az b/graphics/graphviz/patches/patch-az index b764b4c9b74..881b2d55c11 100644 --- a/graphics/graphviz/patches/patch-az +++ b/graphics/graphviz/patches/patch-az @@ -1,19 +1,8 @@ -$NetBSD: patch-az,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-az,v 1.2 2002/08/28 13:49:40 seb Exp $ ---- tkspline/Makefile.am.orig Thu Feb 21 23:16:54 2002 +--- tkspline/Makefile.am.orig Thu Aug 1 02:19:11 2002 +++ tkspline/Makefile.am -@@ -4,9 +4,7 @@ - @TCL_CFLAGS@ \ - @TK_CFLAGS@ @TK_DEFS@ \ - @TCLINT_INCLUDES@ \ -- @TKINT_INCLUDES@ \ -- -I@TK_EXEC_PREFIX@/include \ -- -I@TCLSH_EXEC_PREFIX@/include -+ @TKINT_INCLUDES@ - - LIBS = - -@@ -20,8 +18,8 @@ +@@ -16,8 +16,8 @@ man_MANS = tkspline.n libtkspline_la_SOURCES = tkspline.c libtkspline_la_LIBADD = \ diff --git a/graphics/graphviz/patches/patch-ba b/graphics/graphviz/patches/patch-ba index b7e17e24b28..659a29cda3b 100644 --- a/graphics/graphviz/patches/patch-ba +++ b/graphics/graphviz/patches/patch-ba @@ -1,23 +1,19 @@ -$NetBSD: patch-ba,v 1.3 2002/04/19 18:42:35 seb Exp $ +$NetBSD: patch-ba,v 1.4 2002/08/28 13:49:40 seb Exp $ ---- tkspline/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tkspline/Makefile.in.orig Mon Aug 5 05:11:35 2002 +++ tkspline/Makefile.in -@@ -181,13 +181,7 @@ +@@ -183,9 +183,7 @@ YACC = @YACC@ Z_INCLUDES = @Z_INCLUDES@ Z_LIBS = @Z_LIBS@ -INCLUDES = @X_CFLAGS@ \ -- @TCL_CFLAGS@ \ -- @TK_CFLAGS@ @TK_DEFS@ \ -- @TCLINT_INCLUDES@ \ -- @TKINT_INCLUDES@ \ -- -I@TK_EXEC_PREFIX@/include \ -- -I@TCLSH_EXEC_PREFIX@/include -+INCLUDES = @X_CFLAGS@ @TCL_CFLAGS@ @TK_CFLAGS@ @TK_DEFS@ @TCLINT_INCLUDES@ @TKINT_INCLUDES@ +- @TCL_CFLAGS@ @TCL_INCLUDES@ @TCLINT_INCLUDES@ \ +- @TK_CFLAGS@ @TK_INCLUDES@ @TK_DEFS@ @TKINT_INCLUDES@ ++INCLUDES = @X_CFLAGS@ @TCL_CFLAGS@ @TCL_INCLUDES@ @TCLINT_INCLUDES@ @TK_CFLAGS@ @TK_INCLUDES@ @TK_DEFS@ @TKINT_INCLUDES@ LIBS = -@@ -201,9 +195,7 @@ +@@ -199,9 +197,7 @@ man_MANS = tkspline.n libtkspline_la_SOURCES = tkspline.c @@ -28,7 +24,7 @@ $NetBSD: patch-ba,v 1.3 2002/04/19 18:42:35 seb Exp $ CLEANFILES = pkgIndex.tcl -@@ -223,8 +215,7 @@ +@@ -221,8 +217,7 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ libtkspline_la_LDFLAGS = @@ -38,7 +34,7 @@ $NetBSD: patch-ba,v 1.3 2002/04/19 18:42:35 seb Exp $ libtkspline_la_OBJECTS = tkspline.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -240,7 +231,7 @@ +@@ -238,7 +233,7 @@ DIST_COMMON = README Makefile.am Makefi DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -47,7 +43,7 @@ $NetBSD: patch-ba,v 1.3 2002/04/19 18:42:35 seb Exp $ GZIP_ENV = --best SOURCES = $(libtkspline_la_SOURCES) OBJECTS = $(libtkspline_la_OBJECTS) -@@ -481,7 +472,6 @@ +@@ -479,7 +474,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done diff --git a/graphics/graphviz/patches/patch-bb b/graphics/graphviz/patches/patch-bb index a6475e07847..5b70ebe594d 100644 --- a/graphics/graphviz/patches/patch-bb +++ b/graphics/graphviz/patches/patch-bb @@ -1,12 +1,12 @@ -$NetBSD: patch-bb,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +$NetBSD: patch-bb,v 1.2 2002/08/28 13:49:40 seb Exp $ ---- tkspline/demo/Makefile.am.orig Thu May 4 15:12:32 2000 +--- tkspline/demo/Makefile.am.orig Wed May 15 23:55:32 2002 +++ tkspline/demo/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = spline demo_DATA = spline.README diff --git a/graphics/graphviz/patches/patch-bc b/graphics/graphviz/patches/patch-bc index 5ac9c98ca09..ee308d7289c 100644 --- a/graphics/graphviz/patches/patch-bc +++ b/graphics/graphviz/patches/patch-bc @@ -1,17 +1,17 @@ -$NetBSD: patch-bc,v 1.3 2002/04/19 18:42:35 seb Exp $ +$NetBSD: patch-bc,v 1.4 2002/08/28 13:49:41 seb Exp $ ---- tkspline/demo/Makefile.in.orig Fri Apr 19 14:31:38 2002 +--- tkspline/demo/Makefile.in.orig Mon Aug 5 05:11:35 2002 +++ tkspline/demo/Makefile.in -@@ -183,7 +183,7 @@ +@@ -185,7 +185,7 @@ Z_LIBS = @Z_LIBS@ AUTOMAKE_OPTIONS = 1.4 --demodir = $(libdir)/@PACKAGE@/demo +-demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = spline demo_DATA = spline.README EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) -@@ -199,7 +199,7 @@ +@@ -201,7 +201,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) |