Date: Sat, 18 Jan 2014 13:48:44 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340169 - head/graphics/graphviz Message-ID: <201401181348.s0IDmiwi072941@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sat Jan 18 13:48:43 2014 New Revision: 340169 URL: http://svnweb.freebsd.org/changeset/ports/340169 QAT: https://qat.redports.org/buildarchive/r340169/ Log: - update to 2.36.0 - removal of libgraph - new option GDK - set BROKEN for option MING and GUILE - hardcode tcl dependecies - fix path of PHP extension Modified: head/graphics/graphviz/Makefile head/graphics/graphviz/distinfo head/graphics/graphviz/pkg-plist Modified: head/graphics/graphviz/Makefile ============================================================================== --- head/graphics/graphviz/Makefile Sat Jan 18 12:20:08 2014 (r340168) +++ head/graphics/graphviz/Makefile Sat Jan 18 13:48:43 2014 (r340169) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= graphviz -PORTVERSION= 2.34.0 -PORTREVISION= 1 +PORTVERSION= 2.36.0 CATEGORIES= graphics tk MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -17,7 +16,7 @@ LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/gra libexpat.so:${PORTSDIR}/textproc/expat2 \ libgd.so:${PORTSDIR}/${GD_PORT} -USES= bison gmake pkgconfig +USES= bison gmake pkgconfig shebangfix USE_AUTOTOOLS= libltdl libtool WANT_GNOME= yes GNU_CONFIGURE= yes @@ -27,18 +26,12 @@ PLIST_SUB= PORTVERSION="${PORTVERSION}" MAKE_ENV= EXPR_COMPAT=yes MISSING=${TRUE} -MLINKS= dot.1 circo.1 \ - dot.1 fdp.1 \ - dot.1 neato.1 \ - dot.1 sfdp.1 \ - dot.1 twopi.1 \ - gml2gv.1 gv2gml.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 \ @@ -58,9 +51,9 @@ PDOCS_HTML= doc/*.html doc/info/*.gif USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} OPTIONS_DEFINE= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER \ - ANN GTS GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL \ + ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL \ GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE NVTHREADS -OPTIONS_DEFAULT?= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO +OPTIONS_DEFAULT= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO NO_OPTIONS_SORT=yes OPTIONS_SUB= yes DIGCOLA_DESC= neato layout engine wiwth DIGCOLA features @@ -69,7 +62,8 @@ PANGOCAIRO_DESC=pangocairo support ANN_DESC= ANN edge bundling support GTS_DESC= GNU Triangulated Surface Library support GTK2_DESC= gtk2 plugin (requires PANGOCAIRO) -GDK_PIXBUF_DESC=gdk pixbuf support +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) @@ -102,12 +96,8 @@ PHP_USE= PHP=yes PHP_BUILD=yes PYTHON_USE= PYTHON_BUILD=yes RUBY_USE= RUBY=yes LUA_USE= LUA=yes -# broken: Do not set both tcl and tk in USES -#TCL_USES= tcl:84+,build -#TK_USES= tk:84+,build -TCL_USE= TCL_BUILD=84+ -TK_USE= TK_BUILD=84+ - +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 @@ -128,6 +118,7 @@ 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 @@ -159,7 +150,6 @@ GUILE_CONFIGURE_ENABLE= guile NVTHREADS_CFLAGS+= ${PTHREAD_CFLAGS} NVTHREADS_LDFLAGS+= ${PTHREAD_LIBS} - .include <bsd.port.options.mk> # allow the use localized gd ports in Makefile.local or slave ports. @@ -177,10 +167,20 @@ CONFIGURE_ARGS+= --program-transform-nam CONFIGURE_ENV+= MISSING=${TRUE} +.if ${PORT_OPTIONS:MGUILE} +BROKEN= guile is too old +.endif + +.if ${PORT_OPTIONS:MMING} +BROKEN= incomplete, uses removed libgraph +.endif + .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 ${PORT_OPTIONS:MTCL} @@ -205,11 +205,17 @@ IGNORE= option PANGOCAIRO is required fo IGNORE= option PANGOCAIRO is required for option GTK2 .endif .else +.if ${PORT_OPTIONS:MGNOMEUI} +IGNORE= option GTK2 is required for option GNOMEUI +.endif +.endif + .if ${PORT_OPTIONS:MGDK_PIXBUF} +.if empty(PORT_OPTIONS:MGTK2) IGNORE= option GTK2 is required for option GDK_PIXBUF .endif -.if ${PORT_OPTIONS:MGNOMEUI} -IGNORE= option GTK2 is required for option GNOMEUI +.if empty(PORT_OPTIONS:MGDK) +IGNORE= option GDK is required for option GDK_PIXBUF .endif .endif @@ -240,6 +246,23 @@ CONFIGURE_ARGS+= --disable-swig CONFIGURE_ENV+= SWIG="/nonexistent" .endif +.if ${PORT_OPTIONS:MPHP} +SHEBANG_FILES+= tclpkg/gv/demo/modgraph.php +.endif + +.if ${PORT_OPTIONS:MRUBY} +SHEBANG_FILES+= tclpkg/gv/demo/modgraph.rb +.endif + +.if ${PORT_OPTIONS:MLUA} +SHEBANG_FILES+= tclpkg/gv/demo/modgraph.lua +.endif + +.if ${PORT_OPTIONS:MTCL} +SHEBANG_FILES+= tclpkg/gv/demo/modgraph.tcl +.endif + + post-patch: ${FIND} ${WRKSRC} -name Makefile.in | \ ${XARGS} ${REINPLACE_CMD} \ @@ -267,6 +290,8 @@ post-patch: -e "s|vendorarchdir|sitearchdir|g" \ -e "s|-lruby|-lruby${RUBY_SUFFIX}|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 Modified: head/graphics/graphviz/distinfo ============================================================================== --- head/graphics/graphviz/distinfo Sat Jan 18 12:20:08 2014 (r340168) +++ head/graphics/graphviz/distinfo Sat Jan 18 13:48:43 2014 (r340169) @@ -1,2 +1,2 @@ -SHA256 (graphviz-2.34.0.tar.gz) = d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 -SIZE (graphviz-2.34.0.tar.gz) = 23921350 +SHA256 (graphviz-2.36.0.tar.gz) = 37fd66d8def158575c75c4f6dbf536839e4ee468aa59314eb472d1aecb076361 +SIZE (graphviz-2.36.0.tar.gz) = 23846318 Modified: head/graphics/graphviz/pkg-plist ============================================================================== --- head/graphics/graphviz/pkg-plist Sat Jan 18 12:20:08 2014 (r340168) +++ head/graphics/graphviz/pkg-plist Sat Jan 18 13:48:43 2014 (r340169) @@ -40,7 +40,6 @@ bin/tred bin/twopi bin/unflatten %%PANGOCAIRO%%%%XPM%%bin/vimdot -include/graphviz/agxbuf.h include/graphviz/arith.h include/graphviz/ast_common.h include/graphviz/cdt.h @@ -65,17 +64,14 @@ include/graphviz/gvplugin_loadimage.h 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 @@ -121,10 +117,10 @@ lib/graphviz/libgvplugin_gd.a %%MING%%lib/graphviz/libgvplugin_ming.la %%MING%%lib/graphviz/libgvplugin_ming.so %%MING%%lib/graphviz/libgvplugin_ming.so.6 -%%GDK_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.a -%%GDK_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.la -%%GDK_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so -%%GDK_PIXBUF%%lib/graphviz/libgvplugin_gdk_pixbuf.so.6 +%%GDK%%lib/graphviz/libgvplugin_gdk.a +%%GDK%%lib/graphviz/libgvplugin_gdk.la +%%GDK%%lib/graphviz/libgvplugin_gdk.so +%%GDK%%lib/graphviz/libgvplugin_gdk.so.6 lib/graphviz/libgvplugin_neato_layout.so lib/graphviz/libgvplugin_neato_layout.so.6 lib/graphviz/libgvplugin_neato_layout.la @@ -153,6 +149,7 @@ lib/graphviz/libgvpr.so.2 %%PHP%%lib/graphviz/php/libgv_php.a %%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.a %%TCL%%lib/graphviz/tcl/libgdtclft.la %%TCL%%lib/graphviz/tcl/libgdtclft.so @@ -173,7 +170,30 @@ lib/graphviz/libgvpr.so.2 %%TCL%%lib/graphviz/tcl/libtclplan.so %%TCL%%lib/graphviz/tcl/libtclplan.so.0 %%TCL%%lib/graphviz/tcl/pkgIndex.tcl -%%TCL%%lib/tcl%%TCL_VER%%/graphviz +%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.a +%%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/libgv_tcl.a +%%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.a +%%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_builtin.a +%%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/libtclplan.a +%%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/libtkspline.a +%%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/pkgIndex.tcl %%TK%%lib/graphviz/tcl/libtkspline.a %%TK%%lib/graphviz/tcl/libtkspline.la %%TK%%lib/graphviz/tcl/libtkspline.so @@ -265,7 +285,6 @@ man/man3/cdt.3.gz man/man3/cgraph.3.gz man/man3/expr.3.gz %%TCL%%man/man3/gdtclft.3tcl.gz -man/man3/graph.3.gz %%GUILE%%man/man3/gv.3guile.gz %%LUA%%man/man3/gv.3lua.gz %%PERL%%man/man3/gv.3perl.gz @@ -274,6 +293,7 @@ man/man3/graph.3.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 @@ -399,6 +419,7 @@ man/man7/graphviz.7.gz %%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 @@ -443,6 +464,7 @@ man/man7/graphviz.7.gz %%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 @@ -467,8 +489,8 @@ man/man7/graphviz.7.gz %%PORTDOCS%%%%DOCSDIR%%/pdf/tred.1.pdf %%PORTDOCS%%%%DOCSDIR%%/pdf/twopi.1.pdf %%PORTDOCS%%%%DOCSDIR%%/pdf/unflatten.1.pdf -%%PORTDOCS%%%%DOCSDIR%%/pdf/xdot.3.pdf %%PORTDOCS%%%%DOCSDIR%%/pdf/vimdot.1.pdf +%%PORTDOCS%%%%DOCSDIR%%/pdf/xdot.3.pdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entities.tcl.README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/doted.tcl @@ -491,6 +513,7 @@ man/man7/graphviz.7.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pathplan.tcl.README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.tcl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.tcl.README +%%PHP%%share/php/gv.php %%LUA%%%%DATADIR%%/demo/modgraph.lua %%PERL%%%%DATADIR%%/demo/modgraph.pl %%PHP%%%%DATADIR%%/demo/modgraph.php @@ -639,10 +662,12 @@ man/man7/graphviz.7.gz %%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 @@ -672,6 +697,8 @@ man/man7/graphviz.7.gz %%SMYRNA%%%%DATADIR%%/smyrna/ltwopi.png %%SMYRNA%%%%DATADIR%%/smyrna/selectr.png %%SMYRNA%%%%DATADIR%%/smyrna/single_select.png +%%TCL%%@dirrm lib/tcl%%TCL_VER%%/graphviz +%%PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%% %%TCL%%@dirrm lib/graphviz/tcl %%RUBY%%@dirrm lib/graphviz/ruby %%PYTHON%%@dirrm lib/graphviz/python @@ -700,6 +727,7 @@ man/man7/graphviz.7.gz %%RUBY%%@dirrmtry %%DATADIR%%/demo %%TCL%%@dirrmtry %%DATADIR%%/demo @dirrm %%DATADIR%% +%%PHP%%@dirrmtry share/php %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pathplan_data %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401181348.s0IDmiwi072941>