cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to pinot-0.95.

Browse Source 
Bugfix updates and daemon speed up.
Developer Fabrice Colin merged all of our patches.
This commit is contained in:
ajacoutot 2009-11-14 11:27:51 +00:00
parent b4e290642b
commit 702887236e
13 changed files with 14 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/pinot/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2009/10/14 11:40:28 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.7 2009/11/14 11:27:51 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= personal search and metasearch
DISTNAME= pinot-0.94
PKGNAME= ${DISTNAME}p3
DISTNAME= pinot-0.95
CATEGORIES= x11 misc

10
x11/pinot/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pinot-0.94.tar.gz) = YZu9bRo72KTd5g7T2z6h+g==
RMD160 (pinot-0.94.tar.gz) = 2k+YSkvQx+fhqstCznZMHQj3+Xo=
SHA1 (pinot-0.94.tar.gz) = 7Hbr5UYIeH2TnxKGKsyznVuTmIk=
SHA256 (pinot-0.94.tar.gz) = 3yhYtG294YsDVhHV2PQxQGw5HslA+uhQGDEXt+ac2NE=
SIZE (pinot-0.94.tar.gz) = 1107116
MD5 (pinot-0.95.tar.gz) = hz40CC48vjK3/qNZjBwFFA==
RMD160 (pinot-0.95.tar.gz) = mhIPyBMp5pGyC2EHLsyeY3TODc4=
SHA1 (pinot-0.95.tar.gz) = NS8LlFUPARizPU9CSNnrVMyQG+8=
SHA256 (pinot-0.95.tar.gz) = BIlt1TqdqsvXYg4Y70Y2RwLl+ZCVV0cDNwKATU0mFJg=
SIZE (pinot-0.95.tar.gz) = 1125597

13
x11/pinot/patches/patch-Core_DaemonState_cpp
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-Core_DaemonState_cpp,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- Core/DaemonState.cpp.orig Fri Jul 31 13:57:14 2009
+++ Core/DaemonState.cpp Fri Jul 31 13:58:28 2009
@@ -36,6 +36,9 @@
#define CHECK_DISK_SPACE 1
#else
#ifdef HAVE_SYS_MOUNT_H
+ #if defined(__OpenBSD__)
+ #include <sys/param.h>
+ #endif
#include <sys/mount.h>
#define CHECK_DISK_SPACE 1
#endif

30
x11/pinot/patches/patch-Core_Makefile_in
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-Core_Makefile_in,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- Core/Makefile.in.orig Mon Aug 17 13:34:11 2009
+++ Core/Makefile.in Mon Aug 17 13:34:54 2009
@@ -303,7 +303,7 @@ AM_CXXFLAGS = @MISC_CFLAGS@ -I$(top_srcdir)/Utils \
@SQL_CFLAGS@ @HTTP_CFLAGS@ @XML_CFLAGS@ @DBUS_CFLAGS@ \
@INDEX_CFLAGS@ @GTHREAD_CFLAGS@ @GTKMM_CFLAGS@ $(am__append_1)
pinot_index_LDFLAGS = \
- -rdynamic
+ -export-dynamic
pinot_index_LDADD = \
-L$(top_builddir)/Utils \
@@ -320,7 +320,7 @@ pinot_index_LDADD = \
pinot_index_SOURCES = pinot-index.cpp
pinot_index_DEPENDENCIES = libCore.la
pinot_search_LDFLAGS = \
- -rdynamic
+ -export-dynamic
pinot_search_LDADD = \
-L$(top_builddir)/Utils \
@@ -337,7 +337,7 @@ pinot_search_SOURCES = \
pinot_search_DEPENDENCIES = libCore.la
pinot_dbus_daemon_LDFLAGS = \
- -rdynamic
+ -export-dynamic
pinot_dbus_daemon_LDADD = \
-L$(top_builddir)/Utils \

