ports/150939: [PATCH] deskutils/recoll update to 1.14.2 and move to qt4

Sat Sep 25 15:40:02 UTC 2010

>Number:         150939
>Category:       ports
>Synopsis:       [PATCH] deskutils/recoll update to 1.14.2 and move to qt4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 25 15:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Francois Dockes
>Release:        FreeBSD 7.3-STABLE amd64
>Organization:
>Environment:
System: FreeBSD y 7.3-STABLE FreeBSD 7.3-STABLE #4: Mon Sep 20
18:04:30 CEST 2010 dockes at y:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	Move port to qt4 and update to new recoll release 1.14.2
>How-To-Repeat:
	
>Fix:
See patch.
Please remove file files/patch-xapian12 (unneeded empty file remains after
the patch)

diff -ruN recoll.prev/Makefile recoll/Makefile

--- recoll.prev/Makefile	2010-09-23 19:20:30.000000000 +0200
+++ recoll/Makefile	2010-09-25 17:10:40.000000000 +0200
@@ -2,25 +2,22 @@
 # Date created:        5 December 2005
 # Whom:                J.F. Dockes <jean-francois.dockes at wanadoo.fr>
 #
-# $FreeBSD: ports/deskutils/recoll/Makefile,v 1.43 2010/09/23
17:20:30 pgollucci Exp $
+# $FreeBSD: ports/deskutils/recoll/Makefile,v 1.42 2010/09/14
03:42:05 pgollucci Exp $
 #

 PORTNAME=	recoll
-PORTVERSION=	1.13.04
-PORTREVISION=	1
+PORTVERSION=	1.14.2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/recoll/

 MAINTAINER=	jf at dockes.org
 COMMENT=	A personal full text search package, based on QT and Xapian

-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS=	xapian.[1-2][0-9]:${PORTSDIR}/databases/xapian-core \
-		qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
-
-USE_QT_VER=	3
-CONFIGURE_ENV=	QMAKESPEC="freebsd-g++"
-MAKE_ENV=	${CONFIGURE_ENV}
+LIB_DEPENDS=	xapian.[1-2][0-9]:${PORTSDIR}/databases/xapian-core
+
+USE_QT_VER=	4
+QT_COMPONENTS=  gui qmake_build uic_build moc_build rcc_build \
+		qt3support uic3_build porting
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff -ruN recoll.prev/distinfo recoll/distinfo
--- recoll.prev/distinfo	2010-05-04 22:16:09.000000000 +0200
+++ recoll/distinfo	2010-09-25 14:39:38.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (recoll-1.13.04.tar.gz) = eba9d639dbac149996a92b9b2dffc5ee
-SHA256 (recoll-1.13.04.tar.gz) =
22a12df9595bfd3e42452c806e0b8ddd4e2425c748141a74af44f8bc33be493b
-SIZE (recoll-1.13.04.tar.gz) = 1209507
+MD5 (recoll-1.14.2.tar.gz) = 6130d2c6c9d82ef7e2f01f4441b7abc5
+SHA256 (recoll-1.14.2.tar.gz) =
064932fb359760fb757ef72f04e1c6b54bf4990e2e0331b8babe97251ad32eb2
+SIZE (recoll-1.14.2.tar.gz) = 1285595
diff -ruN recoll.prev/files/patch-configure recoll/files/patch-configure
--- recoll.prev/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ recoll/files/patch-configure	2010-09-25 16:18:14.000000000 +0200
@@ -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
program. Maybe you need to install
diff -ruN recoll.prev/files/patch-xapian12 recoll/files/patch-xapian12
--- recoll.prev/files/patch-xapian12	2010-09-14 05:42:05.000000000 +0200
+++ recoll/files/patch-xapian12	1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rcldb.cpp
---- rcldb/rcldb.cpp	Tue May 04 15:40:13 2010 +0200
-+++ rcldb/rcldb.cpp	Tue May 04 15:40:40 2010 +0200
-@@ -33,7 +33,7 @@
- using namespace std;
- #endif /* NO_NAMESPACES */
-
--#include "xapian/version.h"
-+#include "xapian.h"
-
- #include "rclconfig.h"
- #include "rcldb.h"
-diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rclquery.cpp
---- rcldb/rclquery.cpp	Tue May 04 15:40:13 2010 +0200
-+++ rcldb/rclquery.cpp	Tue May 04 15:40:40 2010 +0200
-@@ -8,7 +8,7 @@
- #include <list>
- #include <vector>
-
--#include "xapian/sorter.h"
-+#include "xapian.h"
-
- #include "rcldb.h"
- #include "rcldb_p.h"
-diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/stemdb.cpp
---- rcldb/stemdb.cpp	Tue May 04 15:40:13 2010 +0200
-+++ rcldb/stemdb.cpp	Tue May 04 15:40:40 2010 +0200
-@@ -12,7 +12,6 @@
- #include <map>
-
- #include <xapian.h>
--#include <xapian/stem.h>
-
- #include "stemdb.h"
- #include "wipedir.h"
diff -ruN recoll.prev/pkg-plist recoll/pkg-plist
--- recoll.prev/pkg-plist	2010-05-04 22:16:09.000000000 +0200
+++ recoll/pkg-plist	2010-09-25 14:39:38.000000000 +0200
@@ -12,11 +12,14 @@
 %%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
@@ -25,6 +28,7 @@
 %%DATADIR%%/filters/rclkwd
 %%DATADIR%%/filters/rcllyx
 %%DATADIR%%/filters/rclman
+%%DATADIR%%/filters/rclnull
 %%DATADIR%%/filters/rclogg
 %%DATADIR%%/filters/rclopxml
 %%DATADIR%%/filters/rclpdf
@@ -44,6 +48,7 @@
 %%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
>Release-Note:
>Audit-Trail:
>Unformatted:

