Date: Sun, 8 Sep 2013 15:28:15 +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: r326745 - in head/graphics/graphviz: . files Message-ID: <201309081528.r88FSFw1058566@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sun Sep 8 15:28:15 2013 New Revision: 326745 URL: http://svnweb.freebsd.org/changeset/ports/326745 Log: - update to 2.34.0 - new option ANN for edge bundling Deleted: head/graphics/graphviz/files/patch-config_perl.pl Modified: head/graphics/graphviz/Makefile head/graphics/graphviz/distinfo head/graphics/graphviz/files/patch-configure head/graphics/graphviz/pkg-plist Modified: head/graphics/graphviz/Makefile ============================================================================== --- head/graphics/graphviz/Makefile Sun Sep 8 15:14:17 2013 (r326744) +++ head/graphics/graphviz/Makefile Sun Sep 8 15:28:15 2013 (r326745) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= graphviz -PORTVERSION= 2.32.0 +PORTVERSION= 2.34.0 CATEGORIES= graphics tk MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -61,12 +61,13 @@ PDOCS_HTML= doc/*.html doc/info/*.gif USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} -OPTIONS_DEFINE= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL GUILE TK NVTHREADS +OPTIONS_DEFINE= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER ANN GTK2 GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL GUILE TK NVTHREADS OPTIONS_DEFAULT?= XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO NO_OPTIONS_SORT=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 SMYRNA_DESC= SMYRNA graph viewer (requires GTK2) GVEDIT_DESC= gvedit (requires qt) GTK2_DESC= gtk2 plugin (requires PANGOCAIRO) @@ -166,7 +167,7 @@ PLIST_SUB+= WITH_PANGOCAIRO="@comment " CONFIGURE_ARGS+= --with-rsvg=yes PLIST_SUB+= WITH_RSVG="" USE_GNOME+= librsvg2 -USE_GL+= gl glu +USE_GL+= gl glu glut .if empty(PORT_OPTIONS:MPANGOCAIRO) IGNORE= option PANGOCAIRO is required for option LIBRVG2 .endif @@ -184,6 +185,17 @@ CONFIGURE_ARGS+= --without-popple PLIST_SUB+= WITH_POPPLER="@comment " .endif +.if ${PORT_OPTIONS:MANN} +LIB_DEPENDS+= ann:${PORTSDIR}/math/ann +CONFIGURE_ENV+= ANN_CFLAGS=-I${LOCALBASE}/include ANN_LIBS=-lann +CONFIGURE_ARGS+= --with-ann=yes +PLIST_SUB+= WITH_ANN="" +MAN1+= mingle.1 +.else +CONFIGURE_ARGS+= --without-ann +PLIST_SUB+= WITH_ANN="@comment " +.endif + .if ${PORT_OPTIONS:MGTK2} CONFIGURE_ARGS+= --with-gtk PLIST_SUB+= WITH_GTK="" Modified: head/graphics/graphviz/distinfo ============================================================================== --- head/graphics/graphviz/distinfo Sun Sep 8 15:14:17 2013 (r326744) +++ head/graphics/graphviz/distinfo Sun Sep 8 15:28:15 2013 (r326745) @@ -1,2 +1,2 @@ -SHA256 (graphviz-2.32.0.tar.gz) = d853b2313e08a1dd0cce20d9ff8051acfa9ec418b5ba2dc65c8f4ddb07a7a77a -SIZE (graphviz-2.32.0.tar.gz) = 23756717 +SHA256 (graphviz-2.34.0.tar.gz) = d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 +SIZE (graphviz-2.34.0.tar.gz) = 23921350 Modified: head/graphics/graphviz/files/patch-configure ============================================================================== --- head/graphics/graphviz/files/patch-configure Sun Sep 8 15:14:17 2013 (r326744) +++ head/graphics/graphviz/files/patch-configure Sun Sep 8 15:28:15 2013 (r326745) @@ -1,8 +1,8 @@ ---- configure.orig 2013-02-14 14:30:22.000000000 +0100 -+++ configure 2013-06-28 08:33:36.000000000 +0200 -@@ -17696,6 +17696,9 @@ - *-apple-darwin* ) +--- 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" @@ -10,7 +10,7 @@ *-freebsd* ) CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math" ;; -@@ -21518,7 +21521,9 @@ +@@ -21662,7 +21665,9 @@ LUA_INCLUDES="" LUA_LIBS="" @@ -21,9 +21,9 @@ if test -n "$lua_inc"; then CFLAGS="$CFLAGS -I$lua_inc" -@@ -21580,13 +21585,13 @@ +@@ -21724,13 +21729,13 @@ pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null` - if test "x$?" == "x0" ; then + 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` @@ -31,7 +31,7 @@ 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 + 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` Modified: head/graphics/graphviz/pkg-plist ============================================================================== --- head/graphics/graphviz/pkg-plist Sun Sep 8 15:14:17 2013 (r326744) +++ head/graphics/graphviz/pkg-plist Sun Sep 8 15:28:15 2013 (r326745) @@ -26,6 +26,7 @@ bin/gxl2gv bin/gxl2dot %%WITH_XPM%%bin/lefty %%WITH_XPM%%bin/lneato +%%WITH_ANN%%bin/mingle bin/mm2gv bin/neato bin/nop @@ -388,6 +389,7 @@ libdata/pkgconfig/libxdot.pc %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309081528.r88FSFw1058566>