5 files changed, 38 insertions, 71 deletions

diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index c740af2f9303..d4583a357a0f 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -2,55 +2,53 @@
 # $FreeBSD$
 
 PORTNAME=	pinot
-PORTVERSION=	1.06
-PORTREVISION=	12
+PORTVERSION=	1.09
 CATEGORIES=	deskutils
-MASTER_SITES=	GOOGLE_CODE
-#MASTER_SITES=	http://colinf.chez.com/pinot/
-#		http://amra.dyndns.org/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Personal search and metasearch for the Free Desktop
 
 LICENSE=	GPLv2
 
-BROKEN=		Unfetchable (google code has gone away)
-
-BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils \
+BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils	\
 		update-mime-database:misc/shared-mime-info
 LIB_DEPENDS=	libxapian.so:databases/xapian-core		\
-		libgtkmm-2.4.so:x11-toolkits/gtkmm24	\
+		libfontconfig.so:x11-fonts/fontconfig		\
+		libfreetype.so:print/freetype2			\
 		libexttextcat-2.0.so:textproc/libexttextcat	\
 		libdbus-glib-1.so:devel/dbus-glib		\
-		libxml++-2.6.so:textproc/libxml++26	\
+		libdbus-1.so:devel/dbus				\
+		libxml++-2.6.so:textproc/libxml++26		\
 		libboost_thread.so:devel/boost-libs		\
 		libexif.so:graphics/libexif			\
 		libexiv2.so:graphics/exiv2			\
-		libgmime-2.4.so:mail/gmime24		\
-		libtag.so:audio/taglib			\
+		libgmime-2.4.so:mail/gmime24			\
+		libtag.so:audio/taglib				\
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	update-mime-database:misc/shared-mime-info	\
 		antiword:textproc/antiword			\
 		xdg-open:devel/xdg-utils			\
-		${LOCALBASE}/libexec/xpdf/pdftotext:graphics/xpdf	\
-		catppt:textproc/catdoc			\
-		unrtf:textproc/unrtf			\
+		catppt:textproc/catdoc				\
+		unrtf:textproc/unrtf				\
 		catdvi:print/catdvi				\
-		bash:shells/bash
+		bash:shells/bash				\
+		${LOCALBASE}/libexec/xpdf/pdftotext:graphics/xpdf
 
-PROJECTHOST=	${PORTNAME}-search
+USE_GITHUB=	yes
+GH_ACCOUNT=	FabriceColin
+GH_TAGNAME=	c14d6d5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive	\
 		--enable-mempool=no
-CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
+CONFIGURE_ENV=	MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lboost_system
 
-USES=		execinfo gettext libarchive libtool pkgconfig python \
-		shebangfix sqlite:3
-USE_OPENSSL=	yes
+USES=		autoreconf execinfo gettext libarchive libtool pkgconfig python \
+		shebangfix sqlite:3 ssl
 USE_XORG=	pixman
