4 files changed, 27 insertions, 9 deletions

diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 965f128cc0ea..b83ba29ba1a2 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pinot
-PORTVERSION=	0.81
-PORTREVISION=	2
+PORTVERSION=	0.82
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 #MASTER_SITES=	http://www.chez.com/colinf/pinot/	\
@@ -49,7 +48,7 @@ USE_XLIB=	yes
 #USE_SQLITE=	3	# Replaced by sqlite3-threads
 USE_PYTHON=	yes
 USE_OPENSSL=	yes
-USE_LDCONFIG=	${PREFIX}/lib/pinot/filters
+USE_LDCONFIG=	${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
 
 .if defined(WITH_SOAP)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libgsoap.a:${PORTSDIR}/devel/gsoap
@@ -64,7 +63,6 @@ SQ3THOL=	${LOCALBASE}/share/sqlite3/sqlite3_with_threads-override-locks
 
 INSTALLS_ICONS=	yes
 
-SUB_FILES=	pkg-message
 PLIST_SUB=	DESKBAR_MOD="${LDESKBAR_MOD}"
 
 MAN1=		pinot-dbus-daemon.1 pinot-index.1 pinot-label.1 pinot-search.1 pinot.1
@@ -72,7 +70,7 @@ 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
-SHR2FIX=	Search/pinot-search.1 README
+SHR2FIX=	IndexSearch/pinot-search.1 README
 UL2FIX=		Utils/xdgmime/xdgmime.c
 
 LDESKBAR_MOD=	lib/deskbar-applet/modules-2.20-compatible
@@ -85,6 +83,7 @@ BROKEN=		does not build on ${OPSYS}-${OSREL}
 .endif
 
 .if ${OSVERSION} < 700041
+SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 .endif
 
diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo
index d418716a9333..b306c0e24ad2 100644
--- a/deskutils/pinot/distinfo
+++ b/deskutils/pinot/distinfo
@@ -1,3 +1,3 @@
-MD5 (pinot-0.81.tar.gz) = c18505716886138a48c766a9b89dcc54
-SHA256 (pinot-0.81.tar.gz) = 5877251710f98b35114d5e8b41496027bb2f507e849da582288d738eb1fc0d45
-SIZE (pinot-0.81.tar.gz) = 925020
+MD5 (pinot-0.82.tar.gz) = 99568299235fa72ab5cc3eae73ee68c6
+SHA256 (pinot-0.82.tar.gz) = a89b1e63e845d5ca1e1f0c1856a1724b80697ae0d0510b0e5447f7ec9c3aa42a
+SIZE (pinot-0.82.tar.gz) = 905303
diff --git a/deskutils/pinot/files/patch-Makefile.in b/deskutils/pinot/files/patch-Makefile.in
new file mode 100644
index 000000000000..322aa50f86ad
--- /dev/null
+++ b/deskutils/pinot/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	2008-01-26 05:35:08.000000000 +0100
++++ Makefile.in	2008-01-28 21:11:55.000000000 +0100
+@@ -783,8 +783,10 @@
+ 	@rm $(DESTDIR)$(libdir)/lib*filter.a $(DESTDIR)$(libdir)/lib*filter.la
+ 	@mv $(DESTDIR)$(libdir)/lib*filter* $(DESTDIR)$(libdir)/pinot/filters/
+ 	@mkdir -p $(DESTDIR)$(libdir)/pinot/backends
+-	@rm $(DESTDIR)$(libdir)/lib*.a $(DESTDIR)$(libdir)/lib*.la
+-	@mv $(DESTDIR)$(libdir)/lib* $(DESTDIR)$(libdir)/pinot/backends/
++	@rm $(DESTDIR)$(libdir)/libxapianbackend.a \
++		$(DESTDIR)$(libdir)/libxapianbackend.la
++	@mv $(DESTDIR)$(libdir)/libxapianbackend.so* \
++		$(DESTDIR)$(libdir)/pinot/backends/
+ 	@mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/
+ 	$(INSTALL_DATA) $(srcdir)/UI/icons/48x48/pinot.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/pinot.png
+ 	@mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/
diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist
index 940d67554c04..ce5cf9216e58 100644
--- a/deskutils/pinot/pkg-plist
+++ b/deskutils/pinot/pkg-plist
@@ -14,6 +14,8 @@ 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/backends/libxapianbackend.so
+lib/pinot/backends/libxapianbackend.so.0
 lib/pinot/filters/libexternalfilter.so
 lib/pinot/filters/libexternalfilter.so.0
 lib/pinot/filters/libmboxfilter.so
@@ -54,8 +56,9 @@ share/locale/zh_TW/LC_MESSAGES/pinot.mo
 %%DATADIR%%/engines/RollYOTopNews.src
 %%DATADIR%%/engines/Topix.src
 %%DATADIR%%/engines/Wikipedia.src
-%%DATADIR%%/engines/WiseNut.src
 %%DATADIR%%/engines/Yahoo.src
+%%DATADIR%%/engines/eric01.src
+%%DATADIR%%/engines/eric02.src
 %%DATADIR%%/metase-gtk2.glade
 %%DATADIR%%/metase-gtk2.gladep
 %%DATADIR%%/pinot-dbus-daemon.xml
@@ -68,6 +71,7 @@ share/locale/zh_TW/LC_MESSAGES/pinot.mo
 @dirrmtry share/icons
 @dirrmtry share/applications
 @dirrm lib/pinot/filters
+@dirrm lib/pinot/backends
 @dirrm lib/pinot
 @dirrmtry lib/deskbar-applet/modules-2.20-compatible
 @dirrmtry lib/deskbar-applet/handlers