[Midnightbsd-cvs] mports [19398] graphviz 2.38.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 9 08:44:52 EDT 2015


Revision: 19398
          http://svnweb.midnightbsd.org/mports/?rev=19398
Author:   laffer1
Date:     2015-06-09 08:44:52 -0400 (Tue, 09 Jun 2015)
Log Message:
-----------
graphviz 2.38.0

Modified Paths:
--------------
    trunk/graphics/graphviz/Makefile
    trunk/graphics/graphviz/distinfo
    trunk/graphics/graphviz/files/patch-configure
    trunk/graphics/graphviz/pkg-plist

Removed Paths:
-------------
    trunk/graphics/graphviz/files/patch-config_perl.pl
    trunk/graphics/graphviz/files/pkg-install.in

Property Changed:
----------------
    trunk/graphics/graphviz/files/patch-cmd-gvpr-gvpr.1
    trunk/graphics/graphviz/files/patch-cmd-tools-gvpack.1
    trunk/graphics/graphviz/files/patch-configure
    trunk/graphics/graphviz/files/patch-lib-ortho-trapezoid.c
    trunk/graphics/graphviz/pkg-descr

Modified: trunk/graphics/graphviz/Makefile
===================================================================
--- trunk/graphics/graphviz/Makefile	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/Makefile	2015-06-09 12:44:52 UTC (rev 19398)
@@ -1,53 +1,37 @@
 # $MidnightBSD$
 
 PORTNAME=	graphviz
-PORTVERSION=	2.28.0
-PORTREVISION=	1
+PORTVERSION=	2.38.0
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
+
 LICENSE=	epl
 
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
-		expat.6:${PORTSDIR}/textproc/expat2 \
-		gd.4:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libgd.so:${PORTSDIR}/${GD_PORT}
 
-USE_BISON=	build
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libltdl libtool
-WANT_GNOME=	yes
+USES=		cpe gmake bison libtool:keepla pkgconfig pathfix shebangfix
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
-SUB_FILES+=	pkg-install
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
-MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
-FAKE_MAKEENV+= 	 EXPR_COMPAT=yes MISSING=${TRUE}
+MAKE_ENV=	EXPR_COMPAT=yes
 
-MAN1=		acyclic.1 bcomps.1 ccomps.1 cluster.1 diffimg.1 dijkstra.1 \
-		dot.1 dotty.1 gc.1 gml2gv.1 gv2gxl.1 gvedit.1 gvmap.1 \
-		gvmap.sh.1 gvgen.1 mm2gv.1 gvcolor.1 gvpack.1 gvpr.1 \
-		lneato.1 nop.1 osage.1 patchwork.1 prune.1 sccmap.1 smyrna.1 \
-		tred.1 unflatten.1 vimdot.1
-MAN3=		cdt.3 expr.3 cgraph.3 graph.3 gvc.3 pack.3 pathplan.3 xdot.3
-MAN7=		graphviz.7
-MLINKS=		dot.1 circo.1 \
-		dot.1 fdp.1 \
-		dot.1 neato.1 \
-		dot.1 sfdp.1 \
-		dot.1 twopi.1 \
-		gv2gxl.1 gxl2gv.1
+SHEBANG_LANG=	tcl
+tcl_OLD_CMD=	/usr/bin/tclsh
+tcl_CMD=	${TCLSH}
 
 FIX_INCLUDE=	ast_common.h \
 		lib/cdt/dthdr.h \
-		lib/graph/libgraph.h lib/graph/triefa.h \
-		lib/graph/parser.h lib/graph/agxbuf.h \
 		lib/pathplan/tri.h lib/pathplan/pathplan.h \
 		lib/pathplan/pathutil.h lib/pathplan/solvers.h \
 		lib/pathplan/vis.h lib/pathplan/vispath.h \
@@ -56,7 +40,8 @@
 		lib/gvc/gvcint.h
 
 PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted.tcl \
-			tclpkg/tclpathplan/demo/pathplan.tcl tclpkg/tkspline/demo/spline.tcl
+			tclpkg/tclpathplan/demo/pathplan.tcl \
+			tclpkg/tkspline/demo/spline.tcl
 PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
 
 PDOCS_TXT=	doc/Dot.ref doc/latex_suggestions.txt
@@ -65,39 +50,111 @@
 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
-OPTIONS=	ICONV "Build with ICONV support" on \
-		XPM "Build with XPM support" on \
-		DIGCOLA "DIGCOLA features in neato layout engine" on \
-		IPSEPCOLA "IPSEPCOLA features in neato layout engine" on \
-		NLS "Build with gettext support" on \
-		TK "Build with TK support" off \
-		PANGOCAIRO "build with pangocairo support" on \
-		RSVG "build with rsvg library" off \
-		GTK "build with gtk plugin" off \
-		GDK_PIXBUF  "build with gdk pixbuf support" off \
-		GNOMEUI  "build with libgnomeui support" off \
-		SMYRNA "SMYRNA large graph viewer (GTK is required)" off \
-		GVEDIT "gvedit (qt is required)" off \
-		MING "Build with ming plugin" off \
-		DEVIL "Build with devil plugin" off \
-		GHOSTSCRIPT "Build with ghostscript plugin" off \
-		PERL "Perl bindings (swig)" off \
-		PHP "PHP bindings (swig)" off \
-		PYTHON "Python bindings (swig)" off \
-		RUBY "Ruby bindings (swig)" off \
-		LUA "Lua bindings (swig)" off \
-		TCL "TCL bindings (swig)" off \
-		GUILE "Guile bindings (swig)" off
+OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER \
+		ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL \
+		GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE NVTHREADS \
+		DOCS EXAMPLES
+OPTIONS_DEFAULT=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO
+NO_OPTIONS_SORT=yes
+OPTIONS_SUB=	yes
+DIGCOLA_DESC=	neato layout engine wiwth DIGCOLA features
+IPSEPCOLA_DESC=	neato layout engine wiwth IPSEPCOLA features
+PANGOCAIRO_DESC=pangocairo support
+ANN_DESC=	ANN edge bundling support
+GTS_DESC=	GNU Triangulated Surface Library support
+GTK2_DESC=	gtk2 plugin (requires PANGOCAIRO)
+GDK_DESC=	gdk library support (requires GTK2)
+GDK_PIXBUF_DESC=gdk pixbuf support (requires GDK)
+GNOMEUI_DESC=	libgnomeui support
+SMYRNA_DESC=	SMYRNA graph viewer (requires GTK2)
+GVEDIT_DESC=	gvedit (requires qt)
+MING_DESC=	ming plugin
+DEVIL_DESC=	devil plugin
+GHOSTSCRIPT_DESC=ghostscript plugin (requires PANGOCAIRO)
+PERL_DESC=	Perl bindings (swig)
+PHP_DESC=	PHP bindings (swig) 
+PYTHON_DESC=	Python bindings (swig)
+RUBY_DESC=	Ruby bindings (swig)
+LUA_DESC=	Lua bindings (swig)
+TCL_DESC=	TCL bindings (swig)
+GUILE_DESC=	Guile bindings (swig)
+TK_DESC=	TK toolkit support
+NVTHREADS_DESC=	Link with threads (needed for nvidia)
 
