4 files changed, 21 insertions, 15 deletions

diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 33446ae67033..62544565e429 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	pinot
-PORTVERSION=	0.97
-PORTREVISION=	3
+PORTVERSION=	0.98
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 #MASTER_SITES=	http://colinf.chez.com/pinot/
 #		http://amra.dyndns.org/
-MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Personal search and metasearch for the Free Desktop
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
 LIB_DEPENDS=	xapian.21:${PORTSDIR}/databases/xapian-core	\
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24	\
@@ -38,7 +38,7 @@ RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info	\
 		unrtf:${PORTSDIR}/textproc/unrtf			\
 		catdvi:${PORTSDIR}/print/catdvi
 
-LICENSE=	GPLv2
+PROJECTHOST=	${PORTNAME}-search
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
@@ -57,15 +57,22 @@ USE_LDCONFIG=	${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
 CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
 
+.if defined(WITH_CHMLIB)
+CONFIGURE_ARGS+=	--enable-chmlib=yes
+PLIST_SUB+=	CHMLIB=""
+.else
+PLIST_SUB+=	CHMLIB="@comment "
+.endif
+
 INSTALLS_ICONS=	yes
 
-PLIST_SUB=	DESKBAR_MOD="${LDESKBAR_MOD}"
+PLIST_SUB+=	DESKBAR_MOD="${LDESKBAR_MOD}"
 
 MAN1=		pinot-dbus-daemon.1 pinot-index.1 pinot-label.1 pinot-search.1 pinot.1
 
 PORTDOCS=	AUTHORS ChangeLog ChangeLog-dijon INSTALL NEWS README TODO
 
-LM2FIX=		textcat_conf.txt textcat3_conf.txt IndexSearch/Google/Makefile.in
+LM2FIX=		textcat_conf.txt textcat3_conf.txt textcat31_conf.txt
 SHR2FIX=	Core/pinot-search.1 README
 UL2FIX=		Utils/xdgmime/xdgmime.c
 
diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo
index 1cdd01b3545a..1952bafcea9b 100644
--- a/deskutils/pinot/distinfo
+++ b/deskutils/pinot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pinot-0.97.tar.gz) = 65910a1cfc07b2fe4df4f377b9f1e84ba1e9e781bc27f2b83d780dbccece03eb
-SIZE (pinot-0.97.tar.gz) = 1115824
+SHA256 (pinot-0.98.tar.gz) = 8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c
+SIZE (pinot-0.98.tar.gz) = 1100996
diff --git a/deskutils/pinot/pkg-descr b/deskutils/pinot/pkg-descr
index b08e5a1f0a6b..7059a8a5fa12 100644
--- a/deskutils/pinot/pkg-descr
+++ b/deskutils/pinot/pkg-descr
@@ -20,4 +20,4 @@ Features:
 - search your desktop and the Web.
 - query remote indexes.
 
-WWW: http://pinot.berlios.de/
+WWW: http://code.google.com/p/pinot-search/
diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist
index 61cf00b0f3c7..2510c448f609 100644
--- a/deskutils/pinot/pkg-plist
+++ b/deskutils/pinot/pkg-plist
@@ -7,6 +7,7 @@ bin/pinot-search
 etc/pinot/external-filters.xml
 etc/pinot/globalconfig.xml
 etc/pinot/textcat3_conf.txt
+etc/pinot/textcat31_conf.txt
 etc/pinot/textcat_conf.txt
 etc/xdg/autostart/pinot-dbus-daemon.desktop
 %%DESKBAR_MOD%%/pinot-module.py
@@ -17,7 +18,8 @@ lib/deskbar-applet/handlers/pinot-live.pyc
 lib/deskbar-applet/handlers/pinot-live.pyo
 lib/pinot/backends/libxapianbackend.so
 lib/pinot/filters/libarchivefilter.so
-lib/pinot/filters/libexifimagefilter.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
@@ -42,20 +44,17 @@ share/locale/ru/LC_MESSAGES/pinot.mo
 share/locale/sv/LC_MESSAGES/pinot.mo
 share/locale/zh_CN/LC_MESSAGES/pinot.mo
 share/locale/zh_TW/LC_MESSAGES/pinot.mo
-%%DATADIR%%/YahooBOSS.src
 %%DATADIR%%/engines/AmazonAPI.src
 %%DATADIR%%/engines/Bing.src
 %%DATADIR%%/engines/Clusty.src
+%%DATADIR%%/engines/DuckDuckGo.xml
 %%DATADIR%%/engines/Freshmeat.src
 %%DATADIR%%/engines/Google.src
-%%DATADIR%%/engines/GoogleCodeSearch.src
 %%DATADIR%%/engines/KodersDescription.xml
 %%DATADIR%%/engines/OmegaDescription.xml
-%%DATADIR%%/engines/RollYOTopNews.src
 %%DATADIR%%/engines/Topix.src
 %%DATADIR%%/engines/UNData.src
 %%DATADIR%%/engines/Wikipedia.src
-%%DATADIR%%/engines/Yahoo.src
 %%DATADIR%%/metase-gtk2.glade
 %%DATADIR%%/metase-gtk2.gladep
 %%DATADIR%%/pinot-cd.sh