macports updates
This commit is contained in:
medoc
parent
621c075820
commit
3fed6f2050
@ -5,7 +5,7 @@ PortSystem 1.0
|
|||||||
PortGroup app 1.0
|
PortGroup app 1.0
|
||||||
|
|
||||||
name recoll
|
name recoll
|
||||||
version 1.18.0
|
version 1.19.7
|
||||||
categories textproc
|
categories textproc
|
||||||
platforms darwin
|
platforms darwin
|
||||||
license GPL-2+
|
license GPL-2+
|
||||||
@ -18,8 +18,8 @@ long_description Recoll is a desktop search tool based on Xapian
|
|||||||
homepage http://www.recoll.org/
|
homepage http://www.recoll.org/
|
||||||
master_sites ${homepage}
|
master_sites ${homepage}
|
||||||
|
|
||||||
checksums rmd160 6c7d6be04d1133cb1043241852e171b80b53c1d3 \
|
checksums rmd160 a22658e9ce855718b2d3dfcf69bd980130f54c6a \
|
||||||
sha256 352a5cd9c6c324c22ee659e8fd088735f99a7707f213369b19faf61983160057
|
sha256 6d647f4c17282994cefb37e068cfb571cf9de14a22087701c59ff8c78a4e0b9d
|
||||||
|
|
||||||
depends_lib port:xapian-core \
|
depends_lib port:xapian-core \
|
||||||
port:qt4-mac \
|
port:qt4-mac \
|
||||||
@ -34,8 +34,10 @@ depends_run port:antiword \
|
|||||||
port:unrtf \
|
port:unrtf \
|
||||||
port:unzip
|
port:unzip
|
||||||
|
|
||||||
patchfiles patch-configure.diff \
|
patchfiles patch-configure.diff \
|
||||||
patch-sampleconf-mimeview.diff
|
patch-recollinstall.diff \
|
||||||
|
patch-qtgui-rclmain.diff \
|
||||||
|
patch-sampleconf-mimeview.diff
|
||||||
|
|
||||||
configure.args --without-x \
|
configure.args --without-x \
|
||||||
--disable-x11mon
|
--disable-x11mon
|
||||||
|
|||||||
@ -1,12 +1,130 @@
|
|||||||
diff -r d2ac364b662c src/configure
|
# HG changeset patch
|
||||||
--- configure Fri Oct 19 16:28:23 2012 +0200
|
# User Jean-Francois Dockes <jfd@recoll.org>
|
||||||
+++ configure Fri Oct 19 18:49:28 2012 +0200
|
# Date 1381233803 -7200
|
||||||
@@ -4472,7 +4472,7 @@
|
# Node ID 1e6e8586ee1f058f58fef5ebba5ae49d8267bee1
|
||||||
LIBICONV=""
|
# Parent 65a7041abbe6e64f6597d5cf27690e91014a85d4
|
||||||
S_LDFLAGS=$LDFLAGS
|
autoconfig out things that dont work currently on mac os x
|
||||||
S_CPPFLAGS=$CPPFLAGS
|
|
||||||
-for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
|
diff --git a/src/configure b/src/configure
|
||||||
+for dir in ${libdir} ;do
|
--- configure
|
||||||
CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
|
+++ configure
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
#! /bin/sh
|
||||||
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
|
-# Generated by GNU Autoconf 2.69 for Recoll 1.19.5.
|
||||||
|
+# Generated by GNU Autoconf 2.69 for Recoll 1.20.0.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||||
|
@@ -577,8 +577,8 @@
|
||||||
|
# Identity of this package.
|
||||||
|
PACKAGE_NAME='Recoll'
|
||||||
|
PACKAGE_TARNAME='recoll'
|
||||||
|
-PACKAGE_VERSION='1.19.5'
|
||||||
|
-PACKAGE_STRING='Recoll 1.19.5'
|
||||||
|
+PACKAGE_VERSION='1.20.0'
|
||||||
|
+PACKAGE_STRING='Recoll 1.20.0'
|
||||||
|
PACKAGE_BUGREPORT=''
|
||||||
|
PACKAGE_URL=''
|
||||||
|
|
||||||
|
@@ -623,6 +623,7 @@
|
||||||
|
LIBOBJS
|
||||||
|
RCLLIBVERSION
|
||||||
|
RCLVERSION
|
||||||
|
+NODYNLIB
|
||||||
|
NOPYTHON
|
||||||
|
NOTHREADS
|
||||||
|
NOPIC
|
||||||
|
@@ -1281,7 +1282,7 @@
|
||||||
|
# Omit some internal or obsolete options to make the list less imposing.
|
||||||
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
|
cat <<_ACEOF
|
||||||
|
-\`configure' configures Recoll 1.19.5 to adapt to many kinds of systems.
|
||||||
|
+\`configure' configures Recoll 1.20.0 to adapt to many kinds of systems.
|
||||||
|
|
||||||
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
|
@@ -1346,7 +1347,7 @@
|
||||||
|
|
||||||
|
if test -n "$ac_init_help"; then
|
||||||
|
case $ac_init_help in
|
||||||
|
- short | recursive ) echo "Configuration of Recoll 1.19.5:";;
|
||||||
|
+ short | recursive ) echo "Configuration of Recoll 1.20.0:";;
|
||||||
|
esac
|
||||||
|
cat <<\_ACEOF
|
||||||
|
|
||||||
|
@@ -1475,7 +1476,7 @@
|
||||||
|
test -n "$ac_init_help" && exit $ac_status
|
||||||
|
if $ac_init_version; then
|
||||||
|
cat <<\_ACEOF
|
||||||
|
-Recoll configure 1.19.5
|
||||||
|
+Recoll configure 1.20.0
|
||||||
|
generated by GNU Autoconf 2.69
|
||||||
|
|
||||||
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||||
|
@@ -2028,7 +2029,7 @@
|
||||||
|
This file contains any messages produced by compilers while
|
||||||
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
|
-It was created by Recoll $as_me 1.19.5, which was
|
||||||
|
+It was created by Recoll $as_me 1.20.0, which was
|
||||||
|
generated by GNU Autoconf 2.69. Invocation command line was
|
||||||
|
|
||||||
|
$ $0 $@
|
||||||
|
@@ -2910,6 +2911,12 @@
|
||||||
|
fi
|
||||||
|
(cd mk; rm -f sysconf; ln -s $sys sysconf)
|
||||||
|
|
||||||
|
+# There a few Recoll users on Mac OS X and a few things are just not worth
|
||||||
|
+# supporting
|
||||||
|
+if test X$sys = XDarwin ; then
|
||||||
|
+ NODYNLIB=#
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
ac_ext=c
|
||||||
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
|
@@ -4402,6 +4409,7 @@
|
||||||
|
# configure --disable-python-module; make; make install;make clean
|
||||||
|
# configure; make; cd python/recoll; make install
|
||||||
|
#
|
||||||
|
+if test X$sys != XDarwin ; then
|
||||||
|
# Check whether --enable-python-module was given.
|
||||||
|
if test "${enable_python_module+set}" = set; then :
|
||||||
|
enableval=$enable_python_module; pythonEnabled=$enableval
|
||||||
|
@@ -4414,6 +4422,9 @@
|
||||||
|
else
|
||||||
|
NOPYTHON="#"
|
||||||
|
fi
|
||||||
|
+else
|
||||||
|
+ NOPYTHON="#"
|
||||||
|
+fi
|
||||||
|
|
||||||
|
# Build PIC objects for the library ?
|
||||||
|
# Check whether --enable-pic was given.
|
||||||
|
@@ -5826,6 +5837,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
+
|
||||||
|
# All object files depend on localdefs which has the cc flags. Avoid
|
||||||
|
# changing it unless necessary
|
||||||
|
ac_config_files="$ac_config_files mk/localdefs.new:mk/localdefs.in"
|
||||||
|
@@ -6355,7 +6367,7 @@
|
||||||
|
# report actual input values of CONFIG_FILES etc. instead of their
|
||||||
|
# values after options handling.
|
||||||
|
ac_log="
|
||||||
|
-This file was extended by Recoll $as_me 1.19.5, which was
|
||||||
|
+This file was extended by Recoll $as_me 1.20.0, which was
|
||||||
|
generated by GNU Autoconf 2.69. Invocation command line was
|
||||||
|
|
||||||
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
|
@@ -6417,7 +6429,7 @@
|
||||||
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||||
|
ac_cs_version="\\
|
||||||
|
-Recoll config.status 1.19.5
|
||||||
|
+Recoll config.status 1.20.0
|
||||||
|
configured by $0, generated by GNU Autoconf 2.69,
|
||||||
|
with options \\"\$ac_cs_config\\"
|
||||||
|
|
||||||
LDFLAGS="$S_LDFLAGS -L$dir"
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
--- sampleconf/mimeview 2012-10-18 10:47:45.000000000 +0200
|
--- sampleconf/mimeview 2013-09-30 18:45:06.000000000 +0200
|
||||||
+++ sampleconf/mimeview.mac 2012-10-19 18:46:14.000000000 +0200
|
+++ sampleconf/mimeview.mac 2013-09-30 18:45:06.000000000 +0200
|
||||||
@@ -2,7 +2,8 @@
|
@@ -2,7 +2,8 @@
|
||||||
|
|
||||||
## ##########################################
|
## ##########################################
|
||||||
@ -10,19 +10,138 @@
|
|||||||
|
|
||||||
# Mime types which we should not uncompress if they are found gzipped or
|
# 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
|
# bzipped because the native viewer knows how to handle. These would be
|
||||||
@@ -16,12 +17,12 @@
|
@@ -16,20 +17,17 @@
|
||||||
# search string
|
# search string
|
||||||
# - For pages of CHM and EPUB documents where we can choose to open the
|
# - For pages of CHM and EPUB documents where we can choose to open the
|
||||||
# parent document instead of a temporary html file.
|
# parent document instead of a temporary html file.
|
||||||
-xallexcepts = application/pdf application/postscript application/x-dvi \
|
-xallexcepts = application/pdf application/postscript application/x-dvi \
|
||||||
- text/html|gnuinfo text/html|chm text/html|epub
|
- text/html|gnuinfo text/html|chm text/html|epub \
|
||||||
|
- application/x-fsdirectory|parentopen inode/directory|parentopen
|
||||||
+#xallexcepts = application/pdf application/postscript application/x-dvi \
|
+#xallexcepts = application/pdf application/postscript application/x-dvi \
|
||||||
+# text/html|gnuinfo text/html|chm text/html|epub
|
+# text/html|gnuinfo text/html|chm text/html|epub
|
||||||
|
|
||||||
[view]
|
[view]
|
||||||
# Pseudo entry used if the 'use desktop' preference is set in the GUI
|
# Pseudo entry used if the 'use desktop' preference is set in the GUI
|
||||||
-application/x-all = xdg-open %f
|
-application/x-all = xdg-open %u
|
||||||
+application/x-all = open %f
|
+application/x-all = open %f
|
||||||
|
|
||||||
application/epub+zip = ebook-viewer %f
|
application/epub+zip = ebook-viewer %f
|
||||||
# If you want to open the parent epub document for epub parts instead of
|
-# 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
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user