diff options
author | seb <seb> | 2004-04-17 16:56:10 +0000 |
---|---|---|
committer | seb <seb> | 2004-04-17 16:56:10 +0000 |
commit | 5adb940a3347f4b537daadadf5837063952dc40d (patch) | |
tree | dcf497e81f2701e98b2425fda493984bce6f45d5 /graphics | |
parent | eba421bcd73d0986e1a8c253ed38b16d542ff160 (diff) | |
download | pkgsrc-5adb940a3347f4b537daadadf5837063952dc40d.tar.gz |
Update to version 1.12
Package changes:
- bl3ify
- provide a buildlinl3.mk
- no more conflicting with package coreutils
Changes in graphviz since last packaged version:
March 1, 2004
- release 1.12
- general
- rename bcc -> bcomps to avoid name conflict with "Bruce's C Compiler"
on Redhat distributions.
- all build without X11 (fix problem in lefty tree)
- remove from distribution:
dag, fdp, geo, grid, incr, shape, tcldgr, tcldgl
- dotneato
- fix "brown-bag" problem resulting in PNG and JPEG errors on RH8 and RH9.
February 23, 2004
- release 1.11
- general
- fix windows builds
- add tool "bcc" to distribution
- dotneato
- add -Gviewport="X,Y,Z,x,y" where XY are the dimensions of a viewport
in device coordinates (pixels), Z is a zooming factor, x,y is the
location of the center of the viewport in graph coordinates.
Supported in bitmap and imagemap outputs only.
- fix memory leak in gd/gdft.c
- clean up calculation of whitespace around labels
- dotty, lefty
- fix for bug #400
December 23, 2003
- added dijkstra (single source distance) filter
September 10, 2003
- general
- removed CVS directories from .tar.gz distributions
- add "config" directory to contain some of the autoconf clutter
- only remove flex products with "make maintainer-clean" to
avoid trying to regenerate them after "make distclean"
basically this is to avoid the broken flex on Debian.
- suppress complaints from ./configure about config.rpath
- doc/build.html updated with notes about Windows builds
- build fixes for Forte 6sp2 compiler on Sun -xarch=v9a (64bit)
- build fixes for OpenBSD
- improved configure testing for Tcl/Tk
- various bug fixes, internal restructuring, etc
- dotneato
- fix problem with extra escape chars in .fig output
- support for "setlinewidth" in -Tfig
- improved splines in -Tfig
- add manpage for dotneato-config
- neato: add defaultdist graph attribute to set distance
between components
- first cut at html table formatter add. not ready for use yet
as the syntax is going to change some more.
- tools
- renamed "colorize" to "gvcolor" to avoid conflict on Debian
- renamed "gpr" to "gvpr" to avoid conflict on Debian
- add fflush() to acyclic, ccomps, gvcolor, tred, dot2gxl
to try to fix truncated output when used in php or perl cgi scripts
Diffstat (limited to 'graphics')
24 files changed, 1015 insertions, 891 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 2526a5050ad..183ea53733f 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2004/03/08 20:27:14 minskim Exp $ +# $NetBSD: Makefile,v 1.21 2004/04/17 16:56:10 seb Exp $ # -DISTNAME= graphviz-1.10 -PKGREVISION= 1 +DISTNAME= graphviz-1.12 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -13,45 +12,32 @@ COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs LICENSE= graphviz-license GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_LIBTOOL= yes USE_X11= yes XAW_TYPE= standard .include "../../mk/bsd.prefs.mk" -# sysutils/coreutils installs a 'gpr' program, so conflict with it if -# GNU_PROGRAM_PREFIX == 'g' -.if ${GNU_PROGRAM_PREFIX} == "g" -CONFLICTS+= coreutils-[0-9]* -.endif - -CONFIGURE_ENV+= TCLCONFIG=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh -CONFIGURE_ENV+= TKCONFIG=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh +CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH} +CONFIGURE_ENV+= TKCONFIG=${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-zincludedir=${BUILDLINK_PREFIX.zlib}/include CONFIGURE_ARGS+= --with-zlibdir=${BUILDLINK_PREFIX.zlib}/lib -CONFIGURE_ARGS+= --with-iconvincludedir=${BUILDLINK_PREFIX.iconv}/include -CONFIGURE_ARGS+= --with-iconvlibdir=${BUILDLINK_PREFIX.iconv}/lib CONFIGURE_ARGS+= --with-jpegincludedir=${BUILDLINK_PREFIX.jpeg}/include CONFIGURE_ARGS+= --with-jpeglibdir=${BUILDLINK_PREFIX.jpeg}/lib CONFIGURE_ARGS+= --with-expatincludedir=${BUILDLINK_PREFIX.expat}/include CONFIGURE_ARGS+= --with-expatlibdir=${BUILDLINK_PREFIX.expat}/lib -# curl support... Not yet -#CONFIGURE_ARGS+= --with-curlincludedir=${BUILDLINK_PREFIX.curl}/include -#CONFIGURE_ARGS+= --with-curllibdir=${BUILDLINK_PREFIX.curl}/lib +CONFIGURE_ARGS+= --with-freetypeincludedir=${BUILDLINK_PREFIX.freetype2}/include +CONFIGURE_ARGS+= --with-freetypelibdir=${BUILDLINK_PREFIX.freetype2}/lib # Dynagraph is left out for now #UNLIMIT_RESOURCES= datasize stacksize memorysize CONFIGURE_ARGS+= --without-dynagraph -post-configure: - ${TOUCH} ${WRKSRC}/configure.in ${WRKSRC}/aclocal.m4 \ - ${WRKSRC}/stamp-h.in ${WRKSRC}/configure \ - ${WRKSRC}/config.status ${WRKSRC}/Makefile +post-extract: + ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/graphviz @@ -73,13 +59,13 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/graphviz ${INSTALL_DATA} ${WRKSRC}/MINTERMS.txt ${PREFIX}/share/doc/graphviz -.include "../../graphics/png/buildlink2.mk" -.include "../../devel/zlib/buildlink2.mk" -.include "../../converters/libiconv/buildlink2.mk" -.include "../../graphics/jpeg/buildlink2.mk" -.include "../../graphics/freetype2/buildlink2.mk" -.include "../../x11/tk83/buildlink2.mk" -# .include "../../www/curl/buildlink2.mk" -.include "../../textproc/expat/buildlink2.mk" -.include "../../mk/xaw.buildlink2.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../x11/tk/buildlink3.mk" +# .include "../../www/curl/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" +.include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST index 7be6e6392df..406f68f6823 100644 --- a/graphics/graphviz/PLIST +++ b/graphics/graphviz/PLIST @@ -1,16 +1,18 @@ -@comment $NetBSD: PLIST,v 1.6 2003/07/28 10:06:44 seb Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/04/17 16:56:10 seb Exp $ bin/acyclic +bin/bcomps bin/ccomps -bin/colorize +bin/circo +bin/dijkstra bin/dot bin/dot2gxl bin/dotneato-config bin/dotty -@comment bin/dynagraph +bin/fdp bin/gc -bin/gpr -@comment bin/graphsearch +bin/gvcolor bin/gvpack +bin/gvpr bin/gxl2dot bin/lefty bin/lneato @@ -24,18 +26,31 @@ bin/unflatten include/graphviz/adjust.h include/graphviz/aghdr.h include/graphviz/agraph.h +include/graphviz/agxbuf.h include/graphviz/ast_common.h +include/graphviz/block.h +include/graphviz/blockpath.h +include/graphviz/blocktree.h include/graphviz/cdt.h include/graphviz/circle.h +include/graphviz/circo.h +include/graphviz/circpos.h +include/graphviz/circular.h +include/graphviz/colortbl.h +include/graphviz/comp.h include/graphviz/const.h +include/graphviz/dbg.h +include/graphviz/deglist.h include/graphviz/dot.h include/graphviz/dotneato.h include/graphviz/dotprocs.h include/graphviz/dthdr.h +include/graphviz/edgelist.h include/graphviz/edges.h include/graphviz/exgram.h include/graphviz/exlib.h include/graphviz/expr.h +include/graphviz/fdp.h include/graphviz/gd.h include/graphviz/gd_io.h include/graphviz/gdcache.h @@ -49,8 +64,14 @@ include/graphviz/geometry.h include/graphviz/globals.h include/graphviz/grammar.h include/graphviz/graph.h +include/graphviz/grid.h +include/graphviz/gvre.h +include/graphviz/gvrender.h +include/graphviz/gvrenderint.h include/graphviz/heap.h include/graphviz/hedges.h +include/graphviz/htmllex.h +include/graphviz/htmltable.h include/graphviz/info.h include/graphviz/jisx0208.h include/graphviz/libgraph.h @@ -59,6 +80,9 @@ include/graphviz/malloc.h include/graphviz/mem.h include/graphviz/neato.h include/graphviz/neatoprocs.h +include/graphviz/nodelist.h +include/graphviz/nodeset.h +include/graphviz/options.h include/graphviz/pack.h include/graphviz/parser.h include/graphviz/pathgeom.h @@ -71,6 +95,8 @@ include/graphviz/renderprocs.h include/graphviz/simple.h include/graphviz/site.h include/graphviz/solvers.h +include/graphviz/stack.h +include/graphviz/tlayout.h include/graphviz/tri.h include/graphviz/triefa.h include/graphviz/types.h @@ -80,7 +106,7 @@ include/graphviz/vispath.h include/graphviz/vmstub.h include/graphviz/voronoi.h include/graphviz/wbmp.h -include/graphviz/xbuf.h +include/graphviz/xlayout.h lib/graphviz/libagraph.a lib/graphviz/libagraph.la lib/graphviz/libagraph.so @@ -121,16 +147,6 @@ 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 -lib/graphviz/libtcldgl.so.0 -lib/graphviz/libtcldgl.so.0.0 -lib/graphviz/libtcldgr.a -lib/graphviz/libtcldgr.la -lib/graphviz/libtcldgr.so -lib/graphviz/libtcldgr.so.0 -lib/graphviz/libtcldgr.so.0.0 lib/graphviz/libtcldot.a lib/graphviz/libtcldot.la lib/graphviz/libtcldot.so @@ -148,16 +164,22 @@ lib/graphviz/libtkspline.so.0 lib/graphviz/libtkspline.so.0.0 lib/graphviz/pkgIndex.tcl man/man1/acyclic.1 +man/man1/bcomps.1 man/man1/ccomps.1 -man/man1/colorize.1 +man/man1/circo.1 +man/man1/dijkstra.1 man/man1/dot.1 man/man1/dot2gxl.1 +man/man1/dotneato-config.1 man/man1/dotty.1 +man/man1/fdp.1 man/man1/gc.1 -man/man1/gpr.1 +man/man1/gvcolor.1 man/man1/gvpack.1 +man/man1/gvpr.1 man/man1/gxl2dot.1 man/man1/lefty.1 +man/man1/lneato.1 man/man1/neato.1 man/man1/nop.1 man/man1/prune.1 @@ -172,8 +194,6 @@ man/man3/graph.3 man/man3/pack.3 man/man3/pathplan.3 man/mann/gdtclft.n -man/mann/tcldgl.n -man/mann/tcldgr.n man/mann/tcldot.n man/mann/tkspline.n share/doc/graphviz/COPYING @@ -184,13 +204,9 @@ share/doc/graphviz/dottyguide.pdf share/doc/graphviz/leftyguide.pdf share/doc/graphviz/neatoguide.pdf share/doc/html/graphviz/FAQ.html -@comment share/doc/html/graphviz/dynagraph.html -share/doc/html/graphviz/info/Box.gif -share/doc/html/graphviz/info/Diamond.gif share/doc/html/graphviz/info/Mcircle.gif share/doc/html/graphviz/info/Mdiamond.gif share/doc/html/graphviz/info/Msquare.gif -share/doc/html/graphviz/info/a_back.gif share/doc/html/graphviz/info/a_both.gif share/doc/html/graphviz/info/a_box.gif share/doc/html/graphviz/info/a_crow.gif @@ -204,6 +220,7 @@ share/doc/html/graphviz/info/a_inv.gif share/doc/html/graphviz/info/a_invdot.gif share/doc/html/graphviz/info/a_invempty.gif share/doc/html/graphviz/info/a_invodot.gif +share/doc/html/graphviz/info/a_lteeoldiamond.gif share/doc/html/graphviz/info/a_nohead.gif share/doc/html/graphviz/info/a_none.gif share/doc/html/graphviz/info/a_normal.gif @@ -212,6 +229,42 @@ share/doc/html/graphviz/info/a_odiamond.gif share/doc/html/graphviz/info/a_odot.gif share/doc/html/graphviz/info/a_open.gif share/doc/html/graphviz/info/a_tee.gif +share/doc/html/graphviz/info/aa_box.gif +share/doc/html/graphviz/info/aa_crow.gif +share/doc/html/graphviz/info/aa_diamond.gif +share/doc/html/graphviz/info/aa_dot.gif +share/doc/html/graphviz/info/aa_inv.gif +share/doc/html/graphviz/info/aa_lbox.gif +share/doc/html/graphviz/info/aa_lcrow.gif +share/doc/html/graphviz/info/aa_ldiamond.gif +share/doc/html/graphviz/info/aa_linv.gif +share/doc/html/graphviz/info/aa_lnormal.gif +share/doc/html/graphviz/info/aa_ltee.gif +share/doc/html/graphviz/info/aa_lvee.gif +share/doc/html/graphviz/info/aa_none.gif +share/doc/html/graphviz/info/aa_normal.gif +share/doc/html/graphviz/info/aa_obox.gif +share/doc/html/graphviz/info/aa_odiamond.gif +share/doc/html/graphviz/info/aa_odot.gif +share/doc/html/graphviz/info/aa_oinv.gif +share/doc/html/graphviz/info/aa_olbox.gif +share/doc/html/graphviz/info/aa_oldiamond.gif +share/doc/html/graphviz/info/aa_olinv.gif +share/doc/html/graphviz/info/aa_olnormal.gif +share/doc/html/graphviz/info/aa_onormal.gif +share/doc/html/graphviz/info/aa_orbox.gif +share/doc/html/graphviz/info/aa_ordiamond.gif +share/doc/html/graphviz/info/aa_orinv.gif +share/doc/html/graphviz/info/aa_ornormal.gif +share/doc/html/graphviz/info/aa_rbox.gif +share/doc/html/graphviz/info/aa_rcrow.gif +share/doc/html/graphviz/info/aa_rdiamond.gif +share/doc/html/graphviz/info/aa_rinv.gif +share/doc/html/graphviz/info/aa_rnormal.gif +share/doc/html/graphviz/info/aa_rtee.gif +share/doc/html/graphviz/info/aa_rvee.gif +share/doc/html/graphviz/info/aa_tee.gif +share/doc/html/graphviz/info/aa_vee.gif share/doc/html/graphviz/info/attrs.html share/doc/html/graphviz/info/back.gif share/doc/html/graphviz/info/both.gif @@ -220,36 +273,26 @@ share/doc/html/graphviz/info/circle.gif share/doc/html/graphviz/info/colors.html share/doc/html/graphviz/info/command.html share/doc/html/graphviz/info/constraint.gif -share/doc/html/graphviz/info/crow.gif share/doc/html/graphviz/info/diamond.gif -share/doc/html/graphviz/info/dot.gif share/doc/html/graphviz/info/doublecircle.gif share/doc/html/graphviz/info/doubleoctagon.gif share/doc/html/graphviz/info/egg.gif share/doc/html/graphviz/info/ellipse.gif -share/doc/html/graphviz/info/empty.gif +share/doc/html/graphviz/info/fill.gif share/doc/html/graphviz/info/forward.gif share/doc/html/graphviz/info/grammar.html -share/doc/html/graphviz/info/half.gif share/doc/html/graphviz/info/hexagon.gif share/doc/html/graphviz/info/house.gif +share/doc/html/graphviz/info/html1.gif +share/doc/html/graphviz/info/html2.gif share/doc/html/graphviz/info/index.html -share/doc/html/graphviz/info/inv.gif -share/doc/html/graphviz/info/invdot.gif -share/doc/html/graphviz/info/invempty.gif share/doc/html/graphviz/info/invhouse.gif -share/doc/html/graphviz/info/invodot.gif share/doc/html/graphviz/info/invtrapezium.gif share/doc/html/graphviz/info/invtriangle.gif share/doc/html/graphviz/info/lang.html +share/doc/html/graphviz/info/mrecord.gif share/doc/html/graphviz/info/nohead.gif -share/doc/html/graphviz/info/none.gif -share/doc/html/graphviz/info/normal.gif -share/doc/html/graphviz/info/obox.gif share/doc/html/graphviz/info/octagon.gif -share/doc/html/graphviz/info/odiamond.gif -share/doc/html/graphviz/info/odot.gif -share/doc/html/graphviz/info/open.gif share/doc/html/graphviz/info/output.html share/doc/html/graphviz/info/parallelogram.gif share/doc/html/graphviz/info/pentagon.gif @@ -257,17 +300,15 @@ share/doc/html/graphviz/info/plaintext.gif share/doc/html/graphviz/info/point.gif share/doc/html/graphviz/info/polygon.gif share/doc/html/graphviz/info/record.gif +share/doc/html/graphviz/info/rect.gif +share/doc/html/graphviz/info/rectangle.gif +share/doc/html/graphviz/info/round.gif share/doc/html/graphviz/info/septagon.gif share/doc/html/graphviz/info/shapes.html -share/doc/html/graphviz/info/tee.gif share/doc/html/graphviz/info/trapezium.gif share/doc/html/graphviz/info/triangle.gif share/doc/html/graphviz/info/tripleoctagon.gif share/doc/html/graphviz/tcldot.html -share/examples/graphviz/dge -share/examples/graphviz/dge.README -share/examples/graphviz/dge.example1.dot -share/examples/graphviz/dge.example2.dot share/examples/graphviz/doted share/examples/graphviz/doted.README share/examples/graphviz/entities @@ -275,9 +316,6 @@ share/examples/graphviz/entities.README share/examples/graphviz/entities.html share/examples/graphviz/gcat share/examples/graphviz/gcat.README -share/examples/graphviz/ihi -share/examples/graphviz/ihi.README -share/examples/graphviz/ihi.testdata share/examples/graphviz/pathplan share/examples/graphviz/pathplan.README share/examples/graphviz/pathplan_data/boxes.dat @@ -299,6 +337,7 @@ 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/arrows.dot share/graphviz/graphs/directed/awilliams.dot share/graphviz/graphs/directed/clust.dot share/graphviz/graphs/directed/clust1.dot @@ -319,8 +358,8 @@ 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/oldarrows.dot share/graphviz/graphs/directed/pgram.dot share/graphviz/graphs/directed/pm2way.dot share/graphviz/graphs/directed/pmpipe.dot @@ -329,9 +368,11 @@ 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/sdh.dot share/graphviz/graphs/directed/shells.dot share/graphviz/graphs/directed/states.dot share/graphviz/graphs/directed/structs.dot +share/graphviz/graphs/directed/table.dot share/graphviz/graphs/directed/train11.dot share/graphviz/graphs/directed/trapeziumlr.dot share/graphviz/graphs/directed/tree.dot diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk new file mode 100644 index 00000000000..945f8e77624 --- /dev/null +++ b/graphics/graphviz/buildlink3.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/17 16:56:10 seb Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GRAPHVIZ_BUILDLINK3_MK:= ${GRAPHVIZ_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= graphviz +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngraphviz} +BUILDLINK_PACKAGES+= graphviz + +.if !empty(GRAPHVIZ_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.graphviz+= graphviz>=1.12 +BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz +.endif # GRAPHVIZ_BUILDLINK3_MK + +.include "../../graphics/png/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../x11/tk/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 6905fe97247..71f25a7f476 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,33 +1,25 @@ -$NetBSD: distinfo,v 1.8 2003/07/28 10:06:45 seb Exp $ +$NetBSD: distinfo,v 1.9 2004/04/17 16:56:10 seb Exp $ -SHA1 (graphviz-1.10.tar.gz) = ddb54a6050800837c8dd6613676ff17bf31d5e4b -Size (graphviz-1.10.tar.gz) = 3357416 bytes +SHA1 (graphviz-1.12.tar.gz) = 78f56aaa92f5d58436e5bb5bafd18bb09e04e2d0 +Size (graphviz-1.12.tar.gz) = 3371279 bytes SHA1 (patch-aa) = d60925921fa7daa753ee04e267fce6f978644ea2 -SHA1 (patch-ab) = 9b281f8630b7d6e7829a3edabbb12f2cbb8fcda4 -SHA1 (patch-ac) = c06df152d9029f231b8c94ade890c52f3bc3db82 -SHA1 (patch-ad) = 4b408a1b6f5af3cf62fe7af3ca056e0b3fe835c9 -SHA1 (patch-ae) = 7ba04984accee4dd6fbb1dc5ec1e19c522d6a2f6 -SHA1 (patch-af) = 0b65e9e30328957d7ecd0479bfc938e55e29b141 -SHA1 (patch-ag) = 45b468bd5ceb267c66e97192f9ed3112ddbaa762 -SHA1 (patch-ah) = e7840f7d7f1e028319fc6cb0fe919325c4c919ad -SHA1 (patch-ai) = c4cc117728d48284f23ec8997f22684064818a4f -SHA1 (patch-aj) = 0e06cdaf97f7c7e57738f6cabdf6907c766c035e -SHA1 (patch-ak) = 331df33504eb8df5bf8ee3f2ea47e1fc57573fd7 -SHA1 (patch-al) = f91beebe473ca0ad0d221416deaba1a0c1928bc4 -SHA1 (patch-am) = 061e742acc73f49d2dc264b6e9209876c0b75abe -SHA1 (patch-an) = afb5ae74861113a206a3c7a1c0bc87cb6c23e517 -SHA1 (patch-ao) = 55c26f319464268d081cbc2ec9eb8ab362435e62 -SHA1 (patch-ap) = 5571051e0681adf44a4c90ea839e0aecbe36fa19 -SHA1 (patch-aq) = c5ea47940623b9b8f72c2de907ba31d2258dc40f -SHA1 (patch-ar) = 2bac7b9059fabcc5bd98059784722bb912be98dd -SHA1 (patch-as) = 78609997e50b6946e1d30ca043d3971a938b4904 -SHA1 (patch-at) = 3ad0af77f0e96414c93f81aca36e14f40341deca -SHA1 (patch-au) = 9a087def0f16962878f56a74cb95e7b1b0c98b9c -SHA1 (patch-av) = b7e5f709cd84cecaa198fe764a54868b4b0cc5d8 -SHA1 (patch-aw) = 21f4de791352bd826fd1cbb99ddd2db9e1a0ebb8 -SHA1 (patch-ax) = e251347c9022dc6be61cb2790973dfdd2791f50b -SHA1 (patch-ay) = 90ae86f00763dfd538bdff7396902bbf68bbef02 -SHA1 (patch-az) = e92545fdeda264912d714454b56768525c2b967e -SHA1 (patch-ba) = 05aa65f5f7a490b615d8598bf39650531999a7d7 -SHA1 (patch-bb) = 7b42bb0f86aac0c58945efcab3adc55f02cf6212 -SHA1 (patch-bc) = 1718cfdaa7dc66c799240240875995b652dd2251 +SHA1 (patch-ab) = 751f786fec8f4907d6aedd37de0304c353621a83 +SHA1 (patch-ac) = a69f70e2a3f95f3ef0f32cfcaf9bf872afd1cea4 +SHA1 (patch-ad) = 023a7ebfe07181ad0804811f9de46dc071e3d570 +SHA1 (patch-ae) = d50e2022e7f6d8d56286ebaad76f336226c0b34d +SHA1 (patch-af) = bb421c78192625c7a1df43a79aca907adf1b6f12 +SHA1 (patch-ag) = 14ef4661ddb3a039a722c569e06975dc5cf1a83a +SHA1 (patch-ah) = 607a3e52246d56ea9b6ea6bab2b3e68e3edb2e66 +SHA1 (patch-ai) = ec091f9ccbc88c12a16b20f80c050da2f08ad982 +SHA1 (patch-aj) = 66672b1152252692154e4a8f84f0193ee41d5d59 +SHA1 (patch-ak) = e4a39a77acfa4e06969d0ac853e996d68661ffff +SHA1 (patch-al) = 9c5eefb0e071f0683b74a9b10699fc2c6c234de6 +SHA1 (patch-am) = bbb29acab4ea2c7f01ff76fb4731e19911e1c3aa +SHA1 (patch-an) = a86f5edfe6e27e5ebfcb5d32a8f3cab52d7dbb00 +SHA1 (patch-ao) = 410700df6fc0c5a4700b7d38f966024a13ce1648 +SHA1 (patch-ap) = cef1d5b5805ccee2e59e359ee8ede1f322886ee6 +SHA1 (patch-aq) = 6af96ef9a50543bda3ceef615ffda053fc13813f +SHA1 (patch-ar) = da6312bc97343d91a8590872755b9faa7c0f80f4 +SHA1 (patch-as) = 01880404e721a70af19e0c2af49b046dca7f2a68 +SHA1 (patch-at) = 9d2a6f677f840ab1e6c98485509104d49cce19cf +SHA1 (patch-au) = 3a75effec8c86e0db42f5088bc266e16319a6b75 diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab index e1653737bf8..c1535a12983 100644 --- a/graphics/graphviz/patches/patch-ab +++ b/graphics/graphviz/patches/patch-ab @@ -1,38 +1,154 @@ -$NetBSD: patch-ab,v 1.6 2003/07/28 10:06:46 seb Exp $ +$NetBSD: patch-ab,v 1.7 2004/04/17 16:56:10 seb Exp $ ---- configure.in.orig 2003-07-09 19:28:52.000000000 +0000 +--- configure.in.orig 2004-03-02 00:18:28.000000000 +0000 +++ configure.in -@@ -59,7 +59,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI - PATHSEPARATOR=";" - else - # This sucks! Whatever happened to standards for file system layout? --DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf" -+DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf" -+if test x"$X11PREFIX" != x"$X11BASE"; then -+DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1" -+fi - PATHSEPARATOR=":" - fi - fi -@@ -214,7 +217,7 @@ if test "x$TCLCONFIG" != "x"; then +@@ -25,7 +25,10 @@ case "${target_os}" in + PATHSEPARATOR=":" + ;; + * ) # This sucks! Whatever happened to standards for file system layout? +- DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf"; ++ DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf"; ++ if test x"$X11PREFIX" != x"$X11BASE"; then ++ DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1" ++ fi + PATHSEPARATOR=":" + ;; + esac +@@ -202,52 +205,13 @@ fi + # AC_MSG_RESULT(no) + # ) + +-dnl ----------------------------------- +-dnl INCLUDES and LIBS for TCL +-AC_ARG_WITH(tclsh, +- [ --with-tclsh=PROG build graphviz for specific tclsh], +- TCLSH=$withval,) +-if test "x$TCLSH" = "x"; then +- AC_PATH_PROG(TCLSH,tclsh8.4) +- if test "x$TCLSH" = "x"; then +- AC_PATH_PROG(TCLSH,tclsh8.3) +- if test "x$TCLSH" = "x"; then +- AC_PATH_PROG(TCLSH,tclsh) +- fi +- fi +-fi +-TCL_VERSION_FOUND=`echo 'puts [[info tclversion]]' | $TCLSH` +- +-# can't assume ksh on all architectures +-# TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*} +-TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'` +- +-if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then +- TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic" +-else +-if test "x${TCLSH_EXEC_PREFIX}" != "x/usr" -a -f ${TCLSH_EXEC_PREFIX}/include/tcl.h; then +- TCL_INCLUDES=-I${TCLSH_EXEC_PREFIX}/include +-fi +-fi +-if test "x$TCL_INCLUDES" != "x" ; then +- AC_MSG_RESULT([using tcl headers from $TCL_INCLUDES]) +-fi +-AC_SUBST(TCL_INCLUDES) +- +-# Some systems don't have Tcl. Don't build +-# the Tcl products if we don't have the library. +-if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then +- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh +-else +-if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then +- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh +-fi +-fi +- + if test "x$TCLCONFIG" != "x"; then + AC_MSG_RESULT([using $TCLCONFIG]) + file=${TCLCONFIG} . $file ++ # ++ TCLSH_EXEC_PREFIX="${TCL_EXEC_PREFIX}" ++ TCL_INCLUDES="${TCL_INCLUDE_SPEC}" # 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]) -@@ -328,7 +331,7 @@ if test "x$TKCONFIG" != "x"; then + # TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" +@@ -293,6 +257,7 @@ AC_SUBST(TCL_NEEDS_EXP_FILE) + AC_SUBST(TCL_EXPORT_FILE_SUFFIX) + AC_SUBST(TCL_LIBS) + AC_SUBST(TCL_PREFIX) ++AC_SUBST(TCL_INCLUDES) + AC_SUBST(TCL_EXEC_PREFIX) + AC_SUBST(TCL_SHLIB_CFLAGS) + AC_SUBST(TCL_SHLIB_CXXFLAGS) +@@ -321,58 +286,13 @@ AC_SUBST(TCL_STUB_LIB_SPEC) + AC_SUBST(TCL_BUILD_STUB_LIB_PATH) + AC_SUBST(TCL_STUB_LIB_PATH) + +-dnl ----------------------------------- +-dnl INCLUDES and LIBS for TK +-AC_ARG_WITH(wish, +- [ --with-wish=PROG build graphviz for specific wish], +- WISH=$withval,) +-if test "x$WISH" = "x"; then +- AC_PATH_PROG(WISH,wish8.4) +- if test "x$WISH" = "x"; then +- AC_PATH_PROG(WISH,wish8.3) +- if test "x$WISH" = "x"; then +- AC_PATH_PROG(WISH,wish) +- fi +- fi +-fi +- +- +-#TK_VERSION_FOUND=`echo 'puts [[info tkversion]]' | $WISH` +-# +-# No such var as tkversion. Use tclversion instead. +-TK_VERSION_FOUND=${TCL_VERSION_FOUND} +- +-# can't assume ksh on all architectures +-# WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*} +-WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'` +- +-if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then +- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic" +-else +-if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then +- TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include +-fi +-fi +-if test "x$TK_INCLUDES" != "x" ; then +- AC_MSG_RESULT([using tk headers from $TK_INCLUDES]) +-fi +-AC_SUBST(TK_INCLUDES) +- +-# Some systems don't have Tcl. Don't build +-# Some systems have Tcl, but not TK. Don't build +-# the Tk products if we don't have the library. +-if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then +- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh +-else +-if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then +- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh +-fi +-fi +- + if test "x$TKCONFIG" != "x"; then + AC_MSG_RESULT([using $TKCONFIG]) file=${TKCONFIG} . $file ++ # ++ WISH_EXEC_PREFIX="${TK_EXEC_PREFIX}" ++ TK_INCLUDES="-I${TK_PREFIX}/include" 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]) -@@ -763,36 +766,12 @@ AC_MSG_RESULT(no)]) +@@ -414,6 +334,7 @@ AC_SUBST(TK_BUILD_STUB_LIB_SPEC) + AC_SUBST(TK_STUB_LIB_SPEC) + AC_SUBST(TK_BUILD_STUB_LIB_PATH) + AC_SUBST(TK_STUB_LIB_PATH) ++AC_SUBST(TK_INCLUDES) + + dnl ----------------------------------- + dnl Support for generic "extra" search paths for includes and libraries +@@ -774,36 +695,12 @@ AC_MSG_RESULT(no)]) # ----------------------------------- # tclInt.h @@ -49,7 +165,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/28 10:06:46 seb Exp $ -fi -fi -fi -+TCLINT_INCLUDES="-I${BUILDLINK_PREFIX_TCL}/include/tcl/generic" ++TCLINT_INCLUDES="-I${TCL_PREFIX}/include/tcl/generic" AC_SUBST(TCLINT_INCLUDES) # ----------------------------------- @@ -67,7 +183,7 @@ $NetBSD: patch-ab,v 1.6 2003/07/28 10:06:46 seb Exp $ -fi -fi -fi -+TKINT_INCLUDES="-I${BUILDLINK_PREFIX_TK}/include/tk/generic" ++TKINT_INCLUDES="-I${TK_PREFIX}/include/tk/generic" AC_SUBST(TKINT_INCLUDES) # ----------------------------------- diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac index 53ed2058e0a..7e3485418e0 100644 --- a/graphics/graphviz/patches/patch-ac +++ b/graphics/graphviz/patches/patch-ac @@ -1,38 +1,388 @@ -$NetBSD: patch-ac,v 1.8 2003/07/28 10:06:47 seb Exp $ +$NetBSD: patch-ac,v 1.9 2004/04/17 16:56:10 seb Exp $ ---- configure.orig 2003-07-25 20:53:45.000000000 +0000 +--- configure.orig 2004-03-02 00:20:47.000000000 +0000 +++ configure -@@ -8375,7 +8375,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI - PATHSEPARATOR=";" - else - # This sucks! Whatever happened to standards for file system layout? --DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf" -+DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf" -+if test x"$X11PREFIX" != x"$X11BASE"; then -+DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1" -+fi - PATHSEPARATOR=":" - fi - fi -@@ -8690,7 +8693,7 @@ echo "${ECHO_T}using $TCLCONFIG" >&6 +@@ -1021,8 +1021,6 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects default=use both + --with-dmalloc use dmalloc for debugging memory use + --with-efence use efence for debugging memory use +- --with-tclsh=PROG build graphviz for specific tclsh +- --with-wish=PROG build graphviz for specific wish + --with-extraincludedir=DIR use extra includes from DIR + --with-extralibdir=DIR use extra libraries from DIR + --with-x use the X Window System +@@ -1530,7 +1528,10 @@ case "${target_os}" in + PATHSEPARATOR=":" + ;; + * ) # This sucks! Whatever happened to standards for file system layout? +- DEFAULT_FONTPATH="/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf"; ++ DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:/usr/common/share/fonts/ttf"; ++ if test x"$X11PREFIX" != x"$X11BASE"; then ++ DEFAULT_FONTPATH="${DEFAULT_FONTPATH}:${X11BASE}/lib/X11/fonts/TrueType:${X11BASE}/lib/X11/fonts/truetype:${X11BASE}/lib/X11/fonts/TTF:${X11BASE}/lib/X11/fonts/Type1" ++ fi + PATHSEPARATOR=":" + ;; + esac +@@ -8964,169 +8965,14 @@ fi + # AC_MSG_RESULT(no) + # ) + +- +-# Check whether --with-tclsh or --without-tclsh was given. +-if test "${with_tclsh+set}" = set; then +- withval="$with_tclsh" +- TCLSH=$withval +-fi; +-if test "x$TCLSH" = "x"; then +- # Extract the first word of "tclsh8.4", so it can be a program name with args. +-set dummy tclsh8.4; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_TCLSH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $TCLSH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- ;; +-esac +-fi +-TCLSH=$ac_cv_path_TCLSH +- +-if test -n "$TCLSH"; then +- echo "$as_me:$LINENO: result: $TCLSH" >&5 +-echo "${ECHO_T}$TCLSH" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- if test "x$TCLSH" = "x"; then +- # Extract the first word of "tclsh8.3", so it can be a program name with args. +-set dummy tclsh8.3; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_TCLSH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $TCLSH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- ;; +-esac +-fi +-TCLSH=$ac_cv_path_TCLSH +- +-if test -n "$TCLSH"; then +- echo "$as_me:$LINENO: result: $TCLSH" >&5 +-echo "${ECHO_T}$TCLSH" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- if test "x$TCLSH" = "x"; then +- # Extract the first word of "tclsh", so it can be a program name with args. +-set dummy tclsh; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_TCLSH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $TCLSH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- ;; +-esac +-fi +-TCLSH=$ac_cv_path_TCLSH +- +-if test -n "$TCLSH"; then +- echo "$as_me:$LINENO: result: $TCLSH" >&5 +-echo "${ECHO_T}$TCLSH" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +- fi +-fi +-TCL_VERSION_FOUND=`echo 'puts [info tclversion]' | $TCLSH` +- +-# can't assume ksh on all architectures +-# TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*} +-TCLSH_EXEC_PREFIX=`echo $TCLSH|sed -e 's%/bin/tclsh.*$%%'` +- +-if test -f ${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/tcl.h; then +- TCL_INCLUDES="-I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND} -I${TCLSH_EXEC_PREFIX}/include/tcl${TCL_VERSION_FOUND}/generic" +-else +-if test "x${TCLSH_EXEC_PREFIX}" != "x/usr" -a -f ${TCLSH_EXEC_PREFIX}/include/tcl.h; then +- TCL_INCLUDES=-I${TCLSH_EXEC_PREFIX}/include +-fi +-fi +-if test "x$TCL_INCLUDES" != "x" ; then +- echo "$as_me:$LINENO: result: using tcl headers from $TCL_INCLUDES" >&5 +-echo "${ECHO_T}using tcl headers from $TCL_INCLUDES" >&6 +-fi +- +- +-# Some systems don't have Tcl. Don't build +-# the Tcl products if we don't have the library. +-if test -f ${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh; then +- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tcl${TCL_VERSION_FOUND}/tclConfig.sh +-else +-if test -f ${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh; then +- TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh +-fi +-fi +- + if test "x$TCLCONFIG" != "x"; then + echo "$as_me:$LINENO: result: using $TCLCONFIG" >&5 + echo "${ECHO_T}using $TCLCONFIG" >&6 + file=${TCLCONFIG} . $file ++ # ++ TCLSH_EXEC_PREFIX="${TCL_EXEC_PREFIX}" ++ TCL_INCLUDES="${TCL_INCLUDE_SPEC}" # 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 "$as_me:$LINENO: WARNING: Tcl does not have STUBs support, perhaps it is too old? The packages: \"gdtclft tcldot tcldgr tcldgl tclpathplan\" will not be built" >&5 -@@ -8923,7 +8926,7 @@ echo "${ECHO_T}using $TKCONFIG" >&6 + # TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" +@@ -9212,174 +9058,14 @@ fi + + + +-# Check whether --with-wish or --without-wish was given. +-if test "${with_wish+set}" = set; then +- withval="$with_wish" +- WISH=$withval +-fi; +-if test "x$WISH" = "x"; then +- # Extract the first word of "wish8.4", so it can be a program name with args. +-set dummy wish8.4; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_WISH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $WISH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_WISH="$WISH" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- ;; +-esac +-fi +-WISH=$ac_cv_path_WISH +- +-if test -n "$WISH"; then +- echo "$as_me:$LINENO: result: $WISH" >&5 +-echo "${ECHO_T}$WISH" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- if test "x$WISH" = "x"; then +- # Extract the first word of "wish8.3", so it can be a program name with args. +-set dummy wish8.3; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_WISH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $WISH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_WISH="$WISH" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- ;; +-esac +-fi +-WISH=$ac_cv_path_WISH +- +-if test -n "$WISH"; then +- echo "$as_me:$LINENO: result: $WISH" >&5 +-echo "${ECHO_T}$WISH" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- if test "x$WISH" = "x"; then +- # Extract the first word of "wish", so it can be a program name with args. +-set dummy wish; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_WISH+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $WISH in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_WISH="$WISH" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- ;; +-esac +-fi +-WISH=$ac_cv_path_WISH +- +-if test -n "$WISH"; then +- echo "$as_me:$LINENO: result: $WISH" >&5 +-echo "${ECHO_T}$WISH" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +- fi +-fi +- +- +-#TK_VERSION_FOUND=`echo 'puts [[info tkversion]]' | $WISH` +-# +-# No such var as tkversion. Use tclversion instead. +-TK_VERSION_FOUND=${TCL_VERSION_FOUND} +- +-# can't assume ksh on all architectures +-# WISH_EXEC_PREFIX=${WISH%%/bin/tclsh.*} +-WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'` +- +-if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then +- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic" +-else +-if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then +- TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include +-fi +-fi +-if test "x$TK_INCLUDES" != "x" ; then +- echo "$as_me:$LINENO: result: using tk headers from $TK_INCLUDES" >&5 +-echo "${ECHO_T}using tk headers from $TK_INCLUDES" >&6 +-fi +- +- +-# Some systems don't have Tcl. Don't build +-# Some systems have Tcl, but not TK. Don't build +-# the Tk products if we don't have the library. +-if test -f ${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh; then +- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tk${TK_VERSION_FOUND}/tkConfig.sh +-else +-if test -f ${WISH_EXEC_PREFIX}/lib/tkConfig.sh; then +- TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh +-fi +-fi +- + if test "x$TKCONFIG" != "x"; then + echo "$as_me:$LINENO: result: using $TKCONFIG" >&5 + echo "${ECHO_T}using $TKCONFIG" >&6 file=${TKCONFIG} . $file ++ # ++ WISH_EXEC_PREFIX="${TK_EXEC_PREFIX}" ++ TK_INCLUDES="-I${TK_PREFIX}/include" if test "${TCL_SUPPORTS_STUBS}" = "1"; then -- TK_SUBDIRS="tkstubs tkspline" -+ TK_SUBDIRS="tkspline" TK_PKGINDEX="tkspline/pkgIndex.tcl" else - { echo "$as_me:$LINENO: WARNING: Tcl does not have STUBs support, so neither does Tk. The packages: \"tkspline\" will not be built" >&5 -@@ -14031,36 +14034,12 @@ rm -f conftest.$ac_objext conftest.$ac_e +@@ -9434,6 +9120,7 @@ fi + + + ++ + # Check whether --with-extraincludedir or --without-extraincludedir was given. + if test "${with_extraincludedir+set}" = set; then + withval="$with_extraincludedir" +@@ -13653,36 +13340,12 @@ rm -f conftest.$ac_objext conftest.$ac_e # ----------------------------------- # tclInt.h @@ -49,7 +399,7 @@ $NetBSD: patch-ac,v 1.8 2003/07/28 10:06:47 seb Exp $ -fi -fi -fi -+TCLINT_INCLUDES="-I${BUILDLINK_PREFIX_TCL}/include/tcl/generic" ++TCLINT_INCLUDES="-I${TCL_PREFIX}/include/tcl/generic" # ----------------------------------- @@ -67,7 +417,41 @@ $NetBSD: patch-ac,v 1.8 2003/07/28 10:06:47 seb Exp $ -fi -fi -fi -+TKINT_INCLUDES="-I${BUILDLINK_PREFIX_TK}/include/tk/generic" ++TKINT_INCLUDES="-I${TK_PREFIX}/include/tk/generic" # ----------------------------------- +@@ -14920,8 +14583,6 @@ s,@ENABLE_GVRENDER_TRUE@,$ENABLE_GVRENDE + s,@ENABLE_GVRENDER_FALSE@,$ENABLE_GVRENDER_FALSE,;t t + s,@ENABLE_CODEGENS_TRUE@,$ENABLE_CODEGENS_TRUE,;t t + s,@ENABLE_CODEGENS_FALSE@,$ENABLE_CODEGENS_FALSE,;t t +-s,@TCLSH@,$TCLSH,;t t +-s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t + s,@WITH_TCL_TRUE@,$WITH_TCL_TRUE,;t t + s,@WITH_TCL_FALSE@,$WITH_TCL_FALSE,;t t + s,@TCL_PKGINDEX@,$TCL_PKGINDEX,;t t +@@ -14944,6 +14605,7 @@ s,@TCL_NEEDS_EXP_FILE@,$TCL_NEEDS_EXP_FI + s,@TCL_EXPORT_FILE_SUFFIX@,$TCL_EXPORT_FILE_SUFFIX,;t t + s,@TCL_LIBS@,$TCL_LIBS,;t t + s,@TCL_PREFIX@,$TCL_PREFIX,;t t ++s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t + s,@TCL_EXEC_PREFIX@,$TCL_EXEC_PREFIX,;t t + s,@TCL_SHLIB_CFLAGS@,$TCL_SHLIB_CFLAGS,;t t + s,@TCL_SHLIB_CXXFLAGS@,$TCL_SHLIB_CXXFLAGS,;t t +@@ -14971,8 +14633,6 @@ s,@TCL_BUILD_STUB_LIB_SPEC@,$TCL_BUILD_S + s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t + s,@TCL_BUILD_STUB_LIB_PATH@,$TCL_BUILD_STUB_LIB_PATH,;t t + s,@TCL_STUB_LIB_PATH@,$TCL_STUB_LIB_PATH,;t t +-s,@WISH@,$WISH,;t t +-s,@TK_INCLUDES@,$TK_INCLUDES,;t t + s,@WITH_TK_TRUE@,$WITH_TK_TRUE,;t t + s,@WITH_TK_FALSE@,$WITH_TK_FALSE,;t t + s,@TK_PKGINDEX@,$TK_PKGINDEX,;t t +@@ -14999,6 +14659,7 @@ s,@TK_BUILD_STUB_LIB_SPEC@,$TK_BUILD_STU + s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t + s,@TK_BUILD_STUB_LIB_PATH@,$TK_BUILD_STUB_LIB_PATH,;t t + s,@TK_STUB_LIB_PATH@,$TK_STUB_LIB_PATH,;t t ++s,@TK_INCLUDES@,$TK_INCLUDES,;t t + s,@SOCKET_LIBS@,$SOCKET_LIBS,;t t + s,@X_CFLAGS@,$X_CFLAGS,;t t + s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad index 8ad4387f0c0..6cec1e7ad3b 100644 --- a/graphics/graphviz/patches/patch-ad +++ b/graphics/graphviz/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2003/07/28 10:06:47 seb Exp $ +$NetBSD: patch-ad,v 1.5 2004/04/17 16:56:10 seb Exp $ ---- gdtclft/Makefile.am.orig 2003-06-04 17:12:52.000000000 +0000 +--- gdtclft/Makefile.am.orig 2004-02-27 13:01:47.000000000 +0000 +++ gdtclft/Makefile.am -@@ -20,7 +20,7 @@ libgdtclft_la_SOURCES = gdtclft.c +@@ -22,7 +22,7 @@ libgdtclft_la_SOURCES = gdtclft.c libgdtclft_la_LIBADD = \ $(top_builddir)/tclhandle/libtclhandle.la \ $(top_builddir)/gd/libgdconvenience.la \ diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae index 81a84552b03..e202ad785ef 100644 --- a/graphics/graphviz/patches/patch-ae +++ b/graphics/graphviz/patches/patch-ae @@ -1,8 +1,24 @@ -$NetBSD: patch-ae,v 1.6 2003/07/28 10:06:48 seb Exp $ +$NetBSD: patch-ae,v 1.7 2004/04/17 16:56:10 seb Exp $ ---- gdtclft/Makefile.in.orig 2003-07-27 16:46:10.000000000 +0000 +--- gdtclft/Makefile.in.orig 2004-04-17 13:41:29.000000000 +0000 +++ gdtclft/Makefile.in -@@ -222,7 +222,7 @@ libgdtclft_la_SOURCES = gdtclft.c +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -218,7 +216,7 @@ libgdtclft_la_SOURCES = gdtclft.c libgdtclft_la_LIBADD = \ $(top_builddir)/tclhandle/libtclhandle.la \ $(top_builddir)/gd/libgdconvenience.la \ @@ -11,7 +27,7 @@ $NetBSD: patch-ae,v 1.6 2003/07/28 10:06:48 seb Exp $ CLEANFILES = pkgIndex.tcl -@@ -236,8 +236,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) +@@ -232,8 +230,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) libgdtclft_la_LDFLAGS = libgdtclft_la_DEPENDENCIES = $(top_builddir)/tclhandle/libtclhandle.la \ @@ -21,100 +37,3 @@ $NetBSD: patch-ae,v 1.6 2003/07/28 10:06:48 seb Exp $ am_libgdtclft_la_OBJECTS = gdtclft.lo libgdtclft_la_OBJECTS = $(am_libgdtclft_la_OBJECTS) -@@ -245,8 +244,7 @@ DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --depcomp = $(SHELL) $(top_srcdir)/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/gdtclft.Plo -+depcomp = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -283,7 +281,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu gdtclft/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps gdtclft/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -316,29 +314,14 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gdtclft.Plo@am__quote@ -- --distclean-depend: -- -rm -rf $(DEPDIR) -- - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< - - .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` - - .c.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< --CCDEPMODE = @CCDEPMODE@ - uninstall-info-am: - - manndir = $(mandir)/mann -@@ -545,8 +528,8 @@ clean-am: clean-generic clean-libtool cl - - distclean: distclean-recursive - --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - -@@ -584,21 +567,21 @@ uninstall-man: uninstall-mann - - .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \ - clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \ -- clean-recursive distclean distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-mann \ -- install-pkglibLTLIBRARIES install-recursive install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- installdirs-recursive maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- tags tags-recursive uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-man uninstall-mann \ -- uninstall-pkglibLTLIBRARIES uninstall-recursive -+ clean-recursive distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-recursive distclean-tags distdir \ -+ dvi dvi-am dvi-recursive info info-am info-recursive install \ -+ install-am install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-mann install-pkglibLTLIBRARIES install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-recursive tags tags-recursive uninstall \ -+ uninstall-am uninstall-info-am uninstall-info-recursive \ -+ uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \ -+ uninstall-recursive - - - all-local: pkgIndex.tcl diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af index 36166aa114d..3c5e5e678c0 100644 --- a/graphics/graphviz/patches/patch-af +++ b/graphics/graphviz/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.3 2003/03/03 11:34:59 seb Exp $ +$NetBSD: patch-af,v 1.4 2004/04/17 16:56:10 seb Exp $ ---- gdtclft/demo/Makefile.am.orig 2003-01-15 17:22:13.000000000 +0000 +--- gdtclft/demo/Makefile.am.orig 2003-09-09 10:15:24.000000000 +0000 +++ gdtclft/demo/Makefile.am @@ -2,7 +2,7 @@ @@ -10,4 +10,4 @@ $NetBSD: patch-af,v 1.3 2003/03/03 11:34:59 seb Exp $ +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = entities demo_DATA = entities.README entities.html - EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/* + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag index 99b00049f2c..83e063368fb 100644 --- a/graphics/graphviz/patches/patch-ag +++ b/graphics/graphviz/patches/patch-ag @@ -1,8 +1,24 @@ -$NetBSD: patch-ag,v 1.5 2003/03/03 11:34:59 seb Exp $ +$NetBSD: patch-ag,v 1.6 2004/04/17 16:56:10 seb Exp $ ---- gdtclft/demo/Makefile.in.orig 2003-03-02 20:12:23.000000000 +0000 +--- gdtclft/demo/Makefile.in.orig 2004-03-02 00:20:38.000000000 +0000 +++ gdtclft/demo/Makefile.in -@@ -206,7 +206,7 @@ install_sh = @install_sh@ +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -199,7 +197,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = 1.4 @@ -10,21 +26,4 @@ $NetBSD: patch-ag,v 1.5 2003/03/03 11:34:59 seb Exp $ +demodir = $(prefix)/share/examples/@PACKAGE@ demo_SCRIPTS = entities demo_DATA = entities.README entities.html - EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/* -@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(demo_SCRIPTS) - -+depcomp = - DIST_SOURCES = - DATA = $(demo_DATA) - -@@ -234,7 +235,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu gdtclft/demo/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps gdtclft/demo/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah index ddab5d7632b..4df60b3edf6 100644 --- a/graphics/graphviz/patches/patch-ah +++ b/graphics/graphviz/patches/patch-ah @@ -1,11 +1,11 @@ -$NetBSD: patch-ah,v 1.4 2003/07/28 10:06:48 seb Exp $ +$NetBSD: patch-ah,v 1.5 2004/04/17 16:56:10 seb Exp $ ---- tcldgl/Makefile.am.orig 2003-06-04 17:12:53.000000000 +0000 -+++ tcldgl/Makefile.am -@@ -34,7 +34,7 @@ libtcldgl_la_LIBADD = \ - $(top_builddir)/agutil/libagutil.la \ - $(top_builddir)/shape/libshape.la \ - $(top_builddir)/ns/libns.la \ +--- tcldot/Makefile.am.orig 2004-02-27 13:01:48.000000000 +0000 ++++ tcldot/Makefile.am +@@ -46,7 +46,7 @@ libtcldot_la_LIBADD = \ + $(top_builddir)/cdt/libcdtconvenience.la \ + $(top_builddir)/gd/libgdconvenience.la \ + $(top_builddir)/gdtclft/gdtclft.lo \ - $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai index 7c0ca567888..7e847bc98e1 100644 --- a/graphics/graphviz/patches/patch-ai +++ b/graphics/graphviz/patches/patch-ai @@ -1,124 +1,39 @@ -$NetBSD: patch-ai,v 1.6 2003/07/28 10:06:49 seb Exp $ +$NetBSD: patch-ai,v 1.7 2004/04/17 16:56:10 seb Exp $ ---- tcldgl/Makefile.in.orig 2003-07-27 16:46:23.000000000 +0000 -+++ tcldgl/Makefile.in -@@ -236,7 +236,7 @@ libtcldgl_la_LIBADD = \ - $(top_builddir)/agutil/libagutil.la \ - $(top_builddir)/shape/libshape.la \ - $(top_builddir)/ns/libns.la \ +--- tcldot/Makefile.in.orig 2004-04-17 13:42:01.000000000 +0000 ++++ tcldot/Makefile.in +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -242,7 +240,7 @@ libtcldot_la_LIBADD = \ + $(top_builddir)/cdt/libcdtconvenience.la \ + $(top_builddir)/gd/libgdconvenience.la \ + $(top_builddir)/gdtclft/gdtclft.lo \ - $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -257,8 +257,7 @@ libtcldgl_la_DEPENDENCIES = $(top_buildd - $(top_builddir)/incr/libincr.la \ - $(top_builddir)/pathplan/libpathplanconvenience.la \ - $(top_builddir)/agutil/libagutil.la \ -- $(top_builddir)/shape/libshape.la $(top_builddir)/ns/libns.la \ +@@ -270,8 +268,7 @@ libtcldot_la_DEPENDENCIES = $(top_buildd + $(top_builddir)/graph/libgraphconvenience.la \ + $(top_builddir)/cdt/libcdtconvenience.la \ + $(top_builddir)/gd/libgdconvenience.la \ +- $(top_builddir)/gdtclft/gdtclft.lo \ - $(top_builddir)/tclstubs/libtclstubs.la -+ $(top_builddir)/shape/libshape.la $(top_builddir)/ns/libns.la - am_libtcldgl_la_OBJECTS = dgl.lo dglayout.lo dglshape.lo dglutil.lo - libtcldgl_la_OBJECTS = $(am_libtcldgl_la_OBJECTS) ++ $(top_builddir)/gdtclft/gdtclft.lo + am_libtcldot_la_OBJECTS = tcldot.lo tkgen.lo + libtcldot_la_OBJECTS = $(am_libtcldot_la_OBJECTS) -@@ -266,9 +265,7 @@ DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --depcomp = $(SHELL) $(top_srcdir)/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dgl.Plo $(DEPDIR)/dglayout.Plo \ --@AMDEP_TRUE@ $(DEPDIR)/dglshape.Plo $(DEPDIR)/dglutil.Plo -+depcomp = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -307,7 +304,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu tcldgl/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps tcldgl/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -340,32 +337,14 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgl.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dglayout.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dglshape.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dglutil.Plo@am__quote@ -- --distclean-depend: -- -rm -rf $(DEPDIR) -- - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< - - .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` - - .c.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< --CCDEPMODE = @CCDEPMODE@ - uninstall-info-am: - - manndir = $(mandir)/mann -@@ -572,8 +551,8 @@ clean-am: clean-generic clean-libtool cl - - distclean: distclean-recursive - --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - -@@ -611,21 +590,21 @@ uninstall-man: uninstall-mann - - .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \ - clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \ -- clean-recursive distclean distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-mann \ -- install-pkglibLTLIBRARIES install-recursive install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- installdirs-recursive maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- tags tags-recursive uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-man uninstall-mann \ -- uninstall-pkglibLTLIBRARIES uninstall-recursive -+ clean-recursive distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-recursive distclean-tags distdir \ -+ dvi dvi-am dvi-recursive info info-am info-recursive install \ -+ install-am install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-mann install-pkglibLTLIBRARIES install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-recursive tags tags-recursive uninstall \ -+ uninstall-am uninstall-info-am uninstall-info-recursive \ -+ uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \ -+ uninstall-recursive - - - all-local: pkgIndex.tcl diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj index 212fedcd0b6..8b702e19b54 100644 --- a/graphics/graphviz/patches/patch-aj +++ b/graphics/graphviz/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.3 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-aj,v 1.4 2004/04/17 16:56:10 seb Exp $ ---- tcldgl/demo/Makefile.am.orig 2003-01-15 17:22:16.000000000 +0000 -+++ tcldgl/demo/Makefile.am +--- tcldot/demo/Makefile.am.orig 2003-11-08 11:38:10.000000000 +0000 ++++ tcldot/demo/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 -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) CVS/* + if WITH_TCL + demo_SCRIPTS = doted gcat + demo_DATA = doted.README gcat.README diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak index 717400487a1..c1d46d5c726 100644 --- a/graphics/graphviz/patches/patch-ak +++ b/graphics/graphviz/patches/patch-ak @@ -1,30 +1,29 @@ -$NetBSD: patch-ak,v 1.5 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-ak,v 1.6 2004/04/17 16:56:10 seb Exp $ ---- tcldgl/demo/Makefile.in.orig 2003-03-02 20:12:23.000000000 +0000 -+++ tcldgl/demo/Makefile.in -@@ -206,7 +206,7 @@ install_sh = @install_sh@ +--- tcldot/demo/Makefile.in.orig 2004-03-02 00:20:40.000000000 +0000 ++++ tcldot/demo/Makefile.in +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -199,7 +197,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = 1.4 -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) CVS/* -@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(demo_SCRIPTS) - -+depcomp = - DIST_SOURCES = - DATA = $(demo_DATA) - -@@ -234,7 +235,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu tcldgl/demo/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps tcldgl/demo/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ + @WITH_TCL_TRUE@demo_SCRIPTS = doted gcat + @WITH_TCL_TRUE@demo_DATA = doted.README gcat.README + EXTRA_DIST = doted gcat doted.README gcat.README diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al index 207203d6b34..584931e82a6 100644 --- a/graphics/graphviz/patches/patch-al +++ b/graphics/graphviz/patches/patch-al @@ -1,12 +1,12 @@ -$NetBSD: patch-al,v 1.4 2003/07/28 10:06:49 seb Exp $ +$NetBSD: patch-al,v 1.5 2004/04/17 16:56:10 seb Exp $ ---- tcldgr/Makefile.am.orig 2003-06-04 17:12:53.000000000 +0000 -+++ tcldgr/Makefile.am -@@ -23,7 +23,7 @@ libtcldgr_la_LIBADD = \ +--- tclpathplan/Makefile.am.orig 2003-11-08 11:38:10.000000000 +0000 ++++ tclpathplan/Makefile.am +@@ -23,7 +23,7 @@ libtclplan_la_SOURCES = find_ints.c inte + libtclplan_la_LIBADD = \ $(top_builddir)/tclhandle/libtclhandle.la \ - $(top_builddir)/agraph/libagraphconvenience.la \ - $(top_builddir)/cdt/libcdtconvenience.la \ -- $(top_builddir)/tclstubs/libtclstubs.la + $(top_builddir)/pathplan/libpathplanconvenience.la \ +- $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} all-local: pkgIndex.tcl diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am index 74b82cb1312..2dc57e231b3 100644 --- a/graphics/graphviz/patches/patch-am +++ b/graphics/graphviz/patches/patch-am @@ -1,126 +1,39 @@ -$NetBSD: patch-am,v 1.6 2003/07/28 10:06:49 seb Exp $ +$NetBSD: patch-am,v 1.7 2004/04/17 16:56:10 seb Exp $ ---- tcldgr/Makefile.in.orig 2003-07-27 16:46:33.000000000 +0000 -+++ tcldgr/Makefile.in -@@ -225,7 +225,7 @@ libtcldgr_la_LIBADD = \ +--- tclpathplan/Makefile.in.orig 2004-04-17 13:41:50.000000000 +0000 ++++ tclpathplan/Makefile.in +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -220,7 +218,7 @@ libtclplan_la_SOURCES = find_ints.c inte + libtclplan_la_LIBADD = \ $(top_builddir)/tclhandle/libtclhandle.la \ - $(top_builddir)/agraph/libagraphconvenience.la \ - $(top_builddir)/cdt/libcdtconvenience.la \ -- $(top_builddir)/tclstubs/libtclstubs.la + $(top_builddir)/pathplan/libpathplanconvenience.la \ +- $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -240,8 +240,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) - libtcldgr_la_LDFLAGS = - libtcldgr_la_DEPENDENCIES = $(top_builddir)/tclhandle/libtclhandle.la \ - $(top_builddir)/agraph/libagraphconvenience.la \ -- $(top_builddir)/cdt/libcdtconvenience.la \ -- $(top_builddir)/tclstubs/libtclstubs.la -+ $(top_builddir)/cdt/libcdtconvenience.la - am_libtcldgr_la_OBJECTS = dgedge.lo dgnode.lo dgr.lo dgraph.lo \ - dgrutil.lo - libtcldgr_la_OBJECTS = $(am_libtcldgr_la_OBJECTS) -@@ -250,10 +249,7 @@ DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --depcomp = $(SHELL) $(top_srcdir)/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dgedge.Plo $(DEPDIR)/dgnode.Plo \ --@AMDEP_TRUE@ $(DEPDIR)/dgr.Plo $(DEPDIR)/dgraph.Plo \ --@AMDEP_TRUE@ $(DEPDIR)/dgrutil.Plo -+depcomp = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -292,7 +288,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu tcldgr/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps tcldgr/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -325,33 +321,14 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgedge.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgnode.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgr.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgraph.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dgrutil.Plo@am__quote@ -- --distclean-depend: -- -rm -rf $(DEPDIR) -- - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< - - .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` - - .c.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< --CCDEPMODE = @CCDEPMODE@ - uninstall-info-am: - - manndir = $(mandir)/mann -@@ -558,8 +535,8 @@ clean-am: clean-generic clean-libtool cl - - distclean: distclean-recursive +@@ -234,8 +232,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - -@@ -597,21 +574,21 @@ uninstall-man: uninstall-mann - - .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \ - clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \ -- clean-recursive distclean distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-mann \ -- install-pkglibLTLIBRARIES install-recursive install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- installdirs-recursive maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- tags tags-recursive uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-man uninstall-mann \ -- uninstall-pkglibLTLIBRARIES uninstall-recursive -+ clean-recursive distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-recursive distclean-tags distdir \ -+ dvi dvi-am dvi-recursive info info-am info-recursive install \ -+ install-am install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-mann install-pkglibLTLIBRARIES install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-recursive tags tags-recursive uninstall \ -+ uninstall-am uninstall-info-am uninstall-info-recursive \ -+ uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \ -+ uninstall-recursive - - - all-local: pkgIndex.tcl + libtclplan_la_LDFLAGS = + libtclplan_la_DEPENDENCIES = $(top_builddir)/tclhandle/libtclhandle.la \ +- $(top_builddir)/pathplan/libpathplanconvenience.la \ +- $(top_builddir)/tclstubs/libtclstubs.la ++ $(top_builddir)/pathplan/libpathplanconvenience.la + am_libtclplan_la_OBJECTS = find_ints.lo intersect.lo makecw.lo \ + tclpathplan.lo wrapper.lo + libtclplan_la_OBJECTS = $(am_libtclplan_la_OBJECTS) diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an index 6a8cb4cd4e9..487b3d5ed00 100644 --- a/graphics/graphviz/patches/patch-an +++ b/graphics/graphviz/patches/patch-an @@ -1,13 +1,13 @@ -$NetBSD: patch-an,v 1.3 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-an,v 1.4 2004/04/17 16:56:10 seb Exp $ ---- tcldgr/demo/Makefile.am.orig 2003-01-15 17:22:16.000000000 +0000 -+++ tcldgr/demo/Makefile.am -@@ -2,7 +2,7 @@ +--- tclpathplan/demo/Makefile.am.orig 2003-11-08 11:38:10.000000000 +0000 ++++ tclpathplan/demo/Makefile.am +@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 - AUTOMAKE_OPTIONS = 1.4 + SUBDIRS = pathplan_data -demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ - demo_SCRIPTS = ihi - demo_DATA = ihi.README ihi.testdata - EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/* + if WITH_TCL + demo_SCRIPTS = pathplan + demo_DATA = pathplan.README diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao index 6f64755c71b..e8a42571db9 100644 --- a/graphics/graphviz/patches/patch-ao +++ b/graphics/graphviz/patches/patch-ao @@ -1,30 +1,29 @@ -$NetBSD: patch-ao,v 1.5 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-ao,v 1.6 2004/04/17 16:56:10 seb Exp $ ---- tcldgr/demo/Makefile.in.orig 2003-03-02 20:12:23.000000000 +0000 -+++ tcldgr/demo/Makefile.in -@@ -206,7 +206,7 @@ install_sh = @install_sh@ +--- tclpathplan/demo/Makefile.in.orig 2004-03-02 00:20:41.000000000 +0000 ++++ tclpathplan/demo/Makefile.in +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -201,7 +199,7 @@ AUTOMAKE_OPTIONS = 1.4 - AUTOMAKE_OPTIONS = 1.4 + SUBDIRS = pathplan_data -demodir = $(datadir)/@PACKAGE@/demo +demodir = $(prefix)/share/examples/@PACKAGE@ - demo_SCRIPTS = ihi - demo_DATA = ihi.README ihi.testdata - EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) CVS/* -@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(demo_SCRIPTS) + @WITH_TCL_TRUE@demo_SCRIPTS = pathplan + @WITH_TCL_TRUE@demo_DATA = pathplan.README -+depcomp = - DIST_SOURCES = - DATA = $(demo_DATA) - -@@ -234,7 +235,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu tcldgr/demo/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps tcldgr/demo/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap index 6e9b9465bee..be6db32279b 100644 --- a/graphics/graphviz/patches/patch-ap +++ b/graphics/graphviz/patches/patch-ap @@ -1,13 +1,13 @@ -$NetBSD: patch-ap,v 1.4 2003/07/28 10:06:50 seb Exp $ +$NetBSD: patch-ap,v 1.5 2004/04/17 16:56:10 seb Exp $ ---- tcldot/Makefile.am.orig 2003-06-04 17:12:53.000000000 +0000 -+++ tcldot/Makefile.am -@@ -36,7 +36,7 @@ libtcldot_la_LIBADD = \ - $(top_builddir)/cdt/libcdtconvenience.la \ - $(top_builddir)/gd/libgdconvenience.la \ - $(top_builddir)/gdtclft/gdtclft.lo \ -- $(top_builddir)/tclstubs/libtclstubs.la -+ ${TCL_STUB_LIB_SPEC} +--- tclpathplan/demo/pathplan_data/Makefile.am.orig 2003-11-08 11:38:10.000000000 +0000 ++++ tclpathplan/demo/pathplan_data/Makefile.am +@@ -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 - all-local: pkgIndex.tcl +-pathplanexampledir = $(datadir)/@PACKAGE@/demo/pathplan_data ++pathplanexampledir = $(prefix)/share/examples/@PACKAGE@/pathplan_data + if WITH_TCL + pathplanexample_DATA = $(EXAMPLES) diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq index 0dd500c6c51..9b6317ac757 100644 --- a/graphics/graphviz/patches/patch-aq +++ b/graphics/graphviz/patches/patch-aq @@ -1,121 +1,29 @@ -$NetBSD: patch-aq,v 1.6 2003/07/28 10:06:50 seb Exp $ +$NetBSD: patch-aq,v 1.7 2004/04/17 16:56:10 seb Exp $ ---- tcldot/Makefile.in.orig 2003-07-27 16:46:46.000000000 +0000 -+++ tcldot/Makefile.in -@@ -238,7 +238,7 @@ libtcldot_la_LIBADD = \ - $(top_builddir)/cdt/libcdtconvenience.la \ - $(top_builddir)/gd/libgdconvenience.la \ - $(top_builddir)/gdtclft/gdtclft.lo \ -- $(top_builddir)/tclstubs/libtclstubs.la -+ ${TCL_STUB_LIB_SPEC} +--- tclpathplan/demo/pathplan_data/Makefile.in.orig 2004-03-02 00:20:41.000000000 +0000 ++++ tclpathplan/demo/pathplan_data/Makefile.in +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -203,7 +201,7 @@ EXAMPLES = boxes.dat dpd.dat funny.dat m + obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat + + +-pathplanexampledir = $(datadir)/@PACKAGE@/demo/pathplan_data ++pathplanexampledir = $(prefix)/share/examples/@PACKAGE@/pathplan_data + + @WITH_TCL_TRUE@pathplanexample_DATA = $(EXAMPLES) - - CLEANFILES = pkgIndex.tcl -@@ -263,8 +263,7 @@ libtcldot_la_DEPENDENCIES = $(top_buildd - $(top_builddir)/graph/libgraphconvenience.la \ - $(top_builddir)/cdt/libcdtconvenience.la \ - $(top_builddir)/gd/libgdconvenience.la \ -- $(top_builddir)/gdtclft/gdtclft.lo \ -- $(top_builddir)/tclstubs/libtclstubs.la -+ $(top_builddir)/gdtclft/gdtclft.lo - am_libtcldot_la_OBJECTS = tcldot.lo tkgen.lo - libtcldot_la_OBJECTS = $(am_libtcldot_la_OBJECTS) - -@@ -272,8 +271,7 @@ DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --depcomp = $(SHELL) $(top_srcdir)/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/tcldot.Plo $(DEPDIR)/tkgen.Plo -+depcomp = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -312,7 +310,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu tcldot/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps tcldot/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -345,30 +343,14 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tcldot.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tkgen.Plo@am__quote@ -- --distclean-depend: -- -rm -rf $(DEPDIR) -- - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< - - .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` - - .c.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< --CCDEPMODE = @CCDEPMODE@ - uninstall-info-am: - - manndir = $(mandir)/mann -@@ -575,8 +557,8 @@ clean-am: clean-generic clean-libtool cl - - distclean: distclean-recursive - --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - -@@ -614,21 +596,21 @@ uninstall-man: uninstall-mann - - .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \ - clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \ -- clean-recursive distclean distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-mann \ -- install-pkglibLTLIBRARIES install-recursive install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- installdirs-recursive maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- tags tags-recursive uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-man uninstall-mann \ -- uninstall-pkglibLTLIBRARIES uninstall-recursive -+ clean-recursive distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-recursive distclean-tags distdir \ -+ dvi dvi-am dvi-recursive info info-am info-recursive install \ -+ install-am install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-mann install-pkglibLTLIBRARIES install-recursive \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am installdirs-recursive maintainer-clean \ -+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ mostlyclean-recursive tags tags-recursive uninstall \ -+ uninstall-am uninstall-info-am uninstall-info-recursive \ -+ uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \ -+ uninstall-recursive - - - all-local: pkgIndex.tcl diff --git a/graphics/graphviz/patches/patch-ar b/graphics/graphviz/patches/patch-ar index de7eb7946f6..58e14c963f3 100644 --- a/graphics/graphviz/patches/patch-ar +++ b/graphics/graphviz/patches/patch-ar @@ -1,13 +1,15 @@ -$NetBSD: patch-ar,v 1.3 2003/03/03 11:35:01 seb Exp $ +$NetBSD: patch-ar,v 1.4 2004/04/17 16:56:10 seb Exp $ ---- tcldot/demo/Makefile.am.orig 2003-01-15 17:22:16.000000000 +0000 -+++ tcldot/demo/Makefile.am -@@ -2,7 +2,7 @@ +--- tkspline/Makefile.am.orig 2003-11-08 11:38:11.000000000 +0000 ++++ tkspline/Makefile.am +@@ -20,8 +20,8 @@ endif + libtkspline_la_SOURCES = tkspline.c - AUTOMAKE_OPTIONS = 1.4 + libtkspline_la_LIBADD = \ +- $(top_builddir)/tkstubs/libtkstubs.la \ +- $(top_builddir)/tclstubs/libtclstubs.la ++ ${TK_STUB_LIB_SPEC} \ ++ ${TCL_STUB_LIB_SPEC} + + all-local: pkgIndex.tcl --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) CVS/* diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as index a59dfd38d4c..41618126619 100644 --- a/graphics/graphviz/patches/patch-as +++ b/graphics/graphviz/patches/patch-as @@ -1,30 +1,41 @@ -$NetBSD: patch-as,v 1.5 2003/03/03 11:35:01 seb Exp $ +$NetBSD: patch-as,v 1.6 2004/04/17 16:56:10 seb Exp $ ---- tcldot/demo/Makefile.in.orig 2003-03-02 20:12:23.000000000 +0000 -+++ tcldot/demo/Makefile.in -@@ -206,7 +206,7 @@ install_sh = @install_sh@ +--- tkspline/Makefile.in.orig 2004-04-17 13:41:39.000000000 +0000 ++++ tkspline/Makefile.in +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -216,8 +214,8 @@ SUBDIRS = demo + libtkspline_la_SOURCES = tkspline.c - AUTOMAKE_OPTIONS = 1.4 + libtkspline_la_LIBADD = \ +- $(top_builddir)/tkstubs/libtkstubs.la \ +- $(top_builddir)/tclstubs/libtclstubs.la ++ ${TK_STUB_LIB_SPEC} \ ++ ${TCL_STUB_LIB_SPEC} --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) CVS/* -@@ -216,6 +216,7 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(demo_SCRIPTS) -+depcomp = - DIST_SOURCES = - DATA = $(demo_DATA) + CLEANFILES = pkgIndex.tcl +@@ -230,8 +228,7 @@ CONFIG_CLEAN_FILES = + LTLIBRARIES = $(pkglib_LTLIBRARIES) + + libtkspline_la_LDFLAGS = +-libtkspline_la_DEPENDENCIES = $(top_builddir)/tkstubs/libtkstubs.la \ +- $(top_builddir)/tclstubs/libtclstubs.la ++libtkspline_la_DEPENDENCIES = + am_libtkspline_la_OBJECTS = tkspline.lo + libtkspline_la_OBJECTS = $(am_libtkspline_la_OBJECTS) -@@ -234,7 +235,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu tcldot/demo/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps tcldot/demo/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ diff --git a/graphics/graphviz/patches/patch-at b/graphics/graphviz/patches/patch-at index eb1a7495296..5e23e11927b 100644 --- a/graphics/graphviz/patches/patch-at +++ b/graphics/graphviz/patches/patch-at @@ -1,13 +1,13 @@ -$NetBSD: patch-at,v 1.4 2003/07/28 10:06:50 seb Exp $ +$NetBSD: patch-at,v 1.5 2004/04/17 16:56:10 seb Exp $ ---- tclpathplan/Makefile.am.orig 2003-06-04 17:12:53.000000000 +0000 -+++ tclpathplan/Makefile.am -@@ -21,7 +21,7 @@ libtclplan_la_SOURCES = find_ints.c inte - libtclplan_la_LIBADD = \ - $(top_builddir)/tclhandle/libtclhandle.la \ - $(top_builddir)/pathplan/libpathplanconvenience.la \ -- $(top_builddir)/tclstubs/libtclstubs.la -+ ${TCL_STUB_LIB_SPEC} +--- tkspline/demo/Makefile.am.orig 2003-11-08 11:38:11.000000000 +0000 ++++ tkspline/demo/Makefile.am +@@ -2,7 +2,7 @@ - all-local: pkgIndex.tcl + AUTOMAKE_OPTIONS = 1.4 +-demodir = $(datadir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + if WITH_TK + demo_SCRIPTS = spline + demo_DATA = spline.README diff --git a/graphics/graphviz/patches/patch-au b/graphics/graphviz/patches/patch-au index f1f6bad0ae5..30c474a5742 100644 --- a/graphics/graphviz/patches/patch-au +++ b/graphics/graphviz/patches/patch-au @@ -1,115 +1,29 @@ -$NetBSD: patch-au,v 1.6 2003/07/28 10:06:51 seb Exp $ +$NetBSD: patch-au,v 1.7 2004/04/17 16:56:10 seb Exp $ ---- tclpathplan/Makefile.in.orig 2003-07-27 16:46:59.000000000 +0000 -+++ tclpathplan/Makefile.in -@@ -224,7 +224,7 @@ libtclplan_la_SOURCES = find_ints.c inte - libtclplan_la_LIBADD = \ - $(top_builddir)/tclhandle/libtclhandle.la \ - $(top_builddir)/pathplan/libpathplanconvenience.la \ -- $(top_builddir)/tclstubs/libtclstubs.la -+ ${TCL_STUB_LIB_SPEC} - - - CLEANFILES = pkgIndex.tcl -@@ -238,8 +238,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) - - libtclplan_la_LDFLAGS = - libtclplan_la_DEPENDENCIES = $(top_builddir)/tclhandle/libtclhandle.la \ -- $(top_builddir)/pathplan/libpathplanconvenience.la \ -- $(top_builddir)/tclstubs/libtclstubs.la -+ $(top_builddir)/pathplan/libpathplanconvenience.la - am_libtclplan_la_OBJECTS = find_ints.lo intersect.lo makecw.lo \ - tclpathplan.lo wrapper.lo - libtclplan_la_OBJECTS = $(am_libtclplan_la_OBJECTS) -@@ -248,10 +247,7 @@ DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --depcomp = $(SHELL) $(top_srcdir)/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/find_ints.Plo $(DEPDIR)/intersect.Plo \ --@AMDEP_TRUE@ $(DEPDIR)/makecw.Plo $(DEPDIR)/tclpathplan.Plo \ --@AMDEP_TRUE@ $(DEPDIR)/wrapper.Plo -+depcomp = - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -287,7 +283,7 @@ distclean-libtool: - -rm -f libtool - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu tclpathplan/Makefile -+ $(AUTOMAKE) --foreign --ignore-deps tclpathplan/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -320,33 +316,14 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/find_ints.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/intersect.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/makecw.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tclpathplan.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrapper.Plo@am__quote@ -- --distclean-depend: -- -rm -rf $(DEPDIR) -- - .c.o: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< - - .c.obj: --@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `cygpath -w $<` - - .c.lo: --@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< --CCDEPMODE = @CCDEPMODE@ - uninstall-info-am: - - # This directory's subdirectories are mostly independent; you can cd -@@ -514,8 +491,8 @@ clean-am: clean-generic clean-libtool cl - - distclean: distclean-recursive - --distclean-am: clean-am distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-tags -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - -@@ -550,16 +527,15 @@ uninstall-info: uninstall-info-recursive - - .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \ - clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \ -- clean-recursive distclean distclean-compile distclean-depend \ -- distclean-generic distclean-libtool distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-pkglibLTLIBRARIES \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -+ clean-recursive distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-recursive distclean-tags distdir \ -+ dvi dvi-am dvi-recursive info info-am info-recursive install \ -+ install-am install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive install-man \ -+ install-pkglibLTLIBRARIES install-recursive install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ installdirs-recursive maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - tags tags-recursive uninstall uninstall-am uninstall-info-am \ +--- tkspline/demo/Makefile.in.orig 2004-03-02 00:20:41.000000000 +0000 ++++ tkspline/demo/Makefile.in +@@ -104,7 +104,6 @@ SOCKET_LIBS = @SOCKET_LIBS@ + SORT = @SORT@ + STRIP = @STRIP@ + TCLINT_INCLUDES = @TCLINT_INCLUDES@ +-TCLSH = @TCLSH@ + TCLSH_EXEC_PREFIX = @TCLSH_EXEC_PREFIX@ + TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ + TCL_BUILD_STUB_LIB_PATH = @TCL_BUILD_STUB_LIB_PATH@ +@@ -181,7 +180,6 @@ TK_XINCLUDES = @TK_XINCLUDES@ + TK_XLIBSW = @TK_XLIBSW@ + TOP_DIR = @TOP_DIR@ + VERSION = @VERSION@ +-WISH = @WISH@ + XAW_INCLUDES = @XAW_INCLUDES@ + XAW_LIBS = @XAW_LIBS@ + XPM_INCLUDES = @XPM_INCLUDES@ +@@ -199,7 +197,7 @@ install_sh = @install_sh@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(datadir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + @WITH_TK_TRUE@demo_SCRIPTS = spline + @WITH_TK_TRUE@demo_DATA = spline.README + EXTRA_DIST = spline spline.README |