+XPM_USE=	XORG=xaw,xpm,xmu,xt,sm,ice,xext,x11,xau,xdmcp,xp
+ICONV_USES=	iconv
+NLS_USES=	gettext
+PANGOCAIRO_USE=	GNOME=pango XORG=xrender,x11,xau,xdmcp
+LIBRSVG2_USE=	GNOME=librsvg2 GL=gl,glu,glut
+GTK2_USE=	XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
+GNOMEUI_USE=	GNOME=libgnomeui
+SMYRNA_USE=	GNOME=libglade2 GL=glut
+GVEDIT_USE=	qt4=qmake_build,moc_build,rcc_build,uic_build \
+		qt4=linguist_build,corelib,gui
+GHOSTSCRIPT_USE=GHOSTSCRIPT=yes
+PERL_USES=	perl5
+PHP_USE=	PHP=yes PHP_BUILD=yes
+PYTHON_USES=	python:2.7,build
+RUBY_USE=	RUBY=yes
+LUA_USES=	lua
+TCL_USES=	tcl:build
+TK_USES= 	tk:build
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+ANN_LIB_DEPENDS=	libann.so:${PORTSDIR}/math/ann
+GTS_LIB_DEPENDS=	libgts.so:${PORTSDIR}/graphics/gts
+SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2 \
+			libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
+DEVIL_LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil
+GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+
+XPM_CONFIGURE_WITH=		x
+DIGCOLA_CONFIGURE_WITH=		digcola
+IPSEPCOLA_CONFIGURE_WITH=	ipsepcola
+NLS_CONFIGURE_ENABLE=		nls
+PANGOCAIRO_CONFIGURE_WITH=	pangocairo
+LIBRSVG2_CONFIGURE_WITH=	rsvg
+POPPLER_CONFIGURE_WITH=		poppler
+ANN_CONFIGURE_WITH=		ann
+ANN_CONFIGURE_ENV=	ANN_CFLAGS=-I${LOCALBASE}/include ANN_LIBS=-lann
+GTS_CONFIGURE_WITH=		gts
+GTK2_CONFIGURE_WITH=		gtk
+GDK_CONFIGURE_WITH=		gdk
+GDK_PIXBUF_CONFIGURE_WITH=	gdk-pixbuf
+GNOMEUI_CONFIGURE_WITH=		gnomeui
+SMYRNA_CONFIGURE_WITH=		smyrna glade gtkgl gtkglext
+GVEDIT_CONFIGURE_ON=		--with-gvedit=yes
+GVEDIT_CONFIGURE_OFF=		--with-qt=no
+MING_CONFIGURE_WITH=		ming
+DEVIL_CONFIGURE_WITH=		devil
+GHOSTSCRIPT_CONFIGURE_OFF=	--with-ghostscript=no
+PERL_CONFIGURE_ENABLE=		perl
+PHP_CONFIGURE_ENABLE=		php
+PHP_CPPFLAGS=		-I${LOCALBASE}/include/php/Zend
+PYTHON_CONFIGURE_ENABLE=	python
+PYTHON_LDFLAGS=		"-L${PYTHON_LIBDIR}"
+RUBY_CONFIGURE_ENABLE=		ruby
+RUBY_CONFIGURE_ENV=	RUBY="${RUBY}"
+LUA_CONFIGURE_ENABLE=		lua
+LUA_CFLAGS=		-I${LUA_INCDIR}
+LUA_LDFLAGS=		-L${LUA_LIBDIR} -lm
+LUA_CONFIGURE_ENV=	LUA="${LUA_BINDIR}/lua" \
+			LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER}
+TCL_CONFIGURE_ENABLE=		tcl
+TCL_CPPFLAGS=		-I${TK_INCLUDEDIR}
+TCL_CONFIGURE_ON=	--with-tclsh=${TCLSH} --enable-tcl=yes
+TCL_CONFIGURE_ENV=	TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
+TK_CPPFLAGS=		-I${TK_INCLUDEDIR}
+TK_CONFIGURE_ON=	--with-wish=${WISH}
+TK_CONFIGURE_ENV=	TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
+GUILE_CONFIGURE_ENABLE=		guile
+NVTHREADS_LDFLAGS=	-lpthread
+
 .include <bsd.mport.options.mk>
 
-.if defined(WITH_GVEDIT)
-USE_QT_VER=		4
-QT_COMPONENTS=		qmake_build moc_build rcc_build uic_build linguist_build
-.endif
+# allow the use localized gd ports in Makefile.local or slave ports.
+GD_PORT?=	graphics/gd
 
-.include <bsd.port.pre.mk>
-
 CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--enable-dependency-tracking \
 		--enable-r=no \
@@ -108,293 +165,117 @@
 		--disable-io --disable-ocaml --disable-java \
 		--disable-sharp
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		MISSING=${TRUE}
-
-.if defined(WITH_TK)
-CPPFLAGS+=		-I${TK_INCLUDEDIR}
-USE_TK_BUILD=		84+
-CONFIGURE_ARGS+=	--with-wish=${WISH}
-CONFIGURE_ENV+=		TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
-MAN3+=			tkspline.3tk
-PLIST_SUB+=		WITH_TK=""
-.else
-PLIST_SUB+=		WITH_TK="@comment "
+.if ${PORT_OPTIONS:MGUILE}
+BROKEN=	guile is too old
 .endif
-.if defined(WITH_TCL) || defined(WITH_TK)
-CPPFLAGS+=		-I${TCL_INCLUDEDIR}
-USE_TCL_BUILD=		84+
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
-CONFIGURE_ARGS+=	--with-tclsh=${TCLSH}
-CONFIGURE_ENV+=		TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
-MAN3+=			gdtclft.3tcl tcldot.3tcl
-PLIST_SUB+=		TCL_VER="${TCL_VER}"
-.endif
 
