[pkgsrc/trunk]: pkgsrc/graphics/graphviz Disable pangocairo and the resulting...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86f87e06dfe7
branches:  trunk
changeset: 524184:86f87e06dfe7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jan 20 13:49:03 2007 +0000

description:
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.

diffstat:

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

diffs (69 lines):

diff -r 2a84eddc45f6 -r 86f87e06dfe7 graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile        Sat Jan 20 13:33:13 2007 +0000
+++ b/graphics/graphviz/Makefile        Sat Jan 20 13:49:03 2007 +0000
@@ -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 @@
 
 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 -r 2a84eddc45f6 -r 86f87e06dfe7 graphics/graphviz/PLIST
--- a/graphics/graphviz/PLIST   Sat Jan 20 13:33:13 2007 +0000
+++ b/graphics/graphviz/PLIST   Sat Jan 20 13:49:03 2007 +0000
@@ -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/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 -r 2a84eddc45f6 -r 86f87e06dfe7 graphics/graphviz/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/graphviz/patches/patch-ae        Sat Jan 20 13:49:03 2007 +0000
@@ -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);