From 54e408f051ae085fb84924892e21cdd790a83ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr>
Date: Tue, 29 Jan 2013 17:32:09 +0100
Subject: [PATCH] [planning/hatpconsole] Add missing dependency
hatpconsole was missing libgvc that can be found in graphviz.
Modify the Makefile to add the dependency, and add the file to
find the libgvc (from graphviz). If a project needs libgvc it
should use the file mk/sysdep/libgraphviz.mk instead of the
mk/sysdep/graphviz.mk in order to get the libraries.
As this was a minor change, update the PKGREVISION.
---
hatpconsole/Makefile | 3 ++-
mk/sysdep/libgraphviz.mk | 46 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 mk/sysdep/libgraphviz.mk
diff --git a/hatpconsole/Makefile b/hatpconsole/Makefile
index 00ea6262..3b5f00ed 100644
--- a/hatpconsole/Makefile
+++ b/hatpconsole/Makefile
@@ -4,7 +4,7 @@
DISTNAME= hatpconsole-${VERSION}
VERSION= 1.0.0
-PKGREVISION=
+PKGREVISION= 1
CATEGORIES= planning
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=hatpconsole/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}hatpconsole
@@ -24,6 +24,7 @@ DEPEND_ABI.boost-headers=boost-headers>=1.34
include ../../wip/msgconnector/depend.mk
include ../../wip/libhatp/depend.mk
+include ../../wip/mk/sysdep/libgraphviz.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../mk/sysdep/cmake.mk
diff --git a/mk/sysdep/libgraphviz.mk b/mk/sysdep/libgraphviz.mk
new file mode 100644
index 00000000..3416e506
--- /dev/null
+++ b/mk/sysdep/libgraphviz.mk
@@ -0,0 +1,46 @@
+#
+# Copyright (c) 2013 LAAS/CNRS
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# Raphaël Lallement on Tue Feb 29 2013
+#
+DEPEND_DEPTH:= ${DEPEND_DEPTH}+
+LIBGRAPHVIZ_DEPEND_MK:= ${LIBGRAPHVIZ_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+= libgraphviz
+endif
+
+ifeq (+,$(LIBGRAPHVIZ_DEPEND_MK)) # ---------------------------------------------
+
+PREFER.libgraphviz?= system
+
+DEPEND_USE+= libgraphviz
+
+DEPEND_ABI.libgraphviz?= libgraphviz>=5.0.0
+
+SYSTEM_SEARCH.libgraphviz= \
+ 'include/graphviz/gvc.h'\
+ 'lib/pkgconfig/libgvc.pc'\
+ 'lib/libgvc.so:/Version/s/[^.0-9]//gp'
+
+SYSTEM_PKG.Fedora.libgraphviz= libgraphviz-devel
+SYSTEM_PKG.Ubuntu.libgraphviz= graphviz-dev
+SYSTEM_PKG.Debian.libgraphviz= graphviz-dev
+SYSTEM_PKG.NetBSD.libgraphviz= pkgsrc/graphics/graphviz
+
+endif # LIBGRAPHVIZ_DEPEND_MK --------------------------------------------------
+
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
--
GitLab