36
x11/pinot/patches/patch-Core_WorkerThreads_cpp
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-Core_WorkerThreads_cpp,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- Core/WorkerThreads.cpp.orig Sat Jun 20 19:15:20 2009
+++ Core/WorkerThreads.cpp Fri Jul 31 13:50:19 2009
@@ -34,6 +34,11 @@
#include <glibmm/convert.h>
#include <glibmm/exception.h>
+#ifdef __OpenBSD__
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
#include "config.h"
#include "NLS.h"
#include "Languages.h"
@@ -285,8 +290,19 @@ ThreadsManager::ThreadsManager(const string &defaultIn
pthread_rwlock_init(&m_threadsLock, NULL);
pthread_rwlock_init(&m_listsLock, NULL);
-#ifdef HAVE_SYSCONF
+#if (defined HAVE_SYSCONF && ! defined __OpenBSD__)
m_numCPUs = sysconf(_SC_NPROCESSORS_ONLN);
+#elif defined __OpenBSD__
+ int mib[2], ncpus;
+ size_t len;
+ mib[0] = CTL_HW;
+ mib[1] = HW_NCPU;
+ len = sizeof(ncpus);
+ if (sysctl(mib, 2, &ncpus, &len, NULL, 0) > 0) {
+ m_numCPUs = ncpus;
+ } else {
+ m_numCPUs = 1;
+ }
#endif
}

12
x11/pinot/patches/patch-IndexSearch_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-IndexSearch_Makefile_in,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- IndexSearch/Makefile.in.orig Mon Aug 17 13:35:01 2009
+++ IndexSearch/Makefile.in Mon Aug 17 13:35:12 2009
@@ -311,7 +311,7 @@ libIndexSearch_la_SOURCES = FilterWrapper.cpp ModuleFa
SearchPluginProperties.cpp WebEngine.cpp $(am__append_1) \
$(am__append_2)
pinot_label_LDFLAGS = \
- -rdynamic
+ -export-dynamic
pinot_label_LDADD = \
-L$(top_builddir)/Utils \

12
x11/pinot/patches/patch-IndexSearch_Xapian_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-IndexSearch_Xapian_Makefile_in,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- IndexSearch/Xapian/Makefile.in.orig Mon Aug 17 14:06:19 2009
+++ IndexSearch/Xapian/Makefile.in Mon Aug 17 14:06:32 2009
@@ -296,7 +296,7 @@ libxapianbackend_la_SOURCES = AbstractGenerator.cpp \
$(top_srcdir)/IndexSearch/xesam/XesamQLParser.cc \
$(top_srcdir)/IndexSearch/xesam/XesamQueryBuilder.cc \
$(am__append_1)
-libxapianbackend_la_LDFLAGS = -module -shared -nostartfiles
+libxapianbackend_la_LDFLAGS = -module -avoid-version -shared -nostartfiles
libxapianbackend_la_LIBADD = \
-L$(top_builddir)/Utils \
-lBasicUtils \

