Upgrade to 1.06.

Changelog at <http://pinotdev.blogspot.sg/2013/05/pinot-v106.html>.

6 files changed, 8 insertions, 75 deletions

diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index f68255880217..c964fc956101 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pinot
-PORTVERSION=	1.05
-PORTREVISION=	1
+PORTVERSION=	1.06
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 #MASTER_SITES=	http://colinf.chez.com/pinot/
diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo
index 17f6a26d0c21..c3b40fe59cd1 100644
--- a/deskutils/pinot/distinfo
+++ b/deskutils/pinot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pinot-1.05.tar.gz) = edcd9c3b5697735872c9e4f86d1103c8ed58f558b03a6d1df25722b674148fd9
-SIZE (pinot-1.05.tar.gz) = 1064984
+SHA256 (pinot-1.06.tar.gz) = bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d
+SIZE (pinot-1.06.tar.gz) = 1066326
diff --git a/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp b/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp
deleted file mode 100644
index a4670a6754b0..000000000000
--- a/deskutils/pinot/files/patch-IndexSearch_PluginWebEngine.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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";
diff --git a/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp b/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp
deleted file mode 100644
index 03755b5ad680..000000000000
--- a/deskutils/pinot/files/patch-IndexSearch_SherlockParser.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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"
diff --git a/deskutils/pinot/files/patch-configure b/deskutils/pinot/files/patch-configure
index 2e79f84e27f5..9e46032d1024 100644
--- a/deskutils/pinot/files/patch-configure
+++ b/deskutils/pinot/files/patch-configure
@@ -1,33 +1,6 @@
---- 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 @@
+--- configure.orig	2013-05-11 12:27:42.000000000 +0200
++++ configure	2013-06-02 16:00:47.000000000 +0200
+@@ -18189,7 +18189,7 @@
    HAVE_TEXTCAT_CAT_FALSE=
  fi
  
diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist
index 3466a72331c7..8d98af8e75a9 100644
--- a/deskutils/pinot/pkg-plist
+++ b/deskutils/pinot/pkg-plist
@@ -63,6 +63,7 @@ include/pinot/ViewHistory.h
 include/pinot/Visibility.h
 include/pinot/WebEngine.h
 include/pinot/WorkerThreads.h
+include/pinot/cjkv/CJKVTokenizer.h
 include/pinot/filters/Filter.h
 include/pinot/filters/FilterFactory.h
 include/pinot/filters/HtmlFilter.h
@@ -164,5 +165,6 @@ share/locale/zh_TW/LC_MESSAGES/pinot.mo
 @dirrm lib/pinot
 @dirrm include/pinot/xdgmime
 @dirrm include/pinot/filters
+@dirrm include/pinot/cjkv
 @dirrm include/pinot
 @dirrm etc/pinot