-.if defined(WITHOUT_ICONV)
-CONFIGURE_ARGS+=	--without-libiconv-prefix
-.else
-USE_ICONV=		yes
-CONFIGURE_ARGS+=	--with-iconvlibdir=${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--with-iconvincludedir=${LOCALBASE}/include
+.if ${PORT_OPTIONS:MMING}
+BROKEN=	Ming incomplete, uses removed libgraph
 .endif
 
-.if !defined(WITHOUT_XPM) || exists(${LOCALBASE}/lib/libXpm.so)
-USE_XORG+=		xaw xpm xmu xt sm ice xext x11 xau xdmcp xp
-MAN1+=			lefty.1
-PLIST_SUB+=		WITH_XPM=""
-.else
-PLIST_SUB+=		WITH_XPM="@comment "
+.if ${OSVERSION} > 1100000
+.if ${PORT_OPTIONS:MPHP}
+BROKEN=	code generated by swig fails to compile
 .endif
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-.else
-USE_GETTEXT=		yes
 .endif
 
-.if !defined(WITHOUT_PANGOCAIRO)
-CONFIGURE_ARGS+=	--with-pangocairo
-PLIST_SUB+=		WITH_PANGOCAIRO=""
-USE_GNOME=		pango
-USE_XORG+=		xrender x11 xau xdmcp
-.else
-CONFIGURE_ARGS+=	--without-pangocairo
-PLIST_SUB+=		WITH_PANGOCAIRO="@comment "
+.if ${PORT_OPTIONS:MTK}
+.if empty(PORT_OPTIONS:MTCL)
+IGNORE=	option TCL is required for option TK
 .endif
+# USES=tk:build is BROKEN: Does not allow to set both tcl and tk depedencies
+BUILD_DEPENDS+=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${_TCLTK_WANTED_VERSION}
+.endif
 
-.if defined(WITH_RSVG)
-CONFIGURE_ARGS+=	--with-rsvg=yes
-PLIST_SUB+=		WITH_RSVG=""
-USE_GNOME+=		librsvg2
-USE_GL+=		gl glu
-.if defined(WITHOUT_PANGOCAIRO)
-IGNORE=			option WITH_PANGOCAIRO is required for option WITH_RSVG
+.if ${PORT_OPTIONS:MTCL}
+PLIST_SUB+=	TCL_VER="${TCL_VER}"
 .endif
-.else
-CONFIGURE_ARGS+=	--without-rsvg
-PLIST_SUB+=		WITH_RSVG="@comment "
-.endif
 
-.if defined(WITH_GTK)
-CONFIGURE_ARGS+=	--with-gtk
-PLIST_SUB+=		WITH_GTK=""
-USE_GNOME+=		gtk20
-USE_XORG+=		sm ice xext xinerama xi xrandr xcursor xfixes
-.if defined(WITHOUT_PANGOCAIRO)
-IGNORE=			option WITH_PANGOCAIRO is required for option WITH_GTK
-.endif
+.if ${PORT_OPTIONS:MICONV}
+CONFIGURE_ARGS+=	--with-iconvlibdir=${ICONV_PREFIX}/lib
+CONFIGURE_ARGS+=	--with-iconvincludedir=${ICONV_PREFIX}/include
 .else
-CONFIGURE_ARGS+=	--without-gtk --without-gdk-pixbuf
-PLIST_SUB+=		WITH_GTK="@comment "
+CONFIGURE_ARGS+=	--without-libiconv-prefix
 .endif
 
-.if defined(WITH_GDK_PIXBUF)
-CONFIGURE_ARGS+=	--with-gdk-pixbuf=yes
-PLIST_SUB+=		WITH_PIXBUF=""
-.if !defined(WITH_GTK)
-IGNORE=			option WITH_GTK is required for option WITH_GDK_PIXBUF
+.if ${PORT_OPTIONS:MLIBRSVG2}
+.if empty(PORT_OPTIONS:MPANGOCAIRO)
+IGNORE=	option PANGOCAIRO is required for option LIBRVG2
 .endif
-.else
-CONFIGURE_ARGS+=	--without-gdk-pixbuf
-PLIST_SUB+=		WITH_PIXBUF="@comment "
 .endif
 
-.if defined(WITH_GNOMEUI)
-CONFIGURE_ARGS+=	--with-gnomeui
-USE_GNOME+=		libgnomeui
-.if !defined(WITH_GTK)
-IGNORE=			option WITH_GTK is required for option WITH_GNOMEUI
+.if ${PORT_OPTIONS:MGHOSTSCRIPT}
+.if empty(PORT_OPTIONS:MPANGOCAIRO)
+IGNORE=	option PANGOCAIRO is required for option GHOSTSCRIPT
 .endif
-.else
-CONFIGURE_ARGS+=	--without-gnomeui
 .endif
 
-.if defined(WITH_SMYRNA)
-CONFIGURE_ARGS+=	--with-glade=yes
-USE_GNOME+=		gnomelibs libglade2
-.if !defined(WITH_GTK)
-IGNORE=			option WITH_GTK is required for option WITH_SMYRNA
+.if ${PORT_OPTIONS:MGTK2}
+.if empty(PORT_OPTIONS:MPANGOCAIRO)
+IGNORE=	option PANGOCAIRO is required for option GTK2
 .endif
 .else
-CONFIGURE_ARGS+=	--without-glade
+.if ${PORT_OPTIONS:MGNOMEUI}
+IGNORE=	option GTK2 is required for option GNOMEUI
 .endif
-
-.if defined(WITH_SMYRNA)
-CONFIGURE_ARGS+=	 --with-gtkgl=yes
-LIB_DEPENDS+=		gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2
-.else
-CONFIGURE_ARGS+=	--without-gtkgl
 .endif
 
-.if defined(WITH_SMYRNA)
-CONFIGURE_ARGS+=	 --with-gtkglext=yes
-LIB_DEPENDS+=		gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
-.else
-CONFIGURE_ARGS+=	--without-gtkglext
+.if ${PORT_OPTIONS:MGDK_PIXBUF}
+.if empty(PORT_OPTIONS:MGTK2)
+IGNORE=	option GTK2 is required for option GDK_PIXBUF
 .endif
-
-.if defined(WITH_SMYRNA)
-CONFIGURE_ARGS+=	 --with-gts=yes
-LIB_DEPENDS+=		gts.5:${PORTSDIR}/graphics/gts
-.else
-CONFIGURE_ARGS+=	--without-gts
+.if empty(PORT_OPTIONS:MGDK)
+IGNORE=	option GDK is required for option GDK_PIXBUF
 .endif
-
-.if !defined(WITHOUT_DIGCOLA)
-CONFIGURE_ARGS+=	--with-digcola
-.else
-CONFIGURE_ARGS+=	--without-digcola
 .endif
 
-.if !defined(WITHOUT_IPSEPCOLA)
-CONFIGURE_ARGS+=	--with-ipsepcola
-.if defined(WITHOUT_DIGCOLA)
-IGNORE=			option WITH_DIGCOLA is required for option WITH_IPSEPCOLA
+.if ${PORT_OPTIONS:MSMYRNA}
+.if empty(PORT_OPTIONS:MGTK2)
+IGNORE=	option GTK2 is required for option SMYRNA
 .endif
-.else
-CONFIGURE_ARGS+=	--without-ipsepcola
+.if empty(PORT_OPTIONS:MGTS)
+IGNORE=	option GTS is required for option SMYRNA
 .endif
-
-.if defined(WITH_SMYRNA)
-CONFIGURE_ARGS+=	--with-smyrna=yes
-PLIST_SUB+=		WITH_SMYRNA=""
-.else
-PLIST_SUB+=		WITH_SMYRNA="@comment "
-CONFIGURE_ARGS+=	--without-smyrna
 .endif
 
-.if defined(WITH_GVEDIT)
-CONFIGURE_ARGS+=	--with-gvedit=yes
-PLIST_SUB+=		WITH_GVEDIT=""
-.else
-PLIST_SUB+=		WITH_GVEDIT="@comment "
-CONFIGURE_ARGS+=	--with-qt=no
+.if ${PORT_OPTIONS:MIPSEPCOLA}
+.if empty(PORT_OPTIONS:MDIGCOLA)
+IGNORE=		option WITH_DIGCOLA is required for option WITH_IPSEPCOLA
 .endif
-
-.if defined(WITH_MING)
-CONFIGURE_ARGS+=	--with-ming
-PLIST_SUB+=		WITH_MING=""
-LIB_DEPENDS+=		ming.5:${PORTSDIR}/graphics/ming
-.else
-CONFIGURE_ARGS+=	--without-ming
-PLIST_SUB+=		WITH_MING="@comment "
 .endif
 
-.if defined(WITH_DEVIL)
-CONFIGURE_ARGS+=	--with-devil
-PLIST_SUB+=		WITH_DEVIL=""
-LIB_DEPENDS+=		IL:${PORTSDIR}/graphics/devil
-.else
-CONFIGURE_ARGS+=	--without-devil
-PLIST_SUB+=		WITH_DEVIL="@comment "
-.endif
-
-.if defined(WITH_PERL) || defined(WITH_PHP) || defined(WITH_PYTHON) || \
-    defined(WITH_RUBY) || defined(WITH_LUA) || defined(WITH_TCL) || defined(WITH_GUILE)
-BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
-RUN_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
+.if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \
+    ${PORT_OPTIONS:MRUBY} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MTCL} || \
+    ${PORT_OPTIONS:MGUILE}
+BUILD_DEPENDS+=		swig2.0:${PORTSDIR}/devel/swig20
+RUN_DEPENDS+=		swig2.0:${PORTSDIR}/devel/swig20
 CONFIGURE_ARGS+=	--enable-swig
-CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig1.3"
+CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig2.0"
 .else
 CONFIGURE_ARGS+=	--disable-swig
 CONFIGURE_ENV+=		SWIG="/nonexistent"
 .endif
 
-.if defined(WITH_PERL)
-CONFIGURE_ARGS+=	--enable-perl
-PLIST_SUB+=		WITH_PERL=""
-USE_PERL5=	yes
-MAN3+=			gv.3perl
-.else
-CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUB+=		WITH_PERL="@comment "
+.if ${PORT_OPTIONS:MPHP}
+SHEBANG_FILES+=	tclpkg/gv/demo/modgraph.php
 .endif
 
-.if defined(WITH_PHP)
-CONFIGURE_ARGS+=	--enable-php
-PLIST_SUB+=		WITH_PHP=""
-USE_PHP=	yes
-USE_PHP_BUILD=	yes
-CPPFLAGS+=		-I${LOCALBASE}/include/php/Zend
-MAN3+=			gv.3php
-.else
-CONFIGURE_ARGS+=	--disable-php
-PLIST_SUB+=		WITH_PHP="@comment "
+.if ${PORT_OPTIONS:MRUBY}
+SHEBANG_FILES+=	tclpkg/gv/demo/modgraph.rb
 .endif
 
-.if defined(WITH_PYTHON)
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=		WITH_PYTHON=""
-USE_PYTHON_BUILD=	yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
-LDFLAGS+=		"-L${PYTHON_LIBDIR}"
-MAN3+=			gv.3python
-.else
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		WITH_PYTHON="@comment "
+.if ${PORT_OPTIONS:MLUA}
+SHEBANG_FILES+=	tclpkg/gv/demo/modgraph.lua
 .endif
 
-.if defined(WITH_RUBY)
-CONFIGURE_ARGS+=	--enable-ruby
-CONFIGURE_ENV+=		RUBY="${RUBY}"
-PLIST_SUB+=		WITH_RUBY=""
-USE_RUBY=		yes
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-MAN3+=			gv.3ruby
-.else
-CONFIGURE_ARGS+=	--disable-ruby
-PLIST_SUB+=		WITH_RUBY="@comment "
+.if ${PORT_OPTIONS:MTCL}
+SHEBANG_FILES+=	tclpkg/gv/demo/modgraph.tcl
 .endif
 
