diff options
author | Thomas Gellekum <tg@FreeBSD.org> | 2001-11-09 12:38:54 +0000 |
---|---|---|
committer | Thomas Gellekum <tg@FreeBSD.org> | 2001-11-09 12:38:54 +0000 |
commit | 54bf77b3a6a3e4f3d9572a79e458d3656edd394e (patch) | |
tree | 2640985916fcd1711930c7dee5bae9d5067c65ac /graphics | |
parent | Set proper LATEST_LINK names to avoid conflicts. (diff) |
Upgrade to 1.7.7.
Notes
Notes:
svn path=/head/; revision=49873
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/graphviz/Makefile | 16 | ||||
-rw-r--r-- | graphics/graphviz/distinfo | 2 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-configure.in | 24 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-fdp::adjust.c | 19 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-gd::gdcache.h | 14 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-gd::gdhelpers.c | 14 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-incr::callback.c | 11 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-incr::edgeclip.c | 9 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-incr::routem.c | 13 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-pathplan::route.c | 12 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-pathplan::shortest.c | 12 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-tools::sfio::sfhdr.h | 12 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-tools::vmalloc::malloc.c | 13 | ||||
-rw-r--r-- | graphics/graphviz/pkg-plist | 5 |
14 files changed, 163 insertions, 13 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index f900eadc0b98..594aefd53dd6 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -6,10 +6,9 @@ # PORTNAME= graphviz -PORTVERSION= 1.7.6 +PORTVERSION= 1.7.7 CATEGORIES= graphics tk83 MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/dist/ -DISTNAME= gviz${PORTVERSION:S/.//g} EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org @@ -19,8 +18,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ freetype.7:${PORTSDIR}/print/freetype2 \ tk83.1:${PORTSDIR}/x11-toolkits/tk83 -WRKSRC= ${WRKDIR}/gv${PORTVERSION} - USE_XPM= yes USE_GMAKE= yes USE_AUTOMAKE= yes @@ -39,14 +36,13 @@ MAN3= agraph.3 cdt.3 expr.3 graph.3 pathplan.3 MANN= gdtclft.n tcldgl.n tcldgr.n tcldot.n tkspline.n PORTDOCS= dotguide.pdf dottyguide.pdf gd.html leftyguide.pdf \ - neatoguide.pdf tcldot.html Dot.ref + neatoguide.pdf tcldot.html Dot.ref FAQ.html -post-patch: - @cd ${WRKSRC} && aclocal && autoheader && libtoolize --force +post-extract: + @${RM} ${WRKSRC}/cdt/ast_common.h -pre-build: - @cd ${WRKSRC}/cdt && ./iffe - set cc ${CC} ${CFLAGS} : run \ - features/common > ast_common.h +#post-patch: +# @cd ${WRKSRC} && ${ACLOCAL} && ${AUTOHEADER} && libtoolize --force post-install: .if !defined(NOPORTDOCS) diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 1f6b02c85cbe..4dd149337725 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1 +1 @@ -MD5 (gviz176.tgz) = 10fc46667bc7402a19e503568d922953 +MD5 (graphviz-1.7.7.tgz) = e04a6031b34d07ebceacc6ccb0745eb5 diff --git a/graphics/graphviz/files/patch-configure.in b/graphics/graphviz/files/patch-configure.in new file mode 100644 index 000000000000..9a347623348a --- /dev/null +++ b/graphics/graphviz/files/patch-configure.in @@ -0,0 +1,24 @@ +--- configure.in.orig Fri Jul 13 19:50:41 2001 ++++ configure.in Wed Nov 7 16:50:08 2001 +@@ -97,7 +97,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} +@@ -173,7 +175,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-fdp::adjust.c b/graphics/graphviz/files/patch-fdp::adjust.c new file mode 100644 index 000000000000..3bc50879d6db --- /dev/null +++ b/graphics/graphviz/files/patch-fdp::adjust.c @@ -0,0 +1,19 @@ +--- fdp/adjust.c.orig Wed May 3 22:28:23 2000 ++++ fdp/adjust.c Wed Nov 7 17:46:43 2001 +@@ -1,5 +1,7 @@ + /* adjust.c + */ ++#include <math.h> ++#include <assert.h> + #include "adjust.h" + #include "grid.h" + #include "structs.h" +@@ -7,8 +9,6 @@ + #include "options.h" + #include "component.h" + #include "macros.h" +-#include <math.h> +-#include <assert.h> + + static void + doRep (fdp_data* p, fdp_data* q, double xdelta, double ydelta, double dist2) diff --git a/graphics/graphviz/files/patch-gd::gdcache.h b/graphics/graphviz/files/patch-gd::gdcache.h new file mode 100644 index 000000000000..605bdaf7b762 --- /dev/null +++ b/graphics/graphviz/files/patch-gd::gdcache.h @@ -0,0 +1,14 @@ +--- gd/gdcache.h.orig Mon Apr 24 03:04:01 2000 ++++ gd/gdcache.h Thu Nov 8 17:08:56 2001 +@@ -40,7 +40,11 @@ + /* header */ + /*********************************************************/ + ++#ifndef __STDC__ + #include <malloc.h> ++#else ++#include <stdlib.h> ++#endif + #ifndef NULL + #define NULL (void *)0 + #endif diff --git a/graphics/graphviz/files/patch-gd::gdhelpers.c b/graphics/graphviz/files/patch-gd::gdhelpers.c new file mode 100644 index 000000000000..9935cfe105f5 --- /dev/null +++ b/graphics/graphviz/files/patch-gd::gdhelpers.c @@ -0,0 +1,14 @@ +--- gd/gdhelpers.c.orig Thu Jun 7 23:13:52 2001 ++++ gd/gdhelpers.c Thu Nov 8 17:10:18 2001 +@@ -1,9 +1,9 @@ + #include "gd.h" + #include "gdhelpers.h" + #include <stdlib.h> +-#ifndef _OSD_POSIX /* _OSD_POSIX defines *alloc() in stdlib.h */ ++#ifndef __STDC__ + #include <malloc.h> +-#endif /*_OSD_POSIX*/ ++#endif + + /* TBB: gd_strtok_r is not portable; provide an implementation */ + diff --git a/graphics/graphviz/files/patch-incr::callback.c b/graphics/graphviz/files/patch-incr::callback.c new file mode 100644 index 000000000000..823d718dbe0b --- /dev/null +++ b/graphics/graphviz/files/patch-incr::callback.c @@ -0,0 +1,11 @@ +--- incr/callback.c.orig Tue May 30 21:19:18 2000 ++++ incr/callback.c Wed Nov 7 17:48:02 2001 +@@ -1,7 +1,7 @@ + /* Common callback management for incremental layout engines. */ + +-#include <engine.h> + #include <math.h> ++#include <engine.h> + + static ilbool do_node_cb(engview_t *view, Agraph_t *set, ILevf_t fn) + { diff --git a/graphics/graphviz/files/patch-incr::edgeclip.c b/graphics/graphviz/files/patch-incr::edgeclip.c new file mode 100644 index 000000000000..9b76690ad1f9 --- /dev/null +++ b/graphics/graphviz/files/patch-incr::edgeclip.c @@ -0,0 +1,9 @@ +--- incr/edgeclip.c.orig Fri Nov 10 04:23:25 2000 ++++ incr/edgeclip.c Wed Nov 7 17:48:55 2001 +@@ -1,5 +1,5 @@ +-#include <engine.h> + #include <math.h> ++#include <engine.h> + #define EPSILON (.005) + + static int seg_size(ilcurve_t *curve) diff --git a/graphics/graphviz/files/patch-incr::routem.c b/graphics/graphviz/files/patch-incr::routem.c new file mode 100644 index 000000000000..60137ba731dd --- /dev/null +++ b/graphics/graphviz/files/patch-incr::routem.c @@ -0,0 +1,13 @@ +--- incr/routem.c.orig Tue Apr 18 05:55:32 2000 ++++ incr/routem.c Wed Nov 7 17:49:35 2001 +@@ -1,8 +1,8 @@ ++#include <stdio.h> /* temporary for debugging */ ++#include <math.h> + #include <engine.h> + #include <pathplan.h> + #include <vispath.h> +-#include <stdio.h> /* temporary for debugging */ +-#include <math.h> + + typedef struct { + Ppoly_t **list; diff --git a/graphics/graphviz/files/patch-pathplan::route.c b/graphics/graphviz/files/patch-pathplan::route.c new file mode 100644 index 000000000000..be8cdd021fde --- /dev/null +++ b/graphics/graphviz/files/patch-pathplan::route.c @@ -0,0 +1,12 @@ +--- pathplan/route.c.orig Sun Oct 15 11:13:58 2000 ++++ pathplan/route.c Thu Nov 8 17:12:41 2001 +@@ -11,7 +11,9 @@ + + #include <stdlib.h> + #include <stdio.h> ++#ifndef __STDC__ + #include <malloc.h> ++#endif + #include <math.h> + #include "pathplan.h" + #include "solvers.h" diff --git a/graphics/graphviz/files/patch-pathplan::shortest.c b/graphics/graphviz/files/patch-pathplan::shortest.c new file mode 100644 index 000000000000..b88a516f54d1 --- /dev/null +++ b/graphics/graphviz/files/patch-pathplan::shortest.c @@ -0,0 +1,12 @@ +--- pathplan/shortest.c.orig Tue Apr 18 05:56:48 2000 ++++ pathplan/shortest.c Thu Nov 8 17:13:03 2001 +@@ -11,7 +11,9 @@ + + #include <stdlib.h> + #include <stdio.h> ++#ifndef __STDC__ + #include <malloc.h> ++#endif + #include <limits.h> + #include <math.h> + #include "pathplan.h" diff --git a/graphics/graphviz/files/patch-tools::sfio::sfhdr.h b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h new file mode 100644 index 000000000000..35046f7ddfce --- /dev/null +++ b/graphics/graphviz/files/patch-tools::sfio::sfhdr.h @@ -0,0 +1,12 @@ +--- tools/sfio/sfhdr.h.orig Thu Apr 26 21:17:42 2001 ++++ tools/sfio/sfhdr.h Wed Nov 7 17:58:52 2001 +@@ -230,7 +230,9 @@ + #endif + + #if _hdr_values ++#ifndef __STDC__ + #include <values.h> ++#endif + #if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE) + #define SF_MAXDOUBLE MAXDOUBLE + #endif diff --git a/graphics/graphviz/files/patch-tools::vmalloc::malloc.c b/graphics/graphviz/files/patch-tools::vmalloc::malloc.c new file mode 100644 index 000000000000..3e02c3c26eb9 --- /dev/null +++ b/graphics/graphviz/files/patch-tools::vmalloc::malloc.c @@ -0,0 +1,13 @@ +--- tools/vmalloc/malloc.c.orig Thu Apr 26 20:59:21 2001 ++++ tools/vmalloc/malloc.c Thu Nov 8 17:14:01 2001 +@@ -345,7 +345,9 @@ + #define malloc ______malloc + #define realloc ______realloc + +-#include <malloc.h> ++#ifndef __STDC__ ++#include <malloc.h> ++#endif + + #if _lib_mallopt + #if __STD_C diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist index ab772aec2091..833176b62d71 100644 --- a/graphics/graphviz/pkg-plist +++ b/graphics/graphviz/pkg-plist @@ -106,12 +106,13 @@ lib/graphviz/libtcldgr.so lib/graphviz/libtcldgr.so.0 lib/graphviz/libtcldot.so lib/graphviz/libtcldot.so.0 -lib/graphviz/libtclpathplan.so -lib/graphviz/libtclpathplan.so.0 +lib/graphviz/libtclplan.so +lib/graphviz/libtclplan.so.0 lib/graphviz/libtkspline.so lib/graphviz/libtkspline.so.0 lib/graphviz/pkgIndex.tcl %%PORTDOCS%%share/doc/graphviz/Dot.ref +%%PORTDOCS%%share/doc/graphviz/FAQ.html %%PORTDOCS%%share/doc/graphviz/dotguide.pdf %%PORTDOCS%%share/doc/graphviz/dottyguide.pdf %%PORTDOCS%%share/doc/graphviz/gd.html |