Update to version 1.7c

PR: 25431
Submitted by: Ports Fury

6 files changed, 60 insertions, 19 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index ab6889a73749..38a981946bfb 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	1.7b
+PORTVERSION=	1.7c
 CATEGORIES=	graphics tk83
 MASTER_SITES=	http://www.research.att.com/sw/tools/graphviz/
-DISTNAME=	gviz17b
+DISTNAME=	gviz${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -33,11 +33,26 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I
 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
+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
+
+PORTDOCS=	dotguide.pdf dottyguide.pdf gd.html leftyguide.pdf \
+		neatoguide.pdf tcldot.html
 
 post-patch:
 	@cd ${WRKSRC} && aclocal && autoheader && libtoolize --force
 
+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
+.for file in ${PORTDOCS} 
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/graphviz
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 140fcebc334c..644231931054 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1 +1 @@
-MD5 (gviz17b.tgz) = 25585969eb95b6196e80f8a07638164d
+MD5 (gviz17c.tgz) = 6c701b2d17985452fcdc3e6b9a8fb028
diff --git a/graphics/graphviz/files/patch-doc:Makefile.am b/graphics/graphviz/files/patch-doc:Makefile.am
index acad5c200ccc..08a82c01be30 100644
--- a/graphics/graphviz/files/patch-doc:Makefile.am
+++ b/graphics/graphviz/files/patch-doc:Makefile.am
@@ -1,10 +1,12 @@
---- doc/Makefile.am.orig	Thu May  4 02:31:24 2000
-+++ doc/Makefile.am	Tue Oct 17 19:10:01 2000
-@@ -4,6 +4,6 @@
+--- doc/Makefile.am.orig	Sun Oct 15 12:46:20 2000
++++ doc/Makefile.am	Tue Feb 27 07:03:09 2001
+@@ -4,8 +4,6 @@
  
- DOCS = dotguide.ps dotty.ps gd.html lefty.ps neatoguide.ps tcldot.html
+ # SUBDIRS = dot neato lefty dotty
+ 
+-DOCS = dotguide.ps dotty.ps gd.html lefty.ps neatoguide.ps tcldot.html
++DOCS = dotguide.pdf dottyguide.pdf gd.html leftyguide.pdf neatoguide.pdf tcldot.html
  
 -docdir = $(prefix)/doc
-+docdir = $(datadir)/doc/@PACKAGE@
- doc_DATA = $(DOCS)
+-doc_DATA = $(DOCS)
  EXTRA_DIST = $(DOCS)
diff --git a/graphics/graphviz/files/patch-dotneato:dot.c b/graphics/graphviz/files/patch-dotneato:dot.c
new file mode 100644
index 000000000000..7551fa1423de
--- /dev/null
+++ b/graphics/graphviz/files/patch-dotneato:dot.c
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..6d36edd006b1
--- /dev/null
+++ b/graphics/graphviz/files/patch-dotneato:neato.c
@@ -0,0 +1,12 @@
+--- 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/pkg-plist b/graphics/graphviz/pkg-plist
index 457e2a333ce8..517ae9b650fc 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -102,13 +102,13 @@ lib/graphviz/libtclpathplan.so.0
 lib/graphviz/libtkspline.so
 lib/graphviz/libtkspline.so.0
 lib/graphviz/pkgIndex.tcl
-share/doc/graphviz/dotguide.ps
-share/doc/graphviz/dotty.ps
-share/doc/graphviz/gd.html
-share/doc/graphviz/lefty.ps
-share/doc/graphviz/neatoguide.ps
-share/doc/graphviz/tcldot.html
-@dirrm share/doc/graphviz
+%%PORTDOCS%%share/doc/graphviz/dotguide.pdf
+%%PORTDOCS%%share/doc/graphviz/dottyguide.pdf
+%%PORTDOCS%%share/doc/graphviz/gd.html
+%%PORTDOCS%%share/doc/graphviz/leftyguide.pdf
+%%PORTDOCS%%share/doc/graphviz/neatoguide.pdf
+%%PORTDOCS%%share/doc/graphviz/tcldot.html
+%%PORTDOCS%%@dirrm share/doc/graphviz
 @dirrm lib/graphviz/lefty
 @dirrm lib/graphviz/graphs/undirected
 @dirrm lib/graphviz/graphs/directed