-.if defined(WITH_LUA)
-CONFIGURE_ARGS+=	--enable-lua
-PLIST_SUB+=		WITH_LUA=""
-USE_LUA=		yes
-.include "${PORTSDIR}/Mk/bsd.lua.mk"
-CFLAGS+=		-I${LUA_INCDIR}
-LDFLAGS+=		-L${LUA_LIBDIR} -lm
-CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua" \
-			LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER}
-MAN3+=			gv.3lua
-.else
-CONFIGURE_ARGS+=	--disable-lua
-PLIST_SUB+=		WITH_LUA="@comment "
-.endif
 
-.if defined(WITH_TCL)
-CONFIGURE_ARGS+=	--enable-tcl
-PLIST_SUB+=		WITH_TCL=""
-MAN3+=			gv.3tcl
-.else
-CONFIGURE_ARGS+=	--disable-tcl
-PLIST_SUB+=		WITH_TCL="@comment "
-.endif
-
-.if defined(WITH_GUILE)
-CONFIGURE_ARGS+=	--enable-guile
-PLIST_SUB+=		WITH_GUILE=""
-LIB_DEPENDS+=		guile.21:${PORTSDIR}/lang/guile
-MAN3+=			gv.3guile
-.else
-CONFIGURE_ARGS+=	--disable-guile
-PLIST_SUB+=		WITH_GUILE="@comment "
-.endif
-
-.if defined(WITH_GHOSTSCRIPT)
-USE_GHOSTSCRIPT=	yes
-PLIST_SUB+=		WITH_GHOSTSCRIPT=""
-.else
-CONFIGURE_ARGS+=	--with-ghostscript=no
-PLIST_SUB+=		WITH_GHOSTSCRIPT="@comment "
-.endif
-
 post-patch:
-	@${FIND} ${WRKSRC} -name Makefile.in | \
+	${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} \
-		-e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
 		-e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-htmlDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-txtDATA\(.*\)|\1\2|g" \
@@ -403,44 +284,52 @@
 		-e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \
 		-e 's|txtdir = $$(pkgdatadir)/doc|txtdir = ${DOCSDIR}|' \
 		-e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|';
-	@${REINPLACE_CMD} \
+	${REINPLACE_CMD} \
 		-e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|' \
 		${WRKSRC}/cmd/tools/Makefile.in \
 		${WRKSRC}/cmd/gvpr/Makefile.in
