Upgrade to 0.70.

Changelog at
<http://svn.berlios.de/wsvn/pinot/tags/version_0_7_0/NEWS?op=file&rev=0&sc=0>

4 files changed, 39 insertions, 23 deletions

diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index c4b0c77c54ac..5b6c65efec15 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	pinot
-PORTVERSION=	0.65
+PORTVERSION=	0.70
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 #		http://www.chez.com/colinf/pinot/	\
@@ -27,6 +27,7 @@ LIB_DEPENDS=	xapian.13:${PORTSDIR}/databases/xapian-core	\
 		curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info	\
 		antiword:${PORTSDIR}/textproc/antiword			\
+		xdg-open:${PORTSDIR}/devel/xdg-utils			\
 		pdftotext:${PORTSDIR}/graphics/xpdf			\
 		unzip:${PORTSDIR}/archivers/unzip			\
 		unrtf:${PORTSDIR}/textproc/unrtf
@@ -45,9 +46,17 @@ USE_GETTEXT=	yes
 USE_XLIB=	yes
 USE_SQLITE=	3
 USE_PYTHON=	yes
+USE_LDCONFIG=	${PREFIX}/lib/pinot/filters
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug=yes
+.endif
 
 INSTALLS_ICONS=	yes
 
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 MAN1=		pinot-collect.1 pinot-dbus-daemon.1 pinot-index.1	\
 		pinot-search.1 pinot.1
 
@@ -75,5 +84,8 @@ post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo
index b74e4f5cd808..98b98a9fbc0d 100644
--- a/deskutils/pinot/distinfo
+++ b/deskutils/pinot/distinfo
@@ -1,3 +1,3 @@
-MD5 (pinot-0.65.tar.gz) = ec6cde03361533372f6ec5ae6976be8b
-SHA256 (pinot-0.65.tar.gz) = ce261c196034c5b922f4505c5e59fb5c8e46a5d50dffbb810985ff567e1f63ed
-SIZE (pinot-0.65.tar.gz) = 762233
+MD5 (pinot-0.70.tar.gz) = 40738cde904eee6645f4daafdd18a849
+SHA256 (pinot-0.70.tar.gz) = 7f0c6b8a4dbbb6c9fc67518c4cfbbc924142a83882cfe019fd15321d8efe19b8
+SIZE (pinot-0.70.tar.gz) = 808023
diff --git a/deskutils/pinot/files/pkg-message.in b/deskutils/pinot/files/pkg-message.in
new file mode 100644
index 000000000000..6baf21a23a51
--- /dev/null
+++ b/deskutils/pinot/files/pkg-message.in
@@ -0,0 +1,13 @@
+=-=-=-=-=-=-=-=-=-=-=-=-==-=-=-=-=-=-=-=-=-=-=-=-==-=-=-=-=-=-=-=-=-=-=-=-=-=-
+Threading issues may cause the daemon to crash unexpectedly.
+A fix is to add the following lines to /etc/libmap.conf (which may not exist):
+
+[%%PREFIX%%/bin/pinot]
+libpthread.so.2         libc_r.so.6
+libpthread.so           libc_r.so
+[%%PREFIX%%/bin/pinot-dbus-daemon]
+libpthread.so.2         libc_r.so.6
+libpthread.so           libc_r.so
+
+Refer to the libmap.conf(5) man page for details.
+=-=-=-=-=-=-=-=-=-=-=-=-==-=-=-=-=-=-=-=-=-=-=-=-==-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist
index 1d4ed4f5e3ff..d71a4be9d049 100644
--- a/deskutils/pinot/pkg-plist
+++ b/deskutils/pinot/pkg-plist
@@ -3,6 +3,7 @@ bin/pinot-collect
 bin/pinot-dbus-daemon
 bin/pinot-index
 bin/pinot-search
+etc/pinot/external-filters.xml
 etc/pinot/globalconfig.xml
 etc/pinot/textcat3_conf.txt
 etc/pinot/textcat_conf.txt
@@ -10,31 +11,22 @@ etc/xdg/autostart/pinot-dbus-daemon.desktop
 lib/deskbar-applet/handlers/pinot-live.py
 lib/deskbar-applet/handlers/pinot-live.pyc
 lib/deskbar-applet/handlers/pinot-live.pyo
-lib/pinot/tokenizers/libopendocumenttokenizer.so
-lib/pinot/tokenizers/libopendocumenttokenizer.so.0
-lib/pinot/tokenizers/libpdftokenizer.so
-lib/pinot/tokenizers/libpdftokenizer.so.0
-lib/pinot/tokenizers/librtftokenizer.so
-lib/pinot/tokenizers/librtftokenizer.so.0
-lib/pinot/tokenizers/libtaglibtokenizer.so
-lib/pinot/tokenizers/libtaglibtokenizer.so.0
-lib/pinot/tokenizers/libwordtokenizer.so
-lib/pinot/tokenizers/libwordtokenizer.so.0
+lib/pinot/filters/libexternalfilter.so
+lib/pinot/filters/libexternalfilter.so.0
+lib/pinot/filters/libmboxfilter.so
+lib/pinot/filters/libmboxfilter.so.0
+lib/pinot/filters/libtaglibfilter.so
+lib/pinot/filters/libtaglibfilter.so.0
 share/applications/pinot.desktop
 share/dbus-1/services/de.berlios.Pinot.service
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/icons/hicolor/48x48/apps/pinot.png
 share/locale/es/LC_MESSAGES/pinot.mo
 share/locale/fr/LC_MESSAGES/pinot.mo
 share/locale/nl/LC_MESSAGES/pinot.mo
+share/locale/pt_BR/LC_MESSAGES/pinot.mo
+share/locale/ru/LC_MESSAGES/pinot.mo
 share/locale/sv/LC_MESSAGES/pinot.mo
 %%DATADIR%%/AmazonAPI.src
-%%DATADIR%%/engines
 %%DATADIR%%/engines/A9.src
 %%DATADIR%%/engines/Accoona.src
 %%DATADIR%%/engines/Ask.src
@@ -59,7 +51,6 @@ share/locale/sv/LC_MESSAGES/pinot.mo
 %%DATADIR%%/metase-gtk2.gladep
 %%DATADIR%%/pinot-dbus-daemon.xml
 %%DATADIR%%/xapian-powered.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/engines
 @dirrm %%DATADIR%%
 @dirrmtry share/icons/hicolor/48x48/apps
@@ -67,7 +58,7 @@ share/locale/sv/LC_MESSAGES/pinot.mo
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
-@dirrm lib/pinot/tokenizers
+@dirrm lib/pinot/filters
 @dirrm lib/pinot
 @dirrmtry lib/deskbar-applet/handlers
 @dirrmtry lib/deskbar-applet