Date: Sun, 10 Mar 2013 16:16:40 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313831 - in head/deskutils/pinot: . files Message-ID: <201303101616.r2AGGeut060300@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sun Mar 10 16:16:40 2013 New Revision: 313831 URL: http://svnweb.freebsd.org/changeset/ports/313831 Log: Chase boost-spirit reorganization in order to re-enable Sherlock. Added: head/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp (contents, props changed) head/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp (contents, props changed) Modified: head/deskutils/pinot/Makefile head/deskutils/pinot/files/patch-configure Modified: head/deskutils/pinot/Makefile ============================================================================== --- head/deskutils/pinot/Makefile Sun Mar 10 15:08:04 2013 (r313830) +++ head/deskutils/pinot/Makefile Sun Mar 10 16:16:40 2013 (r313831) @@ -3,6 +3,7 @@ PORTNAME= pinot PORTVERSION= 1.05 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES= http://colinf.chez.com/pinot/ Added: head/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp Sun Mar 10 16:16:40 2013 (r313831) @@ -0,0 +1,17 @@ +--- IndexSearch/PluginWebEngine.cpp.orig 2012-04-08 10:39:34.000000000 +0200 ++++ IndexSearch/PluginWebEngine.cpp 2013-03-10 17:09:52.000000000 +0100 +@@ -165,14 +165,12 @@ + } + + string extension(fileName.substr(pos + 1)); +-#ifdef HAVE_BOOST_SPIRIT_CORE_HPP + if (strncasecmp(extension.c_str(), "src", 3) == 0) + { + pluginType = "sherlock"; + return new SherlockParser(fileName); + } + else +-#endif + if (strncasecmp(extension.c_str(), "xml", 3) == 0) + { + pluginType = "opensearch"; Added: head/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp Sun Mar 10 16:16:40 2013 (r313831) @@ -0,0 +1,24 @@ +--- IndexSearch/SherlockParser.cpp.orig 2012-04-08 10:39:34.000000000 +0200 ++++ IndexSearch/SherlockParser.cpp 2013-03-10 17:03:22.000000000 +0100 +@@ -21,10 +21,17 @@ + #include <set> + #include <iostream> + #include <cstring> +-#include <boost/spirit/core.hpp> +-#include <boost/spirit/actor/push_back_actor.hpp> +-#include <boost/spirit/actor/insert_at_actor.hpp> +-#include <boost/spirit/utility/confix.hpp> ++#ifdef HAVE_BOOST_SPIRIT_CORE_HPP ++# include <boost/spirit/core.hpp> ++# include <boost/spirit/actor/push_back_actor.hpp> ++# include <boost/spirit/actor/insert_at_actor.hpp> ++# include <boost/spirit/utility/confix.hpp> ++#else ++# include <boost/spirit.hpp> ++# include <boost/spirit/home/classic/actor/push_back_actor.hpp> ++# include <boost/spirit/home/classic/actor/insert_at_actor.hpp> ++# include <boost/spirit/home/classic/utility/confix.hpp> ++#endif + + #include "StringManip.h" + #include "Url.h" Modified: head/deskutils/pinot/files/patch-configure ============================================================================== --- head/deskutils/pinot/files/patch-configure Sun Mar 10 15:08:04 2013 (r313830) +++ head/deskutils/pinot/files/patch-configure Sun Mar 10 16:16:40 2013 (r313831) @@ -1,6 +1,33 @@ ---- configure.orig 2012-06-10 15:26:06.000000000 +0200 -+++ configure 2012-07-19 18:59:05.000000000 +0200 -@@ -18840,7 +18840,7 @@ +--- configure.orig 2013-03-03 03:25:56.000000000 +0100 ++++ configure 2013-03-10 16:52:56.000000000 +0100 +@@ -18010,6 +18010,26 @@ + HAVE_BOOST_SPIRIT_FALSE= + fi + ++else ++ for ac_header in boost/spirit.hpp ++do : ++ ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit.hpp" "ac_cv_header_boost_spirit_hpp" "$ac_includes_default" ++if test "x$ac_cv_header_boost_spirit_hpp" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_BOOST_SPIRIT_HPP 1 ++_ACEOF ++ if true; then ++ HAVE_BOOST_SPIRIT_TRUE= ++ HAVE_BOOST_SPIRIT_FALSE='#' ++else ++ HAVE_BOOST_SPIRIT_TRUE='#' ++ HAVE_BOOST_SPIRIT_FALSE= ++fi ++ ++fi ++ ++done ++ + + fi + +@@ -18169,7 +18189,7 @@ HAVE_TEXTCAT_CAT_FALSE= fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303101616.r2AGGeut060300>