-	@${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \
+	${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|pkglibdir = $$(libdir)/@PACKAGE@|pkglibdir = $$(libdir)|g' \
 		-e 's|libdir = @libdir@|libdir = @libdir@/@PACKAGE@|g';
-	@${FIND} ${WRKSRC}/lib -name '*.pc.in' | \
+	${FIND} ${WRKSRC}/lib -name '*.pc.in' | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|libdir=@libdir@|libdir=@libdir@/@PACKAGE@|';
-	@${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
-		-e "s|vendorarch|installsitearch|g" \
-		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
+	${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
+		-e "s|vendorarchdir|sitearchdir|g" \
+		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" \
+		-e "s|ruby-1[.]9|ruby-${RUBY_VER}|g" \
+		-e "s|Config::|RbConfig::|" \
+		-e 's|PHP_INSTALL_DIR=.*|PHP_INSTALL_DIR="${PREFIX}/lib/php/${PHP_EXT_DIR}"|' \
+		-e 's|PHP_INSTALL_DATADIR=.*|PHP_INSTALL_DATADIR="${PREFIX}/share/php"|' \
+		-e '/if test/ s| == | = |g' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
+	${REINPLACE_CMD} -e 's|GTS_LIBS)|GTS_LIBS) $$(MATH_LIBS)|' \
+		${WRKSRC}/cmd/smyrna/Makefile.in
+	${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/
+.if ! ${PORT_OPTIONS:MDOCS}
+	${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
 		${WRKSRC}/Makefile.in
 .endif
 
-post-install:
+post-install: install-ldconfig-file
 	cd ${WRKSRC}/lib/expr && \
-		${MAKE} ${FAKE_MAKEARGS} ${INSTALL_TARGET}
+		${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${FIX_INCLUDE} ${PREFIX}/include/graphviz/
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/html
-	@${MKDIR} ${DOCSDIR}/pdf
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/html
+	${MKDIR} ${DOCSDIR}/pdf
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}/ && \
 		${INSTALL_DATA} ${PDOCS_PDF} ${DOCSDIR}/pdf/ && \
 		${INSTALL_DATA} ${PDOCS_HTML} ${DOCSDIR}/html/
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO_MSG} "Installing demo data..."
-	@${MKDIR} ${EXAMPLESDIR}
+	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl \
 		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl \
@@ -455,10 +344,10 @@
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl.README \
 		${WRKSRC}/tclpkg/tkspline/demo/spline.tcl.README \
 		${EXAMPLESDIR}/
-	@${MKDIR} ${EXAMPLESDIR}/pathplan_data
+	${MKDIR} ${EXAMPLESDIR}/pathplan_data
 	${INSTALL_DATA} \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan_data/*.dat \
 		${EXAMPLESDIR}/pathplan_data/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/graphics/graphviz/distinfo
===================================================================
--- trunk/graphics/graphviz/distinfo	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/distinfo	2015-06-09 12:44:52 UTC (rev 19398)
@@ -1,3 +1,2 @@
-SHA256 (graphviz-2.28.0.tar.gz) = d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76
-RMD160 (graphviz-2.28.0.tar.gz) = 5a5fae7cb1128d4e863b954bee5f2491ff23ada0
-SIZE (graphviz-2.28.0.tar.gz) = 19620087
+SHA256 (graphviz-2.38.0.tar.gz) = 81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e
+SIZE (graphviz-2.38.0.tar.gz) = 25848858

Index: trunk/graphics/graphviz/files/patch-cmd-gvpr-gvpr.1
===================================================================
--- trunk/graphics/graphviz/files/patch-cmd-gvpr-gvpr.1	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/files/patch-cmd-gvpr-gvpr.1	2015-06-09 12:44:52 UTC (rev 19398)

Property changes on: trunk/graphics/graphviz/files/patch-cmd-gvpr-gvpr.1
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/graphics/graphviz/files/patch-cmd-tools-gvpack.1
===================================================================
--- trunk/graphics/graphviz/files/patch-cmd-tools-gvpack.1	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/files/patch-cmd-tools-gvpack.1	2015-06-09 12:44:52 UTC (rev 19398)

Property changes on: trunk/graphics/graphviz/files/patch-cmd-tools-gvpack.1
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/graphics/graphviz/files/patch-config_perl.pl
===================================================================
--- trunk/graphics/graphviz/files/patch-config_perl.pl	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/files/patch-config_perl.pl	2015-06-09 12:44:52 UTC (rev 19398)
@@ -1,9 +0,0 @@
---- config/config_perl.pl.orig	2008-07-14 14:54:04.000000000 +0200
-+++ config/config_perl.pl	2009-03-15 11:08:29.000000000 +0100
-@@ -11,5 +11,5 @@
- 	print "-I$archlib/CORE";
- }
- if ($ARGV[0] eq "PERL_INSTALL_DIR") {
--	print "$Config{vendorarch}"
-+	print "$Config{sitearch}"
- }

Modified: trunk/graphics/graphviz/files/patch-configure
===================================================================
--- trunk/graphics/graphviz/files/patch-configure	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/files/patch-configure	2015-06-09 12:44:52 UTC (rev 19398)
@@ -1,16 +1,16 @@
---- configure.orig	2010-01-26 16:01:10.000000000 +0000
-+++ configure	2011-02-28 06:36:25.156165774 +0000
-@@ -6917,6 +6917,9 @@
- 	        *-apple-darwin* )
- 	            CFLAGS="${CFLAGS} -fno-common -Wall"
- 	            ;;
-+	        *alpha*-freebsd* )
-+	            CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall"
+--- configure.orig	2013-09-07 03:11:08.000000000 +0200
++++ configure	2013-09-08 14:44:48.000000000 +0200
+@@ -17820,6 +17820,9 @@
+ 	        CFLAGS="${CFLAGS} -fno-common -Wall"
+ 	        LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
+ 	        ;;
++	    *alpha*-freebsd* )
++	        CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall"
 +		    ;;
- 	        *-freebsd* )
- 	            CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
+ 	    *-freebsd* )
+ 	        CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
  		    ;;
-@@ -24803,7 +24806,9 @@
+@@ -21662,7 +21665,9 @@
  
          LUA_INCLUDES=""
          LUA_LIBS=""
@@ -21,19 +21,19 @@
  
          if test -n "$lua_inc"; then
             CFLAGS="$CFLAGS -I$lua_inc"
-@@ -27574,7 +27579,14 @@
-       if test "x$RUBY" = "x"; then
- 	use_ruby="No (ruby not available)"
-       else
--        RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
-+	RUBY_VER="`$RUBY -rrbconfig -e \"puts Config::CONFIG['ruby_version']\"`"
-+	if test "x$RUBY_VER" = "x1.8"; then
-+        	RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
-+	else
-+        	RUBY_INC="`$RUBY -rrbconfig -e \"puts Config::CONFIG['rubyhdrdir']\"`"
-+		RUBY_ARCH="`$RUBY -rrbconfig -e \"puts Config::CONFIG['arch']\"`"
-+		RUBY_INCLUDES="-I$RUBY_INC -I$RUBY_INC/$RUBY_ARCH"
-+	fi
- 	# hack for powerpc-darwin8 (10.4)
- 	RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
-         RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG['LIBRUBYARG_SHARED']\"`"
+@@ -21724,13 +21729,13 @@
+ 	            pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
+ 	            if test "x$?" = "x0" ; then
+ 		        LUA_VERSION=`$PKGCONFIG --modversion lua$l`
+-                        LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
++                        LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lua$l`
+                         LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
+ 		        LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
+ 
+ 		        pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
+ 		        if test  "x$?" = "x0"; then
+-		           LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l`
++		           LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags-only-I lualib$l`
+ 		           LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l`
+ 		        fi
+                         break


Property changes on: trunk/graphics/graphviz/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/graphics/graphviz/files/patch-lib-ortho-trapezoid.c
===================================================================
--- trunk/graphics/graphviz/files/patch-lib-ortho-trapezoid.c	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/files/patch-lib-ortho-trapezoid.c	2015-06-09 12:44:52 UTC (rev 19398)

Property changes on: trunk/graphics/graphviz/files/patch-lib-ortho-trapezoid.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/graphics/graphviz/files/pkg-install.in
===================================================================
--- trunk/graphics/graphviz/files/pkg-install.in	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/files/pkg-install.in	2015-06-09 12:44:52 UTC (rev 19398)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%PREFIX%%/bin:%%PREFIX%%/sbin
-export PATH
-
-case $2 in
-POST-INSTALL)
-    echo -n "Creating %%PREFIX%%/lib/graphviz/config... "
-    %%PREFIX%%/bin/dot -c
-    echo "done."
-    ;;
-esac

Index: trunk/graphics/graphviz/pkg-descr
===================================================================
--- trunk/graphics/graphviz/pkg-descr	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/pkg-descr	2015-06-09 12:44:52 UTC (rev 19398)

Property changes on: trunk/graphics/graphviz/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/graphviz/pkg-plist
===================================================================
--- trunk/graphics/graphviz/pkg-plist	2015-06-09 12:43:42 UTC (rev 19397)
+++ trunk/graphics/graphviz/pkg-plist	2015-06-09 12:44:52 UTC (rev 19398)
@@ -7,14 +7,17 @@
 bin/dijkstra
 bin/dot
 bin/dot2gxl
-bin/dotty
+%%XPM%%bin/dotty
 bin/dot_builtins
+bin/edgepaint
 bin/fdp
 bin/gc
 bin/gml2gv
+bin/graphml2gv
+bin/gv2gml
 bin/gv2gxl
 bin/gvcolor
-%%WITH_GVEDIT%%bin/gvedit
+%%GVEDIT%%bin/gvedit
 bin/gvgen
 bin/gvmap
 bin/gvmap.sh
@@ -22,8 +25,9 @@
 bin/gvpr
 bin/gxl2gv
 bin/gxl2dot
-%%WITH_XPM%%bin/lefty
-bin/lneato
+%%XPM%%bin/lefty
+%%XPM%%bin/lneato
+%%ANN%%bin/mingle
 bin/mm2gv
 bin/neato
 bin/nop
@@ -32,12 +36,11 @@
 bin/prune
 bin/sccmap
 bin/sfdp
-%%WITH_SMYRNA%%bin/smyrna
+%%SMYRNA%%bin/smyrna
 bin/tred
 bin/twopi
 bin/unflatten
-%%WITH_PANGOCAIRO%%bin/vimdot
-include/graphviz/agxbuf.h
+%%PANGOCAIRO%%%%XPM%%bin/vimdot
 include/graphviz/arith.h
 include/graphviz/ast_common.h
 include/graphviz/cdt.h
@@ -46,7 +49,6 @@
 include/graphviz/dthdr.h
 include/graphviz/geom.h
 include/graphviz/globals.h
-include/graphviz/graph.h
 include/graphviz/graphviz_version.h
 include/graphviz/gv.i
 include/graphviz/gv.cpp
@@ -63,159 +65,234 @@
 include/graphviz/gvplugin_textlayout.h
 include/graphviz/gvplugin_device.h
 include/graphviz/gvpr.h
-include/graphviz/libgraph.h
 include/graphviz/logic.h
 include/graphviz/pack.h
-include/graphviz/parser.h
 include/graphviz/pathgeom.h
 include/graphviz/pathplan.h
 include/graphviz/pathutil.h
 include/graphviz/solvers.h
-include/graphviz/textpara.h
+include/graphviz/textspan.h
 include/graphviz/tri.h
-include/graphviz/triefa.h
 include/graphviz/types.h
 include/graphviz/usershape.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/xdot.h
- at comment lib/graphviz/config6
+lib/graphviz/libcdt.la
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.5
-lib/graphviz/libcdt.la
-lib/graphviz/libcdt.a
-lib/graphviz/libgraph.so
-lib/graphviz/libgraph.so.5
-lib/graphviz/libgraph.la
-lib/graphviz/libgraph.a
+lib/graphviz/libcdt.so.5.0.0
+lib/graphviz/libcgraph.la
 lib/graphviz/libcgraph.so
 lib/graphviz/libcgraph.so.6
-lib/graphviz/libcgraph.la
-lib/graphviz/libcgraph.a
+lib/graphviz/libcgraph.so.6.0.0
+lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.so
 lib/graphviz/libpathplan.so.4
-lib/graphviz/libpathplan.la
-lib/graphviz/libpathplan.a
+lib/graphviz/libpathplan.so.4.0.0
+lib/graphviz/libgvc.la
 lib/graphviz/libgvc.so
 lib/graphviz/libgvc.so.6
-lib/graphviz/libgvc.la
-lib/graphviz/libgvc.a
+lib/graphviz/libgvc.so.6.0.0
+lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_core.so
 lib/graphviz/libgvplugin_core.so.6
-lib/graphviz/libgvplugin_core.la
-lib/graphviz/libgvplugin_core.a
+lib/graphviz/libgvplugin_core.so.6.0.0
+lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_dot_layout.so
 lib/graphviz/libgvplugin_dot_layout.so.6
-lib/graphviz/libgvplugin_dot_layout.la
-lib/graphviz/libgvplugin_dot_layout.a
+lib/graphviz/libgvplugin_dot_layout.so.6.0.0
+lib/graphviz/libgvplugin_gd.la
 lib/graphviz/libgvplugin_gd.so
 lib/graphviz/libgvplugin_gd.so.6
-lib/graphviz/libgvplugin_gd.la
-lib/graphviz/libgvplugin_gd.a
-%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.a
-%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.la
-%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so
-%%WITH_GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6
-%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.a
-%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.la
-%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so
-%%WITH_GTK%%lib/graphviz/libgvplugin_gtk.so.6
-%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.a
-%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.la
-%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so
-%%WITH_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so.6
+lib/graphviz/libgvplugin_gd.so.6.0.0
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.la
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6.0.0
+%%GTK2%%lib/graphviz/libgvplugin_gtk.la
+%%GTK2%%lib/graphviz/libgvplugin_gtk.so
+%%GTK2%%lib/graphviz/libgvplugin_gtk.so.6
+%%GTK2%%lib/graphviz/libgvplugin_gtk.so.6.0.0
+%%MING%%lib/graphviz/libgvplugin_ming.so
+%%MING%%lib/graphviz/libgvplugin_ming.so.6
+%%MING%%lib/graphviz/libgvplugin_ming.so.6.0.0
+%%GDK%%lib/graphviz/libgvplugin_gdk.la
+%%GDK%%lib/graphviz/libgvplugin_gdk.so
+%%GDK%%lib/graphviz/libgvplugin_gdk.so.6
+%%GDK%%lib/graphviz/libgvplugin_gdk.so.6.0.0
+lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_neato_layout.so
 lib/graphviz/libgvplugin_neato_layout.so.6
-lib/graphviz/libgvplugin_neato_layout.la
-lib/graphviz/libgvplugin_neato_layout.a
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.6
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.a
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.a
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.la
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so.6
-lib/graphviz/libgvpr.a
+lib/graphviz/libgvplugin_neato_layout.so.6.0.0
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.6
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.6.0.0
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.la
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.so
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6.0.0
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.la
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so.6
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so.6.0.0
 lib/graphviz/libgvpr.la
 lib/graphviz/libgvpr.so
 lib/graphviz/libgvpr.so.2
-%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.a
-%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la
-%%WITH_GUILE%%lib/graphviz/guile/libgv_guile.so
-%%WITH_PHP%%lib/graphviz/php/gv.php
-%%WITH_PHP%%lib/graphviz/php/gv.so
-%%WITH_PHP%%lib/graphviz/php/libgv_php.a
-%%WITH_PHP%%lib/graphviz/php/libgv_php.la
-%%WITH_PHP%%lib/graphviz/php/libgv_php.so
-%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.a
-%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.la
-%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so
-%%WITH_TCL%%lib/graphviz/tcl/libgdtclft.so.0
-%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.a
-%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.la
-%%WITH_TCL%%lib/graphviz/tcl/libgv_tcl.so
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot.a
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot.la
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot.so
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot.so.0
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.a
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.la
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.so
-%%WITH_TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0
-%%WITH_TCL%%lib/graphviz/tcl/libtclplan.a
-%%WITH_TCL%%lib/graphviz/tcl/libtclplan.la
-%%WITH_TCL%%lib/graphviz/tcl/libtclplan.so
-%%WITH_TCL%%lib/graphviz/tcl/libtclplan.so.0
-%%WITH_TCL%%lib/graphviz/tcl/pkgIndex.tcl
-%%WITH_TCL%%lib/tcl%%TCL_VER%%/graphviz
-%%WITH_TK%%lib/graphviz/tcl/libtkspline.a
-%%WITH_TK%%lib/graphviz/tcl/libtkspline.la
-%%WITH_TK%%lib/graphviz/tcl/libtkspline.so
-%%WITH_TK%%lib/graphviz/tcl/libtkspline.so.0
-%%WITH_LUA%%lib/graphviz/lua/gv.so
-%%WITH_LUA%%lib/graphviz/lua/libgv_lua.a
-%%WITH_LUA%%lib/graphviz/lua/libgv_lua.la
-%%WITH_LUA%%lib/graphviz/lua/libgv_lua.so
-%%WITH_LUA%%lib/lua/%%LUA_VER%%/gv.so
-%%WITH_PERL%%lib/graphviz/perl/gv.so
-%%WITH_PERL%%lib/graphviz/perl/gv.pm
-%%WITH_PERL%%lib/graphviz/perl/libgv_perl.a
-%%WITH_PERL%%lib/graphviz/perl/libgv_perl.la
-%%WITH_PERL%%lib/graphviz/perl/libgv_perl.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.so
-%%WITH_PYTHON%%lib/graphviz/python/_gv.so
-%%WITH_PYTHON%%lib/graphviz/python/gv.py
-%%WITH_PYTHON%%lib/graphviz/python/libgv_python.a
-%%WITH_PYTHON%%lib/graphviz/python/libgv_python.la
-%%WITH_PYTHON%%lib/graphviz/python/libgv_python.so
-%%WITH_PYTHON%%%%PYTHON_LIBDIR%%/site-packages/_gv.so
-%%WITH_PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py
-%%WITH_RUBY%%lib/graphviz/ruby/gv.so
-%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.a
-%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.la
-%%WITH_RUBY%%lib/graphviz/ruby/libgv_ruby.so
-%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.a
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.la
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so
-%%WITH_RSVG%%lib/graphviz/libgvplugin_rsvg.so.6
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.a
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.la
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so
-%%WITH_DEVIL%%lib/graphviz/libgvplugin_devil.so.6
-lib/graphviz/libxdot.a
+lib/graphviz/libgvpr.so.2.0.0
+%%GUILE%%lib/graphviz/guile/libgv_guile.la
+%%GUILE%%lib/graphviz/guile/libgv_guile.so
+%%PHP%%lib/graphviz/php/gv.php
+%%PHP%%lib/graphviz/php/gv.so
+%%PHP%%lib/graphviz/php/libgv_php.la
+%%PHP%%lib/graphviz/php/libgv_php.so
+%%PHP%%lib/php/%%PHP_EXT_DIR%%/gv.so
+%%TCL%%lib/graphviz/tcl/libgdtclft.la
+%%TCL%%lib/graphviz/tcl/libgdtclft.so
+%%TCL%%lib/graphviz/tcl/libgdtclft.so.0
+%%TCL%%lib/graphviz/tcl/libgdtclft.so.0.0.0
+%%TCL%%lib/graphviz/tcl/libgv_tcl.la
+%%TCL%%lib/graphviz/tcl/libgv_tcl.so
+%%TCL%%lib/graphviz/tcl/libtcldot.la
+%%TCL%%lib/graphviz/tcl/libtcldot.so
+%%TCL%%lib/graphviz/tcl/libtcldot.so.0
+%%TCL%%lib/graphviz/tcl/libtcldot.so.0.0.0
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.la
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.so
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0.0.0
+%%TCL%%lib/graphviz/tcl/libtclplan.la
+%%TCL%%lib/graphviz/tcl/libtclplan.so
+%%TCL%%lib/graphviz/tcl/libtclplan.so.0
+%%TCL%%lib/graphviz/tcl/libtclplan.so.0.0.0
+%%TCL%%lib/graphviz/tcl/pkgIndex.tcl
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.la
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so.0.0.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgv_tcl.la
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgv_tcl.so
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.la
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so.0.0.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.la
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so.0.0.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.la
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0.0.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.la
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0.0.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/pkgIndex.tcl
+%%TK%%lib/graphviz/tcl/libtkspline.la
+%%TK%%lib/graphviz/tcl/libtkspline.so
+%%TK%%lib/graphviz/tcl/libtkspline.so.0
+%%TK%%lib/graphviz/tcl/libtkspline.so.0.0.0
+%%LUA%%lib/graphviz/lua/gv.so
+%%LUA%%lib/graphviz/lua/libgv_lua.la
+%%LUA%%lib/graphviz/lua/libgv_lua.so
+%%LUA%%lib/lua/%%LUA_VER%%/gv.so
+%%PERL%%lib/graphviz/perl/gv.so
+%%PERL%%lib/graphviz/perl/gv.pm
+%%PERL%%lib/graphviz/perl/libgv_perl.la
+%%PERL%%lib/graphviz/perl/libgv_perl.so
+%%PERL%%%%SITE_ARCH%%/gv.pm
+%%PERL%%%%SITE_ARCH%%/gv.so
+%%PYTHON%%lib/graphviz/python/_gv.so
+%%PYTHON%%lib/graphviz/python/gv.py
+%%PYTHON%%lib/graphviz/python/libgv_python.la
+%%PYTHON%%lib/graphviz/python/libgv_python.so
+%%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/_gv.so
+%%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py
+%%RUBY%%lib/graphviz/ruby/gv.so
+%%RUBY%%lib/graphviz/ruby/libgv_ruby.la
+%%RUBY%%lib/graphviz/ruby/libgv_ruby.so
+%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.la
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.so
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.so.6
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.so.6.0.0
+%%DEVIL%%lib/graphviz/libgvplugin_devil.la
+%%DEVIL%%lib/graphviz/libgvplugin_devil.so
+%%DEVIL%%lib/graphviz/libgvplugin_devil.so.6
+%%DEVIL%%lib/graphviz/libgvplugin_devil.so.6.0.0
 lib/graphviz/libxdot.la
 lib/graphviz/libxdot.so
 lib/graphviz/libxdot.so.4
+lib/graphviz/libxdot.so.4.0.0
+ at exec %D/bin/dot -c
+ at unexec rm -f %D/lib/graphviz/config6
 libdata/pkgconfig/libcdt.pc
-libdata/pkgconfig/libgraph.pc
 libdata/pkgconfig/libcgraph.pc
 libdata/pkgconfig/libpathplan.pc
 libdata/pkgconfig/libgvc.pc
 libdata/pkgconfig/libgvpr.pc
 libdata/pkgconfig/libxdot.pc
+man/man1/acyclic.1.gz
+man/man1/bcomps.1.gz
+man/man1/ccomps.1.gz
+man/man1/cluster.1.gz
+man/man1/diffimg.1.gz
+man/man1/dijkstra.1.gz
+man/man1/dot.1.gz
+%%XPM%%man/man1/dotty.1.gz
+man/man1/edgepaint.1.gz
+man/man1/gc.1.gz
+man/man1/graphml2gv.1.gz
+man/man1/gml2gv.1.gz
+man/man1/gv2gxl.1.gz
+%%GVEDIT%%man/man1/gvedit.1.gz
+man/man1/gvgen.1.gz
+man/man1/gvmap.1.gz
+man/man1/gvmap.sh.1.gz
+man/man1/gvcolor.1.gz
+man/man1/gvpack.1.gz
+man/man1/gvpr.1.gz
+%%XPM%%man/man1/lefty.1.gz
+%%XPM%%man/man1/lneato.1.gz
+%%ANN%%man/man1/mingle.1.gz
+man/man1/mm2gv.1.gz
+man/man1/nop.1.gz
+man/man1/osage.1.gz
+man/man1/patchwork.1.gz
+man/man1/prune.1.gz
+man/man1/sccmap.1.gz
+%%SMYRNA%%man/man1/smyrna.1.gz
+man/man1/tred.1.gz
+man/man1/unflatten.1.gz
+man/man1/vimdot.1.gz
+man/man1/circo.1.gz
+man/man1/fdp.1.gz
+man/man1/neato.1.gz
+man/man1/sfdp.1.gz
+man/man1/twopi.1.gz
+man/man1/gv2gml.1.gz
+man/man1/gxl2gv.1.gz
+man/man3/cdt.3.gz
+man/man3/cgraph.3.gz
+man/man3/expr.3.gz
+%%TCL%%man/man3/gdtclft.3tcl.gz
+%%GUILE%%man/man3/gv.3guile.gz
+%%LUA%%man/man3/gv.3lua.gz
+%%PERL%%man/man3/gv.3perl.gz
+%%PHP%%man/man3/gv.3php.gz
+%%PYTHON%%man/man3/gv.3python.gz
+%%RUBY%%man/man3/gv.3ruby.gz
+%%TCL%%man/man3/gv.3tcl.gz
+man/man3/gvc.3.gz
+man/man3/gvpr.3.gz
+man/man3/pack.3.gz
+man/man3/pathplan.3.gz
+%%TCL%%man/man3/tcldot.3tcl.gz
+%%TK%%man/man3/tkspline.3tk.gz
+man/man3/xdot.3.gz
+man/man7/graphviz.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -309,6 +386,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/html2.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/html3.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/html4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/internal_todo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/invhouse.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/invtrapezium.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/invtriangle.gif
@@ -317,6 +395,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/none.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/note.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/octagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/oval.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/parallelogram.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pentagon.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/plaintext.gif
@@ -334,7 +413,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/trapezium.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/tripleoctagon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/underline.gif
 %%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt
+%%PORTDOCS%%%%DOCSDIR%%/pdf/Agraph.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/acyclic.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/bcomps.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/ccomps.1.pdf
@@ -348,12 +429,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dotguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dotty.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/dottyguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/edgepaint.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/expr.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/fdp.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gc.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gdtclft.3tcl.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gml2gv.1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/graph.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/graphml2gv.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3go.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3guile.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3io.pdf
@@ -367,6 +449,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3ruby.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3sharp.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv.3tcl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gv2gml.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gv2gxl.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvc.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvcolor.1.pdf
@@ -376,11 +459,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvmap.sh.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvpack.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/gvpr.3.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/gxl2gv.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/lefty.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/leftyguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/libguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/lneato.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/mingle.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/mm2gv.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/neato.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/neatoguide.pdf
@@ -399,8 +484,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/pdf/tred.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/twopi.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/unflatten.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/pdf/vimdot.1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/pdf/xdot.3.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pdf/vimdot.1.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl.README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl
@@ -423,74 +508,77 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pathplan.tcl.README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.tcl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.tcl.README
-%%WITH_LUA%%%%DATADIR%%/demo/modgraph.lua
-%%WITH_PERL%%%%DATADIR%%/demo/modgraph.pl
-%%WITH_PHP%%%%DATADIR%%/demo/modgraph.php
-%%WITH_PYTHON%%%%DATADIR%%/demo/modgraph.py
-%%WITH_RUBY%%%%DATADIR%%/demo/modgraph.rb
-%%WITH_TCL%%%%DATADIR%%/demo/modgraph.tcl
+%%PHP%%share/php/gv.php
+%%LUA%%%%DATADIR%%/demo/modgraph.lua
+%%PERL%%%%DATADIR%%/demo/modgraph.pl
+%%PHP%%%%DATADIR%%/demo/modgraph.php
+%%PYTHON%%%%DATADIR%%/demo/modgraph.py
+%%RUBY%%%%DATADIR%%/demo/modgraph.rb
+%%TCL%%%%DATADIR%%/demo/modgraph.tcl
 %%DATADIR%%/doc/html/schema/arguments.xml
 %%DATADIR%%/doc/html/schema/attributes.xml
 %%DATADIR%%/doc/html/schema/attributes.xslt
-%%WITH_SMYRNA%%%%DATADIR%%/examples/4elt.gv
-%%WITH_SMYRNA%%%%DATADIR%%/examples/world.gv
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/2D.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/3D.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/arial.tga
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/attr_widgets.dot
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/center.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/cursor.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/details.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/find_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fish.PNG
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fisheye.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fit.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mod_3D.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mod_fisheye.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/mouse_actions.txt
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/move.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/new_node.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/no_fisheye.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/node.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/pan.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/pan.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/preview.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rect_select.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rect_select2.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rotate.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/select.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/selectx.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/smyrna.glade
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/template.dot
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
-%%WITH_GVEDIT%%%%DATADIR%%/gvedit/attrs.txt
+%%SMYRNA%%%%DATADIR%%/examples/4elt.gv
+%%SMYRNA%%%%DATADIR%%/examples/world.gv
+%%MING%%%%DATADIR%%/font/Bitstream_Vera_Sans.fdb
+%%MING%%%%DATADIR%%/font/Bitstream_Vera_Serif.fdb
+%%SMYRNA%%%%DATADIR%%/smyrna/2D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/3D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRect.png
+%%SMYRNA%%%%DATADIR%%/smyrna/AntiselectRectX.png
+%%SMYRNA%%%%DATADIR%%/smyrna/add_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/arial.tga
+%%SMYRNA%%%%DATADIR%%/smyrna/attrs.txt
+%%SMYRNA%%%%DATADIR%%/smyrna/attr_widgets.dot
+%%SMYRNA%%%%DATADIR%%/smyrna/center.png
+%%SMYRNA%%%%DATADIR%%/smyrna/cursor.png
+%%SMYRNA%%%%DATADIR%%/smyrna/deletE_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/delete_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/details.png
+%%SMYRNA%%%%DATADIR%%/smyrna/edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/find_edge.png
+%%SMYRNA%%%%DATADIR%%/smyrna/find_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fish.PNG
+%%SMYRNA%%%%DATADIR%%/smyrna/fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fisheye.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/fit.png
+%%SMYRNA%%%%DATADIR%%/smyrna/fit_to_screen.png
+%%SMYRNA%%%%DATADIR%%/smyrna/hourglass.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magifier_zoom_out.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magnifier.png
+%%SMYRNA%%%%DATADIR%%/smyrna/magnifier_zoom_in.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mod_3D.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mod_fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/mouse_actions.txt
+%%SMYRNA%%%%DATADIR%%/smyrna/move.png
+%%SMYRNA%%%%DATADIR%%/smyrna/new_delete.png
+%%SMYRNA%%%%DATADIR%%/smyrna/new_node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/newzoom.png
+%%SMYRNA%%%%DATADIR%%/smyrna/no_fisheye.png
+%%SMYRNA%%%%DATADIR%%/smyrna/node.png
+%%SMYRNA%%%%DATADIR%%/smyrna/ok.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/ok2.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/ok3.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/pan.png
+%%SMYRNA%%%%DATADIR%%/smyrna/pan.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/preview.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rect_select.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rect_select2.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rotate.png
+%%SMYRNA%%%%DATADIR%%/smyrna/rotate.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/select.png
+%%SMYRNA%%%%DATADIR%%/smyrna/selectx.png
+%%SMYRNA%%%%DATADIR%%/smyrna/smyrna.glade
+%%SMYRNA%%%%DATADIR%%/smyrna/template.dot
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomin.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomout.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom_in.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoom_out.png
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomminus.raw
+%%SMYRNA%%%%DATADIR%%/smyrna/zoomplus.raw
+%%GVEDIT%%%%DATADIR%%/gvedit/attrs.txt
 %%DATADIR%%/lefty/box.lefty
 %%DATADIR%%/lefty/def.lefty
 %%DATADIR%%/lefty/fractal.lefty
@@ -498,11 +586,11 @@
 %%DATADIR%%/lefty/slides.lefty
 %%DATADIR%%/lefty/tree.lefty
 %%DATADIR%%/lefty/lefty.psp
-%%DATADIR%%/lefty/dotty.lefty
-%%DATADIR%%/lefty/dotty_draw.lefty
-%%DATADIR%%/lefty/dotty_edit.lefty
-%%DATADIR%%/lefty/dotty_layout.lefty
-%%DATADIR%%/lefty/dotty_ui.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_draw.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_edit.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_layout.lefty
+%%XPM%%%%DATADIR%%/lefty/dotty_ui.lefty
 %%DATADIR%%/graphs/directed/KW91.gv
 %%DATADIR%%/graphs/directed/Latin1.gv
 %%DATADIR%%/graphs/directed/NaN.gv
@@ -510,6 +598,7 @@
 %%DATADIR%%/graphs/directed/alf.gv
 %%DATADIR%%/graphs/directed/arrows.gv
 %%DATADIR%%/graphs/directed/awilliams.gv
+%%DATADIR%%/graphs/directed/biological.gv
 %%DATADIR%%/graphs/directed/clust.gv
 %%DATADIR%%/graphs/directed/clust1.gv
 %%DATADIR%%/graphs/directed/clust2.gv
@@ -562,71 +651,44 @@
 %%DATADIR%%/graphs/undirected/Petersen.gv
 %%DATADIR%%/graphs/undirected/ngk10_4.gv
 %%DATADIR%%/graphs/undirected/process.gv
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/dot.PNG
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/glade-3.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/lcirco.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ldot.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/lfdp.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/lneato.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/ltwopi.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/selectr.png
-%%WITH_SMYRNA%%%%DATADIR%%/smyrna/single_select.png
- at exec mkdir -p %D/lib/graphviz/R
- at exec mkdir -p %D/lib/graphviz/go
- at exec mkdir -p %D/lib/graphviz/guile
- at exec mkdir -p %D/lib/graphviz/io
- at exec mkdir -p %D/lib/graphviz/lua
- at exec mkdir -p %D/lib/graphviz/java
- at exec mkdir -p %D/lib/graphviz/ocaml
- at exec mkdir -p %D/lib/graphviz/perl
- at exec mkdir -p %D/lib/graphviz/php
- at exec mkdir -p %D/lib/graphviz/python27
- at exec mkdir -p %D/lib/graphviz/python26
- at exec mkdir -p %D/lib/graphviz/python25
- at exec mkdir -p %D/lib/graphviz/python24
- at exec mkdir -p %D/lib/graphviz/python23
- at exec mkdir -p %D/lib/graphviz/python
- at exec mkdir -p %D/lib/graphviz/ruby
- at exec mkdir -p %D/lib/graphviz/sharp
- at exec mkdir -p %D/lib/graphviz/tcl
- at exec mkdir -p %D/%%DATADIR%%/demo
- at exec mkdir -p %D/%%DATADIR%%/examples
- at exec mkdir -p %D/%%DATADIR%%/gvedit
- at exec mkdir -p %D/%%DATADIR%%/smyrna
- at dirrm lib/graphviz/tcl
- at dirrm lib/graphviz/sharp
- at dirrm lib/graphviz/ruby
- at dirrm lib/graphviz/python27
- at dirrm lib/graphviz/python26
- at dirrm lib/graphviz/python25
- at dirrm lib/graphviz/python24
- at dirrm lib/graphviz/python23
- at dirrm lib/graphviz/python
- at dirrm lib/graphviz/php
- at dirrm lib/graphviz/perl
- at dirrm lib/graphviz/ocaml
- at dirrm lib/graphviz/lua
- at dirrm lib/graphviz/java
- at dirrm lib/graphviz/io
- at dirrm lib/graphviz/guile
- at dirrm lib/graphviz/go
- at dirrm lib/graphviz/R
- at dirrm lib/graphviz
- at dirrm include/graphviz
- at dirrm %%DATADIR%%/demo
- at dirrm %%DATADIR%%/doc/html/schema
- at dirrm %%DATADIR%%/doc/html
- at dirrm %%DATADIR%%/doc
- at dirrm %%DATADIR%%/examples
- at dirrm %%DATADIR%%/gvedit
- at dirrm %%DATADIR%%/graphs/directed
- at dirrm %%DATADIR%%/graphs/undirected
- at dirrm %%DATADIR%%/graphs
- at dirrm %%DATADIR%%/lefty
- at dirrm %%DATADIR%%/smyrna
- at dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pathplan_data
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/gvpr/addranks
+%%DATADIR%%/gvpr/addrings
+%%DATADIR%%/gvpr/anon
+%%DATADIR%%/gvpr/attr
+%%DATADIR%%/gvpr/bb
+%%DATADIR%%/gvpr/bbox
+%%DATADIR%%/gvpr/chkclusters
+%%DATADIR%%/gvpr/cliptree
+%%DATADIR%%/gvpr/col
+%%DATADIR%%/gvpr/collapse
+%%DATADIR%%/gvpr/color
+%%DATADIR%%/gvpr/cycle
+%%DATADIR%%/gvpr/dechain
+%%DATADIR%%/gvpr/deghist
+%%DATADIR%%/gvpr/deledges
+%%DATADIR%%/gvpr/delmulti
+%%DATADIR%%/gvpr/delnodes
+%%DATADIR%%/gvpr/depath
+%%DATADIR%%/gvpr/dijkstra
+%%DATADIR%%/gvpr/flatten
+%%DATADIR%%/gvpr/get-layers-list
+%%DATADIR%%/gvpr/group
+%%DATADIR%%/gvpr/indent
+%%DATADIR%%/gvpr/knbhd
+%%DATADIR%%/gvpr/maxdeg
+%%DATADIR%%/gvpr/path
+%%DATADIR%%/gvpr/rotate
+%%DATADIR%%/gvpr/scale
+%%DATADIR%%/gvpr/scalexy
+%%DATADIR%%/gvpr/span
+%%DATADIR%%/gvpr/topon
+%%DATADIR%%/gvpr/treetoclust
+%%SMYRNA%%%%DATADIR%%/smyrna/dot.PNG
+%%SMYRNA%%%%DATADIR%%/smyrna/glade-3.png
+%%SMYRNA%%%%DATADIR%%/smyrna/lcirco.png
+%%SMYRNA%%%%DATADIR%%/smyrna/ldot.png
+%%SMYRNA%%%%DATADIR%%/smyrna/lfdp.png
+%%SMYRNA%%%%DATADIR%%/smyrna/lneato.png
+%%SMYRNA%%%%DATADIR%%/smyrna/ltwopi.png
+%%SMYRNA%%%%DATADIR%%/smyrna/selectr.png
+%%SMYRNA%%%%DATADIR%%/smyrna/single_select.png



More information about the Midnightbsd-cvs mailing list