Date: Wed, 30 Oct 2013 19:28:26 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332164 - in head/deskutils/recoll: . files Message-ID: <201310301928.r9UJSQO4012550@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Wed Oct 30 19:28:26 2013 New Revision: 332164 URL: http://svnweb.freebsd.org/changeset/ports/332164 Log: - Update to 1.19.7 - Change maintainer email to @FreeBSD.org - Fix configure with --enable-pic - Remove PORTSCOUT - Support STAGEDIR and add OPTIONS_SUB - Add patches, fix build on FreeBSD 10 Approved by: pawel / wg (mentors, implicit) Added: head/deskutils/recoll/files/ head/deskutils/recoll/files/patch-common__autoconfig.h.in (contents, props changed) head/deskutils/recoll/files/patch-common__textsplit.cpp (contents, props changed) head/deskutils/recoll/files/patch-common__unordered_defs.h (contents, props changed) head/deskutils/recoll/files/patch-configure (contents, props changed) head/deskutils/recoll/files/patch-configure.ac (contents, props changed) head/deskutils/recoll/files/patch-internfile__mimehandler.cpp (contents, props changed) head/deskutils/recoll/files/patch-lib__Makefile (contents, props changed) head/deskutils/recoll/files/patch-lib__mkMake (contents, props changed) head/deskutils/recoll/files/patch-mk__FreeBSD (contents, props changed) head/deskutils/recoll/files/patch-rcldb__rclabstract.cpp (contents, props changed) head/deskutils/recoll/files/patch-unac__unac.c (contents, props changed) head/deskutils/recoll/files/patch-unac__unac.cpp (contents, props changed) head/deskutils/recoll/files/patch-utils__pxattr.cpp (contents, props changed) head/deskutils/recoll/files/patch-utils__smallut.cpp (contents, props changed) head/deskutils/recoll/files/patch-utils__workqueue.h (contents, props changed) Modified: head/deskutils/recoll/Makefile head/deskutils/recoll/distinfo head/deskutils/recoll/pkg-plist Modified: head/deskutils/recoll/Makefile ============================================================================== --- head/deskutils/recoll/Makefile Wed Oct 30 18:50:38 2013 (r332163) +++ head/deskutils/recoll/Makefile Wed Oct 30 19:28:26 2013 (r332164) @@ -2,72 +2,61 @@ # $FreeBSD$ PORTNAME= recoll -PORTVERSION= 1.18.2 +PORTVERSION= 1.19.7 CATEGORIES= deskutils MASTER_SITES= http://www.lesbonscomptes.com/${PORTNAME}/ -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= Personal full text search package, based on Xapian LICENSE= GPLv2 BUILD_DEPENDS= xapian-core>=0:${PORTSDIR}/databases/xapian-core -USES= iconv gmake +USES= gmake iconv GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-pic CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= recollindex.1 -MAN5= recoll.conf.5 - -OPTIONS_DEFINE= QT4 ASPELL PYTHON X11MON +OPTIONS_DEFINE= ASPELL PYTHON QT4 X11MON X11MON_DESC= X11 session monitoring support -OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON +OPTIONS_DEFAULT=ASPELL PYTHON QT4 X11MON + +OPTIONS_SUB= yes + +ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell +ASPELL_CONFIGURE_WITH= aspell + +PYTHON_CONFIGURE_ENABLE= python-module + +QT4_CONFIGURE_ENABLE= qtgui -# Wrong versioning upstream -PORTSCOUT= skipv:1.19 +X11MON_CONFIGURE_ENABLE= x11mon -NO_STAGE= yes .include <bsd.port.options.mk> +PLIST_SUB+= MAJORVER=${PORTVERSION} + +.if ${PORT_OPTIONS:MPYTHON} +USE_PYTHON= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_EGGINFO= Recoll-1.0-py${PYTHON_VER}.egg-info +.endif + .if ${PORT_OPTIONS:MQT4} USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ corelib gui xml webkit QT_NONSTANDARD= yes CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" -CONFIGURE_ARGS+=--enable-qtgui INSTALLS_ICONS= yes -PLIST_SUB+= QT="" -MAN1+= recollq.1 recoll.1 -.else -CONFIGURE_ARGS+=--disable-qtgui -PLIST_SUB+= QT="@comment " -.endif - -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell -.else -CONFIGURE_ARGS+=--without-aspell -.endif - -.if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= yes -INSTALLS_EGGINFO= yes -PYDISTUTILS_EGGINFO= Recoll-1.0-py${PYTHON_VER}.egg-info -PLIST_SUB+= PYTHON="" -.else -CONFIGURE_ARGS+=--disable-python-module -PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MX11MON} USE_XORG+= ice sm x11 USE_FAM= yes CONFIGURE_ARGS+=--with-fam -.else -CONFIGURE_ARGS+=--disable-x11mon .endif post-patch: @@ -85,7 +74,7 @@ post-patch: post-configure: .if ${PORT_OPTIONS:MQT4} @cd ${WRKSRC}/qtgui && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} + ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} .endif .include <bsd.port.mk> Modified: head/deskutils/recoll/distinfo ============================================================================== --- head/deskutils/recoll/distinfo Wed Oct 30 18:50:38 2013 (r332163) +++ head/deskutils/recoll/distinfo Wed Oct 30 19:28:26 2013 (r332164) @@ -1,2 +1,2 @@ -SHA256 (recoll-1.18.2.tar.gz) = 4729785354bd0d465c92e7d2a6fced688d8c08f1342a9bef2f040e7b10b1f510 -SIZE (recoll-1.18.2.tar.gz) = 1969421 +SHA256 (recoll-1.19.7.tar.gz) = 6d647f4c17282994cefb37e068cfb571cf9de14a22087701c59ff8c78a4e0b9d +SIZE (recoll-1.19.7.tar.gz) = 2005198 Added: head/deskutils/recoll/files/patch-common__autoconfig.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-common__autoconfig.h.in Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,9 @@ +--- ./common/autoconfig.h.in.orig 2013-09-30 18:45:05.000000000 +0200 ++++ ./common/autoconfig.h.in 2013-10-29 15:57:51.000000000 +0100 +@@ -111,3 +111,6 @@ + + #undef _FILE_OFFSET_BITS + #undef _LARGE_FILES ++ ++#undef HAVE_TR1_UNORDERED ++#undef HAVE_CXX0X_UNORDERED Added: head/deskutils/recoll/files/patch-common__textsplit.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-common__textsplit.cpp Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,36 @@ +--- ./common/textsplit.cpp.orig 2013-09-30 18:45:05.000000000 +0200 ++++ ./common/textsplit.cpp 2013-10-29 15:57:51.000000000 +0100 +@@ -23,8 +23,9 @@ + #include <iostream> + #include <string> + #include <algorithm> +-#include <tr1/unordered_set> + #include <cstring> ++#include "unordered_defs.h" ++using namespace std; + + #include "textsplit.h" + #include "debuglog.h" +@@ -32,9 +33,6 @@ + #include "utf8iter.h" + #include "uproplist.h" + +-using std::tr1::unordered_set; +-using namespace std; +- + + /** + * Splitting a text into words. The code in this file works with utf-8 +@@ -60,9 +58,9 @@ + // of Unicode properties, but seems to do the job well enough in most + // common cases + static vector<unsigned int> vpuncblocks; +-static unordered_set<unsigned int> spunc; +-static unordered_set<unsigned int> visiblewhite; +-static unordered_set<unsigned int> sskip; ++static STD_UNORDERED_SET<unsigned int> spunc; ++static STD_UNORDERED_SET<unsigned int> visiblewhite; ++static STD_UNORDERED_SET<unsigned int> sskip; + + class CharClassInit { + public: Added: head/deskutils/recoll/files/patch-common__unordered_defs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-common__unordered_defs.h Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,22 @@ +--- ./common/unordered_defs.h.orig 2013-10-29 15:57:51.000000000 +0100 ++++ ./common/unordered_defs.h 2013-10-29 15:57:51.000000000 +0100 +@@ -0,0 +1,19 @@ ++ ++#include "autoconfig.h" ++ ++#ifdef HAVE_CXX0X_UNORDERED ++# include <unordered_map> ++# include <unordered_set> ++# define STD_UNORDERED_MAP std::unordered_map ++# define STD_UNORDERED_SET std::unordered_set ++#elif defined(HAVE_TR1_UNORDERED) ++# include <tr1/unordered_map> ++# include <tr1/unordered_set> ++# define STD_UNORDERED_MAP std::tr1::unordered_map ++# define STD_UNORDERED_SET std::tr1::unordered_set ++#else ++# include <map> ++# include <set> ++# define STD_UNORDERED_MAP std::map ++# define STD_UNORDERED_SET std::set ++#endif Added: head/deskutils/recoll/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-configure Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,608 @@ +--- ./configure.orig 2013-09-30 18:45:05.000000000 +0200 ++++ ./configure 2013-10-29 15:57:51.000000000 +0100 +@@ -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.19.7. + # + # + # 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.19.7' ++PACKAGE_STRING='Recoll 1.19.7' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -649,7 +649,6 @@ + X_LIBS + X_PRE_LIBS + X_CFLAGS +-CXXCPP + XMKMF + QMAKEPATH + XAPIAN_CONFIG2 +@@ -657,6 +656,7 @@ + XAPIAN_CONFIG0 + aspellProg + fileProg ++CXXCPP + EGREP + GREP + CPP +@@ -739,8 +739,8 @@ + CC + CFLAGS + CPP +-XMKMF +-CXXCPP' ++CXXCPP ++XMKMF' + + + # Initialize some variables set by options. +@@ -1281,7 +1281,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.19.7 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1346,7 +1346,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.19.7:";; + esac + cat <<\_ACEOF + +@@ -1406,8 +1406,8 @@ + CC C compiler command + CFLAGS C compiler flags + CPP C preprocessor +- XMKMF Path to xmkmf, Makefile generator for X Window System + CXXCPP C++ preprocessor ++ XMKMF Path to xmkmf, Makefile generator for X Window System + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -1475,7 +1475,7 @@ + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-Recoll configure 1.19.5 ++Recoll configure 1.19.7 + generated by GNU Autoconf 2.69 + + Copyright (C) 2012 Free Software Foundation, Inc. +@@ -1762,6 +1762,130 @@ + + } # ac_fn_c_check_header_compile + ++# ac_fn_cxx_try_cpp LINENO ++# ------------------------ ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_cxx_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } > conftest.i && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_cxx_try_cpp ++ ++# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES ++# --------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_cxx_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if eval \${$3+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ ++} # ac_fn_cxx_check_header_mongrel ++ + # ac_fn_c_try_link LINENO + # ----------------------- + # Try to link conftest.$ac_ext, and return whether this succeeded. +@@ -1921,43 +2045,6 @@ + + } # ac_fn_cxx_try_link + +-# ac_fn_cxx_try_cpp LINENO +-# ------------------------ +-# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +-ac_fn_cxx_try_cpp () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } > conftest.i && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_cxx_try_cpp +- + # ac_fn_cxx_check_func LINENO FUNC VAR + # ------------------------------------ + # Tests whether FUNC exists, setting the cache variable VAR accordingly +@@ -2028,7 +2115,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.19.7, which was + generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ +@@ -4062,6 +4149,171 @@ + done + + ++# Check for where to find unordered_map etc. ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 ++$as_echo_n "checking how to run the C++ preprocessor... " >&6; } ++if test -z "$CXXCPP"; then ++ if ${ac_cv_prog_CXXCPP+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # Double quotes because CXXCPP needs to be expanded ++ for CXXCPP in "$CXX -E" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ break ++fi ++ ++ done ++ ac_cv_prog_CXXCPP=$CXXCPP ++ ++fi ++ CXXCPP=$ac_cv_prog_CXXCPP ++else ++ ac_cv_prog_CXXCPP=$CXXCPP ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 ++$as_echo "$CXXCPP" >&6; } ++ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } ++fi ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ ++ac_fn_cxx_check_header_mongrel "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" "$ac_includes_default" ++if test "x$ac_cv_header_tr1_unordered_map" = xyes; then : ++ ++$as_echo "#define HAVE_TR1_UNORDERED /**/" >>confdefs.h ++ ++fi ++ ++ ++ac_fn_cxx_check_header_mongrel "$LINENO" "unordered_map" "ac_cv_header_unordered_map" "$ac_includes_default" ++if test "x$ac_cv_header_unordered_map" = xyes; then : ++ ++$as_echo "#define HAVE_CXX0X_UNORDERED /**/" >>confdefs.h ++ ++fi ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ + for ac_header in sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +@@ -4460,7 +4712,6 @@ + CPPFLAGS="$S_CPPFLAGS -I$dir/../include" + + LIBS="$S_LIBS -L$dir" +- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdlib.h> +@@ -4957,140 +5208,6 @@ + fi + + if test "$enableX11mon" = "yes" ; then +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +-$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +-if test -z "$CXXCPP"; then +- if ${ac_cv_prog_CXXCPP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- # Double quotes because CXXCPP needs to be expanded +- for CXXCPP in "$CXX -E" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <limits.h> exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- break +-fi +- +- done +- ac_cv_prog_CXXCPP=$CXXCPP +- +-fi +- CXXCPP=$ac_cv_prog_CXXCPP +-else +- ac_cv_prog_CXXCPP=$CXXCPP +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +-$as_echo "$CXXCPP" >&6; } +-ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <limits.h> exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } +-fi +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 + $as_echo_n "checking for X... " >&6; } + +@@ -6355,7 +6472,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.19.7, which was + generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -6417,7 +6534,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.19.7 + configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + Added: head/deskutils/recoll/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-configure.ac Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,17 @@ +--- ./configure.ac.orig 2013-09-30 18:45:05.000000000 +0200 ++++ ./configure.ac 2013-10-29 15:57:51.000000000 +0100 +@@ -26,6 +26,14 @@ + # OpenBSD needs sys/param.h for mount.h to compile + AC_CHECK_HEADERS([sys/param.h]) + ++# Check for where to find unordered_map etc. ++AC_LANG_PUSH([C++]) ++AC_CHECK_HEADER(tr1/unordered_map,[AC_DEFINE([HAVE_TR1_UNORDERED], ++ [],["Have tr1"])],[]) ++AC_CHECK_HEADER(unordered_map,[AC_DEFINE([HAVE_CXX0X_UNORDERED], ++ [],["Have C++0x"])],[]) ++AC_LANG_POP([C++]) ++ + AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/statvfs.h sys/vfs.h], [], [], + [#ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> Added: head/deskutils/recoll/files/patch-internfile__mimehandler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-internfile__mimehandler.cpp Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,11 @@ +--- ./internfile/mimehandler.cpp.orig 2013-09-30 18:45:06.000000000 +0200 ++++ ./internfile/mimehandler.cpp 2013-10-29 15:57:51.000000000 +0100 +@@ -127,7 +127,7 @@ + { + LOGDEB(("clearMimeHandlerCache()\n")); + typedef multimap<string, RecollFilter*>::value_type value_type; +- map<string, RecollFilter *>::iterator it; ++ multimap<string, RecollFilter *>::iterator it; + PTMutexLocker locker(o_handlers_mutex); + for (it = o_handlers.begin(); it != o_handlers.end(); it++) { + delete it->second; Added: head/deskutils/recoll/files/patch-lib__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-lib__Makefile Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,11 @@ +--- ./lib/Makefile.orig 2013-10-02 09:44:22.000000000 +0200 ++++ ./lib/Makefile 2013-10-29 15:57:51.000000000 +0100 +@@ -19,7 +19,7 @@ + # no effort whatsoever to maintain any kind of ABI compat in this lib. Only + # programs or modules from the same Recoll release can be compatible. + $(LIBRECOLL): $(DEPS) $(OBJS) +- g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS) $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBSYS) ++ $(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS) $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBSYS) + rm -f librecoll.so + ln -s $(LIBRECOLL) librecoll.so + Added: head/deskutils/recoll/files/patch-lib__mkMake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-lib__mkMake Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,11 @@ +--- ./lib/mkMake.orig 2013-09-30 18:45:06.000000000 +0200 ++++ ./lib/mkMake 2013-10-29 15:57:51.000000000 +0100 +@@ -142,7 +142,7 @@ + # no effort whatsoever to maintain any kind of ABI compat in this lib. Only + # programs or modules from the same Recoll release can be compatible. + \$(LIBRECOLL): \$(DEPS) \$(OBJS) +- g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \ ++ \$(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \ + -Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \ + \$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS) + rm -f librecoll.so Added: head/deskutils/recoll/files/patch-mk__FreeBSD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-mk__FreeBSD Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,8 @@ +--- ./mk/FreeBSD.orig 2013-09-30 18:45:06.000000000 +0200 ++++ ./mk/FreeBSD 2013-10-29 15:57:51.000000000 +0100 +@@ -2,4 +2,4 @@ + include $(depth)/mk/localdefs + + ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) -pthread +-LIBSYS = -lz ++LIBSYS = -pthread -lz Added: head/deskutils/recoll/files/patch-rcldb__rclabstract.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-rcldb__rclabstract.cpp Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,39 @@ +--- ./rcldb/rclabstract.cpp.orig 2013-09-30 18:45:06.000000000 +0200 ++++ ./rcldb/rclabstract.cpp 2013-10-29 15:57:51.000000000 +0100 +@@ -19,8 +19,7 @@ + #include <math.h> + + #include <map> +-#include <tr1/unordered_set> +-using std::tr1::unordered_set; ++#include "unordered_defs.h" + + using namespace std; + +@@ -284,7 +283,7 @@ + multimap<double, vector<string> > byQ; + double totalweight = qualityTerms(docid, terms, byQ); + +- for (map<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); ++ for (multimap<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); + mit != byQ.rend(); mit++) { + for (vector<string>::const_iterator qit = mit->second.begin(); + qit != mit->second.end(); qit++) { +@@ -362,7 +361,7 @@ + map<unsigned int, string> sparseDoc; + // Also remember apart the search term positions so that we can list + // them with their snippets. +- unordered_set<unsigned int> searchTermPositions; ++ STD_UNORDERED_SET<unsigned int> searchTermPositions; + + // Remember max position. Used to stop walking positions lists while + // populating the adjacent slots. +@@ -385,7 +384,7 @@ + int ret = ABSRES_OK; + + // Let's go populate +- for (map<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); ++ for (multimap<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); + mit != byQ.rend(); mit++) { + unsigned int maxgrpoccs; + float q; Added: head/deskutils/recoll/files/patch-unac__unac.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-unac__unac.c Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,27 @@ +--- ./unac/unac.c.orig 2013-09-30 18:45:06.000000000 +0200 ++++ ./unac/unac.c 2013-10-29 15:57:51.000000000 +0100 +@@ -31,9 +31,9 @@ + #include <map> + #include <string> + #include <algorithm> +-#include <tr1/unordered_map> ++#include "unordered_defs.h" + using std::string; +-using std::tr1::unordered_map; ++ + #include "smallut.h" + + /* +@@ -42,10 +42,10 @@ + instead according to some local rule. There will usually be very + few of them, but they must be looked up for every translated char. + */ +-unordered_map<unsigned short, string> except_trans; ++STD_UNORDERED_MAP<unsigned short, string> except_trans; + static inline bool is_except_char(unsigned short c, string& trans) + { +- unordered_map<unsigned short, string>::const_iterator it ++ STD_UNORDERED_MAP<unsigned short, string>::const_iterator it + = except_trans.find(c); + if (it == except_trans.end()) + return false; Added: head/deskutils/recoll/files/patch-unac__unac.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-unac__unac.cpp Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,27 @@ +--- ./unac/unac.cpp.orig 2013-09-30 18:45:06.000000000 +0200 ++++ ./unac/unac.cpp 2013-10-29 15:57:51.000000000 +0100 +@@ -31,9 +31,9 @@ + #include <map> + #include <string> + #include <algorithm> +-#include <tr1/unordered_map> ++#include "unordered_defs.h" + using std::string; +-using std::tr1::unordered_map; ++ + #include "smallut.h" + + /* +@@ -42,10 +42,10 @@ + instead according to some local rule. There will usually be very + few of them, but they must be looked up for every translated char. + */ +-unordered_map<unsigned short, string> except_trans; ++STD_UNORDERED_MAP<unsigned short, string> except_trans; + static inline bool is_except_char(unsigned short c, string& trans) + { +- unordered_map<unsigned short, string>::const_iterator it ++ STD_UNORDERED_MAP<unsigned short, string>::const_iterator it + = except_trans.find(c); + if (it == except_trans.end()) + return false; Added: head/deskutils/recoll/files/patch-utils__pxattr.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-utils__pxattr.cpp Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,10 @@ +--- ./utils/pxattr.cpp.orig 2013-09-30 18:45:06.000000000 +0200 ++++ ./utils/pxattr.cpp 2013-10-29 15:57:51.000000000 +0100 +@@ -326,6 +326,7 @@ + return false; + if (!buf.alloc(ret+1)) // NEEDED on FreeBSD (no ending null) + return false; ++ buf.buf[ret] = 0; + if (fd < 0) { + if (flags & PXATTR_NOFOLLOW) { + ret = extattr_list_link(path.c_str(), EXTATTR_NAMESPACE_USER, Added: head/deskutils/recoll/files/patch-utils__smallut.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/recoll/files/patch-utils__smallut.cpp Wed Oct 30 19:28:26 2013 (r332164) @@ -0,0 +1,29 @@ +--- ./utils/smallut.cpp.orig 2013-09-30 18:45:06.000000000 +0200 ++++ ./utils/smallut.cpp 2013-10-29 15:57:51.000000000 +0100 +@@ -34,8 +34,7 @@ + #include <string> + #include <iostream> + #include <list> +-#include <tr1/unordered_map> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310301928.r9UJSQO4012550>