9 files changed, 82 insertions, 22 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index b4d2a902b306..470d9852a542 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,31 +6,38 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	1.6
+PORTVERSION=	1.7a
 CATEGORIES=	graphics tk83
-MASTER_SITES=	http://www.graphviz.org/pub/graphviz/
+MASTER_SITES=	http://www.research.att.com/sw/tools/graphviz/
+DISTNAME=	gviz17a
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
-		tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
-		ttf.4:${PORTSDIR}/print/freetype \
-		Xpm.4:${PORTSDIR}/graphics/xpm
+		tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
-# do not use USE_AUTOMAKE -- it only works if the configure script
-# finds automake by itself
-USE_AUTOCONF=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+USE_FREETYPE=	yes
+USE_XPM=	yes
+USE_GMAKE=	yes
+USE_AUTOMAKE=	yes
+AUTOMAKE=	libtoolize --force && autoheader && automake --add-missing
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -DHAVE_TERMIOS" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3 -DHAVE_TERMIOS" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
 		TCLCONFIG=${LOCALBASE}/lib/tcl8.3/tclConfig.sh \
 		TKCONFIG=${LOCALBASE}/lib/tk8.3/tkConfig.sh
-USE_GMAKE=	yes
+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
 MANN=	gdtclft.n tcldgl.n tcldgr.n tcldot.n tkspline.n
 
+post-patch:
+	@cd ${WRKSRC} && aclocal
+
 .include <bsd.port.mk>
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 4260992877a2..dd5b85908758 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1 +1 @@
-MD5 (graphviz-1.6.tar.gz) = bad03a6a1bee4c2bb0928dd017d61f2b
+MD5 (gviz17a.tgz) = a077970c1a010d3c7bcd1ed82eaa22a0
diff --git a/graphics/graphviz/files/patch-ae b/graphics/graphviz/files/patch-ae
index a517e4cfdf27..65bb2b4f0a85 100644
--- a/graphics/graphviz/files/patch-ae
+++ b/graphics/graphviz/files/patch-ae
@@ -1,11 +1,14 @@
---- lefty/lefty.c.orig	Tue Apr 18 05:55:50 2000
-+++ lefty/lefty.c	Tue Oct 17 18:47:51 2000
-@@ -32,6 +32,8 @@
+--- 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 _CNT_IN_FILESTRUCT
- #define canread(fp) ((fp)->_cnt > 0)
-+#elif __FreeBSD__
+ #ifdef NO_CNT_IN_FILESTRUCT
++#ifdef __FreeBSD__
 +#define canread(fp) ((fp)->_r > 0)
- #else
++#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-doc:Makefile.am b/graphics/graphviz/files/patch-doc:Makefile.am
index 626acfef99f3..acad5c200ccc 100644
--- a/graphics/graphviz/files/patch-doc:Makefile.am
+++ b/graphics/graphviz/files/patch-doc:Makefile.am
@@ -5,6 +5,6 @@
  DOCS = dotguide.ps dotty.ps gd.html lefty.ps neatoguide.ps tcldot.html
  
 -docdir = $(prefix)/doc
-+docdir = $(datadir)/doc/graphviz
++docdir = $(datadir)/doc/@PACKAGE@
  doc_DATA = $(DOCS)
  EXTRA_DIST = $(DOCS)
diff --git a/graphics/graphviz/files/patch-lefty:Makefile.am b/graphics/graphviz/files/patch-lefty:Makefile.am
new file mode 100644
index 000000000000..55f99149e66e
--- /dev/null
+++ b/graphics/graphviz/files/patch-lefty:Makefile.am
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..3d216114faf1
--- /dev/null
+++ b/graphics/graphviz/files/patch-lefty:ws:x11:Makefile.am
@@ -0,0 +1,11 @@
+--- 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:Makefile.am b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am
new file mode 100644
index 000000000000..bb3c72cb23a9
--- /dev/null
+++ b/graphics/graphviz/files/patch-lefty:ws:x11:libfilereq:Makefile.am
@@ -0,0 +1,11 @@
+--- 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-tkspline:Makefile.am b/graphics/graphviz/files/patch-tkspline:Makefile.am
new file mode 100644
index 000000000000..a558f9db034f
--- /dev/null
+++ b/graphics/graphviz/files/patch-tkspline:Makefile.am
@@ -0,0 +1,10 @@
+--- 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 83163a498be6..6f0a6c9eed7e 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -1,7 +1,8 @@
-bin/dotneato
+bin/dot
 bin/dotty
 bin/lefty
 bin/lneato
+bin/neato
 lib/graphviz/demo/dge
 lib/graphviz/demo/dge.README
 lib/graphviz/demo/dge.example1.dot
@@ -64,11 +65,18 @@ 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.so
 lib/graphviz/libgdtclft.so.0
 lib/graphviz/libtcldgl.so