From cbf1f6cc8b197823b76871e0613c28474e720775 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 20 Jan 2007 13:49:03 +0000
Subject: Disable pangocairo and the resulting xlib plugin for now. Reenable
 dynamic loading. It was originally disabled as it causes segmentation faults
 on NetBSD for what seems like memory corruption. Fix an obvious memory leak.
 Depend on ghostscript-fonts to make this much more useful. Bump revision.

---
 graphics/graphviz/Makefile         |  9 ++++++---
 graphics/graphviz/PLIST            |  4 ++--
 graphics/graphviz/patches/patch-ae | 13 +++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 graphics/graphviz/patches/patch-ae

(limited to 'graphics/graphviz')

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 2fd618c6c72..8c83fd78974 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2007/01/08 16:35:15 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2007/01/20 13:49:03 joerg Exp $
 
 DISTNAME=	graphviz-2.12
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -10,12 +11,14 @@ COMMENT=	Graph Drawing Programs from AT&T Research and Lucent Bell Labs
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
+
+CONFIGURE_ARGS+=	--without-pangocairo
+
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
-# ltdl enabled makes 'dot' crash
-CONFIGURE_ARGS+=	--disable-ltdl
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ENV+=		TCLCONFIG=${TCLCONFIG_SH:Q}
 CONFIGURE_ENV+=		TKCONFIG=${TKCONFIG_SH:Q}
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index 0a7e2d5cdfa..1b04883c3e2 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/08 11:29:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/01/20 13:49:03 joerg Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -70,12 +70,12 @@ include/graphviz/usershape.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/vmstub.h
+lib/graphviz/config
 lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_gd.la
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_pango.la
-lib/graphviz/libgvplugin_xlib.la
 lib/graphviz/lua/gv.so
 lib/graphviz/lua/gv_lua.man
 lib/graphviz/lua/libgv_lua.la
diff --git a/graphics/graphviz/patches/patch-ae b/graphics/graphviz/patches/patch-ae
new file mode 100644
index 00000000000..cc9d1a725c9
--- /dev/null
+++ b/graphics/graphviz/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.12 2007/01/20 13:49:03 joerg Exp $
+
+--- plugin/gd/gvtextlayout_gd.c.orig	2007-01-17 19:18:08.000000000 +0100
++++ plugin/gd/gvtextlayout_gd.c
+@@ -49,7 +49,7 @@ char *gd_alternate_fontlist(char *font)
+     len = strlen(font) + 1;
+     if (len > fontbufsz) {
+ 	fontbufsz = 2 * len;
+-	if (fontbuf)
++	if (fontbuf == NULL)
+ 	    fontbuf = malloc(fontbufsz);
+ 	else
+ 	    fontbuf = realloc(fontbuf, fontbufsz);
-- 
cgit v1.2.3