From owner-svn-ports-head@FreeBSD.ORG Fri Mar 29 19:55:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0595FB21; Fri, 29 Mar 2013 19:55:59 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EB09D87E; Fri, 29 Mar 2013 19:55:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TJtws4016962; Fri, 29 Mar 2013 19:55:58 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TJtwE3016959; Fri, 29 Mar 2013 19:55:58 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201303291955.r2TJtwE3016959@svn.freebsd.org> From: Pawel Pekala Date: Fri, 29 Mar 2013 19:55:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315568 - in head/x11-toolkits/flowcanvas: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 19:55:59 -0000 Author: pawel Date: Fri Mar 29 19:55:58 2013 New Revision: 315568 URL: http://svnweb.freebsd.org/changeset/ports/315568 Log: Unbreak after graphviz update PR: ports/177023 Submitted by: Bojan Petrovic Added: head/x11-toolkits/flowcanvas/files/ head/x11-toolkits/flowcanvas/files/patch-src_Canvas.cpp (contents, props changed) head/x11-toolkits/flowcanvas/files/patch-wscript (contents, props changed) Modified: head/x11-toolkits/flowcanvas/Makefile (contents, props changed) Modified: head/x11-toolkits/flowcanvas/Makefile ============================================================================== --- head/x11-toolkits/flowcanvas/Makefile Fri Mar 29 19:41:55 2013 (r315567) +++ head/x11-toolkits/flowcanvas/Makefile Fri Mar 29 19:55:58 2013 (r315568) @@ -8,17 +8,15 @@ CATEGORIES= x11-toolkits MASTER_SITES= http://download.drobilla.net/ MAINTAINER= ports@FreeBSD.org -COMMENT= An interactive Gtkmm/Gnomecanvasmm widget - -BROKEN= Does not build with recent graphviz +COMMENT= Interactive Gtkmm/Gnomecanvasmm widget LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= boost_date_time:${PORTSDIR}/devel/boost-libs \ - gvc.6:${PORTSDIR}/graphics/graphviz \ + gvc:${PORTSDIR}/graphics/graphviz \ gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \ - gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 + gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 USE_BZIP2= yes USE_PYTHON_BUILD=yes Added: head/x11-toolkits/flowcanvas/files/patch-src_Canvas.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/flowcanvas/files/patch-src_Canvas.cpp Fri Mar 29 19:55:58 2013 (r315568) @@ -0,0 +1,46 @@ +--- src/Canvas.cpp.orig 2011-01-10 00:19:58.000000000 +0100 ++++ src/Canvas.cpp 2013-03-16 13:45:17.797462753 +0100 +@@ -1253,21 +1253,21 @@ + */ + + GVC_t* gvc = gvContext(); +- Agraph_t* G = agopen((char*)"g", AGDIGRAPH); ++ Agraph_t* G = agopen((char*)"g", Agdirected, NULL); + + nodes.gvc = gvc; + nodes.G = G; + + if (_direction == HORIZONTAL) +- agraphattr(G, (char*)"rankdir", (char*)"LR"); ++ agattr(G, AGRAPH, (char*)"rankdir", (char*)"LR"); + else +- agraphattr(G, (char*)"rankdir", (char*)"TD"); ++ agattr(G, AGRAPH, (char*)"rankdir", (char*)"TD"); + + unsigned id = 0; + for (ItemList::const_iterator i = _items.begin(); i != _items.end(); ++i) { + std::ostringstream ss; + ss << "n" << id++; +- Agnode_t* node = agnode(G, strdup(ss.str().c_str())); ++ Agnode_t* node = agnode(G, strdup(ss.str().c_str()), true); + if (boost::dynamic_pointer_cast(*i)) { + ss.str(""); + ss << (*i)->width() / 96.0; +@@ -1310,7 +1310,7 @@ + + assert(src_node && dst_node); + +- Agedge_t* edge = agedge(G, src_node, dst_node); ++ Agedge_t* edge = agedge(G, src_node, dst_node, NULL, true); + + if (use_length_hints && c->length_hint() != 0) { + std::ostringstream len_ss; +@@ -1325,7 +1325,7 @@ + if (partner) { + GVNodes::iterator p = nodes.find(partner); + if (p != nodes.end()) +- agedge(G, i->second, p->second); ++ agedge(G, i->second, p->second, NULL, true); + } + } + Added: head/x11-toolkits/flowcanvas/files/patch-wscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/flowcanvas/files/patch-wscript Fri Mar 29 19:55:58 2013 (r315568) @@ -0,0 +1,10 @@ +--- wscript.orig 2011-01-12 00:09:31.000000000 +0100 ++++ wscript 2013-03-16 14:19:43.577462602 +0100 +@@ -41,6 +41,7 @@ + conf.check_tool('compiler_cxx') + autowaf.check_pkg(conf, 'libgvc', uselib_store='AGRAPH', + atleast_version='2.8', mandatory=False) ++ conf.env['LIB_AGRAPH'] = ['cgraph' if l == 'graph' else l for l in conf.env['LIB_AGRAPH']] + autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GLIBMM', + atleast_version='2.10.0', mandatory=True) + autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM',