From 68daabc2b7907cdbeedf0f2ee7200bc72695c754 Mon Sep 17 00:00:00 2001 From: perky Date: Tue, 18 Feb 2003 11:32:41 +0000 Subject: Update to 1.9 Submitted by: Marco Molteni (partially) --- graphics/graphviz/Makefile | 8 ++--- graphics/graphviz/distinfo | 2 +- graphics/graphviz/files/patch-aclocal.m4 | 41 ++++++++++------------ graphics/graphviz/files/patch-configure.in | 24 ------------- graphics/graphviz/files/patch-tools::sfio::sfhdr.h | 17 +++++++-- graphics/graphviz/pkg-plist | 36 ++++++++++++++++--- 6 files changed, 69 insertions(+), 59 deletions(-) delete mode 100644 graphics/graphviz/files/patch-configure.in (limited to 'graphics/graphviz') diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 0c3d695..c93b6be 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -6,7 +6,7 @@ # PORTNAME= graphviz -PORTVERSION= 1.8.10 +PORTVERSION= 1.9 CATEGORIES= graphics tk83 MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -34,9 +34,9 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${PREFIX}/lib/graphviz MAKE_ENV= EXPR_COMPAT=yes -MAN1= acyclic.1 ccomps.1 colorize.1 dot.1 dotty.1 gc.1 gpr.1 \ - lefty.1 neato.1 nop.1 prune.1 sccmap.1 tred.1 \ - twopi.1 unflatten.1 +MAN1= acyclic.1 ccomps.1 colorize.1 dot.1 dot2gxl.1 dotty.1 gc.1 \ + gpr.1 gxl2dot.1 lefty.1 neato.1 nop.1 prune.1 sccmap.1 \ + tred.1 twopi.1 unflatten.1 MAN3= agraph.3 cdt.3 expr.3 graph.3 pack.3 pathplan.3 MANN= gdtclft.n tcldgl.n tcldgr.n tcldot.n tkspline.n diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index d90fbb1..bb7cd39c 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1 +1 @@ -MD5 (graphviz-1.8.10.tar.gz) = 7c9663c8e2cde4f7edc2b412cc148330 +MD5 (graphviz-1.9.tar.gz) = 5f8d1e1f15594f4869fc9c68f32e7dbb diff --git a/graphics/graphviz/files/patch-aclocal.m4 b/graphics/graphviz/files/patch-aclocal.m4 index d90b04c..64ee7d0 100644 --- a/graphics/graphviz/files/patch-aclocal.m4 +++ b/graphics/graphviz/files/patch-aclocal.m4 @@ -1,26 +1,23 @@ - -$FreeBSD$ - ---- aclocal.m4.orig Fri Apr 12 01:09:26 2002 -+++ aclocal.m4 Thu Apr 25 13:37:28 2002 -@@ -59,10 +59,10 @@ - AC_REQUIRE([AC_ARG_PROGRAM]) - dnl FIXME This is truly gross. - missing_dir=`cd $ac_aux_dir && pwd` --AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) --AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) --AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) --AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -+AM_MISSING_PROG(ACLOCAL, ${ACLOCAL}, $missing_dir) -+AM_MISSING_PROG(AUTOCONF, ${AUTOCONF}, $missing_dir) -+AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE}, $missing_dir) -+AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER}, $missing_dir) - AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) - AC_REQUIRE([AC_PROG_MAKE_SET])]) - -@@ -129,10 +129,13 @@ - +--- aclocal.m4.orig Tue Feb 18 18:22:38 2003 ++++ aclocal.m4 Tue Feb 18 18:24:43 2003 +@@ -144,10 +144,10 @@ + # Some tools Automake needs. + AC_REQUIRE([AM_SANITY_CHECK])dnl + AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake) +-AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(ACLOCAL, ${ACLOCAL}) ++AM_MISSING_PROG(AUTOCONF, ${AUTOCONF}) ++AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE}) ++AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER}) + AM_MISSING_PROG(MAKEINFO, makeinfo) + AM_MISSING_PROG(AMTAR, tar) + AM_PROG_INSTALL_SH +@@ -563,10 +563,13 @@ # serial 46 AC_PROG_LIBTOOL + AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +[ diff --git a/graphics/graphviz/files/patch-configure.in b/graphics/graphviz/files/patch-configure.in deleted file mode 100644 index b51d4b2..0000000 --- a/graphics/graphviz/files/patch-configure.in +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.in.orig Sat Jul 6 12:56:52 2002 -+++ configure.in Thu Jul 25 07:49:22 2002 -@@ -166,7 +166,9 @@ - - # 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 -z $TCLCONFIG; then -+ TCLCONFIG=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh -+fi - if test -f $TCLCONFIG; then - AC_MSG_RESULT([using $TCLCONFIG]) - file=${TCLCONFIG} -@@ -242,7 +244,9 @@ - - # 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 -z $TKCONFIG; then -+ TKCONFIG=${WISH_EXEC_PREFIX}/lib/tkConfig.sh -+fi - if test -f $TKCONFIG; then - AC_MSG_RESULT([using $TKCONFIG]) - file=${TKCONFIG} diff --git a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h index dee4a6c..efdc60a 100644 --- a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h +++ b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h @@ -1,6 +1,17 @@ ---- tools/sfio/sfhdr.h.orig Thu Apr 18 10:28:45 2002 -+++ tools/sfio/sfhdr.h Thu Apr 18 10:29:17 2002 -@@ -230,7 +230,9 @@ +--- tools/sfio/sfhdr.h.orig Fri Apr 27 04:17:42 2001 ++++ tools/sfio/sfhdr.h Tue Feb 18 19:26:37 2003 +@@ -122,6 +122,10 @@ + #include + #include + ++#ifndef va_copy ++#define va_copy(to,fr) ((to)=(fr)) ++#endif ++ + #if vt_threaded + + /* initialization */ +@@ -230,7 +234,9 @@ #endif #if _hdr_values diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist index 02dabfc..b561044 100644 --- a/graphics/graphviz/pkg-plist +++ b/graphics/graphviz/pkg-plist @@ -2,11 +2,12 @@ bin/acyclic bin/ccomps bin/colorize bin/dot +bin/dot2gxl +bin/dotneato-config bin/dotty -bin/dynagraph bin/gc bin/gpr -bin/graphsearch +bin/gxl2dot bin/lefty bin/lneato bin/neato @@ -16,11 +17,18 @@ bin/sccmap bin/tred bin/twopi bin/unflatten +include/graphviz/adjust.h include/graphviz/aghdr.h include/graphviz/agraph.h include/graphviz/ast_common.h include/graphviz/cdt.h +include/graphviz/circle.h +include/graphviz/const.h +include/graphviz/dot.h +include/graphviz/dotneato.h +include/graphviz/dotprocs.h include/graphviz/dthdr.h +include/graphviz/edges.h include/graphviz/exgram.h include/graphviz/exlib.h include/graphviz/expr.h @@ -33,36 +41,54 @@ include/graphviz/gdfontmb.h include/graphviz/gdfonts.h include/graphviz/gdfontt.h include/graphviz/gdhelpers.h +include/graphviz/geometry.h +include/graphviz/globals.h include/graphviz/grammar.h include/graphviz/graph.h +include/graphviz/heap.h +include/graphviz/hedges.h +include/graphviz/info.h include/graphviz/jisx0208.h include/graphviz/libgraph.h +include/graphviz/macros.h include/graphviz/malloc.h +include/graphviz/mem.h +include/graphviz/neato.h +include/graphviz/neatoprocs.h include/graphviz/pack.h include/graphviz/parser.h include/graphviz/pathgeom.h include/graphviz/pathplan.h include/graphviz/pathutil.h include/graphviz/pointset.h +include/graphviz/poly.h +include/graphviz/render.h +include/graphviz/renderprocs.h +include/graphviz/simple.h +include/graphviz/site.h include/graphviz/solvers.h include/graphviz/tri.h include/graphviz/triefa.h +include/graphviz/types.h +include/graphviz/utils.h include/graphviz/vis.h include/graphviz/vispath.h include/graphviz/vmstub.h +include/graphviz/voronoi.h include/graphviz/wbmp.h +include/graphviz/xbuf.h lib/graphviz/libagraph.a lib/graphviz/libagraph.so lib/graphviz/libagraph.so.0 lib/graphviz/libcdt.a lib/graphviz/libcdt.so lib/graphviz/libcdt.so.0 +lib/graphviz/libdotneato.a +lib/graphviz/libdotneato.so +lib/graphviz/libdotneato.so.0 lib/graphviz/libexpr.a lib/graphviz/libexpr.so lib/graphviz/libexpr.so.0 -lib/graphviz/libgd.a -lib/graphviz/libgd.so -lib/graphviz/libgd.so.0 lib/graphviz/libgdtclft.a lib/graphviz/libgdtclft.so lib/graphviz/libgdtclft.so.0 -- cgit v1.1