diff --git a/packaging/macports/textproc/recoll/Portfile b/packaging/macports/textproc/recoll/Portfile
index c63efad8..99820a6d 100644
--- a/packaging/macports/textproc/recoll/Portfile
+++ b/packaging/macports/textproc/recoll/Portfile
@@ -8,7 +8,7 @@ version             1.15.9
 categories          textproc
 platforms           darwin
 license             GPL
-maintainers         medoc
+maintainers         recoll.org:jfd
 description         Desktop full text search
 long_description    Recoll is a desktop search tool based on Xapian
 homepage            http://www.recoll.org
@@ -24,4 +24,12 @@ depends_lib         port:xapian-core \
                     port:libiconv \
                     port:zlib
 
+depends_run         port:antiword \
+                    port:catdoc \
+		    port:libxslt \
+                    port:poppler \
+                    port:unrtf \
+                    port:unzip
+
+patchfiles	    patch-configure.diff patch-sampleconf-mimeview.diff
 configure.args      --without-x --disable-x11mon
diff --git a/packaging/macports/textproc/recoll/files/patch-configure.diff b/packaging/macports/textproc/recoll/files/patch-configure.diff
new file mode 100644
index 00000000..1b7d7e85
--- /dev/null
+++ b/packaging/macports/textproc/recoll/files/patch-configure.diff
@@ -0,0 +1,171 @@
+--- configure.orig	2011-06-06 10:05:13.000000000 +0200
++++ configure	2011-06-06 10:04:15.000000000 +0200
+@@ -4341,12 +4341,8 @@
+ done
+ 
+ 
+-##### Look for iconv. We look for libiconv in ${libdir}, /opt/local/lib,
+-##### /usr/local/lib then in libc (Linux, solaris). Note that there is no
+-##### way to find libiconv in /usr/local if one exists in ${libdir} (can't
+-##### do because the link will always succeed in this case so that if we
+-##### put /usr/local/lib in front in this case, we may end up with using it
+-##### even if no libiconv in there. We'd need a --with-libiconv= option
++##### Look for iconv. This can exist in either libc (ie: Linux, solaris) or
++##### libiconv. We'd need a --with-libiconv= option
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4355,112 +4351,70 @@
+ 
+ LIBICONV=""
+ S_LDFLAGS=$LDFLAGS
+-
++S_CPPFLAGS=$CPPFLAGS
+ for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
++  CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
++
+   LDFLAGS="$S_LDFLAGS -L$dir"
+-  unset ac_cv_lib_iconv_iconv_open
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
+-$as_echo_n "checking for iconv_open in -liconv... " >&6; }
+-if ${ac_cv_lib_iconv_iconv_open+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char iconv_open ();
++#include <stdlib.h>
++#include <iconv.h>
+ int
+ main ()
+ {
+-return iconv_open ();
++iconv_t cd = iconv_open("","");
++       iconv(cd,NULL,NULL,NULL,NULL);
++       iconv_close(cd);
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+-  ac_cv_lib_iconv_iconv_open=yes
+-else
+-  ac_cv_lib_iconv_iconv_open=no
++  LIBICONV="-L$dir";INCICONV=-I$dir/../include
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5
+-$as_echo "$ac_cv_lib_iconv_iconv_open" >&6; }
+-if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
+-  LIBICONV="-L$dir -liconv";INCICONV=-I$dir/../include
+-fi
+-
+   if test A"$LIBICONV" != A ; then
+      break
+   fi
+-done
+ 
+-if test A"$LIBICONV" = A; then
+-  dir=${libdir}
+-  LDFLAGS="$S_LDFLAGS -L$dir"
+-  unset ac_cv_lib_iconv_iconv_open
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -lc" >&5
+-$as_echo_n "checking for iconv_open in -lc... " >&6; }
+-if ${ac_cv_lib_c_iconv_open+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lc  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  LDFLAGS="$S_LDFLAGS -L$dir -liconv"
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char iconv_open ();
++#include <stdlib.h>
++#include <iconv.h>
+ int
+ main ()
+ {
+-return iconv_open ();
++iconv_t cd = iconv_open("","");
++       iconv(cd,NULL,NULL,NULL,NULL);
++       iconv_close(cd);
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+-  ac_cv_lib_c_iconv_open=yes
+-else
+-  ac_cv_lib_c_iconv_open=no
++  LIBICONV="-L$dir -liconv";INCICONV=-I$dir/../include
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_open" >&5
+-$as_echo "$ac_cv_lib_c_iconv_open" >&6; }
+-if test "x$ac_cv_lib_c_iconv_open" = xyes; then :
+-  LIBICONV=NONE;INCICONV=-I/usr/include
+-fi
++  if test A"$LIBICONV" != A ; then
++     break
++  fi
+ 
+-fi
++done
+ 
+ LDFLAGS=$S_LDFLAGS
++CPPFLAGS=$S_CPPFLAGS
++
+ if test A"$LIBICONV" = A ; then
+    as_fn_error $? "Cannot find iconv_open anywhere. Please install iconv" "$LINENO" 5
+    exit 1
+ fi
+-if test A"$LIBICONV" = ANONE ; then
+-   LIBICONV=""
+-fi
+-#echo LIBICONV $LIBICONV
+-#echo INCICONV $INCICONV
++echo LIBICONV $LIBICONV
++echo INCICONV $INCICONV
+ 
+ CPPFLAGS="$CPPFLAGS $INCICONV"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of inbuf parameter to iconv" >&5
+@@ -4494,6 +4448,7 @@
+ fi
+ 
+ 
++############# Putenv
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of string parameter to putenv" >&5
+ $as_echo_n "checking for type of string parameter to putenv... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4523,6 +4478,7 @@
+ 
+ fi
+ 
++
+ #### Look for Xapian
+ # Extract the first word of "xapian-config", so it can be a program name with args.
+ set dummy xapian-config; ac_word=$2
diff --git a/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
new file mode 100644
index 00000000..4bfc8fe8
--- /dev/null
+++ b/packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
@@ -0,0 +1,127 @@
+--- sampleconf/mimeview	2011-06-06 10:13:07.000000000 +0200
++++ sampleconf/mimeview.mac	2011-06-06 10:13:17.000000000 +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 basically 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
+@@ -11,63 +12,70 @@
+ 
+ [view]
+ # Pseudo entry used if the 'use desktop' preference is set in the GUI
+-application/x-all = xdg-open %f
++application/x-all = open %f
++
++[view]
+ 
+ application/x-kword = kword %f
+ application/x-abiword = abiword %f
+ 
+-application/msword = openoffice %f
+-application/ogg = xmms %f
+-application/pdf  = xpdf %f
+-application/postscript = gv %f
+-application/vnd.ms-excel = openoffice %f
+-application/vnd.ms-powerpoint = openoffice %f
++application/pdf  = open %f
++application/postscript = open %f
++application/x-dvi = open %f
++
++application/x-lyx = lyx %f
++application/x-scribus = scribus %f
++
++application/msword = open %f
++application/vnd.ms-excel = open %f
++application/vnd.ms-powerpoint = open %f
++
+ application/vnd.openxmlformats-officedocument.wordprocessingml.document = \
+- openoffice %f
++ open %f
+ application/vnd.openxmlformats-officedocument.wordprocessingml.template = \
+- openoffice %f
++ open %f
+ application/vnd.openxmlformats-officedocument.presentationml.template = \
+- openoffice %f
++ open %f
+ application/vnd.openxmlformats-officedocument.presentationml.presentation = \
+- openoffice %f
++ open %f
+ application/vnd.openxmlformats-officedocument.spreadsheetml.sheet = \
+- openoffice %f
++ open %f
+ application/vnd.openxmlformats-officedocument.spreadsheetml.template =\
+- openoffice %f
+-application/vnd.sun.xml.calc = openoffice %f
+-application/vnd.sun.xml.calc.template = openoffice %f
+-application/vnd.sun.xml.draw = openoffice %f
+-application/vnd.sun.xml.draw.template = openoffice %f
+-application/vnd.sun.xml.impress = openoffice %f
+-application/vnd.sun.xml.impress.template = openoffice %f
+-application/vnd.sun.xml.math = openoffice %f
+-application/vnd.sun.xml.writer = openoffice %f
+-application/vnd.sun.xml.writer.global = openoffice %f
+-application/vnd.sun.xml.writer.template = openoffice %f
+-application/vnd.wordperfect = openoffice %f
++ open %f
++application/vnd.sun.xml.calc = open %f
++application/vnd.sun.xml.calc.template = open %f
++application/vnd.sun.xml.draw = open %f
++application/vnd.sun.xml.draw.template = open %f
++application/vnd.sun.xml.impress = open %f
++application/vnd.sun.xml.impress.template = open %f
++application/vnd.sun.xml.math = open %f
++application/vnd.sun.xml.writer = open %f
++application/vnd.sun.xml.writer.global = open %f
++application/vnd.sun.xml.writer.template = open %f
++application/vnd.wordperfect = open %f
++
+ application/x-chm = kchmviewer %f
+-application/x-dvi = xdvi %f
+-application/x-fsdirectory = rox %f
+-application/x-flac = xmms %f
++application/x-fsdirectory = open %f
+ application/x-gnuinfo = xterm -e "info -f %f"
+-application/x-lyx = lyx %f
+-application/x-scribus = scribus %f
+-application/x-tex = gnuclient -q %f
+-text/x-tex = gnuclient -q %f
+-audio/mpeg = xmms %f
+-image/jpeg = xv %f
+-image/png = xv %f
+-image/tiff = xv %f
+-image/gif  = xv %f
++
++application/x-flac = open %f
++audio/mpeg = open %f
++application/ogg = open %f
++
++image/jpeg = open %f
++image/png = open %f
++image/tiff = open %f
++image/gif  = open %f
++
+ image/svg+xml = inkview %f
+ image/vnd.djvu = djview %f
+-# Or firefox -remote "openFile(%u)"
+-text/html = firefox %u
++
++application/x-tex = open %f
++text/x-tex = open %f
++text/html = open %u
+ text/html|gnuinfo = rclshowinfo %F %(title)
+-text/plain = gnuclient -q %f
+-text/x-c = gnuclient -q %f
+-text/x-c+ = gnuclient -q %f
+-text/x-c++ = gnuclient -q %f
+-text/x-html-sidux-man = konqueror %f
+-text/x-html-aptosid-man = iceweasel %f
++text/plain = open %f
++text/x-c = open %f
++text/x-c+ = open %f
++text/x-c++ = open %f
+ text/x-python = idle %f