12
x11/pinot/patches/patch-Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.1 2009/10/14 11:37:40 ajacoutot Exp $
--- Makefile.in.orig Sat Jun 27 05:40:16 2009
+++ Makefile.in Wed Oct 14 13:15:23 2009
@@ -828,10 +828,10 @@ install-data-local:
$OpenBSD: patch-Makefile_in,v 1.2 2009/11/14 11:27:51 ajacoutot Exp $
--- Makefile.in.orig Sat Nov 7 12:33:02 2009
+++ Makefile.in Sat Nov 7 12:33:27 2009
@@ -932,10 +932,10 @@ install-data-local:
@desktop-file-install --vendor="" --dir=$(DESTDIR)$(datadir)/applications $(srcdir)/pinot-prefs.desktop
@mkdir -p $(DESTDIR)${sysconfdir}/xdg/autostart
@desktop-file-install --vendor="" --dir=$(DESTDIR)${sysconfdir}/xdg/autostart $(srcdir)/pinot-dbus-daemon.desktop
@HAVE_DBUS_TRUE@ @desktop-file-install --vendor="" --dir=$(DESTDIR)${sysconfdir}/xdg/autostart $(srcdir)/pinot-dbus-daemon.desktop
- @mkdir -p $(DESTDIR)$(libdir)/deskbar-applet/handlers/
- $(INSTALL_DATA) $(srcdir)/scripts/python/pinot-live.py $(DESTDIR)$(libdir)/deskbar-applet/handlers/
- @mkdir -p $(DESTDIR)$(libdir)/deskbar-applet/modules-2.20-compatible/
@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2009/10/14 11:37:40 ajacoutot Exp $
+ @mkdir -p $(DESTDIR)$(libdir)/python${MODPY_VERSION}/site-packages/deskbar/handlers/
+ $(INSTALL_DATA) $(srcdir)/scripts/python/pinot-live.py $(DESTDIR)$(libdir)/python${MODPY_VERSION}/site-packages/deskbar/handlers/
+ @mkdir -p $(DESTDIR)$(libexecdir)/deskbar-applet/modules-2.20-compatible/
+ $(INSTALL_DATA) $(srcdir)/scripts/python/pinot-module.py $(DESTDIR)$(libexecdir)/deskbar-applet/modules-2.20-compatible/
+ $(INSTALL_DATA) $(srcdir)/scripts/python/pinot-module.py $(DESTDIR)$(libexecdir)/deskbar-applet/modules-2.20-compatible
$(INSTALL_DATA) $(srcdir)/scripts/bash/*.sh $(DESTDIR)$(datadir)/pinot/
uninstall-local:

30
x11/pinot/patches/patch-README
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-README,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- README.orig Tue Aug 4 15:12:33 2009
+++ README Tue Aug 4 15:13:13 2009
@@ -83,7 +83,7 @@ http://pinot.berlios.de/
http://mycroft.mozdev.org/ has got plenty of plugins. Beware that a lot are
out of date and will require some changes. Use pinot-search on the
command-line to run a quick check on a plugin, eg
- $ pinot-search sherlock /usr/share/pinot/engines/Bozo.src "clowns"
+ $ pinot-search sherlock ${PREFIX}/share/pinot/engines/Bozo.src "clowns"
Plugins are categorized by channels. For Sherlock plugins, the routeType
element under SEARCH specifies the name of the channel the plugin belongs to.
@@ -142,7 +142,7 @@ http://pinot.berlios.de/
Pinot can index any directory configured under the Indexing tab of the
Preferences box. Monitoring is optional and should be disabled for the
- directories whose contents seldom change, eg /usr/share/doc.
+ directories whose contents seldom change, eg ${PREFIX}/share/doc.
Indexing and monitoring of directories is handled by the D-Bus service.
In 0.90 and newer, the daemon will skip symlinks that refer to locations
@@ -475,7 +475,7 @@ http://pinot.berlios.de/
Pinot v0.90 and newer provide a "tagged cd" script that enables to change
a shell's current directory to the directory that matches the path elements
passed as parameter. For instance, after setting :
- $ alias pcd='. /usr/share/pinot/pinot-cd.sh'
+ $ alias pcd='. ${PREFIX}/share/pinot/pinot-cd.sh'
if ~/Documents is configured for indexing in Preferences, the following
command would change the current directory to ~/Documents/Web/Stats :
$ pcd Documents Stats

40
x11/pinot/patches/patch-Tokenize_Makefile_in
View File

@ -1,40 +0,0 @@
$OpenBSD: patch-Tokenize_Makefile_in,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- Tokenize/Makefile.in.orig Mon Aug 17 09:01:38 2009
+++ Tokenize/Makefile.in Mon Aug 17 09:02:13 2009
@@ -336,31 +336,31 @@ noinst_LTLIBRARIES = libTokenize.la
@HAVE_LIBARCHIVE_TRUE@ $(top_srcdir)/Tokenize/filters/Filter.cc \
@HAVE_LIBARCHIVE_TRUE@ $(top_srcdir)/Tokenize/filters/ArchiveFilter.cc
-@HAVE_LIBARCHIVE_TRUE@libarchivefilter_la_LDFLAGS = -module
+@HAVE_LIBARCHIVE_TRUE@libarchivefilter_la_LDFLAGS = -module -avoid-version
@HAVE_LIBARCHIVE_TRUE@libarchivefilter_la_LIBADD = -larchive
libexifimagefilter_la_SOURCES = \
$(top_srcdir)/Tokenize/filters/Filter.cc \
$(top_srcdir)/Tokenize/filters/ExifImageFilter.cc
-libexifimagefilter_la_LDFLAGS = -module
+libexifimagefilter_la_LDFLAGS = -module -avoid-version
libexifimagefilter_la_LIBADD = @EXIF_LIBS@
libexternalfilter_la_SOURCES = \
$(top_srcdir)/Tokenize/filters/Filter.cc \
$(top_srcdir)/Tokenize/filters/ExternalFilter.cc
-libexternalfilter_la_LDFLAGS = -module
+libexternalfilter_la_LDFLAGS = -module -avoid-version
libexternalfilter_la_LIBADD = @XML_LIBS@
libmboxfilter_la_SOURCES = \
$(top_srcdir)/Tokenize/filters/Filter.cc \
$(top_srcdir)/Tokenize/filters/GMimeMboxFilter.cc
-libmboxfilter_la_LDFLAGS = -module
+libmboxfilter_la_LDFLAGS = -module -avoid-version
libmboxfilter_la_LIBADD = @GMIME_LIBS@
libtaglibfilter_la_SOURCES = \
$(top_srcdir)/Tokenize/filters/Filter.cc \
$(top_srcdir)/Tokenize/filters/TagLibMusicFilter.cc
-libtaglibfilter_la_LDFLAGS = -module
+libtaglibfilter_la_LDFLAGS = -module -avoid-version
libtaglibfilter_la_LIBADD = @TAGLIB_LIBS@
libTokenize_la_SOURCES = \
FilterUtils.cpp \

12
x11/pinot/patches/patch-UI_GTK2_src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-UI_GTK2_src_Makefile_in,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- UI/GTK2/src/Makefile.in.orig Mon Aug 17 13:35:22 2009
+++ UI/GTK2/src/Makefile.in Mon Aug 17 13:35:33 2009
@@ -324,7 +324,7 @@ AM_CXXFLAGS = @MISC_CFLAGS@ -I$(top_srcdir)/Utils \
@DBUS_CFLAGS@ @INDEX_CFLAGS@ @GTHREAD_CFLAGS@ @GTKMM_CFLAGS@ \
$(am__append_1)
pinot_LDFLAGS = \
- -rdynamic
+ -export-dynamic
pinot_LDADD = \
-L$(top_builddir)/Utils \

12
x11/pinot/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/08/17 14:34:07 ajacoutot Exp $
--- configure.orig Thu Jul 30 16:19:50 2009
+++ configure Thu Jul 30 16:20:42 2009
@@ -21254,7 +21254,7 @@ pthreadlib=""
{ $as_echo "$as_me:$LINENO: checking if pthreads is available" >&5
$as_echo_n "checking if pthreads is available... " >&6; }
ORIG_LIBS="$LIBS"
-for candidatelib in '' '-pthread' '-lc_r' '-lthr' '-lpthread'; do
+for candidatelib in '' '-pthread' '-lc_r' '-lthr'; do
if test -z "$use_posix_mutex" ; then
LIBS="$candidatelib $ORIG_LIBS"
cat >conftest.$ac_ext <<_ACEOF

4
x11/pinot/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2009/10/14 11:37:40 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2009/11/14 11:27:51 ajacoutot Exp $
@bin bin/pinot
@bin bin/pinot-dbus-daemon
@bin bin/pinot-index
@ -72,11 +72,9 @@ share/pinot/engines/
share/pinot/engines/AmazonAPI.src
share/pinot/engines/Bing.src
share/pinot/engines/Clusty.src
share/pinot/engines/Exalead.src
share/pinot/engines/Freshmeat.src
share/pinot/engines/Google.src
share/pinot/engines/GoogleCodeSearch.src
share/pinot/engines/IOIDescription.xml
share/pinot/engines/KodersDescription.xml
share/pinot/engines/OmegaDescription.xml
share/pinot/engines/RollYOTopNews.src