Changeset 87596


Ignore:
Timestamp:
Nov 28, 2011, 2:26:51 AM (8 years ago)
Author:
ryandesign@…
Message:

recoll: maintainer update to 1.16.2; see #32294

Location:
trunk/dports/textproc/recoll
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/textproc/recoll/Portfile

    r82640 r87596  
    66
    77name                recoll
    8 version             1.15.9
    9 revision            2
     8version             1.16.2
    109categories          textproc
    1110platforms           darwin
     
    2019master_sites        ${homepage}
    2120
    22 checksums           sha1    0281286c2fc6a00dcade3eb1d4abb16e478f5d6e \
    23                     rmd160  aa5421a242505ecd7e8b3324713adc397eec7a09
     21checksums           sha1    40c18a958eeecbb70cbdf14fa7319b54525537fa \
     22                    rmd160  fb598b9c637cab49734547a41f2e8ec232f89dbe
    2423
    2524depends_lib         port:xapian-core \
  • trunk/dports/textproc/recoll/files/patch-configure.diff

    r79261 r87596  
    1 --- configure.orig      2011-05-16 02:37:09.000000000 -0500
    2 +++ configure   2011-06-07 03:28:31.000000000 -0500
    3 @@ -4341,12 +4341,8 @@
    4  done
    5  
    6  
    7 -##### Look for iconv. We look for libiconv in ${libdir}, /opt/local/lib,
    8 -##### /usr/local/lib then in libc (Linux, solaris). Note that there is no
    9 -##### way to find libiconv in /usr/local if one exists in ${libdir} (can't
    10 -##### do because the link will always succeed in this case so that if we
    11 -##### put /usr/local/lib in front in this case, we may end up with using it
    12 -##### even if no libiconv in there. We'd need a --with-libiconv= option
    13 +##### Look for iconv. This can exist in either libc (ie: Linux, solaris) or
    14 +##### libiconv. We'd need a --with-libiconv= option
    15  ac_ext=cpp
    16  ac_cpp='$CXXCPP $CPPFLAGS'
    17  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    18 @@ -4355,112 +4351,70 @@
    19  
     1--- configure.orig      2011-10-11 06:25:31.000000000 -0500
     2+++ configure   2011-11-27 20:02:11.000000000 -0600
     3@@ -4366,7 +4366,7 @@
    204 LIBICONV=""
    215 S_LDFLAGS=$LDFLAGS
    22 +S_CPPFLAGS=$CPPFLAGS
     6 S_CPPFLAGS=$CPPFLAGS
     7-for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
    238+for dir in ${libdir} ;do
    24 +  CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
     9   CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
    2510 
    26 -for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
    2711   LDFLAGS="$S_LDFLAGS -L$dir"
    28 -  unset ac_cv_lib_iconv_iconv_open
    29  
    30 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
    31 -$as_echo_n "checking for iconv_open in -liconv... " >&6; }
    32 -if ${ac_cv_lib_iconv_iconv_open+:} false; then :
    33 -  $as_echo_n "(cached) " >&6
    34 -else
    35 -  ac_check_lib_save_LIBS=$LIBS
    36 -LIBS="-liconv  $LIBS"
    37  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    38  /* end confdefs.h.  */
    39 -
    40 -/* Override any GCC internal prototype to avoid an error.
    41 -   Use char because int might match the return type of a GCC
    42 -   builtin and then its argument prototype would still apply.  */
    43 -#ifdef __cplusplus
    44 -extern "C"
    45 -#endif
    46 -char iconv_open ();
    47 +#include <stdlib.h>
    48 +#include <iconv.h>
    49  int
    50  main ()
    51  {
    52 -return iconv_open ();
    53 +iconv_t cd = iconv_open("","");
    54 +       iconv(cd,NULL,NULL,NULL,NULL);
    55 +       iconv_close(cd);
    56    ;
    57    return 0;
    58  }
    59  _ACEOF
    60  if ac_fn_cxx_try_link "$LINENO"; then :
    61 -  ac_cv_lib_iconv_iconv_open=yes
    62 -else
    63 -  ac_cv_lib_iconv_iconv_open=no
    64 +  LIBICONV="-L$dir";INCICONV=-I$dir/../include
    65  fi
    66  rm -f core conftest.err conftest.$ac_objext \
    67      conftest$ac_exeext conftest.$ac_ext
    68 -LIBS=$ac_check_lib_save_LIBS
    69 -fi
    70 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5
    71 -$as_echo "$ac_cv_lib_iconv_iconv_open" >&6; }
    72 -if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
    73 -  LIBICONV="-L$dir -liconv";INCICONV=-I$dir/../include
    74 -fi
    75 -
    76    if test A"$LIBICONV" != A ; then
    77       break
    78    fi
    79 -done
    80  
    81 -if test A"$LIBICONV" = A; then
    82 -  dir=${libdir}
    83 -  LDFLAGS="$S_LDFLAGS -L$dir"
    84 -  unset ac_cv_lib_iconv_iconv_open
    85 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -lc" >&5
    86 -$as_echo_n "checking for iconv_open in -lc... " >&6; }
    87 -if ${ac_cv_lib_c_iconv_open+:} false; then :
    88 -  $as_echo_n "(cached) " >&6
    89 -else
    90 -  ac_check_lib_save_LIBS=$LIBS
    91 -LIBS="-lc  $LIBS"
    92 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    93 +  LDFLAGS="$S_LDFLAGS -L$dir -liconv"
    94 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    95  /* end confdefs.h.  */
    96 -
    97 -/* Override any GCC internal prototype to avoid an error.
    98 -   Use char because int might match the return type of a GCC
    99 -   builtin and then its argument prototype would still apply.  */
    100 -#ifdef __cplusplus
    101 -extern "C"
    102 -#endif
    103 -char iconv_open ();
    104 +#include <stdlib.h>
    105 +#include <iconv.h>
    106  int
    107  main ()
    108  {
    109 -return iconv_open ();
    110 +iconv_t cd = iconv_open("","");
    111 +       iconv(cd,NULL,NULL,NULL,NULL);
    112 +       iconv_close(cd);
    113    ;
    114    return 0;
    115  }
    116  _ACEOF
    117  if ac_fn_cxx_try_link "$LINENO"; then :
    118 -  ac_cv_lib_c_iconv_open=yes
    119 -else
    120 -  ac_cv_lib_c_iconv_open=no
    121 +  LIBICONV="-L$dir -liconv";INCICONV=-I$dir/../include
    122  fi
    123  rm -f core conftest.err conftest.$ac_objext \
    124      conftest$ac_exeext conftest.$ac_ext
    125 -LIBS=$ac_check_lib_save_LIBS
    126 -fi
    127 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_open" >&5
    128 -$as_echo "$ac_cv_lib_c_iconv_open" >&6; }
    129 -if test "x$ac_cv_lib_c_iconv_open" = xyes; then :
    130 -  LIBICONV=NONE;INCICONV=-I/usr/include
    131 -fi
    132 +  if test A"$LIBICONV" != A ; then
    133 +     break
    134 +  fi
    135  
    136 -fi
    137 +done
    138  
    139  LDFLAGS=$S_LDFLAGS
    140 +CPPFLAGS=$S_CPPFLAGS
    141 +
    142  if test A"$LIBICONV" = A ; then
    143     as_fn_error $? "Cannot find iconv_open anywhere. Please install iconv" "$LINENO" 5
    144     exit 1
    145  fi
    146 -if test A"$LIBICONV" = ANONE ; then
    147 -   LIBICONV=""
    148 -fi
    149 -#echo LIBICONV $LIBICONV
    150 -#echo INCICONV $INCICONV
    151 +echo LIBICONV $LIBICONV
    152 +echo INCICONV $INCICONV
    153  
    154  CPPFLAGS="$CPPFLAGS $INCICONV"
    155  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of inbuf parameter to iconv" >&5
    156 @@ -4494,6 +4448,7 @@
    157  fi
    158  
    159  
    160 +############# Putenv
    161  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of string parameter to putenv" >&5
    162  $as_echo_n "checking for type of string parameter to putenv... " >&6; }
    163  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    164 @@ -4523,6 +4478,7 @@
    165  
    166  fi
    167  
    168 +
    169  #### Look for Xapian
    170  # Extract the first word of "xapian-config", so it can be a program name with args.
    171  set dummy xapian-config; ac_word=$2
  • trunk/dports/textproc/recoll/files/patch-sampleconf-mimeview.diff

    r79261 r87596  
    1 --- sampleconf/mimeview 2011-06-06 10:13:07.000000000 +0200
    2 +++ sampleconf/mimeview.mac     2011-06-06 10:13:17.000000000 +0200
     1--- sampleconf/mimeview 2011-10-11 08:44:09.000000000 +0200
     2+++ sampleconf/mimeview.mac     2011-11-27 17:55:42.000000000 +0100
    33@@ -2,7 +2,8 @@
    44 
     
    66 # External viewers, launched by the recoll GUI when you click on a result
    77-# 'edit' link
    8 +# 'Open' link - Mac version
    9 +# On the Mac, we basically use "open" for everything...
     8+# 'Open' link - MAC version
     9+# On the MAC, we basically use "open" for everything...
    1010 
    1111 # Mime types which we should not uncompress if they are found gzipped or
    1212 # bzipped because the native viewer knows how to handle. These would be
    13 @@ -11,63 +12,70 @@
     13@@ -11,74 +12,71 @@
    1414 
    1515 [view]
     
    1717-application/x-all = xdg-open %f
    1818+application/x-all = open %f
    19 +
    20 +[view]
    2119 
    2220 application/x-kword = kword %f
    2321 application/x-abiword = abiword %f
    2422 
    25 -application/msword = openoffice %f
    26 -application/ogg = xmms %f
    27 -application/pdf  = xpdf %f
    28 -application/postscript = gv %f
    29 -application/vnd.ms-excel = openoffice %f
    30 -application/vnd.ms-powerpoint = openoffice %f
     23-application/pdf  = okular %f
     24-application/postscript = okular %f
     25-application/x-dvi = okular %f
    3126+application/pdf  = open %f
    3227+application/postscript = open %f
    3328+application/x-dvi = open %f
    34 +
    35 +application/x-lyx = lyx %f
    36 +application/x-scribus = scribus %f
    37 +
     29 
     30 application/x-lyx = lyx %f
     31 application/x-scribus = scribus %f
     32 
     33-application/msword = libreoffice %f
     34-application/vnd.ms-excel = libreoffice %f
     35-application/vnd.ms-powerpoint = libreoffice %f
    3836+application/msword = open %f
    3937+application/vnd.ms-excel = open %f
    4038+application/vnd.ms-powerpoint = open %f
    41 +
     39 
    4240 application/vnd.openxmlformats-officedocument.wordprocessingml.document = \
    43 - openoffice %f
     41- libreoffice %f
    4442+ open %f
    4543 application/vnd.openxmlformats-officedocument.wordprocessingml.template = \
    46 - openoffice %f
     44- libreoffice %f
    4745+ open %f
    4846 application/vnd.openxmlformats-officedocument.presentationml.template = \
    49 - openoffice %f
     47- libreoffice %f
    5048+ open %f
    5149 application/vnd.openxmlformats-officedocument.presentationml.presentation = \
    52 - openoffice %f
     50- libreoffice %f
    5351+ open %f
    5452 application/vnd.openxmlformats-officedocument.spreadsheetml.sheet = \
    55 - openoffice %f
     53- libreoffice %f
    5654+ open %f
    5755 application/vnd.openxmlformats-officedocument.spreadsheetml.template =\
    58 - openoffice %f
    59 -application/vnd.sun.xml.calc = openoffice %f
    60 -application/vnd.sun.xml.calc.template = openoffice %f
    61 -application/vnd.sun.xml.draw = openoffice %f
    62 -application/vnd.sun.xml.draw.template = openoffice %f
    63 -application/vnd.sun.xml.impress = openoffice %f
    64 -application/vnd.sun.xml.impress.template = openoffice %f
    65 -application/vnd.sun.xml.math = openoffice %f
    66 -application/vnd.sun.xml.writer = openoffice %f
    67 -application/vnd.sun.xml.writer.global = openoffice %f
    68 -application/vnd.sun.xml.writer.template = openoffice %f
    69 -application/vnd.wordperfect = openoffice %f
     56- libreoffice %f
     57-application/vnd.sun.xml.calc = libreoffice %f
     58-application/vnd.sun.xml.calc.template = libreoffice %f
     59-application/vnd.sun.xml.draw = libreoffice %f
     60-application/vnd.sun.xml.draw.template = libreoffice %f
     61-application/vnd.sun.xml.impress = libreoffice %f
     62-application/vnd.sun.xml.impress.template = libreoffice %f
     63-application/vnd.sun.xml.math = libreoffice %f
     64-application/vnd.sun.xml.writer = libreoffice %f
     65-application/vnd.sun.xml.writer.global = libreoffice %f
     66-application/vnd.sun.xml.writer.template = libreoffice %f
     67-application/vnd.wordperfect = libreoffice %f
    7068+ open %f
    7169+application/vnd.sun.xml.calc = open %f
     
    8078+application/vnd.sun.xml.writer.template = open %f
    8179+application/vnd.wordperfect = open %f
    82 +
     80 
    8381 application/x-chm = kchmviewer %f
    84 -application/x-dvi = xdvi %f
    85 -application/x-fsdirectory = rox %f
    86 -application/x-flac = xmms %f
     82-application/x-fsdirectory = dolphin %f
    8783+application/x-fsdirectory = open %f
    8884 application/x-gnuinfo = xterm -e "info -f %f"
    89 -application/x-lyx = lyx %f
    90 -application/x-scribus = scribus %f
    91 -application/x-tex = gnuclient -q %f
    92 -text/x-tex = gnuclient -q %f
    93 -audio/mpeg = xmms %f
    94 -image/jpeg = xv %f
    95 -image/png = xv %f
    96 -image/tiff = xv %f
    97 -image/gif  = xv %f
    98 +
     85 
     86-application/x-flac = rhythmbox %f
     87-audio/mpeg = rhythmbox %f
     88-application/ogg = rhythmbox %f
     89-
     90-image/jpeg = gwenview %f
     91-image/png = gwenview %f
     92-image/tiff = gwenview %f
     93-image/gif  = gwenview %f
     94-image/svg+xml = inkview %f
     95-image/vnd.djvu = djview %f
     96-image/x-xcf = gimp %f
     97-image/bmp = gwenview %f
     98-image/x-ms-bmp = gwenview %f
     99-image/x-xpmi = gwenview %f
     100-
     101-# Or firefox -remote "openFile(%u)"
     102-application/x-tex = emacsclient  %f
     103-text/x-tex = emacsclient  %f
     104-text/html = firefox %u
    99105+application/x-flac = open %f
    100106+audio/mpeg = open %f
     
    105111+image/tiff = open %f
    106112+image/gif  = open %f
    107 +
    108  image/svg+xml = inkview %f
    109  image/vnd.djvu = djview %f
    110 -# Or firefox -remote "openFile(%u)"
    111 -text/html = firefox %u
     113+image/svg+xml = open %f
     114+image/vnd.djvu = open %f
     115+image/x-xcf = open %f
     116+image/bmp = open %f
     117+image/x-ms-bmp = open %f
     118+image/x-xpmi = open %f
    112119+
    113120+application/x-tex = open %f
     
    115122+text/html = open %u
    116123 text/html|gnuinfo = rclshowinfo %F %(title)
    117 -text/plain = gnuclient -q %f
    118 -text/x-c = gnuclient -q %f
    119 -text/x-c+ = gnuclient -q %f
    120 -text/x-c++ = gnuclient -q %f
     124-text/plain = emacsclient %f
     125-text/x-c = emacsclient %f
     126-text/x-c+ = emacsclient %f
     127-text/x-c++ = emacsclient %f
    121128-text/x-html-sidux-man = konqueror %f
    122129-text/x-html-aptosid-man = iceweasel %f
Note: See TracChangeset for help on using the changeset viewer.