diff options
author | seb <seb@pkgsrc.org> | 2002-03-05 13:37:29 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2002-03-05 13:37:29 +0000 |
commit | fa7de9539015820911e9601c17e44a9caedfde8e (patch) | |
tree | 3205123e03727320fe958e221177da38ae3fdc44 | |
parent | 7e0b35ce3885d16107a6628b7567f71dd061a601 (diff) | |
download | pkgsrc-fa7de9539015820911e9601c17e44a9caedfde8e.tar.gz |
Initial import of Graphviz, version 1.8.1, into the NetBSD Packages
Collection.
Graphviz is a set of graph drawing tools.
It includes:
- dot: makes hierarchical layouts of directed graphs
- neato: makes "spring" model layouts of undirected graphs
- lefty: a programmable graphics editor
- dotty: a customizable interface written in LEFTY
- tcldot: a customizable graphical interface written in TCL
- libgraph: the base library for graph tools
- various associated utilities
34 files changed, 1283 insertions, 0 deletions
diff --git a/graphics/graphviz/DESCR b/graphics/graphviz/DESCR new file mode 100644 index 00000000000..a6657c82f39 --- /dev/null +++ b/graphics/graphviz/DESCR @@ -0,0 +1,11 @@ +Graphviz is a set of graph drawing tools from AT&T Research and Lucent Bell +Laboratories. + +It includes: +- dot: makes hierarchical layouts of directed graphs +- neato: makes "spring" model layouts of undirected graphs +- lefty: a programmable graphics editor +- dotty: a customizable interface written in LEFTY +- tcldot: a customizable graphical interface written in TCL +- libgraph: the base library for graph tools +- various associated utilities diff --git a/graphics/graphviz/MESSAGE b/graphics/graphviz/MESSAGE new file mode 100644 index 00000000000..45ef03f4d14 --- /dev/null +++ b/graphics/graphviz/MESSAGE @@ -0,0 +1,9 @@ +============================================================================== +$NetBSD: MESSAGE,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +Please read graphviz license terms in: + +${PREFIX}/share/doc/graphviz/MINTERMS.txt +${PREFIX}/share/doc/graphviz/COPYING + +============================================================================== diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile new file mode 100644 index 00000000000..8b35eff507c --- /dev/null +++ b/graphics/graphviz/Makefile @@ -0,0 +1,47 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +# + +DISTNAME= graphviz-1.8.1 +CATEGORIES= graphics +MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/dist/ +EXTRACT_SUFX= .tgz + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.research.att.com/sw/tools/graphviz/ +COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs + +LICENSE= graphviz-license + +GNU_CONFIGURE= YES +USE_BUILDLINK_ONLY= YES +USE_LIBTOOL= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +CONFIGURE_ENV+= TCLCONFIG=${BUILDLINK_DIR}/lib/tclConfig.sh +CONFIGURE_ENV+= TKCONFIG=${BUILDLINK_DIR}/lib/tkConfig.sh + +CONFIGURE_ARGS+= --with-extraincludedir=${BUILDLINK_DIR}/include +CONFIGURE_ARGS+= --with-extralibdir=${BUILDLINK_DIR}/lib + +# clean up a bit to help package maintainer produce patch files +post-extract: + ${_PKG_SILENT}${_PKG_DEBUG} \ + ${FIND} ${WRKSRC} -type f -name "*.orig" | ${XARGS} ${RM} + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/graphviz +.for __f__ in Dot.ref FAQ.html dotguide.pdf dottyguide.pdf gd.html \ + leftyguide.pdf neatoguide.pdf tcldot.html + ${INSTALL_DATA} ${WRKSRC}/doc/${__f__} ${PREFIX}/share/doc/graphviz +.endfor + ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/graphviz + ${INSTALL_DATA} ${WRKSRC}/MINTERMS.txt ${PREFIX}/share/doc/graphviz + +.include "../../devel/zlib/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/freetype2/buildlink.mk" +.include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" +.include "../../mk/xaw.buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST new file mode 100644 index 00000000000..f9f192fd901 --- /dev/null +++ b/graphics/graphviz/PLIST @@ -0,0 +1,182 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ +bin/acyclic +bin/ccomps +bin/colorize +bin/dot +bin/dotty +bin/gc +bin/gpr +bin/lefty +bin/lneato +bin/neato +bin/nop +bin/sccmap +bin/tred +bin/twopi +bin/unflatten +lib/graphviz/graphs/directed/KW91.dot +lib/graphviz/graphs/directed/Latin1.dot +lib/graphviz/graphs/directed/NaN.dot +lib/graphviz/graphs/directed/abstract.dot +lib/graphviz/graphs/directed/alf.dot +lib/graphviz/graphs/directed/awilliams.dot +lib/graphviz/graphs/directed/clust.dot +lib/graphviz/graphs/directed/clust1.dot +lib/graphviz/graphs/directed/clust2.dot +lib/graphviz/graphs/directed/clust3.dot +lib/graphviz/graphs/directed/clust4.dot +lib/graphviz/graphs/directed/clust5.dot +lib/graphviz/graphs/directed/crazy.dot +lib/graphviz/graphs/directed/ctext.dot +lib/graphviz/graphs/directed/dfa.dot +lib/graphviz/graphs/directed/fig6.dot +lib/graphviz/graphs/directed/fsm.dot +lib/graphviz/graphs/directed/grammar.dot +lib/graphviz/graphs/directed/hashtable.dot +lib/graphviz/graphs/directed/honda-tokoro.dot +lib/graphviz/graphs/directed/jcctree.dot +lib/graphviz/graphs/directed/jsort.dot +lib/graphviz/graphs/directed/ldbxtried.dot +lib/graphviz/graphs/directed/longflat.dot +lib/graphviz/graphs/directed/mike.dot +lib/graphviz/graphs/directed/newarrows.dot +lib/graphviz/graphs/directed/nhg.dot +lib/graphviz/graphs/directed/pgram.dot +lib/graphviz/graphs/directed/pm2way.dot +lib/graphviz/graphs/directed/pmpipe.dot +lib/graphviz/graphs/directed/polypoly.dot +lib/graphviz/graphs/directed/proc3d.dot +lib/graphviz/graphs/directed/record2.dot +lib/graphviz/graphs/directed/records.dot +lib/graphviz/graphs/directed/rowe.dot +lib/graphviz/graphs/directed/shells.dot +lib/graphviz/graphs/directed/states.dot +lib/graphviz/graphs/directed/structs.dot +lib/graphviz/graphs/directed/train11.dot +lib/graphviz/graphs/directed/trapeziumlr.dot +lib/graphviz/graphs/directed/tree.dot +lib/graphviz/graphs/directed/triedds.dot +lib/graphviz/graphs/directed/try.dot +lib/graphviz/graphs/directed/unix.dot +lib/graphviz/graphs/directed/unix2.dot +lib/graphviz/graphs/directed/unix2k.dot +lib/graphviz/graphs/directed/viewfile.dot +lib/graphviz/graphs/directed/world.dot +lib/graphviz/graphs/undirected/ER.dot +lib/graphviz/graphs/undirected/ngk10_4.dot +lib/graphviz/graphs/undirected/process.dot +lib/graphviz/lefty/box.lefty +lib/graphviz/lefty/def.lefty +lib/graphviz/lefty/dotty.lefty +lib/graphviz/lefty/dotty_draw.lefty +lib/graphviz/lefty/dotty_edit.lefty +lib/graphviz/lefty/dotty_layout.lefty +lib/graphviz/lefty/dotty_ui.lefty +lib/graphviz/lefty/fractal.lefty +lib/graphviz/lefty/fractal2.lefty +lib/graphviz/lefty/lefty.psp +lib/graphviz/lefty/slides.lefty +lib/graphviz/lefty/tree.lefty +lib/graphviz/libgdtclft.a +lib/graphviz/libgdtclft.la +lib/graphviz/libgdtclft.so +lib/graphviz/libgdtclft.so.0 +lib/graphviz/libgdtclft.so.0.0 +lib/graphviz/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 +lib/graphviz/libtcldot.so.0 +lib/graphviz/libtcldot.so.0.0 +lib/graphviz/libtclplan.a +lib/graphviz/libtclplan.la +lib/graphviz/libtclplan.so +lib/graphviz/libtclplan.so.0 +lib/graphviz/libtclplan.so.0.0 +lib/graphviz/libtkspline.a +lib/graphviz/libtkspline.la +lib/graphviz/libtkspline.so +lib/graphviz/libtkspline.so.0 +lib/graphviz/libtkspline.so.0.0 +lib/graphviz/pkgIndex.tcl +man/man1/acyclic.1 +man/man1/ccomps.1 +man/man1/colorize.1 +man/man1/dot.1 +man/man1/dotty.1 +man/man1/gc.1 +man/man1/gpr.1 +man/man1/lefty.1 +man/man1/neato.1 +man/man1/nop.1 +man/man1/sccmap.1 +man/man1/tred.1 +man/man1/twopi.1 +man/man1/unflatten.1 +man/man3/agraph.3 +man/man3/cdt.3 +man/man3/expr.3 +man/man3/graph.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 +share/doc/graphviz/Dot.ref +share/doc/graphviz/FAQ.html +share/doc/graphviz/MINTERMS.txt +share/doc/graphviz/dotguide.pdf +share/doc/graphviz/dottyguide.pdf +share/doc/graphviz/gd.html +share/doc/graphviz/leftyguide.pdf +share/doc/graphviz/neatoguide.pdf +share/doc/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 +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 +share/examples/graphviz/pathplan_data/dpd.dat +share/examples/graphviz/pathplan_data/funny.dat +share/examples/graphviz/pathplan_data/maze.dat +share/examples/graphviz/pathplan_data/nested.dat +share/examples/graphviz/pathplan_data/northo.dat +share/examples/graphviz/pathplan_data/obs.dat +share/examples/graphviz/pathplan_data/other.dat +share/examples/graphviz/pathplan_data/paths.dat +share/examples/graphviz/pathplan_data/rotor.dat +share/examples/graphviz/pathplan_data/u.dat +share/examples/graphviz/pathplan_data/unknown.dat +share/examples/graphviz/spline +share/examples/graphviz/spline.README +@dirrm share/examples/graphviz/pathplan_data +@dirrm share/examples/graphviz +@dirrm share/doc/graphviz +@dirrm lib/graphviz/lefty +@dirrm lib/graphviz/graphs/undirected +@dirrm lib/graphviz/graphs/directed +@dirrm lib/graphviz/graphs +@dirrm lib/graphviz diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo new file mode 100644 index 00000000000..c665f033128 --- /dev/null +++ b/graphics/graphviz/distinfo @@ -0,0 +1,33 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +SHA1 (graphviz-1.8.1.tgz) = a9ec14be381b7dca36b83c321f5115884ce58cec +Size (graphviz-1.8.1.tgz) = 2648185 bytes +SHA1 (patch-aa) = 1284ea4e38bdf2022bc9e270668f57b4f2953f03 +SHA1 (patch-ab) = efee15e28ddbb1ad93e5b18e39e8ffc0b5089ee0 +SHA1 (patch-ac) = 50be7b29211bf56c76f3f7b9c6d9e54053c89dac +SHA1 (patch-ad) = 10926226514d44eb653d4a2006a14dc60e72f143 +SHA1 (patch-ae) = 50b26b99624d5d0dbe6d77af00115d753bccb6c4 +SHA1 (patch-af) = 96c1f98a5b1fce31c596435c879af326604da077 +SHA1 (patch-ag) = ab16434324414efbfda3ec9c762bc1f377dbaa0e +SHA1 (patch-ah) = 4177be8269252663a3bedb4b243ce77de6f8f444 +SHA1 (patch-ai) = 0ff0279812e4b003c45f6bd64aacd39854f20847 +SHA1 (patch-aj) = 25f1dff8fe277346bdd44b540cf559a4f8809ac5 +SHA1 (patch-ak) = 895aa1cae2a2c1b85ee304bd4a495309cf52cf3f +SHA1 (patch-al) = ecb44648b9887d11d39488dd558f53586701fb4c +SHA1 (patch-am) = 4489519aeef7ad42b7d71d084ceb8809867d7957 +SHA1 (patch-an) = 8102be5b12b374b041ca5a41665cc4a47a33d13f +SHA1 (patch-ao) = 7bbdb822dd55319559a3206909e85dc2251b66fa +SHA1 (patch-ap) = bc9e733bfdbbde196f1f851aa8943453430d5dea +SHA1 (patch-aq) = 83f9bc67029594fb8e4d663bb247ac59550f4d14 +SHA1 (patch-ar) = cf60597ae99232500da469762f979dc3a2e6073e +SHA1 (patch-as) = c3ea77929a51617616b24f018ea8661b14d4b623 +SHA1 (patch-at) = 121bbd25a83967aaf976a23c818e7526c2a91ff2 +SHA1 (patch-au) = f11ad65ad5da967588ffce2bb1cdc88c3946d79f +SHA1 (patch-av) = bfcb35ddc2814d304bb2c31923335ea3757bd6ff +SHA1 (patch-aw) = d9437eb239bcf413a6f6f4b516d276e99be990cb +SHA1 (patch-ax) = 7ed8b5e8cfce5bed4c764e8f4855b774f3bfa519 +SHA1 (patch-ay) = ae7630889e67cdd05034c845c8137f0128c050dd +SHA1 (patch-az) = ddbe55931ab479c30cd7d3ec52ea6f4d61df6d98 +SHA1 (patch-ba) = 14fedc672638ce31a189b6c5e908f231953d701b +SHA1 (patch-bb) = 4ea6f919c39c05923ef2312cc3de78d9ea21ec7a +SHA1 (patch-bc) = 3bbc6d3feefba22fe893e7ba553798f48a71fee5 diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa new file mode 100644 index 00000000000..440d9059144 --- /dev/null +++ b/graphics/graphviz/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- MINTERMS.txt.orig Fri Oct 6 18:10:34 2000 ++++ MINTERMS.txt +@@ -2,7 +2,7 @@ + Appendix A - Minimum Terms + -------------------------- + +-LICENSOR: ______________ ++LICENSOR: The NetBSD Project + + LICENSE AGREEMENT + diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab new file mode 100644 index 00000000000..00f71b7d1ff --- /dev/null +++ b/graphics/graphviz/patches/patch-ab @@ -0,0 +1,71 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- configure.in.orig Fri Mar 1 03:47:55 2002 ++++ configure.in +@@ -144,12 +144,11 @@ + + # Some systems don't have Tcl. Don't build + # the Tcl products if we don't have the library. +-TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh + if test -f $TCLCONFIG; then + AC_MSG_RESULT([using $TCLCONFIG]) + file=${TCLCONFIG} + . $file +- TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" ++ TCL_SUBDIRS="tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" + TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" + else + AC_MSG_WARN([Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built]) +@@ -220,12 +219,11 @@ + + # Some systems have Tcl, but not TK. Don't build + # the Tk products if we don't have the library. +-TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh + if test -f $TKCONFIG; then + AC_MSG_RESULT([using $TKCONFIG]) + file=${TKCONFIG} + . $file +- TK_SUBDIRS="tkstubs tkspline" ++ TK_SUBDIRS="tkspline" + TK_PKGINDEX="tkspline/pkgIndex.tcl" + else + AC_MSG_WARN([Unable to find tkConfig.sh. The package "tkspline" will not be built]) +@@ -529,36 +527,12 @@ + + # ----------------------------------- + # tclInt.h +-if test -f "$TCL_SRC_DIR/generic/tclInt.h"; then +-TCLINT_INCLUDES="-I$TCL_SRC_DIR/generic" +-else +-if test -f "/usr/include/tclInt.h"; then +-TCLINT_INCLUDES="-I/usr/include" +-else +-if test -f "/usr/local/include/tclInt.h"; then +-TCLINT_INCLUDES="-I/usr/local/include" +-else +-TCLINT_INCLUDES="-I$TOP_DIR/tclstubs" +-fi +-fi +-fi ++TCLINT_INCLUDES="-I${BUILDLINK_DIR}/include/tcl/generic" + AC_SUBST(TCLINT_INCLUDES) + + # ----------------------------------- + # tkInt.h +-if test -f "$TK_SRC_DIR/generic/tkInt.h"; then +-TKINT_INCLUDES="-I$TK_SRC_DIR/generic" +-else +-if test -f "/usr/include/tkInt.h"; then +-TKINT_INCLUDES="-I/usr/include" +-else +-if test -f "/usr/local/include/tkInt.h"; then +-TKINT_INCLUDES="-I/usr/local/include" +-else +-TKINT_INCLUDES="-I$TOP_DIR/tkstubs" +-fi +-fi +-fi ++TKINT_INCLUDES="-I${BUILDLINK_DIR}/include/tk/generic" + AC_SUBST(TKINT_INCLUDES) + + # ----------------------------------- diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac new file mode 100644 index 00000000000..3c90af0557d --- /dev/null +++ b/graphics/graphviz/patches/patch-ac @@ -0,0 +1,142 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- configure.orig Fri Mar 1 22:34:05 2002 ++++ configure +@@ -1475,60 +1475,9 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include <stdlib.h>' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext <<EOF +-#line 1489 "configure" +-#include "confdefs.h" +-#include <stdlib.h> +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:1497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <<EOF +-#line 1507 "configure" +-#include "confdefs.h" +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:1514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + + echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 +-echo "configure:1532: checking for strerror in -lcposix" >&5 ++echo "configure:1481: checking for strerror in -lcposix" >&5 + ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1860,7 +1809,7 @@ + done + test -n "$YACC" || YACC="yacc" + +-for ac_prog in gawk mawk nawk awk ++for ac_prog in mawk gawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -6079,12 +6028,11 @@ + + # Some systems don't have Tcl. Don't build + # the Tcl products if we don't have the library. +-TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh + if test -f $TCLCONFIG; then + echo "$ac_t""using $TCLCONFIG" 1>&6 + file=${TCLCONFIG} + . $file +- TCL_SUBDIRS="tclstubs tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" ++ TCL_SUBDIRS="tclhandle gdtclft tcldot tcldgr tcldgl tclpathplan" + TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" + else + echo "configure: warning: Unable to find tclConfig.sh. The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built" 1>&2 +@@ -6156,12 +6104,11 @@ + + # Some systems have Tcl, but not TK. Don't build + # the Tk products if we don't have the library. +-TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh + if test -f $TKCONFIG; then + echo "$ac_t""using $TKCONFIG" 1>&6 + file=${TKCONFIG} + . $file +- TK_SUBDIRS="tkstubs tkspline" ++ TK_SUBDIRS="tkspline" + TK_PKGINDEX="tkspline/pkgIndex.tcl" + else + echo "configure: warning: Unable to find tkConfig.sh. The package "tkspline" will not be built" 1>&2 +@@ -8710,36 +8657,12 @@ + + # ----------------------------------- + # tclInt.h +-if test -f "$TCL_SRC_DIR/generic/tclInt.h"; then +-TCLINT_INCLUDES="-I$TCL_SRC_DIR/generic" +-else +-if test -f "/usr/include/tclInt.h"; then +-TCLINT_INCLUDES="-I/usr/include" +-else +-if test -f "/usr/local/include/tclInt.h"; then +-TCLINT_INCLUDES="-I/usr/local/include" +-else +-TCLINT_INCLUDES="-I$TOP_DIR/tclstubs" +-fi +-fi +-fi ++TCLINT_INCLUDES="-I${BUILDLINK_DIR}/include/tcl/generic" + + + # ----------------------------------- + # tkInt.h +-if test -f "$TK_SRC_DIR/generic/tkInt.h"; then +-TKINT_INCLUDES="-I$TK_SRC_DIR/generic" +-else +-if test -f "/usr/include/tkInt.h"; then +-TKINT_INCLUDES="-I/usr/include" +-else +-if test -f "/usr/local/include/tkInt.h"; then +-TKINT_INCLUDES="-I/usr/local/include" +-else +-TKINT_INCLUDES="-I$TOP_DIR/tkstubs" +-fi +-fi +-fi ++TKINT_INCLUDES="-I${BUILDLINK_DIR}/include/tk/generic" + + + # ----------------------------------- diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad new file mode 100644 index 00000000000..83e7e312a60 --- /dev/null +++ b/graphics/graphviz/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- gdtclft/Makefile.am.orig Thu Feb 21 23:16:53 2002 ++++ gdtclft/Makefile.am +@@ -4,8 +4,7 @@ + + INCLUDES = @TCL_CFLAGS@ \ + -I$(top_srcdir)/tclhandle \ +- -I$(top_srcdir)/gd \ +- -I@TCLSH_EXEC_PREFIX@/include ++ -I$(top_srcdir)/gd + + LIBS = ${FT_LIBS} \ + ${PNG_LIBS} \ +@@ -23,7 +22,7 @@ + libgdtclft_la_LIBADD = \ + ../tclhandle/libtclhandle.la \ + ../gd/libgd.la \ +- ../tclstubs/libtclstubs.la ++ ${TCL_STUB_LIB_SPEC} + + all-local: pkgIndex.tcl + diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae new file mode 100644 index 00000000000..20e1862336f --- /dev/null +++ b/graphics/graphviz/patches/patch-ae @@ -0,0 +1,62 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- gdtclft/Makefile.in.orig Fri Mar 1 22:35:34 2002 ++++ gdtclft/Makefile.in +@@ -187,17 +187,10 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-INCLUDES = @TCL_CFLAGS@ \ +- -I$(top_srcdir)/tclhandle \ +- -I$(top_srcdir)/gd \ +- -I@TCLSH_EXEC_PREFIX@/include ++INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/tclhandle -I$(top_srcdir)/gd + + +-LIBS = ${FT_LIBS} \ +- ${PNG_LIBS} \ +- ${JPEG_LIBS} \ +- ${XPM_LIBS} \ +- ${Z_LIBS} -lc ++LIBS = ${FT_LIBS} ${PNG_LIBS} ${JPEG_LIBS} ${XPM_LIBS} ${Z_LIBS} -lc + + + SUBDIRS = demo +@@ -207,10 +200,7 @@ + + libgdtclft_la_SOURCES = gdtclft.c + +-libgdtclft_la_LIBADD = \ +- ../tclhandle/libtclhandle.la \ +- ../gd/libgd.la \ +- ../tclstubs/libtclstubs.la ++libgdtclft_la_LIBADD = ../tclhandle/libtclhandle.la ../gd/libgd.la ${TCL_STUB_LIB_SPEC} + + + CLEANFILES = pkgIndex.tcl +@@ -231,7 +221,7 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + libgdtclft_la_LDFLAGS = + libgdtclft_la_DEPENDENCIES = ../tclhandle/libtclhandle.la \ +-../gd/libgd.la ../tclstubs/libtclstubs.la ++../gd/libgd.la + libgdtclft_la_OBJECTS = gdtclft.lo + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -247,7 +237,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + SOURCES = $(libgdtclft_la_SOURCES) + OBJECTS = $(libgdtclft_la_OBJECTS) +@@ -488,7 +478,6 @@ + || exit 1; \ + fi; \ + done +- + info-am: + info: info-recursive + dvi-am: diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af new file mode 100644 index 00000000000..69e09cb36fd --- /dev/null +++ b/graphics/graphviz/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- gdtclft/demo/Makefile.am.orig Thu May 4 15:12:32 2000 ++++ gdtclft/demo/Makefile.am +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = entities + demo_DATA = entities.README entities.html + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag new file mode 100644 index 00000000000..c1a16cfe580 --- /dev/null +++ b/graphics/graphviz/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- gdtclft/demo/Makefile.in.orig Fri Mar 1 22:35:35 2002 ++++ gdtclft/demo/Makefile.in +@@ -187,7 +187,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = entities + demo_DATA = entities.README entities.html + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) +@@ -203,7 +203,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah new file mode 100644 index 00000000000..02884d335d6 --- /dev/null +++ b/graphics/graphviz/patches/patch-ah @@ -0,0 +1,23 @@ +$NetBSD: patch-ah,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldgl/Makefile.am.orig Thu Feb 21 23:16:54 2002 ++++ tcldgl/Makefile.am +@@ -7,8 +7,7 @@ + -I$(top_srcdir)/cdt \ + -I$(top_srcdir)/tclhandle \ + -I$(top_srcdir)/incr \ +- -I$(top_srcdir)/shape \ +- -I@TCLSH_EXEC_PREFIX@/include ++ -I$(top_srcdir)/shape + + LIBS = + +@@ -32,7 +31,7 @@ + ../agutil/libagutil.la \ + ../shape/libshape.la \ + ../ns/libns.la \ +- ../tclstubs/libtclstubs.la \ ++ ${TCL_STUB_LIB_SPEC} \ + -lc -lm + + all-local: pkgIndex.tcl diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai new file mode 100644 index 00000000000..5246139cc1d --- /dev/null +++ b/graphics/graphviz/patches/patch-ai @@ -0,0 +1,67 @@ +$NetBSD: patch-ai,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldgl/Makefile.in.orig Fri Mar 1 22:35:39 2002 ++++ tcldgl/Makefile.in +@@ -187,13 +187,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-INCLUDES = @TCL_CFLAGS@ \ +- -I$(top_srcdir)/agraph \ +- -I$(top_srcdir)/cdt \ +- -I$(top_srcdir)/tclhandle \ +- -I$(top_srcdir)/incr \ +- -I$(top_srcdir)/shape \ +- -I@TCLSH_EXEC_PREFIX@/include ++INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/agraph -I$(top_srcdir)/cdt -I$(top_srcdir)/tclhandle -I$(top_srcdir)/incr -I$(top_srcdir)/shape + + + LIBS = +@@ -206,20 +200,7 @@ + + libtcldgl_la_SOURCES = dgl.c dglayout.c dglshape.c dglutil.c dgl.h + +-libtcldgl_la_LIBADD = ../tclhandle/libtclhandle.la \ +- ../agraph/libagraph.la \ +- ../cdt/libcdt.la \ +- ../fdp/libfdp.la \ +- ../dag/libdag.la \ +- ../geo/libgeo.la \ +- ../grid/libgrid.la \ +- ../incr/libincr.la \ +- ../pathplan/libpathplan.la \ +- ../agutil/libagutil.la \ +- ../shape/libshape.la \ +- ../ns/libns.la \ +- ../tclstubs/libtclstubs.la \ +- -lc -lm ++libtcldgl_la_LIBADD = ../tclhandle/libtclhandle.la ../agraph/libagraph.la ../cdt/libcdt.la ../fdp/libfdp.la ../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la ../incr/libincr.la ../pathplan/libpathplan.la ../agutil/libagutil.la ../shape/libshape.la ../ns/libns.la ${TCL_STUB_LIB_SPEC} -lc -lm + + + CLEANFILES = pkgIndex.tcl +@@ -243,7 +224,7 @@ + ../agraph/libagraph.la ../cdt/libcdt.la ../fdp/libfdp.la \ + ../dag/libdag.la ../geo/libgeo.la ../grid/libgrid.la ../incr/libincr.la \ + ../pathplan/libpathplan.la ../agutil/libagutil.la ../shape/libshape.la \ +-../ns/libns.la ../tclstubs/libtclstubs.la ++../ns/libns.la + libtcldgl_la_OBJECTS = dgl.lo dglayout.lo dglshape.lo dglutil.lo + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -261,7 +242,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + SOURCES = $(libtcldgl_la_SOURCES) + OBJECTS = $(libtcldgl_la_OBJECTS) +@@ -502,7 +483,6 @@ + || exit 1; \ + fi; \ + done +- + info-am: + info: info-recursive + dvi-am: diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj new file mode 100644 index 00000000000..e40f0ebc9ae --- /dev/null +++ b/graphics/graphviz/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldgl/demo/Makefile.am.orig Thu May 4 15:12:32 2000 ++++ tcldgl/demo/Makefile.am +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@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) diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak new file mode 100644 index 00000000000..a265348956d --- /dev/null +++ b/graphics/graphviz/patches/patch-ak @@ -0,0 +1,22 @@ +$NetBSD: patch-ak,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldgl/demo/Makefile.in.orig Fri Mar 1 22:35:39 2002 ++++ tcldgl/demo/Makefile.in +@@ -187,7 +187,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@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) +@@ -203,7 +203,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al new file mode 100644 index 00000000000..1ebcda2924a --- /dev/null +++ b/graphics/graphviz/patches/patch-al @@ -0,0 +1,23 @@ +$NetBSD: patch-al,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldgr/Makefile.am.orig Thu Feb 21 23:16:54 2002 ++++ tcldgr/Makefile.am +@@ -5,8 +5,7 @@ + INCLUDES = @TCL_CFLAGS@ \ + -I$(top_srcdir)/agraph \ + -I$(top_srcdir)/cdt \ +- -I$(top_srcdir)/tclhandle \ +- -I@TCLSH_EXEC_PREFIX@/include ++ -I$(top_srcdir)/tclhandle + + LIBS = + +@@ -21,7 +20,7 @@ + libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la \ + ../agraph/libagraph.la \ + ../cdt/libcdt.la \ +- ../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 new file mode 100644 index 00000000000..1fd956b3404 --- /dev/null +++ b/graphics/graphviz/patches/patch-am @@ -0,0 +1,55 @@ +$NetBSD: patch-am,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldgr/Makefile.in.orig Fri Mar 1 22:35:37 2002 ++++ tcldgr/Makefile.in +@@ -187,11 +187,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-INCLUDES = @TCL_CFLAGS@ \ +- -I$(top_srcdir)/agraph \ +- -I$(top_srcdir)/cdt \ +- -I$(top_srcdir)/tclhandle \ +- -I@TCLSH_EXEC_PREFIX@/include ++INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/agraph -I$(top_srcdir)/cdt -I$(top_srcdir)/tclhandle + + + LIBS = +@@ -204,10 +200,7 @@ + + libtcldgr_la_SOURCES = dgedge.c dgnode.c dgr.c dgraph.c dgrutil.c dgr.h + +-libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la \ +- ../agraph/libagraph.la \ +- ../cdt/libcdt.la \ +- ../tclstubs/libtclstubs.la ++libtcldgr_la_LIBADD = ../tclhandle/libtclhandle.la ../agraph/libagraph.la ../cdt/libcdt.la ${TCL_STUB_LIB_SPEC} + + + CLEANFILES = pkgIndex.tcl +@@ -228,7 +221,7 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + libtcldgr_la_LDFLAGS = + libtcldgr_la_DEPENDENCIES = ../tclhandle/libtclhandle.la \ +-../agraph/libagraph.la ../cdt/libcdt.la ../tclstubs/libtclstubs.la ++../agraph/libagraph.la ../cdt/libcdt.la + libtcldgr_la_OBJECTS = dgedge.lo dgnode.lo dgr.lo dgraph.lo dgrutil.lo + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -246,7 +239,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + SOURCES = $(libtcldgr_la_SOURCES) + OBJECTS = $(libtcldgr_la_OBJECTS) +@@ -487,7 +480,6 @@ + || exit 1; \ + fi; \ + done +- + info-am: + info: info-recursive + dvi-am: diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an new file mode 100644 index 00000000000..8dad2488770 --- /dev/null +++ b/graphics/graphviz/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldgr/demo/Makefile.am.orig Thu May 4 15:12:32 2000 ++++ tcldgr/demo/Makefile.am +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = ihi + demo_DATA = ihi.README ihi.testdata + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao new file mode 100644 index 00000000000..41eb3524b67 --- /dev/null +++ b/graphics/graphviz/patches/patch-ao @@ -0,0 +1,22 @@ +$NetBSD: patch-ao,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldgr/demo/Makefile.in.orig Fri Mar 1 22:35:38 2002 ++++ tcldgr/demo/Makefile.in +@@ -187,7 +187,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = ihi + demo_DATA = ihi.README ihi.testdata + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) +@@ -203,7 +203,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap new file mode 100644 index 00000000000..a191002de75 --- /dev/null +++ b/graphics/graphviz/patches/patch-ap @@ -0,0 +1,23 @@ +$NetBSD: patch-ap,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldot/Makefile.am.orig Thu Feb 21 23:16:54 2002 ++++ tcldot/Makefile.am +@@ -10,8 +10,7 @@ + -I$(top_srcdir)/graph \ + -I$(top_srcdir)/cdt \ + -I$(top_srcdir)/pathplan \ +- -I$(top_srcdir)/tclhandle \ +- -I@TCLSH_EXEC_PREFIX@/include ++ -I$(top_srcdir)/tclhandle + + LIBS = ${FT_LIBS} \ + ${PNG_LIBS} \ +@@ -39,7 +38,7 @@ + ../cdt/libcdt.la \ + ../gd/libgd.la \ + ../gdtclft/gdtclft.lo \ +- ../tclstubs/libtclstubs.la ++ ${TCL_STUB_LIB_SPEC} + + all-local: pkgIndex.tcl + diff --git a/graphics/graphviz/patches/patch-aq b/graphics/graphviz/patches/patch-aq new file mode 100644 index 00000000000..b6d0c2b7c77 --- /dev/null +++ b/graphics/graphviz/patches/patch-aq @@ -0,0 +1,84 @@ +$NetBSD: patch-aq,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldot/Makefile.in.orig Fri Mar 1 22:35:36 2002 ++++ tcldot/Makefile.in +@@ -187,23 +187,10 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-INCLUDES = @TCL_CFLAGS@ \ +- -I$(top_srcdir)/dotneato/dotgen \ +- -I$(top_srcdir)/dotneato/neatogen \ +- -I$(top_srcdir)/dotneato/twopigen \ +- -I$(top_srcdir)/dotneato/common \ +- -I$(top_srcdir)/graph \ +- -I$(top_srcdir)/cdt \ +- -I$(top_srcdir)/pathplan \ +- -I$(top_srcdir)/tclhandle \ +- -I@TCLSH_EXEC_PREFIX@/include +- +- +-LIBS = ${FT_LIBS} \ +- ${PNG_LIBS} \ +- ${JPEG_LIBS} \ +- ${XPM_LIBS} \ +- ${Z_LIBS} -lc ++INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/dotneato/dotgen -I$(top_srcdir)/dotneato/neatogen -I$(top_srcdir)/dotneato/twopigen -I$(top_srcdir)/dotneato/common -I$(top_srcdir)/graph -I$(top_srcdir)/cdt -I$(top_srcdir)/pathplan -I$(top_srcdir)/tclhandle ++ ++ ++LIBS = ${FT_LIBS} ${PNG_LIBS} ${JPEG_LIBS} ${XPM_LIBS} ${Z_LIBS} -lc + + + CFLAGS = @CFLAGS@ -DDATE="\"`date`\"" +@@ -216,23 +203,12 @@ + + libtcldot_la_SOURCES = tcldot.c tkgen.c tcldot.h + +-libtcldot_la_LIBADD = ../tclhandle/libtclhandle.la \ +- ../dotneato/common/libdotneato.la \ +- ../dotneato/dotgen/libdot.la \ +- ../dotneato/neatogen/libneato.la \ +- ../dotneato/twopigen/libtwopi.la \ +- ../pathplan/libpathplan.la \ +- ../graph/libgraph.la \ +- ../cdt/libcdt.la \ +- ../gd/libgd.la \ +- ../gdtclft/gdtclft.lo \ +- ../tclstubs/libtclstubs.la ++libtcldot_la_LIBADD = ../tclhandle/libtclhandle.la ../dotneato/common/libdotneato.la ../dotneato/dotgen/libdot.la ../dotneato/neatogen/libneato.la ../dotneato/twopigen/libtwopi.la ../pathplan/libpathplan.la ../graph/libgraph.la ../cdt/libcdt.la ../gd/libgd.la ../gdtclft/gdtclft.lo ${TCL_STUB_LIB_SPEC} + + + CLEANFILES = pkgIndex.tcl + +-EXTRA_DIST = $(man_MANS) README README.Tkspline \ +- nmakefile Makefile.old ++EXTRA_DIST = $(man_MANS) README README.Tkspline nmakefile Makefile.old + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../gvconfig.h +@@ -252,7 +228,7 @@ + ../dotneato/common/libdotneato.la ../dotneato/dotgen/libdot.la \ + ../dotneato/neatogen/libneato.la ../dotneato/twopigen/libtwopi.la \ + ../pathplan/libpathplan.la ../graph/libgraph.la ../cdt/libcdt.la \ +-../gd/libgd.la ../gdtclft/gdtclft.lo ../tclstubs/libtclstubs.la ++../gd/libgd.la ../gdtclft/gdtclft.lo + libtcldot_la_OBJECTS = tcldot.lo tkgen.lo + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -269,7 +245,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + SOURCES = $(libtcldot_la_SOURCES) + OBJECTS = $(libtcldot_la_OBJECTS) +@@ -510,7 +486,6 @@ + || exit 1; \ + fi; \ + done +- + info-am: + info: info-recursive + dvi-am: diff --git a/graphics/graphviz/patches/patch-ar b/graphics/graphviz/patches/patch-ar new file mode 100644 index 00000000000..3f2307d31eb --- /dev/null +++ b/graphics/graphviz/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldot/demo/Makefile.am.orig Fri Jul 27 18:30:40 2001 ++++ tcldot/demo/Makefile.am +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = doted gcat + demo_DATA = doted.README gcat.README + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) diff --git a/graphics/graphviz/patches/patch-as b/graphics/graphviz/patches/patch-as new file mode 100644 index 00000000000..03eb9612896 --- /dev/null +++ b/graphics/graphviz/patches/patch-as @@ -0,0 +1,22 @@ +$NetBSD: patch-as,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tcldot/demo/Makefile.in.orig Fri Mar 1 22:35:36 2002 ++++ tcldot/demo/Makefile.in +@@ -187,7 +187,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = doted gcat + demo_DATA = doted.README gcat.README + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) +@@ -203,7 +203,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: diff --git a/graphics/graphviz/patches/patch-at b/graphics/graphviz/patches/patch-at new file mode 100644 index 00000000000..4ae4c13c505 --- /dev/null +++ b/graphics/graphviz/patches/patch-at @@ -0,0 +1,23 @@ +$NetBSD: patch-at,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tclpathplan/Makefile.am.orig Thu Feb 21 23:16:54 2002 ++++ tclpathplan/Makefile.am +@@ -4,8 +4,7 @@ + + INCLUDES = @TCL_CFLAGS@ \ + -I$(top_srcdir)/tclhandle \ +- -I$(top_srcdir)/pathplan \ +- -I@TCLSH_EXEC_PREFIX@/include ++ -I$(top_srcdir)/pathplan + + LIBS = + +@@ -20,7 +19,7 @@ + libtclplan_la_LIBADD = \ + ../tclhandle/libtclhandle.la \ + ../pathplan/libpathplan.la \ +- ../tclstubs/libtclstubs.la -lm ++ ${TCL_STUB_LIB_SPEC} -lm + + all-local: pkgIndex.tcl + diff --git a/graphics/graphviz/patches/patch-au b/graphics/graphviz/patches/patch-au new file mode 100644 index 00000000000..738eab50699 --- /dev/null +++ b/graphics/graphviz/patches/patch-au @@ -0,0 +1,59 @@ +$NetBSD: patch-au,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tclpathplan/Makefile.in.orig Fri Mar 1 22:35:40 2002 ++++ tclpathplan/Makefile.in +@@ -187,10 +187,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-INCLUDES = @TCL_CFLAGS@ \ +- -I$(top_srcdir)/tclhandle \ +- -I$(top_srcdir)/pathplan \ +- -I@TCLSH_EXEC_PREFIX@/include ++INCLUDES = @TCL_CFLAGS@ -I$(top_srcdir)/tclhandle -I$(top_srcdir)/pathplan + + + LIBS = +@@ -200,14 +197,10 @@ + + SUBDIRS = demo + +-libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c \ +- tclpathplan.c wrapper.c simple.h ++libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c tclpathplan.c wrapper.c simple.h + + +-libtclplan_la_LIBADD = \ +- ../tclhandle/libtclhandle.la \ +- ../pathplan/libpathplan.la \ +- ../tclstubs/libtclstubs.la -lm ++libtclplan_la_LIBADD = ../tclhandle/libtclhandle.la ../pathplan/libpathplan.la ${TCL_STUB_LIB_SPEC} -lm + + + CLEANFILES = pkgIndex.tcl +@@ -226,7 +219,7 @@ + X_PRE_LIBS = @X_PRE_LIBS@ + libtclplan_la_LDFLAGS = + libtclplan_la_DEPENDENCIES = ../tclhandle/libtclhandle.la \ +-../pathplan/libpathplan.la ../tclstubs/libtclstubs.la ++../pathplan/libpathplan.la + libtclplan_la_OBJECTS = find_ints.lo intersect.lo makecw.lo \ + tclpathplan.lo wrapper.lo + CFLAGS = @CFLAGS@ +@@ -241,7 +234,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + SOURCES = $(libtclplan_la_SOURCES) + OBJECTS = $(libtclplan_la_OBJECTS) +@@ -443,7 +436,6 @@ + || exit 1; \ + fi; \ + done +- + info-am: + info: info-recursive + dvi-am: diff --git a/graphics/graphviz/patches/patch-av b/graphics/graphviz/patches/patch-av new file mode 100644 index 00000000000..e250c0757ed --- /dev/null +++ b/graphics/graphviz/patches/patch-av @@ -0,0 +1,13 @@ +$NetBSD: patch-av,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tclpathplan/demo/Makefile.am.orig Thu Nov 2 20:10:05 2000 ++++ tclpathplan/demo/Makefile.am +@@ -4,7 +4,7 @@ + + SUBDIRS = pathplan_data + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = pathplan + demo_DATA = pathplan.README + diff --git a/graphics/graphviz/patches/patch-aw b/graphics/graphviz/patches/patch-aw new file mode 100644 index 00000000000..7d3adf479c9 --- /dev/null +++ b/graphics/graphviz/patches/patch-aw @@ -0,0 +1,22 @@ +$NetBSD: patch-aw,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tclpathplan/demo/Makefile.in.orig Fri Mar 1 22:35:41 2002 ++++ tclpathplan/demo/Makefile.in +@@ -189,7 +189,7 @@ + + SUBDIRS = pathplan_data + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = pathplan + demo_DATA = pathplan.README + +@@ -206,7 +206,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: diff --git a/graphics/graphviz/patches/patch-ax b/graphics/graphviz/patches/patch-ax new file mode 100644 index 00000000000..0be788dc301 --- /dev/null +++ b/graphics/graphviz/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tclpathplan/demo/pathplan_data/Makefile.am.orig Thu Nov 2 20:10:05 2000 ++++ tclpathplan/demo/pathplan_data/Makefile.am +@@ -5,7 +5,7 @@ + EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat \ + obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat + +-pathplanexampledir = $(libdir)/@PACKAGE@/demo/pathplan_data ++pathplanexampledir = $(prefix)/share/examples/@PACKAGE@/pathplan_data + + pathplanexample_DATA = $(EXAMPLES) + EXTRA_DIST = $(EXAMPLES) diff --git a/graphics/graphviz/patches/patch-ay b/graphics/graphviz/patches/patch-ay new file mode 100644 index 00000000000..e74629fd96f --- /dev/null +++ b/graphics/graphviz/patches/patch-ay @@ -0,0 +1,27 @@ +$NetBSD: patch-ay,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tclpathplan/demo/pathplan_data/Makefile.in.orig Fri Mar 1 22:35:41 2002 ++++ tclpathplan/demo/pathplan_data/Makefile.in +@@ -187,11 +187,10 @@ + + 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 ++EXAMPLES = boxes.dat dpd.dat funny.dat maze.dat nested.dat northo.dat obs.dat other.dat paths.dat rotor.dat u.dat unknown.dat + + +-pathplanexampledir = $(libdir)/@PACKAGE@/demo/pathplan_data ++pathplanexampledir = $(prefix)/share/examples/@PACKAGE@/pathplan_data + + pathplanexample_DATA = $(EXAMPLES) + EXTRA_DIST = $(EXAMPLES) +@@ -205,7 +204,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: diff --git a/graphics/graphviz/patches/patch-az b/graphics/graphviz/patches/patch-az new file mode 100644 index 00000000000..b764b4c9b74 --- /dev/null +++ b/graphics/graphviz/patches/patch-az @@ -0,0 +1,26 @@ +$NetBSD: patch-az,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tkspline/Makefile.am.orig Thu Feb 21 23:16:54 2002 ++++ tkspline/Makefile.am +@@ -4,9 +4,7 @@ + @TCL_CFLAGS@ \ + @TK_CFLAGS@ @TK_DEFS@ \ + @TCLINT_INCLUDES@ \ +- @TKINT_INCLUDES@ \ +- -I@TK_EXEC_PREFIX@/include \ +- -I@TCLSH_EXEC_PREFIX@/include ++ @TKINT_INCLUDES@ + + LIBS = + +@@ -20,8 +18,8 @@ + libtkspline_la_SOURCES = tkspline.c + + libtkspline_la_LIBADD = \ +- ../tkstubs/libtkstubs.la \ +- ../tclstubs/libtclstubs.la ++ ${TK_STUB_LIB_SPEC} \ ++ ${TCL_STUB_LIB_SPEC} + + all-local: pkgIndex.tcl + diff --git a/graphics/graphviz/patches/patch-ba b/graphics/graphviz/patches/patch-ba new file mode 100644 index 00000000000..85ecd88fe10 --- /dev/null +++ b/graphics/graphviz/patches/patch-ba @@ -0,0 +1,57 @@ +$NetBSD: patch-ba,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tkspline/Makefile.in.orig Fri Mar 1 22:35:43 2002 ++++ tkspline/Makefile.in +@@ -185,13 +185,7 @@ + Z_INCLUDES = @Z_INCLUDES@ + Z_LIBS = @Z_LIBS@ + +-INCLUDES = @X_CFLAGS@ \ +- @TCL_CFLAGS@ \ +- @TK_CFLAGS@ @TK_DEFS@ \ +- @TCLINT_INCLUDES@ \ +- @TKINT_INCLUDES@ \ +- -I@TK_EXEC_PREFIX@/include \ +- -I@TCLSH_EXEC_PREFIX@/include ++INCLUDES = @X_CFLAGS@ @TCL_CFLAGS@ @TK_CFLAGS@ @TK_DEFS@ @TCLINT_INCLUDES@ @TKINT_INCLUDES@ + + + LIBS = +@@ -205,9 +199,7 @@ + + libtkspline_la_SOURCES = tkspline.c + +-libtkspline_la_LIBADD = \ +- ../tkstubs/libtkstubs.la \ +- ../tclstubs/libtclstubs.la ++libtkspline_la_LIBADD = ${TK_STUB_LIB_SPEC} ${TCL_STUB_LIB_SPEC} + + + CLEANFILES = pkgIndex.tcl +@@ -227,8 +219,7 @@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ + libtkspline_la_LDFLAGS = +-libtkspline_la_DEPENDENCIES = ../tkstubs/libtkstubs.la \ +-../tclstubs/libtclstubs.la ++libtkspline_la_DEPENDENCIES = + libtkspline_la_OBJECTS = tkspline.lo + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -244,7 +235,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + SOURCES = $(libtkspline_la_SOURCES) + OBJECTS = $(libtkspline_la_OBJECTS) +@@ -485,7 +476,6 @@ + || exit 1; \ + fi; \ + done +- + info-am: + info: info-recursive + dvi-am: diff --git a/graphics/graphviz/patches/patch-bb b/graphics/graphviz/patches/patch-bb new file mode 100644 index 00000000000..a6475e07847 --- /dev/null +++ b/graphics/graphviz/patches/patch-bb @@ -0,0 +1,13 @@ +$NetBSD: patch-bb,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tkspline/demo/Makefile.am.orig Thu May 4 15:12:32 2000 ++++ tkspline/demo/Makefile.am +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = spline + demo_DATA = spline.README + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) diff --git a/graphics/graphviz/patches/patch-bc b/graphics/graphviz/patches/patch-bc new file mode 100644 index 00000000000..dc1797be513 --- /dev/null +++ b/graphics/graphviz/patches/patch-bc @@ -0,0 +1,22 @@ +$NetBSD: patch-bc,v 1.1.1.1 2002/03/05 13:37:29 seb Exp $ + +--- tkspline/demo/Makefile.in.orig Fri Mar 1 22:35:43 2002 ++++ tkspline/demo/Makefile.in +@@ -187,7 +187,7 @@ + + AUTOMAKE_OPTIONS = 1.4 + +-demodir = $(libdir)/@PACKAGE@/demo ++demodir = $(prefix)/share/examples/@PACKAGE@ + demo_SCRIPTS = spline + demo_DATA = spline.README + EXTRA_DIST = $(demo_SCRIPTS) $(demo_DATA) +@@ -203,7 +203,7 @@ + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +-TAR = gtar ++TAR = tar + GZIP_ENV = --best + all: all-redirect + .SUFFIXES: |