Attachment #113804 for bug #155397

View | Details | Raw Unified | Return to bug 155397
Collapse All | Expand All

Lines 6-12 Link Here

(-)recoll/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= recoll	8	PORTNAME= recoll
9	PORTVERSION= 1.14.2	9	PORTVERSION= 1.15.5
10	CATEGORIES= deskutils	10	CATEGORIES= deskutils
11	MASTER_SITES= http://www.lesbonscomptes.com/recoll/	11	MASTER_SITES= http://www.lesbonscomptes.com/recoll/
12		12

Lines 1-3 Link Here

(-)recoll/distinfo (-3 / +2 lines)
1	MD5 (recoll-1.14.2.tar.gz) = 6130d2c6c9d82ef7e2f01f4441b7abc5	1	SHA256 (recoll-1.15.5.tar.gz) = dec55fadd7475addcf2a005c78260f0fcb6450ef0f12ece96e3cda3e6ad06891
2	SHA256 (recoll-1.14.2.tar.gz) = 064932fb359760fb757ef72f04e1c6b54bf4990e2e0331b8babe97251ad32eb2	2	SIZE (recoll-1.15.5.tar.gz) = 1319396
3	SIZE (recoll-1.14.2.tar.gz) = 1285595




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

Lines 11-16 Link Here

(-)recoll/pkg-plist (+8 lines)
11	%%DATADIR%%/examples/mimeview	11	%%DATADIR%%/examples/mimeview
12	%%DATADIR%%/examples/rclmon.sh	12	%%DATADIR%%/examples/rclmon.sh
13	%%DATADIR%%/examples/recoll.conf	13	%%DATADIR%%/examples/recoll.conf
		14	%%DATADIR%%/filters/hotrecoll.py
14	%%DATADIR%%/filters/rclabw	15	%%DATADIR%%/filters/rclabw
15	%%DATADIR%%/filters/rclaptosidman	16	%%DATADIR%%/filters/rclaptosidman
16	%%DATADIR%%/filters/rclaudio	17	%%DATADIR%%/filters/rclaudio
Lines 25-31 Link Here
25	%%DATADIR%%/filters/rclics	26	%%DATADIR%%/filters/rclics
26	%%DATADIR%%/filters/rclid3	27	%%DATADIR%%/filters/rclid3
27	%%DATADIR%%/filters/rclimg	28	%%DATADIR%%/filters/rclimg
		29	%%DATADIR%%/filters/rclinfo
		30	%%DATADIR%%/filters/rclkar
28	%%DATADIR%%/filters/rclkwd	31	%%DATADIR%%/filters/rclkwd
		32	%%DATADIR%%/filters/rcllatinclass.py
		33	%%DATADIR%%/filters/rcllatinstops.zip
29	%%DATADIR%%/filters/rcllyx	34	%%DATADIR%%/filters/rcllyx
30	%%DATADIR%%/filters/rclman	35	%%DATADIR%%/filters/rclman
31	%%DATADIR%%/filters/rclnull	36	%%DATADIR%%/filters/rclnull
Lines 38-43 Link Here
38	%%DATADIR%%/filters/rclps	43	%%DATADIR%%/filters/rclps
39	%%DATADIR%%/filters/rclrtf	44	%%DATADIR%%/filters/rclrtf
40	%%DATADIR%%/filters/rclscribus	45	%%DATADIR%%/filters/rclscribus
		46	%%DATADIR%%/filters/rclshowinfo
41	%%DATADIR%%/filters/rclsiduxman	47	%%DATADIR%%/filters/rclsiduxman
42	%%DATADIR%%/filters/rclsoff	48	%%DATADIR%%/filters/rclsoff
43	%%DATADIR%%/filters/rclsvg	49	%%DATADIR%%/filters/rclsvg
Lines 48-53 Link Here
48	%%DATADIR%%/filters/rclxls	54	%%DATADIR%%/filters/rclxls
49	%%DATADIR%%/filters/rclzip	55	%%DATADIR%%/filters/rclzip
50	%%DATADIR%%/filters/xdg-open	56	%%DATADIR%%/filters/xdg-open
		57	%%DATADIR%%/images/aptosid-book.png
51	%%DATADIR%%/images/aptosid-manual.png	58	%%DATADIR%%/images/aptosid-manual.png
52	%%DATADIR%%/images/document.png	59	%%DATADIR%%/images/document.png
53	%%DATADIR%%/images/drawing.png	60	%%DATADIR%%/images/drawing.png
Lines 70-75 Link Here
70	%%DATADIR%%/images/wordprocessing.png	77	%%DATADIR%%/images/wordprocessing.png
71	%%DATADIR%%/translations/recoll_fr.qm	78	%%DATADIR%%/translations/recoll_fr.qm
72	%%DATADIR%%/translations/recoll_it.qm	79	%%DATADIR%%/translations/recoll_it.qm
		80	%%DATADIR%%/translations/recoll_lt.qm
73	%%DATADIR%%/translations/recoll_de.qm	81	%%DATADIR%%/translations/recoll_de.qm
74	%%DATADIR%%/translations/recoll_uk.qm	82	%%DATADIR%%/translations/recoll_uk.qm
75	%%DATADIR%%/translations/recoll_ru.qm	83	%%DATADIR%%/translations/recoll_ru.qm

Return to bug 155397

Lines 1-24 Link Here

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