Index: head/deskutils/pinot/files/patch-configure =================================================================== --- head/deskutils/pinot/files/patch-configure (revision 422223) +++ head/deskutils/pinot/files/patch-configure (nonexistent) @@ -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 Property changes on: head/deskutils/pinot/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/pinot/files/patch-Utils_TimeConverter.h =================================================================== --- head/deskutils/pinot/files/patch-Utils_TimeConverter.h (revision 422223) +++ head/deskutils/pinot/files/patch-Utils_TimeConverter.h (nonexistent) @@ -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 - #include - - #include "Visibility.h" Property changes on: head/deskutils/pinot/files/patch-Utils_TimeConverter.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/pinot/Makefile =================================================================== --- head/deskutils/pinot/Makefile (revision 422223) +++ head/deskutils/pinot/Makefile (revision 422224) @@ -1,102 +1,100 @@ # Created by: Thierry Thomas # $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 OPTIONS_DEFINE= DEBUG CHMLIB DOCS OPTIONS_SUB= yes DEBUG_CONFIGURE_ON= --enable-debug=yes CHMLIB_CONFIGURE_ON= --enable-chmlib=yes CHMLIB_CONFIGURE_OFF= --disable-chmlib CHMLIB_LIB_DEPENDS= libchm.so:misc/chmlib INSTALLS_ICONS= yes DOCS= AUTHORS ChangeLog ChangeLog-dijon INSTALL NEWS README TODO LM2FIX= textcat_conf.txt textcat3_conf.txt textcat31_conf.txt textcat32_conf.txt SHR2FIX= Core/pinot-search.1 README UL2FIX= Utils/xdgmime/xdgmime.c post-extract: # remove pre-generated messages catalogs ${FIND} ${WRKSRC}/po -name "*.gmo" -delete post-patch: ${REINPLACE_CMD} -e \ '//s|pdftotext|${LOCALBASE}/libexec/xpdf/pdftotext|' \ ${WRKSRC}/Tokenize/filters/external-filters.xml pre-configure: ${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${LM2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e 's|libtextcat/|libtextcat/LM/|' \ ${WRKSRC}/textcat_conf.txt ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${UL2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ ${SHR2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e 's|Icon=pinot.png|Icon=pinot|g' \ ${WRKSRC}/*.desktop post-install: ${TOUCH} ${STAGEDIR}${DATADIR}/stopwords/.empty_file post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/deskutils/pinot/distinfo =================================================================== --- head/deskutils/pinot/distinfo (revision 422223) +++ head/deskutils/pinot/distinfo (revision 422224) @@ -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 Index: head/deskutils/pinot/pkg-plist =================================================================== --- head/deskutils/pinot/pkg-plist (revision 422223) +++ head/deskutils/pinot/pkg-plist (revision 422224) @@ -1,157 +1,146 @@ bin/pinot bin/pinot-dbus-daemon 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 include/pinot/CrawlHistory.h include/pinot/CurlDownloader.h include/pinot/DBusIndex.h include/pinot/DaemonState.h include/pinot/Document.h include/pinot/DocumentInfo.h include/pinot/DownloaderFactory.h include/pinot/DownloaderInterface.h include/pinot/FieldMapperInterface.h include/pinot/FileCollector.h include/pinot/FilterUtils.h include/pinot/FilterWrapper.h include/pinot/INotifyMonitor.h include/pinot/IndexInterface.h include/pinot/Languages.h include/pinot/MIMEScanner.h include/pinot/Memory.h include/pinot/MetaDataBackup.h include/pinot/ModuleFactory.h include/pinot/ModuleProperties.h include/pinot/MonitorEvent.h include/pinot/MonitorFactory.h include/pinot/MonitorHandler.h include/pinot/MonitorInterface.h include/pinot/NLS.h include/pinot/NeonDownloader.h include/pinot/OnDiskHandler.h include/pinot/OpenSearchParser.h include/pinot/PinotSettings.h include/pinot/PluginParsers.h include/pinot/PluginWebEngine.h include/pinot/QueryHistory.h include/pinot/QueryProperties.h include/pinot/ResultsExporter.h include/pinot/SQLDB.h include/pinot/SQLiteBase.h include/pinot/SearchEngineInterface.h include/pinot/SearchPluginProperties.h include/pinot/ServerThreads.h include/pinot/SherlockParser.h include/pinot/StringManip.h include/pinot/TextConverter.h include/pinot/TimeConverter.h include/pinot/Timer.h include/pinot/UniqueApplication.h 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 include/pinot/filters/FilterFactory.h 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 lib/pinot/libFilter.a 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 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog-dijon %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO share/icons/hicolor/16x16/apps/pinot.png share/icons/hicolor/22x22/apps/pinot.png share/icons/hicolor/24x24/apps/pinot.png share/icons/hicolor/32x32/apps/pinot.png share/icons/hicolor/48x48/apps/pinot.png share/locale/cs/LC_MESSAGES/pinot.mo share/locale/de/LC_MESSAGES/pinot.mo share/locale/es/LC_MESSAGES/pinot.mo share/locale/fr/LC_MESSAGES/pinot.mo share/locale/he/LC_MESSAGES/pinot.mo share/locale/it/LC_MESSAGES/pinot.mo share/locale/ja/LC_MESSAGES/pinot.mo share/locale/nl/LC_MESSAGES/pinot.mo share/locale/pt/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 share/locale/zh_CN/LC_MESSAGES/pinot.mo share/locale/zh_TW/LC_MESSAGES/pinot.mo %%DATADIR%%/engines/AmazonAPI.src %%DATADIR%%/engines/Bing.src %%DATADIR%%/engines/Clusty.src %%DATADIR%%/engines/Freecode.src %%DATADIR%%/engines/Google.src %%DATADIR%%/engines/KodersDescription.xml %%DATADIR%%/engines/OmegaDescription.xml %%DATADIR%%/engines/Topix.src %%DATADIR%%/engines/UNData.src %%DATADIR%%/engines/Wikipedia.src %%DATADIR%%/metase-gtk2.glade %%DATADIR%%/metase-gtk2.gladep %%DATADIR%%/pinot-cd.sh %%DATADIR%%/pinot-check-file.sh %%DATADIR%%/pinot-dbus-daemon.xml %%DATADIR%%/pinot-enum-index.sh %%DATADIR%%/stopwords/.empty_file %%DATADIR%%/xapian-powered.png