diff options
-rw-r--r-- | graphics/graphviz/Makefile | 21 | ||||
-rw-r--r-- | graphics/graphviz/distinfo | 2 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-ac | 42 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-ae | 14 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-agraph:agraph.h | 11 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-configure.in | 44 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-doc:Makefile.am | 9 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-dotneato:dot.c | 12 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-dotneato:neato.c | 12 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-lefty:Makefile.am | 10 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am | 11 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Dir.c | 11 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am | 11 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:SFinternal.h | 10 | ||||
-rw-r--r-- | graphics/graphviz/files/patch-tkspline:Makefile.am | 10 | ||||
-rw-r--r-- | graphics/graphviz/pkg-plist | 9 |
16 files changed, 19 insertions, 220 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 2694e396fb23..196f044bacdc 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -6,35 +6,36 @@ # PORTNAME= graphviz -PORTVERSION= 1.7c +PORTVERSION= 1.7.6 CATEGORIES= graphics tk83 MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/dist/ -DISTNAME= gviz${PORTVERSION:S/.//} +DISTNAME= gviz${PORTVERSION:S/.//g} EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ + freetype.6:${PORTSDIR}/print/freetype2 \ tk83.1:${PORTSDIR}/x11-toolkits/tk83 WRKSRC= ${WRKDIR}/gv${PORTVERSION} -USE_FREETYPE= yes USE_XPM= yes USE_GMAKE= yes USE_AUTOMAKE= yes AUTOMAKE_ARGS= --add-missing USE_LIBTOOL= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -DHAVE_TERMIOS" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3" \ LDFLAGS="-L${LOCALBASE}/lib" \ TCLCONFIG=${LOCALBASE}/lib/tcl8.3/tclConfig.sh \ TKCONFIG=${LOCALBASE}/lib/tk8.3/tkConfig.sh INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${PREFIX}/lib/graphviz -MAN1= dot.1 dotty.1 lefty.1 neato.1 -MAN3= agraph.3 cdt.3 graph.3 pathplan.3 +MAN1= acyclic.1 ccomps.1 colorize.1 dot.1 dotty.1 gc.1 gpr.1 \ + lefty.1 neato.1 nop.1 sccmap.1 tred.1 unflatten.1 +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 \ @@ -43,19 +44,15 @@ PORTDOCS= dotguide.pdf dottyguide.pdf gd.html leftyguide.pdf \ post-patch: @cd ${WRKSRC} && aclocal && autoheader && libtoolize --force -# the tarball contains object files! -post-configure: - @cd ${WRKSRC} && ${GMAKE} clean - pre-build: @cd ${WRKSRC}/cdt && ./iffe - set cc ${CC} ${CFLAGS} : run \ features/common > ast_common.h post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/graphviz + @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/graphviz + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} .endfor .endif diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 5fd614d650db..1f6b02c85cbe 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1 +1 @@ -MD5 (gviz17c.tgz) = 473cd71cd1f173374ba1f6d116973d33 +MD5 (gviz176.tgz) = 10fc46667bc7402a19e503568d922953 diff --git a/graphics/graphviz/files/patch-ac b/graphics/graphviz/files/patch-ac deleted file mode 100644 index c60a65d1e500..000000000000 --- a/graphics/graphviz/files/patch-ac +++ /dev/null @@ -1,42 +0,0 @@ ---- lefty/os/unix/io.c.orig Tue Apr 18 05:56:10 2000 -+++ lefty/os/unix/io.c Tue Oct 17 18:40:25 2000 -@@ -10,7 +10,11 @@ - #include <fcntl.h> - #include <signal.h> - #include <sys/wait.h> -+#ifndef HAVE_TERMIOS - #include <termio.h> -+#else -+#include <termios.h> -+#endif - #include <sys/time.h> - #include <sys/socket.h> - #include <netinet/in.h> -@@ -271,7 +275,11 @@ - static int findpty (int *fd) { - char *majorp, *minorp; - char pty[32], tty[32]; -+#ifndef HAVE_TERMIOS - struct termio tio; -+#else -+ struct termios tio; -+#endif - - static char ptymajor[] = "pqrs"; - static char ptyminor[] = "0123456789abcdefghijklmnopqrstuvwxyz"; -@@ -282,9 +290,15 @@ - if ((fd[0] = open (pty, O_RDWR)) >= 0) { - sprintf (tty, "/dev/tty%c%c", *majorp, *minorp); - if ((fd[1] = open (tty, O_RDWR)) >= 0) { -+#ifndef HAVE_TERMIOS - ioctl (fd[1], TCGETA, &tio); - tio.c_lflag &= ~ECHO; - ioctl (fd[1], TCSETA, &tio); -+#else -+ tcgetattr(fd[1], &tio); -+ tio.c_lflag &= ~ECHO; -+ tcsetattr(fd[1], TCSANOW, &tio); -+#endif - return 0; - } - close (fd[0]); diff --git a/graphics/graphviz/files/patch-ae b/graphics/graphviz/files/patch-ae deleted file mode 100644 index 65bb2b4f0a85..000000000000 --- a/graphics/graphviz/files/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ ---- lefty/lefty.c.orig Mon Oct 9 09:19:43 2000 -+++ lefty/lefty.c Fri Nov 3 04:20:09 2000 -@@ -44,7 +44,11 @@ - #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr) - #else - #ifdef NO_CNT_IN_FILESTRUCT -+#ifdef __FreeBSD__ -+#define canread(fp) ((fp)->_r > 0) -+#else - #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr) -+#endif - #else - #define canread(fp) ((fp)->_cnt > 0) - #endif diff --git a/graphics/graphviz/files/patch-agraph:agraph.h b/graphics/graphviz/files/patch-agraph:agraph.h deleted file mode 100644 index bd3cd84d494b..000000000000 --- a/graphics/graphviz/files/patch-agraph:agraph.h +++ /dev/null @@ -1,11 +0,0 @@ ---- agraph/agraph.h.orig Tue Apr 18 05:54:03 2000 -+++ agraph/agraph.h Tue Oct 17 17:51:06 2000 -@@ -45,6 +45,8 @@ - #define NILsym NIL(Agsym_t*) - #endif - -+typedef unsigned long ulong; -+ - /* forward struct type declarations */ - typedef struct Agtag_s Agtag_t; - typedef struct Agobj_s Agobj_t; /* generic object header */ diff --git a/graphics/graphviz/files/patch-configure.in b/graphics/graphviz/files/patch-configure.in deleted file mode 100644 index 49fbd9a880a4..000000000000 --- a/graphics/graphviz/files/patch-configure.in +++ /dev/null @@ -1,44 +0,0 @@ ---- configure.in.orig Tue Oct 17 17:19:22 2000 -+++ configure.in Tue Oct 17 17:23:32 2000 -@@ -44,13 +44,17 @@ - - AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl binaries from DIR], TCLSH_EXEC_PREFIX=$withval,) - --if test -f $TCLSH_EXEC_PREFIX/lib/tclConfig.sh; then -- AC_MSG_RESULT([using $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]) - else - AC_MSG_ERROR([Unable to find tclConfig.sh.]) - fi - --file=${TCLSH_EXEC_PREFIX}/lib/tclConfig.sh -+file=${TCLCONFIG} - . $file - if test "${TCL_SUPPORTS_STUBS}" = "1"; then - TCL_CFLAGS="${TCL_CFLAGS} -DUSE_TCL_STUBS" -@@ -104,13 +108,17 @@ - AC_SUBST(TCL_BUILD_STUB_LIB_PATH) - AC_SUBST(TCL_STUB_LIB_PATH) - --if test -f $TCLSH_EXEC_PREFIX/lib/tkConfig.sh; then -- AC_MSG_RESULT([using $TCLSH_EXEC_PREFIX/lib/tkConfig.sh]) -+if test -z ${TKCONFIG}; then -+ TKCONFIG=${TCLSH_EXEC_PREFIX}/lib/tkConfig.sh -+fi -+ -+if test -f $TKCONFIG; then -+ AC_MSG_RESULT([using $TKCONFIG]) - else - AC_MSG_ERROR([Unable find tkConfig.sh.]) - fi - --file=${TCLSH_EXEC_PREFIX}/lib/tkConfig.sh -+file=${TKCONFIG} - . $file - - # NB. No TK_SUPPORTS_STUBS set by tkConfig.sh diff --git a/graphics/graphviz/files/patch-doc:Makefile.am b/graphics/graphviz/files/patch-doc:Makefile.am deleted file mode 100644 index c3997420daf5..000000000000 --- a/graphics/graphviz/files/patch-doc:Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ ---- doc/Makefile.am~ Tue Mar 6 13:57:54 2001 -+++ doc/Makefile.am Tue Mar 6 14:00:11 2001 -@@ -6,6 +6,4 @@ - - DOCS = dotguide.pdf dottyguide.pdf gd.html leftyguide.pdf neatoguide.pdf tcldot.html Dot.ref - --docdir = $(prefix)/doc --doc_DATA = $(DOCS) - EXTRA_DIST = $(DOCS) diff --git a/graphics/graphviz/files/patch-dotneato:dot.c b/graphics/graphviz/files/patch-dotneato:dot.c deleted file mode 100644 index 7551fa1423de..000000000000 --- a/graphics/graphviz/files/patch-dotneato:dot.c +++ /dev/null @@ -1,12 +0,0 @@ ---- dotneato/dot.c.orig Wed Feb 7 01:44:19 2001 -+++ dotneato/dot.c Tue Feb 27 06:49:51 2001 -@@ -17,7 +17,9 @@ - #ifdef HAVE_CONFIG_H - #include "gvconfig.h" - #endif -+#ifndef DATE - #include "stamp.h" -+#endif - #include <time.h> - #ifndef MSWIN32 - #include <unistd.h> diff --git a/graphics/graphviz/files/patch-dotneato:neato.c b/graphics/graphviz/files/patch-dotneato:neato.c deleted file mode 100644 index 6d36edd006b1..000000000000 --- a/graphics/graphviz/files/patch-dotneato:neato.c +++ /dev/null @@ -1,12 +0,0 @@ ---- dotneato/neato.c.orig Wed Feb 7 01:45:05 2001 -+++ dotneato/neato.c Tue Feb 27 06:49:23 2001 -@@ -17,7 +17,9 @@ - #ifdef HAVE_CONFIG_H - #include "gvconfig.h" - #endif -+#ifndef DATE - #include "stamp.h" -+#endif - #include <time.h> - #ifndef MSWIN32 - #include <unistd.h> diff --git a/graphics/graphviz/files/patch-lefty:Makefile.am b/graphics/graphviz/files/patch-lefty:Makefile.am deleted file mode 100644 index 55f99149e66e..000000000000 --- a/graphics/graphviz/files/patch-lefty:Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- lefty/Makefile.am.orig Sun Oct 15 16:53:05 2000 -+++ lefty/Makefile.am Fri Nov 3 03:24:02 2000 -@@ -21,6 +21,7 @@ - nmakefile makefile.old - - INCLUDES = \ -+ @X_CFLAGS@ \ - -I$(srcdir)/ws/x11 \ - -I$(srcdir)/os/unix \ - -I$(srcdir)/dot2l diff --git a/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am b/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am deleted file mode 100644 index 3d216114faf1..000000000000 --- a/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- lefty/ws/x11/Makefile.am.orig Sat May 27 03:07:57 2000 -+++ lefty/ws/x11/Makefile.am Fri Nov 3 03:25:30 2000 -@@ -9,7 +9,7 @@ - noinst_HEADERS = gcommon.h - noinst_LTLIBRARIES = libws.la - --INCLUDES = -I../.. -+INCLUDES = @X_CFLAGS@ -I../.. - - libws_la_SOURCES = garray.c gbutton.c gcanvas.c gcommon.c glabel.c \ - gmenu.c gpcanvas.c gquery.c gscroll.c gtext.c gview.c gcommon.h diff --git a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Dir.c b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Dir.c deleted file mode 100644 index 818a0ee7c348..000000000000 --- a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Dir.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lefty/ws/x11/libfilereq/Dir.c.orig Tue Apr 18 05:56:34 2000 -+++ lefty/ws/x11/libfilereq/Dir.c Tue Oct 17 18:29:35 2000 -@@ -32,7 +32,7 @@ - - #include "SFinternal.h" - --#if defined(SVR4) || defined(SYSV) || defined(USG) || defined(__osf__) || defined (__svr4__) -+#if defined(SVR4) || defined(SYSV) || defined(USG) || defined(__osf__) || defined (__svr4__) || defined (__FreeBSD__) - #include <dirent.h> - #else /* defined(SVR4) || defined(SYSV) || defined(USG) */ - #include <sys/dir.h> diff --git a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am deleted file mode 100644 index bb3c72cb23a9..000000000000 --- a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- lefty/ws/x11/libfilereq/Makefile.am.orig Sun Oct 15 14:31:01 2000 -+++ lefty/ws/x11/libfilereq/Makefile.am Fri Nov 3 03:27:59 2000 -@@ -7,6 +7,8 @@ - noinst_HEADERS = SFinternal.h xstat.h - noinst_LTLIBRARIES = libfilereq.la - -+INCLUDES = @X_CFLAGS@ -+ - libfilereq_la_SOURCES = Dir.c Draw.c Path.c SelFile.c SFinternal.h xstat.h - - EXTRA_DIST = README.selfile diff --git a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:SFinternal.h b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:SFinternal.h deleted file mode 100644 index cf039634d6ba..000000000000 --- a/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:SFinternal.h +++ /dev/null @@ -1,10 +0,0 @@ ---- lefty/ws/x11/libfilereq/SFinternal.h.orig Tue Apr 18 05:56:37 2000 -+++ lefty/ws/x11/libfilereq/SFinternal.h Tue Oct 17 18:27:51 2000 -@@ -29,6 +29,7 @@ - #include <X11/Xos.h> - #include <X11/Xaw/Text.h> - #include <X11/Xaw/AsciiText.h> -+#include <sys/types.h> - - #define SEL_FILE_CANCEL -1 - #define SEL_FILE_OK 0 diff --git a/graphics/graphviz/files/patch-tkspline:Makefile.am b/graphics/graphviz/files/patch-tkspline:Makefile.am deleted file mode 100644 index a558f9db034f..000000000000 --- a/graphics/graphviz/files/patch-tkspline:Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- tkspline/Makefile.am.orig Sat May 27 03:07:57 2000 -+++ tkspline/Makefile.am Fri Nov 3 03:22:50 2000 -@@ -10,6 +10,7 @@ - man_MANS = tkspline.n - - INCLUDES = \ -+ @X_CFLAGS@ \ - @TCL_CFLAGS@ \ - @TK_CFLAGS@ \ - -I@TK_EXEC_PREFIX@/include \ diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist index d29d9085ceb5..ab772aec2091 100644 --- a/graphics/graphviz/pkg-plist +++ b/graphics/graphviz/pkg-plist @@ -1,8 +1,17 @@ +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/unflatten lib/graphviz/demo/dge lib/graphviz/demo/dge.README lib/graphviz/demo/dge.example1.dot |