Upgrade to 1.4.

PR:		12423

5 files changed, 28 insertions, 30 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index e984ad9474da..57ada158ce01 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,35 +1,34 @@
 # New ports collection makefile for:    graphviz
-# Version required:     1.21
+# Version required:     1.4
 # Date created:         03 Feb 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1998/09/26 23:11:01 steve Exp $
+# $Id: Makefile,v 1.6 1998/10/05 02:57:52 steve Exp $
 #
 
-DISTNAME=       graphviz_1_21
-PKGNAME=	graphviz-1.21
-CATEGORIES=	graphics tk42
+DISTNAME=       graphviz_1_4.src.unix
+PKGNAME=	graphviz-1.4
+CATEGORIES=	graphics tk80
 MASTER_SITES=	# http://www.research.att.com/sw/tools/graphviz/
-EXTRACT_SUFX=	.src.unix.tgz
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-BROKEN=		fetch
+LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
-LIB_DEPENDS=	tk42.1:${PORTSDIR}/x11-toolkits/tk42
-
-RESTRICTED=	"Can't be fetched without license"
-NO_PACKAGE=	${RESTRICTED}
+RESTRICTED=	"Cannot be fetched without license"
+#NO_PACKAGE=	${RESTRICTED}
 NO_CDROM=	${RESTRICTED}
-WRKSRC=		${WRKDIR}/src/src
+WRKSRC=		${WRKDIR}/gv1.4
 MAKEFILE=	makefile
-MAN1=		dot.1 dotty.1 lefty.1 neato.1 tcldot.1
+MAN1=		dot.1 dotty.1 lefty.1 neato.1
+MANN=		tcldot.n
 
-SELFILEDIR=	${WRKSRC}/cmd/lefty/ws/x11/libfilereq
+DOCDIR=		${PREFIX}/share/doc/graphviz
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.ps ${PREFIX}/share/doc/graphviz
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${PREFIX}/share/doc/graphviz
-	@${GZIP_CMD} ${PREFIX}/share/doc/graphviz/*.ps
+	@${MKDIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCDIR}
+	@${GZIP_CMD} ${DOCDIR}/*.ps
 
 .include <bsd.port.mk>
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index d22e5028dc96..6eb306a15b34 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1 +1 @@
-MD5 (graphviz_1_21.src.unix.tgz) = a724dea82855a2261373a5dcdfb6d51a
+MD5 (graphviz_1_4.src.unix.tar.gz) = 5347f28b4cfe87f4eebefc4a10d7839c
diff --git a/graphics/graphviz/files/patch-ac b/graphics/graphviz/files/patch-ac
index a9446867c3c6..7fa623e54a42 100644
--- a/graphics/graphviz/files/patch-ac
+++ b/graphics/graphviz/files/patch-ac
@@ -1,5 +1,5 @@
---- cmd/lefty/os/unix/io.c.orig	Mon Mar 10 21:45:50 1997
-+++ cmd/lefty/os/unix/io.c	Tue Jan 27 20:45:50 1998
+--- src/cmd/lefty/os/unix/io.c.orig	Mon Mar 10 21:45:50 1997
++++ src/cmd/lefty/os/unix/io.c	Tue Jan 27 20:45:50 1998
 @@ -10,7 +10,11 @@
  #include <fcntl.h>
  #include <signal.h>
diff --git a/graphics/graphviz/files/patch-ae b/graphics/graphviz/files/patch-ae
index 04663e842d86..8dd43091121c 100644
--- a/graphics/graphviz/files/patch-ae
+++ b/graphics/graphviz/files/patch-ae
@@ -1,5 +1,5 @@
---- cmd/lefty/lefty.c.orig	Mon Mar 24 18:01:54 1997
-+++ cmd/lefty/lefty.c	Tue Jan 27 20:25:04 1998
+--- src/cmd/lefty/lefty.c.orig	Mon Mar 24 18:01:54 1997
++++ src/cmd/lefty/lefty.c	Tue Jan 27 20:25:04 1998
 @@ -29,7 +29,11 @@
  #ifdef GNU
  #define canread(fp) ((fp)->_IO_read_end > (fp)->_IO_read_ptr)
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 824bf68a1769..f8c7671f3ab7 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -3,8 +3,7 @@ bin/dotty
 bin/lefty
 bin/lneato
 bin/neato
-lib/Tcldot/Tcldot.so
-lib/Tcldot/Tcldot.so.1.2
+lib/Tcldot/Tcldot.so.1.4
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/Tcldot/pkgIndex.tcl
@@ -14,11 +13,11 @@ share/doc/graphviz/gd.html
 share/doc/graphviz/lefty.ps.gz
 share/doc/graphviz/neatoguide.ps.gz
 share/doc/graphviz/tcldot.html
-share/lefty/dotty.lefty
-share/lefty/dotty_draw.lefty
-share/lefty/dotty_edit.lefty
-share/lefty/dotty_layout.lefty
-share/lefty/dotty_ui.lefty
+lib/lefty/dotty.lefty
+lib/lefty/dotty_draw.lefty
+lib/lefty/dotty_edit.lefty
+lib/lefty/dotty_layout.lefty
+lib/lefty/dotty_ui.lefty
 @dirrm lib/Tcldot
-@dirrm share/lefty
+@dirrm lib/lefty
 @dirrm share/doc/graphviz