Now that gd was updated, use it instead of the local version. Bump

revision. Fixes PR 35679.

4 files changed, 28 insertions, 8 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index d804b62d10b..148311ede61 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2007/02/16 23:49:11 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.56 2007/02/22 14:45:47 joerg Exp $
 
 DISTNAME=	graphviz-2.12
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -54,9 +54,7 @@ pre-build:
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/swig/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
-# The configure script requires gd>=2.0.34, which was never released.
-# Uncomment the following when graphics/gd is updated to 2.0.34
-#.include "../../graphics/gd/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 1b04883c3e2..d8b240cdaad 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/01/20 13:49:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/02/22 14:45:47 joerg Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -168,7 +168,6 @@ share/graphviz/doc/NEWS
 share/graphviz/doc/cpl1.0.txt
 share/graphviz/doc/html/FAQ.html
 share/graphviz/doc/html/build.html
-share/graphviz/doc/html/gd.html
 share/graphviz/doc/html/index.html
 share/graphviz/doc/html/info/Mcircle.gif
 share/graphviz/doc/html/info/Mdiamond.gif
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 38be71e767e..854865446ed 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2007/01/21 16:41:27 minskim Exp $
+$NetBSD: distinfo,v 1.24 2007/02/22 14:45:47 joerg Exp $
 
 SHA1 (graphviz-2.12.tar.gz) = aa48a926395a57c6c7e1e755b9432a29461538e3
 RMD160 (graphviz-2.12.tar.gz) = 68d55176cd5ce0e6a25c90b443529747e738d5c6
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 7fd332e66c44b8a384b6dba4eeccdafe3eb0d930
 SHA1 (patch-ac) = e0877aef8259172549e6b69f1478d1ccdef2bb6d
 SHA1 (patch-ad) = d14bfef61caec543812b9d5ea8d2c331bf350af8
 SHA1 (patch-ae) = df8ec6959bf1b8212f8bfcaf48586aa52537a457
+SHA1 (patch-af) = 3da8cd02537275fb75b92d0fc60db0daf22445f8
diff --git a/graphics/graphviz/patches/patch-af b/graphics/graphviz/patches/patch-af
new file mode 100644
index 00000000000..b95591778c9
--- /dev/null
+++ b/graphics/graphviz/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.9 2007/02/22 14:45:47 joerg Exp $
+
+--- contrib/diffimg/Makefile.in.orig	2007-02-22 13:37:08.000000000 +0000
++++ contrib/diffimg/Makefile.in
+@@ -54,8 +54,6 @@ CONFIG_CLEAN_FILES =
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_diffimg_OBJECTS = diffimg.$(OBJEXT)
+ diffimg_OBJECTS = $(am_diffimg_OBJECTS)
+-@WITH_LIBGD_TRUE@diffimg_DEPENDENCIES =  \
+-@WITH_LIBGD_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+@@ -368,7 +366,7 @@ target_alias = @target_alias@
+ AM_CPPFLAGS = @GD_INCLUDES@
+ diffimg_SOURCES = diffimg.c
+ @WITH_LIBGD_FALSE@diffimg_LDADD = @GD_LIBS@
+-@WITH_LIBGD_TRUE@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
++@WITH_LIBGD_TRUE@diffimg_LDADD = -lgd \
+ @WITH_LIBGD_TRUE@	@FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
+ 
+ GRAPH = "digraph G { hello -> world }"