From a5470725d79cf0c30caf1ce32acd7277f1691f05 Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 28 Jul 2003 10:06:43 +0000 Subject: Update to version 1.10. Changes since version 1.9: July 9, 2003 - rerelease 1.10 with ast_common.h fix in -devel rpms July 3, 2003 - declare this version 1.10 - general - "mkdir obj;cd obj;../configure;make" now works (bug #293) - "make prefix=xxx" now works (bug #274) - "--with-wish=xxx" now works (bug #270) - remove generated file: ast_common.h from source distributions - make GIF support configurable - added .cvsignore thoughout source tree to reduce CVS noise - FAQ updates - documentation updates for gpr - improve portability of dotneato-config, but requires libtool now - improvements to error processing for library users -gd - sync with gd-2.0.15 - optimize line drawing code - dot, neato, twopi - fix bugs 240,270,274,293,298,303 - support "peripheries=0" without crashing - add support for "dia" output format (-Tdia) - espf fixes (use of showpage) - svg fixes (coordinates and viewBox) - ismap/imap, fixes (quoting of label strings) - fix to "point" shape - improve (m|c|re)alloc usage - improve handling of very-small fonts in bitmap outputs. - various fixes for multiple -T -o feature - add support for splines to records and ports (neato) - various improvements to libpack - dot_init_graph and neato_init_graph external for library users - cluster improvements (neato) - fix support for truecolor - normalize splines so that they now always go from tail to head - add some simple help text for any unrecognized option (e.g. -? -h --help) - tools - extend gpr language to allow access to command-line arguments - add sqrt() function to gpr - add new tool - gvpack - tcldot - use .dll extension if on windows - doted demo - use tcl's file requestor instead of homebrew - add zooming controlled by mousewheel - support additonal export formats --- graphics/graphviz/Makefile | 13 ++----------- graphics/graphviz/PLIST | 4 +++- graphics/graphviz/buildlink2.mk | 4 ++-- graphics/graphviz/distinfo | 34 +++++++++++++++++----------------- graphics/graphviz/patches/patch-ab | 20 ++++++++++---------- graphics/graphviz/patches/patch-ac | 20 ++++++++++---------- graphics/graphviz/patches/patch-ad | 10 +++++----- graphics/graphviz/patches/patch-ae | 32 ++++++++++++++++---------------- graphics/graphviz/patches/patch-ah | 12 ++++++------ graphics/graphviz/patches/patch-ai | 38 +++++++++++++++++++------------------- graphics/graphviz/patches/patch-al | 12 ++++++------ graphics/graphviz/patches/patch-am | 36 ++++++++++++++++++------------------ graphics/graphviz/patches/patch-ap | 12 ++++++------ graphics/graphviz/patches/patch-aq | 38 +++++++++++++++++++------------------- graphics/graphviz/patches/patch-at | 10 +++++----- graphics/graphviz/patches/patch-au | 32 ++++++++++++++++---------------- graphics/graphviz/patches/patch-az | 12 ++++++------ graphics/graphviz/patches/patch-ba | 31 ++++++++++++++++--------------- 18 files changed, 182 insertions(+), 188 deletions(-) (limited to 'graphics/graphviz') diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index a7bb4489f9a..8f6cca74cdb 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 21:41:09 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/07/28 10:06:43 seb Exp $ # -DISTNAME= graphviz-1.9 -PKGREVISION= 2 +DISTNAME= graphviz-1.10 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -41,13 +40,6 @@ CONFIGURE_ARGS+= --with-expatlibdir=${BUILDLINK_PREFIX.expat}/lib #UNLIMIT_RESOURCES= datasize stacksize memorysize CONFIGURE_ARGS+= --without-dynagraph -# clean up a bit to help package maintainer produce patch files -# *And* remove this annoying ast_common.h! -post-extract: - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${FIND} ${WRKSRC} -type f -name "*.orig" | ${XARGS} ${RM} -f - ${RM} -f ${WRKSRC}/ast_common.h - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/graphviz ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/graphviz @@ -68,7 +60,6 @@ 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" diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST index 05d4702c394..7be6e6392df 100644 --- a/graphics/graphviz/PLIST +++ b/graphics/graphviz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/03/03 11:34:58 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/07/28 10:06:44 seb Exp $ bin/acyclic bin/ccomps bin/colorize @@ -10,6 +10,7 @@ bin/dotty bin/gc bin/gpr @comment bin/graphsearch +bin/gvpack bin/gxl2dot bin/lefty bin/lneato @@ -154,6 +155,7 @@ man/man1/dot2gxl.1 man/man1/dotty.1 man/man1/gc.1 man/man1/gpr.1 +man/man1/gvpack.1 man/man1/gxl2dot.1 man/man1/lefty.1 man/man1/neato.1 diff --git a/graphics/graphviz/buildlink2.mk b/graphics/graphviz/buildlink2.mk index 43e4fa2d404..a5158575669 100644 --- a/graphics/graphviz/buildlink2.mk +++ b/graphics/graphviz/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:52:07 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/07/28 10:06:44 seb Exp $ # # This Makefile fragment is included by packages that use graphviz. # @@ -9,7 +9,7 @@ GRAPHVIZ_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= graphviz -BUILDLINK_DEPENDS.graphviz?= graphviz>=1.9nb2 +BUILDLINK_DEPENDS.graphviz?= graphviz>=1.10 BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz EVAL_PREFIX+= BUILDLINK_PREFIX.graphviz=graphviz diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 86ccc0f8510..6905fe97247 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,33 +1,33 @@ -$NetBSD: distinfo,v 1.7 2003/03/03 11:34:58 seb Exp $ +$NetBSD: distinfo,v 1.8 2003/07/28 10:06:45 seb Exp $ -SHA1 (graphviz-1.9.tar.gz) = 87e383a1738124b2736ceba0824ebe235446577b -Size (graphviz-1.9.tar.gz) = 3173162 bytes +SHA1 (graphviz-1.10.tar.gz) = ddb54a6050800837c8dd6613676ff17bf31d5e4b +Size (graphviz-1.10.tar.gz) = 3357416 bytes SHA1 (patch-aa) = d60925921fa7daa753ee04e267fce6f978644ea2 -SHA1 (patch-ab) = 4f726e7f8c5c61fd73b53c83e348b503ed2c5299 -SHA1 (patch-ac) = afaeee6960f7d168acb61a7d7c6b8f95866fa3e5 -SHA1 (patch-ad) = bfa4e07ae7968fdda88342b8f0e1e769ac74a2b9 -SHA1 (patch-ae) = 9df3ca38dc6f93f9370fd3374e8fe920943994b8 +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) = 4126fc78fe2b42a5f023d49d928c97df12544f96 -SHA1 (patch-ai) = 698e2212d761c4b1ace42c891f8cae11893f357c +SHA1 (patch-ah) = e7840f7d7f1e028319fc6cb0fe919325c4c919ad +SHA1 (patch-ai) = c4cc117728d48284f23ec8997f22684064818a4f SHA1 (patch-aj) = 0e06cdaf97f7c7e57738f6cabdf6907c766c035e SHA1 (patch-ak) = 331df33504eb8df5bf8ee3f2ea47e1fc57573fd7 -SHA1 (patch-al) = 461853f8b3aea6e4034428a90436b60a493cca08 -SHA1 (patch-am) = 1eb897e98bca8d9f5dea2f9ce0267aa309735a13 +SHA1 (patch-al) = f91beebe473ca0ad0d221416deaba1a0c1928bc4 +SHA1 (patch-am) = 061e742acc73f49d2dc264b6e9209876c0b75abe SHA1 (patch-an) = afb5ae74861113a206a3c7a1c0bc87cb6c23e517 SHA1 (patch-ao) = 55c26f319464268d081cbc2ec9eb8ab362435e62 -SHA1 (patch-ap) = b29f54ee21b6571b07fa692bd9eb653a7e10436d -SHA1 (patch-aq) = 56f9a6b64c78fd0eae0d8037177c2e91ea2bb713 +SHA1 (patch-ap) = 5571051e0681adf44a4c90ea839e0aecbe36fa19 +SHA1 (patch-aq) = c5ea47940623b9b8f72c2de907ba31d2258dc40f SHA1 (patch-ar) = 2bac7b9059fabcc5bd98059784722bb912be98dd SHA1 (patch-as) = 78609997e50b6946e1d30ca043d3971a938b4904 -SHA1 (patch-at) = 08bd6e08b61a650b5b65ae217973df7d42f701c5 -SHA1 (patch-au) = ce84674f8ee4c15cbdbbf325c56b6e8f9e66531c +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) = b1e6eaf223405b97bce47f2a986fc726ee8a0a9d -SHA1 (patch-ba) = ca4d295331d1d6072a405f0e4950af810fdc9a63 +SHA1 (patch-az) = e92545fdeda264912d714454b56768525c2b967e +SHA1 (patch-ba) = 05aa65f5f7a490b615d8598bf39650531999a7d7 SHA1 (patch-bb) = 7b42bb0f86aac0c58945efcab3adc55f02cf6212 SHA1 (patch-bc) = 1718cfdaa7dc66c799240240875995b652dd2251 diff --git a/graphics/graphviz/patches/patch-ab b/graphics/graphviz/patches/patch-ab index d804468e82b..e1653737bf8 100644 --- a/graphics/graphviz/patches/patch-ab +++ b/graphics/graphviz/patches/patch-ab @@ -1,20 +1,20 @@ -$NetBSD: patch-ab,v 1.5 2002/08/28 13:49:36 seb Exp $ +$NetBSD: patch-ab,v 1.6 2003/07/28 10:06:46 seb Exp $ ---- configure.in.orig Fri Aug 2 22:55:20 2002 +--- configure.in.orig 2003-07-09 19:28:52.000000000 +0000 +++ configure.in -@@ -48,7 +48,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI +@@ -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" -+DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/Type1" -+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/Type1" +-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 -@@ -177,7 +180,7 @@ if test -f $TCLCONFIG; then +@@ -214,7 +217,7 @@ if test "x$TCLCONFIG" != "x"; then . $file # TCL STUBS support is required if test "${TCL_SUPPORTS_STUBS}" = "1"; then @@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.5 2002/08/28 13:49:36 seb Exp $ TCL_PKGINDEX="gdtclft/pkgIndex.tcl tcldot/pkgIndex.tcl tcldgr/pkgIndex.tcl tcldgl/pkgIndex.tcl tclpathplan/pkgIndex.tcl" else AC_MSG_WARN([Tcl does not have STUBs support, perhaps it is too old? The packages: "gdtclft tcldot tcldgr tcldgl tclpathplan" will not be built]) -@@ -266,7 +269,7 @@ if test -f $TKCONFIG; then +@@ -328,7 +331,7 @@ if test "x$TKCONFIG" != "x"; then file=${TKCONFIG} . $file if test "${TCL_SUPPORTS_STUBS}" = "1"; then @@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.5 2002/08/28 13:49:36 seb Exp $ TK_PKGINDEX="tkspline/pkgIndex.tcl" else AC_MSG_WARN([Tcl does not have STUBs support, so neither does Tk. The packages: "tkspline" will not be built]) -@@ -610,36 +613,12 @@ AC_MSG_RESULT(no)]) +@@ -763,36 +766,12 @@ AC_MSG_RESULT(no)]) # ----------------------------------- # tclInt.h diff --git a/graphics/graphviz/patches/patch-ac b/graphics/graphviz/patches/patch-ac index 42808b60c99..53ed2058e0a 100644 --- a/graphics/graphviz/patches/patch-ac +++ b/graphics/graphviz/patches/patch-ac @@ -1,20 +1,20 @@ -$NetBSD: patch-ac,v 1.7 2003/03/03 11:34:59 seb Exp $ +$NetBSD: patch-ac,v 1.8 2003/07/28 10:06:47 seb Exp $ ---- configure.orig 2003-03-02 20:11:10.000000000 +0000 +--- configure.orig 2003-07-25 20:53:45.000000000 +0000 +++ configure -@@ -8376,7 +8376,10 @@ DEFAULT_FONTPATH="C:/WINDOWS/FONTS;C:/WI +@@ -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" -+DEFAULT_FONTPATH="${X11PREFIX}/lib/X11/fonts/TrueType:${X11PREFIX}/lib/X11/fonts/truetype:${X11PREFIX}/lib/X11/fonts/Type1" -+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/Type1" +-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 -@@ -8691,7 +8694,7 @@ echo "${ECHO_T}using $TCLCONFIG" >&6 +@@ -8690,7 +8693,7 @@ echo "${ECHO_T}using $TCLCONFIG" >&6 . $file # TCL STUBS support is required if test "${TCL_SUPPORTS_STUBS}" = "1"; then @@ -23,7 +23,7 @@ $NetBSD: patch-ac,v 1.7 2003/03/03 11:34:59 seb Exp $ 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 -@@ -8924,7 +8927,7 @@ echo "${ECHO_T}using $TKCONFIG" >&6 +@@ -8923,7 +8926,7 @@ echo "${ECHO_T}using $TKCONFIG" >&6 file=${TKCONFIG} . $file if test "${TCL_SUPPORTS_STUBS}" = "1"; then @@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.7 2003/03/03 11:34:59 seb Exp $ 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 -@@ -14120,36 +14123,12 @@ rm -f conftest.$ac_objext conftest.$ac_e +@@ -14031,36 +14034,12 @@ rm -f conftest.$ac_objext conftest.$ac_e # ----------------------------------- # tclInt.h diff --git a/graphics/graphviz/patches/patch-ad b/graphics/graphviz/patches/patch-ad index 55b15a461e2..8ad4387f0c0 100644 --- a/graphics/graphviz/patches/patch-ad +++ b/graphics/graphviz/patches/patch-ad @@ -1,12 +1,12 @@ -$NetBSD: patch-ad,v 1.3 2003/03/03 11:34:59 seb Exp $ +$NetBSD: patch-ad,v 1.4 2003/07/28 10:06:47 seb Exp $ ---- gdtclft/Makefile.am.orig 2003-01-15 17:22:13.000000000 +0000 +--- gdtclft/Makefile.am.orig 2003-06-04 17:12:52.000000000 +0000 +++ gdtclft/Makefile.am @@ -20,7 +20,7 @@ libgdtclft_la_SOURCES = gdtclft.c libgdtclft_la_LIBADD = \ - $(top_srcdir)/tclhandle/libtclhandle.la \ - $(top_srcdir)/gd/libgdconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la + $(top_builddir)/tclhandle/libtclhandle.la \ + $(top_builddir)/gd/libgdconvenience.la \ +- $(top_builddir)/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 index 8bc4dc5a913..81a84552b03 100644 --- a/graphics/graphviz/patches/patch-ae +++ b/graphics/graphviz/patches/patch-ae @@ -1,27 +1,27 @@ -$NetBSD: patch-ae,v 1.5 2003/03/03 11:34:59 seb Exp $ +$NetBSD: patch-ae,v 1.6 2003/07/28 10:06:48 seb Exp $ ---- gdtclft/Makefile.in.orig 2003-03-02 20:12:23.000000000 +0000 +--- gdtclft/Makefile.in.orig 2003-07-27 16:46:10.000000000 +0000 +++ gdtclft/Makefile.in -@@ -225,7 +225,7 @@ libgdtclft_la_SOURCES = gdtclft.c +@@ -222,7 +222,7 @@ libgdtclft_la_SOURCES = gdtclft.c libgdtclft_la_LIBADD = \ - $(top_srcdir)/tclhandle/libtclhandle.la \ - $(top_srcdir)/gd/libgdconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la + $(top_builddir)/tclhandle/libtclhandle.la \ + $(top_builddir)/gd/libgdconvenience.la \ +- $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -239,8 +239,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) +@@ -236,8 +236,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) libgdtclft_la_LDFLAGS = - libgdtclft_la_DEPENDENCIES = $(top_srcdir)/tclhandle/libtclhandle.la \ -- $(top_srcdir)/gd/libgdconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la -+ $(top_srcdir)/gd/libgdconvenience.la + libgdtclft_la_DEPENDENCIES = $(top_builddir)/tclhandle/libtclhandle.la \ +- $(top_builddir)/gd/libgdconvenience.la \ +- $(top_builddir)/tclstubs/libtclstubs.la ++ $(top_builddir)/gd/libgdconvenience.la am_libgdtclft_la_OBJECTS = gdtclft.lo libgdtclft_la_OBJECTS = $(am_libgdtclft_la_OBJECTS) -@@ -248,8 +247,7 @@ DEFS = @DEFS@ +@@ -245,8 +244,7 @@ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -31,7 +31,7 @@ $NetBSD: patch-ae,v 1.5 2003/03/03 11:34:59 seb Exp $ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -286,7 +284,7 @@ distclean-libtool: +@@ -283,7 +281,7 @@ distclean-libtool: -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ @@ -40,7 +40,7 @@ $NetBSD: patch-ae,v 1.5 2003/03/03 11:34:59 seb Exp $ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -319,29 +317,14 @@ mostlyclean-compile: +@@ -316,29 +314,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -70,7 +70,7 @@ $NetBSD: patch-ae,v 1.5 2003/03/03 11:34:59 seb Exp $ uninstall-info-am: manndir = $(mandir)/mann -@@ -548,8 +531,8 @@ clean-am: clean-generic clean-libtool cl +@@ -545,8 +528,8 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-recursive @@ -81,7 +81,7 @@ $NetBSD: patch-ae,v 1.5 2003/03/03 11:34:59 seb Exp $ dvi: dvi-recursive -@@ -587,21 +570,21 @@ uninstall-man: uninstall-mann +@@ -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 \ diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah index cd22ec5659f..ddab5d7632b 100644 --- a/graphics/graphviz/patches/patch-ah +++ b/graphics/graphviz/patches/patch-ah @@ -1,12 +1,12 @@ -$NetBSD: patch-ah,v 1.3 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-ah,v 1.4 2003/07/28 10:06:48 seb Exp $ ---- tcldgl/Makefile.am.orig 2003-01-15 17:22:16.000000000 +0000 +--- tcldgl/Makefile.am.orig 2003-06-04 17:12:53.000000000 +0000 +++ tcldgl/Makefile.am @@ -34,7 +34,7 @@ libtcldgl_la_LIBADD = \ - $(top_srcdir)/agutil/libagutil.la \ - $(top_srcdir)/shape/libshape.la \ - $(top_srcdir)/ns/libns.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la + $(top_builddir)/agutil/libagutil.la \ + $(top_builddir)/shape/libshape.la \ + $(top_builddir)/ns/libns.la \ +- $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} all-local: pkgIndex.tcl diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai index 03d084a095c..7c0ca567888 100644 --- a/graphics/graphviz/patches/patch-ai +++ b/graphics/graphviz/patches/patch-ai @@ -1,27 +1,27 @@ -$NetBSD: patch-ai,v 1.5 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-ai,v 1.6 2003/07/28 10:06:49 seb Exp $ ---- tcldgl/Makefile.in.orig 2003-03-02 20:12:23.000000000 +0000 +--- tcldgl/Makefile.in.orig 2003-07-27 16:46:23.000000000 +0000 +++ tcldgl/Makefile.in -@@ -239,7 +239,7 @@ libtcldgl_la_LIBADD = \ - $(top_srcdir)/agutil/libagutil.la \ - $(top_srcdir)/shape/libshape.la \ - $(top_srcdir)/ns/libns.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la +@@ -236,7 +236,7 @@ libtcldgl_la_LIBADD = \ + $(top_builddir)/agutil/libagutil.la \ + $(top_builddir)/shape/libshape.la \ + $(top_builddir)/ns/libns.la \ +- $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -260,8 +260,7 @@ libtcldgl_la_DEPENDENCIES = $(top_srcdir - $(top_srcdir)/incr/libincr.la \ - $(top_srcdir)/pathplan/libpathplanconvenience.la \ - $(top_srcdir)/agutil/libagutil.la \ -- $(top_srcdir)/shape/libshape.la $(top_srcdir)/ns/libns.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la -+ $(top_srcdir)/shape/libshape.la $(top_srcdir)/ns/libns.la +@@ -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 \ +- $(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) -@@ -269,9 +268,7 @@ DEFS = @DEFS@ +@@ -266,9 +265,7 @@ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -32,7 +32,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/03 11:35:00 seb Exp $ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -310,7 +307,7 @@ distclean-libtool: +@@ -307,7 +304,7 @@ distclean-libtool: -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ @@ -41,7 +41,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/03 11:35:00 seb Exp $ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -343,32 +340,14 @@ mostlyclean-compile: +@@ -340,32 +337,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -74,7 +74,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/03 11:35:00 seb Exp $ uninstall-info-am: manndir = $(mandir)/mann -@@ -575,8 +554,8 @@ clean-am: clean-generic clean-libtool cl +@@ -572,8 +551,8 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-recursive @@ -85,7 +85,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/03 11:35:00 seb Exp $ dvi: dvi-recursive -@@ -614,21 +593,21 @@ uninstall-man: uninstall-mann +@@ -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 \ diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al index ff6bf5c5fd2..207203d6b34 100644 --- a/graphics/graphviz/patches/patch-al +++ b/graphics/graphviz/patches/patch-al @@ -1,12 +1,12 @@ -$NetBSD: patch-al,v 1.3 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-al,v 1.4 2003/07/28 10:06:49 seb Exp $ ---- tcldgr/Makefile.am.orig 2003-01-15 17:22:16.000000000 +0000 +--- tcldgr/Makefile.am.orig 2003-06-04 17:12:53.000000000 +0000 +++ tcldgr/Makefile.am @@ -23,7 +23,7 @@ libtcldgr_la_LIBADD = \ - $(top_srcdir)/tclhandle/libtclhandle.la \ - $(top_srcdir)/agraph/libagraphconvenience.la \ - $(top_srcdir)/cdt/libcdtconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la + $(top_builddir)/tclhandle/libtclhandle.la \ + $(top_builddir)/agraph/libagraphconvenience.la \ + $(top_builddir)/cdt/libcdtconvenience.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 58a193522d7..74b82cb1312 100644 --- a/graphics/graphviz/patches/patch-am +++ b/graphics/graphviz/patches/patch-am @@ -1,27 +1,27 @@ -$NetBSD: patch-am,v 1.5 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-am,v 1.6 2003/07/28 10:06:49 seb Exp $ ---- tcldgr/Makefile.in.orig 2003-03-02 20:12:23.000000000 +0000 +--- tcldgr/Makefile.in.orig 2003-07-27 16:46:33.000000000 +0000 +++ tcldgr/Makefile.in -@@ -228,7 +228,7 @@ libtcldgr_la_LIBADD = \ - $(top_srcdir)/tclhandle/libtclhandle.la \ - $(top_srcdir)/agraph/libagraphconvenience.la \ - $(top_srcdir)/cdt/libcdtconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la +@@ -225,7 +225,7 @@ libtcldgr_la_LIBADD = \ + $(top_builddir)/tclhandle/libtclhandle.la \ + $(top_builddir)/agraph/libagraphconvenience.la \ + $(top_builddir)/cdt/libcdtconvenience.la \ +- $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -243,8 +243,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) +@@ -240,8 +240,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) libtcldgr_la_LDFLAGS = - libtcldgr_la_DEPENDENCIES = $(top_srcdir)/tclhandle/libtclhandle.la \ - $(top_srcdir)/agraph/libagraphconvenience.la \ -- $(top_srcdir)/cdt/libcdtconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la -+ $(top_srcdir)/cdt/libcdtconvenience.la + 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) -@@ -253,10 +252,7 @@ DEFS = @DEFS@ +@@ -250,10 +249,7 @@ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -33,7 +33,7 @@ $NetBSD: patch-am,v 1.5 2003/03/03 11:35:00 seb Exp $ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -295,7 +291,7 @@ distclean-libtool: +@@ -292,7 +288,7 @@ distclean-libtool: -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ @@ -42,7 +42,7 @@ $NetBSD: patch-am,v 1.5 2003/03/03 11:35:00 seb Exp $ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -328,33 +324,14 @@ mostlyclean-compile: +@@ -325,33 +321,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -76,7 +76,7 @@ $NetBSD: patch-am,v 1.5 2003/03/03 11:35:00 seb Exp $ uninstall-info-am: manndir = $(mandir)/mann -@@ -561,8 +538,8 @@ clean-am: clean-generic clean-libtool cl +@@ -558,8 +535,8 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-recursive @@ -87,7 +87,7 @@ $NetBSD: patch-am,v 1.5 2003/03/03 11:35:00 seb Exp $ dvi: dvi-recursive -@@ -600,21 +577,21 @@ uninstall-man: uninstall-mann +@@ -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 \ diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap index 5c9e7f82936..6e9b9465bee 100644 --- a/graphics/graphviz/patches/patch-ap +++ b/graphics/graphviz/patches/patch-ap @@ -1,12 +1,12 @@ -$NetBSD: patch-ap,v 1.3 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-ap,v 1.4 2003/07/28 10:06:50 seb Exp $ ---- tcldot/Makefile.am.orig 2003-01-15 17:35:46.000000000 +0000 +--- tcldot/Makefile.am.orig 2003-06-04 17:12:53.000000000 +0000 +++ tcldot/Makefile.am @@ -36,7 +36,7 @@ libtcldot_la_LIBADD = \ - $(top_srcdir)/cdt/libcdtconvenience.la \ - $(top_srcdir)/gd/libgdconvenience.la \ - $(top_srcdir)/gdtclft/gdtclft.lo \ -- $(top_srcdir)/tclstubs/libtclstubs.la + $(top_builddir)/cdt/libcdtconvenience.la \ + $(top_builddir)/gd/libgdconvenience.la \ + $(top_builddir)/gdtclft/gdtclft.lo \ +- $(top_builddir)/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 index c0755bcf452..0dd500c6c51 100644 --- a/graphics/graphviz/patches/patch-aq +++ b/graphics/graphviz/patches/patch-aq @@ -1,27 +1,27 @@ -$NetBSD: patch-aq,v 1.5 2003/03/03 11:35:00 seb Exp $ +$NetBSD: patch-aq,v 1.6 2003/07/28 10:06:50 seb Exp $ ---- tcldot/Makefile.in.orig 2003-03-02 20:12:23.000000000 +0000 +--- tcldot/Makefile.in.orig 2003-07-27 16:46:46.000000000 +0000 +++ tcldot/Makefile.in -@@ -241,7 +241,7 @@ libtcldot_la_LIBADD = \ - $(top_srcdir)/cdt/libcdtconvenience.la \ - $(top_srcdir)/gd/libgdconvenience.la \ - $(top_srcdir)/gdtclft/gdtclft.lo \ -- $(top_srcdir)/tclstubs/libtclstubs.la +@@ -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} CLEANFILES = pkgIndex.tcl -@@ -266,8 +266,7 @@ libtcldot_la_DEPENDENCIES = $(top_srcdir - $(top_srcdir)/graph/libgraphconvenience.la \ - $(top_srcdir)/cdt/libcdtconvenience.la \ - $(top_srcdir)/gd/libgdconvenience.la \ -- $(top_srcdir)/gdtclft/gdtclft.lo \ -- $(top_srcdir)/tclstubs/libtclstubs.la -+ $(top_srcdir)/gdtclft/gdtclft.lo +@@ -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) -@@ -275,8 +274,7 @@ DEFS = @DEFS@ +@@ -272,8 +271,7 @@ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -31,7 +31,7 @@ $NetBSD: patch-aq,v 1.5 2003/03/03 11:35:00 seb Exp $ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -315,7 +313,7 @@ distclean-libtool: +@@ -312,7 +310,7 @@ distclean-libtool: -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ @@ -40,7 +40,7 @@ $NetBSD: patch-aq,v 1.5 2003/03/03 11:35:00 seb Exp $ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -348,30 +346,14 @@ mostlyclean-compile: +@@ -345,30 +343,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -71,7 +71,7 @@ $NetBSD: patch-aq,v 1.5 2003/03/03 11:35:00 seb Exp $ uninstall-info-am: manndir = $(mandir)/mann -@@ -578,8 +560,8 @@ clean-am: clean-generic clean-libtool cl +@@ -575,8 +557,8 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-recursive @@ -82,7 +82,7 @@ $NetBSD: patch-aq,v 1.5 2003/03/03 11:35:00 seb Exp $ dvi: dvi-recursive -@@ -617,21 +599,21 @@ uninstall-man: uninstall-mann +@@ -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 \ diff --git a/graphics/graphviz/patches/patch-at b/graphics/graphviz/patches/patch-at index 53b406cab3b..eb1a7495296 100644 --- a/graphics/graphviz/patches/patch-at +++ b/graphics/graphviz/patches/patch-at @@ -1,12 +1,12 @@ -$NetBSD: patch-at,v 1.3 2003/03/03 11:35:01 seb Exp $ +$NetBSD: patch-at,v 1.4 2003/07/28 10:06:50 seb Exp $ ---- tclpathplan/Makefile.am.orig 2003-01-15 17:22:16.000000000 +0000 +--- 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_srcdir)/tclhandle/libtclhandle.la \ - $(top_srcdir)/pathplan/libpathplanconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la + $(top_builddir)/tclhandle/libtclhandle.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-au b/graphics/graphviz/patches/patch-au index 1b5542a8746..f1f6bad0ae5 100644 --- a/graphics/graphviz/patches/patch-au +++ b/graphics/graphviz/patches/patch-au @@ -1,27 +1,27 @@ -$NetBSD: patch-au,v 1.5 2003/03/03 11:35:01 seb Exp $ +$NetBSD: patch-au,v 1.6 2003/07/28 10:06:51 seb Exp $ ---- tclpathplan/Makefile.in.orig 2003-03-02 20:12:24.000000000 +0000 +--- tclpathplan/Makefile.in.orig 2003-07-27 16:46:59.000000000 +0000 +++ tclpathplan/Makefile.in -@@ -227,7 +227,7 @@ libtclplan_la_SOURCES = find_ints.c inte +@@ -224,7 +224,7 @@ libtclplan_la_SOURCES = find_ints.c inte libtclplan_la_LIBADD = \ - $(top_srcdir)/tclhandle/libtclhandle.la \ - $(top_srcdir)/pathplan/libpathplanconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la + $(top_builddir)/tclhandle/libtclhandle.la \ + $(top_builddir)/pathplan/libpathplanconvenience.la \ +- $(top_builddir)/tclstubs/libtclstubs.la + ${TCL_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -241,8 +241,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) +@@ -238,8 +238,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES) libtclplan_la_LDFLAGS = - libtclplan_la_DEPENDENCIES = $(top_srcdir)/tclhandle/libtclhandle.la \ -- $(top_srcdir)/pathplan/libpathplanconvenience.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la -+ $(top_srcdir)/pathplan/libpathplanconvenience.la + 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) -@@ -251,10 +250,7 @@ DEFS = @DEFS@ +@@ -248,10 +247,7 @@ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -33,7 +33,7 @@ $NetBSD: patch-au,v 1.5 2003/03/03 11:35:01 seb Exp $ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -290,7 +286,7 @@ distclean-libtool: +@@ -287,7 +283,7 @@ distclean-libtool: -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ @@ -42,7 +42,7 @@ $NetBSD: patch-au,v 1.5 2003/03/03 11:35:01 seb Exp $ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -323,33 +319,14 @@ mostlyclean-compile: +@@ -320,33 +316,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -76,7 +76,7 @@ $NetBSD: patch-au,v 1.5 2003/03/03 11:35:01 seb Exp $ uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd -@@ -517,8 +494,8 @@ clean-am: clean-generic clean-libtool cl +@@ -514,8 +491,8 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-recursive @@ -87,7 +87,7 @@ $NetBSD: patch-au,v 1.5 2003/03/03 11:35:01 seb Exp $ dvi: dvi-recursive -@@ -553,16 +530,15 @@ uninstall-info: uninstall-info-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 \ diff --git a/graphics/graphviz/patches/patch-az b/graphics/graphviz/patches/patch-az index 2da2cf9afca..c1950527227 100644 --- a/graphics/graphviz/patches/patch-az +++ b/graphics/graphviz/patches/patch-az @@ -1,14 +1,14 @@ -$NetBSD: patch-az,v 1.3 2003/03/03 11:35:01 seb Exp $ +$NetBSD: patch-az,v 1.4 2003/07/28 10:06:51 seb Exp $ ---- tkspline/Makefile.am.orig 2003-01-15 17:22:17.000000000 +0000 +--- tkspline/Makefile.am.orig 2003-06-04 17:12:53.000000000 +0000 +++ tkspline/Makefile.am -@@ -17,8 +17,8 @@ man_MANS = tkspline.n +@@ -18,8 +18,8 @@ man_MANS = tkspline.n libtkspline_la_SOURCES = tkspline.c libtkspline_la_LIBADD = \ -- $(top_srcdir)/tkstubs/libtkstubs.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la -+ ${TK_STUB_LIB_SPEC} \ +- $(top_builddir)/tkstubs/libtkstubs.la \ +- $(top_builddir)/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 index 69d5c3258a1..9ddc328f7cd 100644 --- a/graphics/graphviz/patches/patch-ba +++ b/graphics/graphviz/patches/patch-ba @@ -1,29 +1,28 @@ -$NetBSD: patch-ba,v 1.5 2003/03/03 11:35:01 seb Exp $ +$NetBSD: patch-ba,v 1.6 2003/07/28 10:06:52 seb Exp $ ---- tkspline/Makefile.in.orig 2003-03-02 20:12:24.000000000 +0000 +--- tkspline/Makefile.in.orig 2003-07-27 16:47:19.000000000 +0000 +++ tkspline/Makefile.in -@@ -222,8 +222,8 @@ man_MANS = tkspline.n +@@ -220,8 +220,7 @@ man_MANS = tkspline.n libtkspline_la_SOURCES = tkspline.c libtkspline_la_LIBADD = \ -- $(top_srcdir)/tkstubs/libtkstubs.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la -+ ${TK_STUB_LIB_SPEC} \ -+ ${TCL_STUB_LIB_SPEC} +- $(top_builddir)/tkstubs/libtkstubs.la \ +- $(top_builddir)/tclstubs/libtclstubs.la ++ ${TK_STUB_LIB_SPEC} CLEANFILES = pkgIndex.tcl -@@ -236,8 +236,7 @@ CONFIG_CLEAN_FILES = +@@ -234,8 +233,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(pkglib_LTLIBRARIES) libtkspline_la_LDFLAGS = --libtkspline_la_DEPENDENCIES = $(top_srcdir)/tkstubs/libtkstubs.la \ -- $(top_srcdir)/tclstubs/libtclstubs.la +-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) -@@ -245,8 +244,7 @@ DEFS = @DEFS@ +@@ -243,8 +241,7 @@ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @@ -33,7 +32,7 @@ $NetBSD: patch-ba,v 1.5 2003/03/03 11:35:01 seb Exp $ 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: +@@ -281,7 +278,7 @@ distclean-libtool: -rm -f libtool $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ @@ -42,7 +41,7 @@ $NetBSD: patch-ba,v 1.5 2003/03/03 11:35:01 seb Exp $ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ -@@ -316,29 +314,14 @@ mostlyclean-compile: +@@ -314,29 +311,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -72,7 +71,7 @@ $NetBSD: patch-ba,v 1.5 2003/03/03 11:35:01 seb Exp $ uninstall-info-am: manndir = $(mandir)/mann -@@ -545,8 +528,8 @@ clean-am: clean-generic clean-libtool cl +@@ -543,8 +525,8 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-recursive @@ -83,7 +82,7 @@ $NetBSD: patch-ba,v 1.5 2003/03/03 11:35:01 seb Exp $ dvi: dvi-recursive -@@ -584,21 +567,21 @@ uninstall-man: uninstall-mann +@@ -582,22 +564,23 @@ uninstall-man: uninstall-mann .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am all-local check check-am \ clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \ @@ -118,5 +117,7 @@ $NetBSD: patch-ba,v 1.5 2003/03/03 11:35:01 seb Exp $ + uninstall-man uninstall-mann uninstall-pkglibLTLIBRARIES \ + uninstall-recursive ++ ${TCL_STUB_LIB_SPEC} all-local: pkgIndex.tcl + -- cgit v1.2.3