Revision: 144413 https://trac.macports.org/changeset/144413 Author: devans@macports.org Date: 2016-01-08 02:19:07 -0800 (Fri, 08 Jan 2016) Log Message: ----------- recoll: update to version 1.21.3, dependencies, remove outdated patch file (#49733). Modified Paths: -------------- trunk/dports/textproc/recoll/Portfile trunk/dports/textproc/recoll/files/patch-sampleconf-mimeview.diff Removed Paths: ------------- trunk/dports/textproc/recoll/files/sampleconf-mimeview.diff Modified: trunk/dports/textproc/recoll/Portfile =================================================================== --- trunk/dports/textproc/recoll/Portfile 2016-01-08 09:10:40 UTC (rev 144412) +++ trunk/dports/textproc/recoll/Portfile 2016-01-08 10:19:07 UTC (rev 144413) @@ -5,8 +5,7 @@ PortGroup app 1.0 name recoll -version 1.19.11p1 -revision 1 +version 1.21.3 categories textproc platforms darwin license GPL-2+ @@ -19,9 +18,11 @@ homepage http://www.lesbonscomptes.com/${name} master_sites ${homepage} -checksums rmd160 de98039d80174a5da6e3cdbcc8b7bc0f4407e44a \ - sha256 8d1d040b8de1f65f01bc0a56053a6df7677360031bf9a6779d3496ced4a61186 +checksums rmd160 ac53ac320a6126e895104a78d1cd9b0baeeae283 \ + sha256 66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a +depends_build port:bison + depends_lib port:xapian-core \ port:qt4-mac \ port:aspell \ Modified: trunk/dports/textproc/recoll/files/patch-sampleconf-mimeview.diff =================================================================== --- trunk/dports/textproc/recoll/files/patch-sampleconf-mimeview.diff 2016-01-08 09:10:40 UTC (rev 144412) +++ trunk/dports/textproc/recoll/files/patch-sampleconf-mimeview.diff 2016-01-08 10:19:07 UTC (rev 144413) @@ -1,5 +1,5 @@ ---- sampleconf/mimeview 2013-09-30 18:45:06.000000000 +0200 -+++ sampleconf/mimeview.mac 2013-09-30 18:45:06.000000000 +0200 +--- sampleconf/mimeview.orig 2015-09-28 00:08:16.000000000 -0700 ++++ sampleconf/mimeview 2016-01-08 01:58:09.000000000 -0800 @@ -2,7 +2,8 @@ ## ########################################## @@ -37,7 +37,17 @@ application/x-mobipocket-ebook = ebook-viewer %f -@@ -76,13 +74,9 @@ +@@ -37,9 +35,6 @@ + application/x-abiword = abiword %f + + application/pdf = evince --page-index=%p --find=%s %f +-# Or: +-#application/pdf = qpdfview --search %s %f#%p +- + application/postscript = evince --page-index=%p --find=%s %f + application/x-dvi = evince --page-index=%p --find=%s %f + +@@ -79,19 +74,9 @@ application/vnd.wordperfect = libreoffice %f text/rtf = libreoffice %f @@ -46,13 +56,19 @@ - application/x-fsdirectory = dolphin %f -inode/directory = dolphin %f +- +-# Both dolphin and nautilus can pre-select a file inside a +-# directory. Thunar can't afaik. xdg-open cant pass an additional +-# parameters so these are to be xallexcepts. -application/x-fsdirectory|parentopen = dolphin --select %(childurl) %f -inode/directory|parentopen = dolphin --select %(childurl) %f +-#application/x-fsdirectory|parentopen = nautilus %(childurl) +-#inode/directory|parentopen = nautilus %(childurl) - application/x-gnuinfo = xterm -e "info -f %f" application/x-gnumeric = gnumeric %f -@@ -102,11 +96,6 @@ +@@ -111,11 +96,6 @@ image/x-ms-bmp = gwenview %f image/x-xpmi = gwenview %f @@ -64,9 +80,9 @@ message/rfc822 = thunderbird -file %f text/x-mail = thunderbird -file %f application/x-mimehtml = thunderbird -file %f -@@ -119,11 +108,11 @@ - application/x-tar = ark %f +@@ -129,11 +109,11 @@ application/zip = ark %f + application/x-7z-compressed = ark %f -application/x-awk = emacsclient --no-wait %f -application/x-perl = emacsclient --no-wait %f @@ -81,7 +97,7 @@ # Or firefox -remote "openFile(%u)" text/html = firefox %u -@@ -135,41 +124,39 @@ +@@ -145,41 +125,39 @@ application/x-webarchive = konqueror %f text/x-fictionbook = ebook-viewer %f Deleted: trunk/dports/textproc/recoll/files/sampleconf-mimeview.diff =================================================================== --- trunk/dports/textproc/recoll/files/sampleconf-mimeview.diff 2016-01-08 09:10:40 UTC (rev 144412) +++ trunk/dports/textproc/recoll/files/sampleconf-mimeview.diff 2016-01-08 10:19:07 UTC (rev 144413) @@ -1,147 +0,0 @@ ---- sampleconf/mimeview 2013-09-30 18:45:06.222313401 +0200 -+++ sampleconf/mimeview.mac 2013-09-30 18:45:06.222313401 +0200 -@@ -2,7 +2,8 @@ - - ## ########################################## - # External viewers, launched by the recoll GUI when you click on a result --# 'edit' link -+# 'Open' link - MAC version -+# On the MAC, we use "open" for everything... - - # Mime types which we should not uncompress if they are found gzipped or - # bzipped because the native viewer knows how to handle. These would be -@@ -16,20 +17,17 @@ - # search string - # - For pages of CHM and EPUB documents where we can choose to open the - # parent document instead of a temporary html file. --xallexcepts = application/pdf application/postscript application/x-dvi \ -- text/html|gnuinfo text/html|chm text/html|epub \ -- application/x-fsdirectory|parentopen inode/directory|parentopen -+#xallexcepts = application/pdf application/postscript application/x-dvi \ -+# text/html|gnuinfo text/html|chm text/html|epub - - [view] - # Pseudo entry used if the 'use desktop' preference is set in the GUI --application/x-all = xdg-open %u -+application/x-all = open %f - - application/epub+zip = ebook-viewer %f --# Open the parent epub document for epub parts instead of opening them as --# html documents. This is almost always what we want. --text/html|epub = ebook-viewer %F;ignoreipath=1 -- --application/x-gnote = gnote %f -+# If you want to open the parent epub document for epub parts instead of -+# opening them as html documents: -+#text/html|epub = ebook-viewer %F;ignoreipath=1 - - application/x-mobipocket-ebook = ebook-viewer %f - -@@ -76,13 +74,9 @@ - application/vnd.wordperfect = libreoffice %f - text/rtf = libreoffice %f - -+application/x-chm = kchmviewer %f - application/x-dia-diagram = dia %f -- - application/x-fsdirectory = dolphin %f --inode/directory = dolphin %f --application/x-fsdirectory|parentopen = dolphin --select %(childurl) %f --inode/directory|parentopen = dolphin --select %(childurl) %f -- - application/x-gnuinfo = xterm -e "info -f %f" - application/x-gnumeric = gnumeric %f - -@@ -102,11 +96,6 @@ - image/x-ms-bmp = gwenview %f - image/x-xpmi = gwenview %f - --# Opening mail messages not always works. --# - Thunderbird will only open a single-message file if it has an .emf --# extension --# - "sylpheed %f" seems to work ok as of version 3.3 --# - "kmail --view %u" works - message/rfc822 = thunderbird -file %f - text/x-mail = thunderbird -file %f - application/x-mimehtml = thunderbird -file %f -@@ -119,11 +108,11 @@ - application/x-tar = ark %f - application/zip = ark %f - --application/x-awk = emacsclient --no-wait %f --application/x-perl = emacsclient --no-wait %f --text/x-perl = emacsclient --no-wait %f --application/x-shellscript = emacsclient --no-wait %f --text/x-shellscript = emacsclient --no-wait %f -+application/x-awk = emacsclient %f -+application/x-perl = emacsclient %f -+text/x-perl = emacsclient %f -+application/x-shellscript = emacsclient %f -+text/x-shellscript = emacsclient %f - - # Or firefox -remote "openFile(%u)" - text/html = firefox %u -@@ -135,41 +124,39 @@ - - application/x-webarchive = konqueror %f - text/x-fictionbook = ebook-viewer %f --application/x-tex = emacsclient --no-wait %f --application/xml = emacsclient --no-wait %f --text/xml = emacsclient --no-wait %f --text/x-tex = emacsclient --no-wait %f --text/plain = emacsclient --no-wait %f --text/x-awk = emacsclient --no-wait %f --text/x-c = emacsclient --no-wait %f --text/x-c+ = emacsclient --no-wait %f --text/x-c++ = emacsclient --no-wait %f -+application/x-tex = emacsclient %f -+application/xml = emacsclient %f -+text/xml = emacsclient %f -+text/x-tex = emacsclient %f -+text/plain = emacsclient %f -+text/x-awk = emacsclient %f -+text/x-c = emacsclient %f -+text/x-c+ = emacsclient %f -+text/x-c++ = emacsclient %f - text/x-csv = libreoffice %f - text/x-html-sidux-man = konqueror %f - text/x-html-aptosid-man = iceweasel %f - --application/x-chm = kchmviewer %f - # Html pages inside a chm have a chm rclaptg set by the filter. Kchmviewer - # knows how to use the ipath (which is the internal chm path) to open the - # file at the right place - text/html|chm = kchmviewer --url %i %F - --text/x-ini = emacsclient --no-wait %f -+text/x-ini = emacsclient %f - text/x-man = xterm -u8 -e "groff -T ascii -man %f | more" - text/x-python = idle %f --text/x-gaim-log = emacsclient --no-wait %f --text/x-purple-html-log = emacsclient --no-wait %f --text/x-purple-log = emacsclient --no-wait %f -+text/x-gaim-log = emacsclient %f -+text/x-purple-html-log = emacsclient %f -+text/x-purple-log = emacsclient %f - - # The video types will usually be handled by the desktop default, but they - # need entries here to get an "Open" link --video/3gpp = vlc %f --video/mp2p = vlc %f --video/mp2t = vlc %f --video/mp4 = vlc %f --video/mpeg = vlc %f --video/quicktime = vlc %f --video/x-matroska = vlc %f --video/x-ms-asf = vlc %f --video/x-msvideo = vlc %f -- -+video/3gpp = open %f -+video/mp2p = open %f -+video/mp2t = open %f -+video/mp4 = open %f -+video/mpeg = open %f -+video/quicktime = open %f -+video/x-matroska = open %f -+video/x-ms-asf = open %f -+video/x-msvideo = open %f