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, 58 insertions, 40 deletions

diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa
index 2ec094b0ddc..5201e9ce5f8 100644
--- a/graphics/graphviz/patches/patch-aa
+++ b/graphics/graphviz/patches/patch-aa
@@ -1,29 +1,19 @@
-$NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
+$NetBSD: patch-aa,v 1.11 2009/05/17 12:55:52 sno Exp $
 
---- configure.ac.orig	2008-10-07 19:40:07.000000000 +0100
-+++ configure.ac	2009-03-02 11:04:39.000000000 +0000
-@@ -23,17 +23,30 @@
- AC_SUBST(GRAPHVIZ_VERSION_MINOR)
- AC_SUBST(GRAPHVIZ_VERSION_MICRO)
- 
--# Windows version numbers
--# For the build number: months since Jan 2000, day of month from the timestamp
--# For the revision number: hour, minute from the timestamp
--
--if test $GRAPHVIZ_VERSION_MICRO = "0"; then
--	GRAPHVIZ_VERSION_BUILD=0
--	GRAPHVIZ_VERSION_REVISION=0
--else
--	GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
--	GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
--fi
-+GRAPHVIZ_VERSION_BUILD=0
-+GRAPHVIZ_VERSION_REVISION=0
-+case "${host_os}" in
+--- configure.ac.orig	2009-04-25 18:39:34.000000000 +0000
++++ configure.ac	2009-04-25 18:55:19.000000000 +0000
+@@ -83,13 +83,24 @@
+ GRAPHVIZ_VERSION_BUILD=0
+ GRAPHVIZ_VERSION_REVISION=0
+ case "${host_os}" in
+-  *uwin* | *cygwin* | *mingw32* )
 +  *uwin* | *cygwin* | *mingw32* ) 
-+	# Windows version numbers
-+	# For the build number: months since Jan 2000, day of month from the timestamp
-+	# For the revision number: hour, minute from the timestamp
+ 	# Windows version numbers
+ 	# For the build number: months since Jan 2000, day of month from the timestamp
+ 	# For the revision number: hour, minute from the timestamp
+-	if test $GRAPHVIZ_VERSION_MICRO != "0"; then
+-		GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
+-		GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
 +
 +	if test $GRAPHVIZ_VERSION_MICRO = "0"; then
 +		GRAPHVIZ_VERSION_BUILD=0
@@ -38,21 +28,10 @@ $NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
 +			print "GRAPHVIZ_VERSION_REVISION=" \
 +				substr($1,10,4)
 +		}'`
-+	fi
-+	;;
-+esac
- AC_SUBST(GRAPHVIZ_VERSION_BUILD)
- AC_SUBST(GRAPHVIZ_VERSION_REVISION)
- 
-@@ -267,6 +280,7 @@
- 	    ;;
-     esac
- else
-+echo ${CC}
-     case "${CC}" in
- 	*icc* )
- 	    # -Wall causes relocation errors with icc
-@@ -753,7 +767,7 @@
+ 	fi
+ 	;;
+ esac
+@@ -807,7 +818,7 @@
  		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
                          LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
                          LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
@@ -61,7 +40,7 @@ $NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
      
  		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
  		        if test  "x$?" = "x0"; then
-@@ -775,7 +789,7 @@
+@@ -829,7 +840,7 @@
                  LUA_INCLUDES=`$LUACONFIG --include`
                  LUA_LIBS=`$LUACONFIG --libs`
  	        LUA_VERSION="5.0.x"
@@ -70,3 +49,42 @@ $NetBSD: patch-aa,v 1.10 2009/03/02 11:24:58 tron Exp $
              fi
          fi
      
+@@ -919,8 +930,8 @@
+         use_ocaml="No (ocaml not available)"
+       else
+         AC_CHECK_PROG(OCAML_OPT,ocamlopt,ocamlopt)
+-        OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
+-        OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
++        OCAML_INCLUDES=-I${PREFIX}/lib$LIBPOSTFIX/ocaml
++        OCAML_LIBS=-L${PREFIX}/lib$LIBPOSTFIX/ocaml
+         save_CPPFLAGS=$CPPFLAGS
+         CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
+         AC_CHECK_HEADER(caml/mlvalues.h,[
+@@ -1006,13 +1017,13 @@
+       if test "x$PHP" = "x"; then
+         use_php="No (php not available)"
+       else
+-        if test -d /usr/include/php5; then
+-          PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
++        if test -d ${PREFIX}/include/php5; then
++          PHP_INCLUDES="-I${PREFIX}/include/php5 -I${PREFIX}/include/php5/main -I${PREFIX}/include/php5/Zend -I${PREFIX}/include/php5/TSRM"
+         else
+-          PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
++          PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/TSRM"
+         fi
+-        PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
+-        PHP_INSTALL_DATADIR="/usr/share/php"
++        PHP_INSTALL_DIR="${PREFIX}/lib${LIBPOSTFIX}/php/modules"
++        PHP_INSTALL_DATADIR="${PREFIX}/share/php"
+         PHP_LIBS=
+         save_CPPFLAGS=$CPPFLAGS
+         CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
+@@ -2232,7 +2243,7 @@
+ 
+ AC_ARG_WITH(platformsdkincludedir,
+   [AS_HELP_STRING([--with-platformsdkincludedir=DIR],[use Platform SDK (Windows) includes from DIR])],
+-  [PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }])
++  [PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=`echo ${PLATFORMSDKINCLUDE} | sed "s/'\\'/\\\\/g" | sed "s/ /\\ /g"`])
+ 
+ AC_ARG_WITH(platformsdklibdir,
+   [AS_HELP_STRING([--with-platformsdklibdir=DIR],[use Platform SDK (Windows) libraries from DIR])],