PkgSrc changes:

  - Updating package graphics/graphviz to 2.22.2
  - Setting license to cpl-1.0
  - Rework optional dependencies handling (handle dependencies
    of dependencies)

Upstream changes:
March 13, 2009
        - Release 2.22.2
                - fix for buffer overflow (present in 2.22.0 and 2.22.1)
        - Fixed bugs:
                1596, 1602

March 9, 2009
        - Release 2.22.1
                - build fixes for Visual Studio and for FreeBSD
March 3, 2009
        - Release 2.22.0
        - Core:
                - libgvc api changed, version bumped.  Affects third party
                  applications using libgvc.
                - plugin api changed, version bumped.  Affects third party
                  plugins for graphviz.
                - 90% conversion to cgraph has been done, but not enabled yet,
                  (and yes, its true what they say about the last 10% )
                - drop libagraph from distribution  (use libcgraph)
                - layout code completely converted to floating point.
                - new "dot -P" option for generating a graph of available
                  plugins.
                - registered MIME type:  text/vnd.graphviz for .gv files
                - rename files from .dot to .gv to avoid conflict with
                  Word templates.  .dot still supported, but deprecated.
                - new command: mm2gv   (matrix-market graph file conversion)
                - rename commands:      dot2gxl -> gv2gxl
                                        gxl2dot -> gxl2gv
        - Plugins:
                - new rsvg plugin for support of node shapes in SVG format
                - new gs plugin for support of node shapes in PS format
                - new lasi plugin for support of UTF-8 characters in PS output
                  (the above thee plugins are Linux only, at the moment)
                - new quartz plugin (MacOSx only)
                - new gdiplus plugin (Windows only)
                - new -Tvml support in core plugin (thanks Steve Roush)
                - new -Ttk support in core plugin (also used by Tcldot and
                  gv_tcl language bindings.)
                - disabled old style codegens completely
        - Linux:
                - new Ubuntu8 builds
                - new Fedora 10 and 11 builds
        - MacOSx:
                - Universal binary for Leopard: i386, x86_64, ppc, ppc64
                - Should not conflict with parallel install of MacPorts
                  version of graphviz
                - Improved GUI
        - Windows:
                - VisualC project files now available, in addition to the GNU
                  Makefiles that are used the mingw builds.
        - Language Bindings:
                - fixed problem with writing dot, xdot, plain, canon to
                  memory or to Tcl_Channels
                - renamed man pages to Debian style:  gv.3tcl, gv.3perl, etc
        - Fixed bugs:
                827, 1365, 1366, 1367, 1368, 1374, 1375, 1376, 1378, 1380, 1382,
                1383, 1385, 1386, 1388, 1390, 1391, 1392, 1394, 1395, 1397,
                1398, 1399, 1405, 1407, 1410, 1412, 1414, 1415, 1416, 1421,
                1424, 1425, 1427, 1429, 1431, 1433, 1435, 1436, 1437, 1438,
                1440, 1441, 1444, 1446, 1451, 1452, 1453, 1456, 1457, 1459,
                1460, 1461, 1462, 1463, 1464, 1465, 1466, 1470, 1474, 1475,
                1476, 1477, 1478, 1484, 1485, 1489, 1490, 1492, 1493, 1495,
                1496, 1499, 1500, 1501, 1502, 1503, 1505, 1509, 1513, 1521,
                1523, 1525, 1530, 1531, 1532, 1533, 1535, 1536, 1539, 1540,
                1542, 1543, 1546, 1547, 1551, 1553, 1554, 1561, 1565, 1566,
                1568, 1569, 1570, 1571, 1573, 1577, 1578, 1579, 1580, 1581,
                1582, 1584, 1586,

1 files changed, 11 insertions, 7 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 04510b686d1..9e94fb2e31f 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,27 +1,26 @@
-# $NetBSD: Makefile,v 1.73 2009/04/01 17:12:57 tron Exp $
+# $NetBSD: Makefile,v 1.74 2009/05/17 12:55:52 sno Exp $
 
-DISTNAME=	graphviz-2.20.3
-PKGREVISION=	4
+DISTNAME=	graphviz-2.22.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	sno@NetBSD.org
 HOMEPAGE=	http://www.graphviz.org/
 COMMENT=	Graph Drawing Programs from AT&T Research and Lucent Bell Labs
+LICENSE=	cpl-1.0
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
 
-CHECK_FILES_SKIP=	${PREFIX}/lib/graphviz/config
+CHECK_FILES_SKIP=	${PREFIX}/lib/graphviz/config6
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		bison pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-java
-CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-php
 CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-ruby
@@ -50,6 +49,10 @@ REPLACE.tclsh.old=	.*tclsh
 REPLACE.tclsh.new=	${PREFIX}/bin/tclsh
 REPLACE_FILES.tclsh=	tclpkg/gv/demo/modgraph.tcl
 
+REPLACE_PERL+=		config/config_perl.pl lib/gd/configure.pl \
+			tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
+			contrib/dirgraph/dirgraph.pl
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../mk/compiler.mk"
@@ -71,7 +74,8 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+#.include "../../devel/libltdl/convenience.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 #.include "../../graphics/jpeg/buildlink3.mk"
 #.include "../../graphics/png/buildlink3.mk"