From f67e7ed81ebbc274b67774440990aeaa1885ecff Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Sat, 19 May 2012 09:18:49 +0200
Subject: [PATCH] macports for 1.17.2

---
 packaging/macports/textproc/recoll/Portfile   |  6 ++---
 .../recoll/files/patch-configure.diff         |  6 ++---
 .../files/patch-sampleconf-mimeview.diff      | 27 ++++++++++++-------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/packaging/macports/textproc/recoll/Portfile b/packaging/macports/textproc/recoll/Portfile
index 8b8d5faa..b2ca8688 100644
--- a/packaging/macports/textproc/recoll/Portfile
+++ b/packaging/macports/textproc/recoll/Portfile
@@ -5,7 +5,7 @@ PortSystem          1.0
 PortGroup           app 1.0
 
 name                recoll
-version             1.16.2
+version             1.17.2
 categories          textproc
 platforms           darwin
 license             GPL-2+
@@ -18,8 +18,8 @@ long_description    Recoll is a desktop search tool based on Xapian
 homepage            http://www.recoll.org/
 master_sites        ${homepage}
 
-checksums           sha1    40c18a958eeecbb70cbdf14fa7319b54525537fa \
-                    rmd160  fb598b9c637cab49734547a41f2e8ec232f89dbe
+checksums           sha1    676be89d376a948798611417b928b31485746b1b \
+                    rmd160  be6752c9a36cd9708ab49bbf1eba445f0eb8f623
 
 depends_lib         port:xapian-core \
                     port:qt4-mac \
diff --git a/packaging/macports/textproc/recoll/files/patch-configure.diff b/packaging/macports/textproc/recoll/files/patch-configure.diff
index d0d6c9f6..b08e2de8 100644
--- a/packaging/macports/textproc/recoll/files/patch-configure.diff
+++ b/packaging/macports/textproc/recoll/files/patch-configure.diff
@@ -1,6 +1,6 @@
---- configure.orig	2011-10-11 06:25:31.000000000 -0500
-+++ configure	2011-11-27 20:02:11.000000000 -0600
-@@ -4366,7 +4366,7 @@
+--- configure.orig	2012-05-19 08:10:35.000000000 +0200
++++ configure	2012-05-19 08:10:47.000000000 +0200
+@@ -4409,7 +4409,7 @@
  LIBICONV=""
  S_LDFLAGS=$LDFLAGS
  S_CPPFLAGS=$CPPFLAGS
diff --git a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
index 1e7e8984..98fb57d1 100644
--- a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
+++ b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
@@ -1,5 +1,5 @@
---- sampleconf/mimeview	2011-10-11 08:44:09.000000000 +0200
-+++ sampleconf/mimeview.mac	2011-11-27 17:55:42.000000000 +0100
+--- sampleconf/mimeview	2012-05-04 09:49:33.000000000 +0200
++++ sampleconf/mimeview.mac	2012-05-19 08:05:00.000000000 +0200
 @@ -2,7 +2,8 @@
  
  ## ##########################################
@@ -10,7 +10,7 @@
  
  # 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
-@@ -11,74 +12,71 @@
+@@ -11,82 +12,79 @@
  
  [view]
  # Pseudo entry used if the 'use desktop' preference is set in the GUI
@@ -79,9 +79,11 @@
 +application/vnd.wordperfect = open %f
  
  application/x-chm = kchmviewer %f
+ application/x-dia-diagram = dia %f
 -application/x-fsdirectory = dolphin %f
 +application/x-fsdirectory = open %f
  application/x-gnuinfo = xterm -e "info -f %f"
+ application/x-gnumeric = gnumeric %f
  
 -application/x-flac = rhythmbox %f
 -audio/mpeg = rhythmbox %f
@@ -97,11 +99,6 @@
 -image/bmp = gwenview %f
 -image/x-ms-bmp = gwenview %f
 -image/x-xpmi = gwenview %f
--
--# Or firefox -remote "openFile(%u)"
--application/x-tex = emacsclient  %f
--text/x-tex = emacsclient  %f
--text/html = firefox %u
 +application/x-flac = open %f
 +audio/mpeg = open %f
 +application/ogg = open %f
@@ -116,7 +113,14 @@
 +image/bmp = open %f
 +image/x-ms-bmp = open %f
 +image/x-xpmi = open %f
-+
+ 
+ message/rfc822 = thunderbird -file %f
+ text/x-mail = thunderbird -file %f
+ 
+-application/x-tex = emacsclient  %f
+-text/x-tex = emacsclient  %f
+-# Or firefox -remote "openFile(%u)"
+-text/html = firefox %u
 +application/x-tex = open %f
 +text/x-tex = open %f
 +text/html = open %u
@@ -131,4 +135,9 @@
 +text/x-c = open %f
 +text/x-c+ = open %f
 +text/x-c++ = open %f
+ text/x-chm-html = openchm %f %i
+-text/x-ini = emacsclient  %f
+-text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
++text/x-ini = open  %f
++#text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
  text/x-python = idle %f