synchronize with current version in fbsd

This commit is contained in:
Jean-Francois Dockes 2010-10-29 19:48:10 +02:00
parent 033a08511b
commit 4607a1fcb8
5 changed files with 62 additions and 18 deletions

View File

@ -1,30 +1,26 @@
# New ports collection makefile for: recoll
# Date created: 5 December 2005
# Whom: J.F. Dockes <jfd@recoll.org>
# Whom: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
#
# $FreeBSD: ports/deskutils/recoll/Makefile,v 1.21 2007/08/12 14:54:13 rafan Exp $
# $FreeBSD: ports/deskutils/recoll/Makefile,v 1.44 2010/10/09 17:52:42 makc Exp $
#
PORTNAME= recoll
PORTVERSION= 1.9.0
PORTVERSION= 1.14.2
CATEGORIES= deskutils
MASTER_SITES= http://www.lesbonscomptes.com/recoll/
MAINTAINER= jfd@recoll.org
MAINTAINER= jf@dockes.org
COMMENT= A personal full text search package, based on QT and Xapian
BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
LIB_DEPENDS= xapian.1[3-6]:${PORTSDIR}/databases/xapian-core \
qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
LIB_DEPENDS= xapian.[1-2][0-9]:${PORTSDIR}/databases/xapian-core
USE_QT_VER= 3
CONFIGURE_ENV= QMAKESPEC="freebsd-g++"
MAKE_ENV= ${CONFIGURE_ENV}
USE_QT_VER= 4
QT_COMPONENTS= gui qmake_build uic_build moc_build rcc_build \
qt3support uic3_build porting
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_ICONV= yes
USE_XLIB= yes
INSTALLS_ICONS= yes
MAN1= recoll.1 recollindex.1

View File

@ -1,3 +1,3 @@
MD5 (recoll-1.9.0.tar.gz) = f63ff5961fdf3ccfaaae177fb26a01b2
SHA256 (recoll-1.9.0.tar.gz) = 2274e9e508d3d569f70ff2c41c683451e034a66579e1ac8fa98aae34b77c8a5a
SIZE (recoll-1.9.0.tar.gz) = 841232
MD5 (recoll-1.14.2.tar.gz) = 6130d2c6c9d82ef7e2f01f4441b7abc5
SHA256 (recoll-1.14.2.tar.gz) = 064932fb359760fb757ef72f04e1c6b54bf4990e2e0331b8babe97251ad32eb2
SIZE (recoll-1.14.2.tar.gz) = 1285595

View File

@ -0,0 +1,24 @@
diff -r 3ff2556caa01 src/configure
--- configure Sat Sep 25 08:32:10 2010 +0200
+++ configure Sat Sep 25 16:16:33 2010 +0200
@@ -5159,8 +5159,9 @@
if test X$QMAKE = X ; then
QMAKE=qmake
fi
-
- # Extract the first word of "$QMAKE", so it can be a program name with args.
+ case $QMAKE in
+ */*) QMAKEPATH=$QMAKE;;
+ *) # Extract the first word of "$QMAKE", so it can be a program name with args.
set dummy $QMAKE; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -5200,6 +5201,8 @@
$as_echo "no" >&6; }
fi
+;;
+ esac
if test X$QMAKEPATH = XNOTFOUND ; then
{ { $as_echo "$as_me:$LINENO: error: Cannot find the qmake

View File

@ -21,4 +21,4 @@ Features:
* An indexer which runs either as a thread inside the GUI or as an
external, cron'able program.
WWW: http://www.lesbonscomptes.com/recoll/
WWW: http://www.lesbonscomptes.com/recoll/

View File

@ -2,34 +2,53 @@ bin/recoll
bin/recollindex
share/applications/recoll-searchgui.desktop
share/icons/hicolor/48x48/apps/recoll.png
share/pixmaps/recoll.png
%%DATADIR%%/doc/docbook.css
%%DATADIR%%/doc/usermanual.html
%%DATADIR%%/examples/fields
%%DATADIR%%/examples/mimeconf
%%DATADIR%%/examples/mimemap
%%DATADIR%%/examples/mimeview
%%DATADIR%%/examples/rclmon.sh
%%DATADIR%%/examples/recoll.conf
%%DATADIR%%/filters/rclabw
%%DATADIR%%/filters/rclaptosidman
%%DATADIR%%/filters/rclaudio
%%DATADIR%%/filters/rclchm
%%DATADIR%%/filters/rcldjvu
%%DATADIR%%/filters/rcldoc
%%DATADIR%%/filters/rcldvi
%%DATADIR%%/filters/rclexecm.py
%%DATADIR%%/filters/rclfb2
%%DATADIR%%/filters/rclflac
%%DATADIR%%/filters/rclgaim
%%DATADIR%%/filters/rclics
%%DATADIR%%/filters/rclid3
%%DATADIR%%/filters/rcljpeg
%%DATADIR%%/filters/rclimg
%%DATADIR%%/filters/rclkwd
%%DATADIR%%/filters/rcllyx
%%DATADIR%%/filters/rclman
%%DATADIR%%/filters/rclmedia
%%DATADIR%%/filters/rclnull
%%DATADIR%%/filters/rclogg
%%DATADIR%%/filters/rclopxml
%%DATADIR%%/filters/rclpdf
%%DATADIR%%/filters/rclpurple
%%DATADIR%%/filters/rclpython
%%DATADIR%%/filters/rclppt
%%DATADIR%%/filters/rclps
%%DATADIR%%/filters/rclrtf
%%DATADIR%%/filters/rclscribus
%%DATADIR%%/filters/rclsiduxman
%%DATADIR%%/filters/rclsoff
%%DATADIR%%/filters/rclsvg
%%DATADIR%%/filters/rcltex
%%DATADIR%%/filters/rcltext
%%DATADIR%%/filters/rcluncomp
%%DATADIR%%/filters/rclwpd
%%DATADIR%%/filters/rclxls
%%DATADIR%%/filters/rclzip
%%DATADIR%%/filters/xdg-open
%%DATADIR%%/images/aptosid-manual.png
%%DATADIR%%/images/document.png
%%DATADIR%%/images/drawing.png
%%DATADIR%%/images/folder.png
@ -38,12 +57,15 @@ share/icons/hicolor/48x48/apps/recoll.png
%%DATADIR%%/images/message.png
%%DATADIR%%/images/mozilla_doc.png
%%DATADIR%%/images/pdf.png
%%DATADIR%%/images/pidgin.png
%%DATADIR%%/images/postscript.png
%%DATADIR%%/images/presentation.png
%%DATADIR%%/images/sidux-book.png
%%DATADIR%%/images/source.png
%%DATADIR%%/images/sownd.png
%%DATADIR%%/images/soffice.png
%%DATADIR%%/images/spreadsheet.png
%%DATADIR%%/images/text-x-python.png
%%DATADIR%%/images/txt.png
%%DATADIR%%/images/wordprocessing.png
%%DATADIR%%/translations/recoll_fr.qm
@ -51,6 +73,8 @@ share/icons/hicolor/48x48/apps/recoll.png
%%DATADIR%%/translations/recoll_de.qm
%%DATADIR%%/translations/recoll_uk.qm
%%DATADIR%%/translations/recoll_ru.qm
%%DATADIR%%/translations/recoll_tr.qm
%%DATADIR%%/translations/recoll_xx.qm
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%/examples
@dirrm %%DATADIR%%/filters