+USE_GNOME=	atkmm cairo cairomm glibmm gtk20 gtkmm24 libsigc++20 libxml2 pangomm
 USE_LDCONFIG=	${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
 SHEBANG_FILES=	scripts/bash/*.sh
 
diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo
index c3b40fe59cd1..010e6415b76e 100644
--- a/deskutils/pinot/distinfo
+++ b/deskutils/pinot/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pinot-1.06.tar.gz) = bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d
-SIZE (pinot-1.06.tar.gz) = 1066326
+TIMESTAMP = 1473961314
+SHA256 (FabriceColin-pinot-1.09-c14d6d5_GH0.tar.gz) = 24faced5089ebe9df143a7ad4a87b9beaf639533e2c113b6de3ed0f6cdce8394
+SIZE (FabriceColin-pinot-1.09-c14d6d5_GH0.tar.gz) = 786374
diff --git a/deskutils/pinot/files/patch-Utils_TimeConverter.h b/deskutils/pinot/files/patch-Utils_TimeConverter.h
deleted file mode 100644
index a61af8b858c6..000000000000
--- a/deskutils/pinot/files/patch-Utils_TimeConverter.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- Utils/TimeConverter.h.orig	2013-04-24 14:28:21.000000000 +0200
-+++ Utils/TimeConverter.h	2013-12-01 15:39:50.000000000 +0100
-@@ -19,6 +19,7 @@
- #ifndef _TIME_CONVERTER_H
- #define _TIME_CONVERTER_H
- 
-+#include <time.h>
- #include <string>
- 
- #include "Visibility.h"
diff --git a/deskutils/pinot/files/patch-configure b/deskutils/pinot/files/patch-configure
deleted file mode 100644
index 9e46032d1024..000000000000
--- a/deskutils/pinot/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
--   TEXTCAT_LIBS="-lexttextcat"
-+   TEXTCAT_LIBS="-lexttextcat-2.0"
- fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the libarchive filter" >&5
diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist
index 628cf10c5a1a..e2b108dcb202 100644
--- a/deskutils/pinot/pkg-plist
+++ b/deskutils/pinot/pkg-plist
@@ -4,12 +4,12 @@ bin/pinot-index
 bin/pinot-label
 bin/pinot-prefs
 bin/pinot-search
-etc/pinot/external-filters.xml
-etc/pinot/globalconfig.xml
-etc/pinot/textcat31_conf.txt
-etc/pinot/textcat32_conf.txt
-etc/pinot/textcat3_conf.txt
-etc/pinot/textcat_conf.txt
+%%ETCDIR%%/external-filters.xml
+%%ETCDIR%%/globalconfig.xml
+%%ETCDIR%%/textcat31_conf.txt
+%%ETCDIR%%/textcat32_conf.txt
+%%ETCDIR%%/textcat3_conf.txt
+%%ETCDIR%%/textcat_conf.txt
 etc/xdg/autostart/pinot-dbus-daemon.desktop
 include/pinot/ActionQueue.h
 include/pinot/CommandLine.h
@@ -62,6 +62,7 @@ include/pinot/Url.h
 include/pinot/ViewHistory.h
 include/pinot/Visibility.h
 include/pinot/WebEngine.h
+include/pinot/WorkerThread.h
 include/pinot/WorkerThreads.h
 include/pinot/cjkv/CJKVTokenizer.h
 include/pinot/filters/Filter.h
@@ -70,23 +71,14 @@ include/pinot/filters/HtmlFilter.h
 include/pinot/filters/HtmlParser.h
 include/pinot/filters/TextFilter.h
 include/pinot/filters/XmlFilter.h
-include/pinot/xdgmime/xdgmime.c
-include/pinot/xdgmime/xdgmime.h
-include/pinot/xdgmime/xdgmimealias.c
-include/pinot/xdgmime/xdgmimealias.h
-include/pinot/xdgmime/xdgmimecache.c
-include/pinot/xdgmime/xdgmimecache.h
-include/pinot/xdgmime/xdgmimeglob.c
-include/pinot/xdgmime/xdgmimeglob.h
-include/pinot/xdgmime/xdgmimeint.c
-include/pinot/xdgmime/xdgmimeint.h
-include/pinot/xdgmime/xdgmimemagic.c
-include/pinot/xdgmime/xdgmimemagic.h
-include/pinot/xdgmime/xdgmimeparent.c
-include/pinot/xdgmime/xdgmimeparent.h
 lib/pinot/backends/libxapianbackend.so
 lib/pinot/backends/libxapianbackend.so.1
 lib/pinot/backends/libxapianbackend.so.1.0.0
+lib/pinot/filters/libarchivefilter.so
+lib/pinot/filters/libexiv2imagefilter.so
+lib/pinot/filters/libexternalfilter.so
+lib/pinot/filters/libmboxfilter.so
+lib/pinot/filters/libtaglibfilter.so
 lib/pinot/libBasicUtils.a
 lib/pinot/libCollect.a
 lib/pinot/libCore.a
@@ -95,21 +87,18 @@ lib/pinot/libIndex.a
 lib/pinot/libIndexSearch.a
 lib/pinot/libMonitor.a
 lib/pinot/libSQL.a
+lib/pinot/libSQLDB.a
+lib/pinot/libSQLite.a
+lib/pinot/libThread.a
 lib/pinot/libTokenize.a
 lib/pinot/libUtils.a
-lib/pinot/filters/libarchivefilter.so
-%%CHMLIB%%lib/pinot/filters/libchmfilter.so
-lib/pinot/filters/libexiv2imagefilter.so
-lib/pinot/filters/libexternalfilter.so
-lib/pinot/filters/libmboxfilter.so
-lib/pinot/filters/libtaglibfilter.so
 man/man1/pinot-dbus-daemon.1.gz
 man/man1/pinot-index.1.gz
 man/man1/pinot-label.1.gz
 man/man1/pinot-search.1.gz
 man/man1/pinot.1.gz
-share/applications/pinot.desktop
 share/applications/pinot-prefs.desktop
+share/applications/pinot.desktop
 share/dbus-1/services/de.berlios.Pinot.service
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog