View | Details | Raw Unified | Return to bug 219481 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-22 / +17 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	recoll
4
PORTNAME=	recoll
5
PORTVERSION=	1.21.6
5
PORTVERSION=	1.23.3
6
PORTREVISION=	1
7
CATEGORIES=	deskutils
6
CATEGORIES=	deskutils
8
MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
7
MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
9
8
Lines 20-27 Link Here
20
		wpd2html:textproc/libwpd010 \
19
		wpd2html:textproc/libwpd010 \
21
		unrtf:textproc/unrtf
20
		unrtf:textproc/unrtf
22
21
23
USES=		bison gmake iconv shebangfix
22
USES=		bison gmake iconv libtool shebangfix
24
SHEBANG_FILES=	filters/rclimg filters/rclpdf desktop/hotrecoll.py
23
SHEBANG_FILES=	filters/rclimg filters/rclpdf.py desktop/hotrecoll.py
25
USE_GNOME=	libxslt:run
24
USE_GNOME=	libxslt:run
26
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
27
CONFIGURE_ARGS=	--enable-pic
26
CONFIGURE_ARGS=	--enable-pic
Lines 33-39 Link Here
33
32
34
OPTIONS_DEFINE=		ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON \
33
OPTIONS_DEFINE=		ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON \
35
			SOUND QT4 X11MON
34
			SOUND QT4 X11MON
36
OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS PYTHON SOUND QT4 X11MON
35
OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS PYTHON SOUND QT4
37
OPTIONS_SUB=		yes
36
OPTIONS_SUB=		yes
38
37
39
ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
38
ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
Lines 48-54 Link Here
48
LATEX_USE=		tex=dvipsk:run,latex:run
47
LATEX_USE=		tex=dvipsk:run,latex:run
49
PDF_RUN_DEPENDS=	pdftotext:graphics/poppler-utils
48
PDF_RUN_DEPENDS=	pdftotext:graphics/poppler-utils
50
PS_RUN_DEPENDS=		pstotext:print/pstotext
49
PS_RUN_DEPENDS=		pstotext:print/pstotext
51
PYTHON_USES=		python
50
PYTHON_USES=		python:build,run
52
PYTHON_CONFIGURE_ENABLE=	python-module
51
PYTHON_CONFIGURE_ENABLE=	python-module
53
PYTHON_PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
52
PYTHON_PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
54
PYTHON_VARS= 		PYDISTUTILS_PKGNAME=Recoll \
53
PYTHON_VARS= 		PYDISTUTILS_PKGNAME=Recoll \
Lines 69-101 Link Here
69
X11MON_CONFIGURE_WITH=	fam
68
X11MON_CONFIGURE_WITH=	fam
70
69
71
post-patch:
70
post-patch:
72
	@${REINPLACE_CMD} -e \
71
	${REINPLACE_CMD} -e \
73
		's|@QMAKE@|${TRUE}|' \
72
                's|@QMAKE@|${TRUE}|' \
74
		${WRKSRC}/Makefile.in
73
                ${WRKSRC}/Makefile.in
75
	@${REINPLACE_CMD} -e \
74
	${REINPLACE_CMD} -e \
76
		's|/usr/local/lib|${LOCALBASE}/lib|' \
75
		's|/usr/local/lib|${LOCALBASE}/lib|' \
77
		${WRKSRC}/configure
76
		${WRKSRC}/configure
78
	@${REINPLACE_CMD} -e \
77
	${REINPLACE_CMD} -e \
79
		's|@NOCMDLINE@|| ; \
80
		 s|python setup.py|${PYTHON_CMD} setup.py|' \
81
		${WRKSRC}/recollinstall.in
82
	@${REINPLACE_CMD} -e \
83
		's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \
78
		's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \
84
		${WRKSRC}/python/recoll/Makefile
79
		${WRKSRC}/python/recoll/Makefile.in
80
	${REINPLACE_CMD} -e \
81
		's|python setup.py|${PYTHON_CMD} setup.py|' \
82
		${WRKSRC}/Makefile.in
85
83
86
pre-build-QT4-on:
84
pre-build-QT4-on:
87
	@(cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \
85
	@(cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \
88
		${QMAKE_ARGS} recoll.pro)
86
		${QMAKE_ARGS} recoll.pro)
89
87
90
post-install:
91
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/recoll/librecoll.so.[0-9].*
92
93
post-install-PYTHON-on:
88
post-install-PYTHON-on:
94
.for l in recoll rclextract
89
.for l in recoll rclextract
95
	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/${l}.so
90
	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/${l}.so
96
.endfor
91
.endfor
97
	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
92
	cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
98
		-d ${PYTHONPREFIX_SITELIBDIR} \
93
		-d ${PYTHONPREFIX_SITELIBDIR} \
99
		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
94
		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
100
95
101
.include <bsd.port.mk>
96
.include <bsd.port.mk>
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (recoll-1.21.6.tar.gz) = 561341ca835d18de0c4c2d24f766bec2cb5de690cead10341c4e7278e45f28e3
1
TIMESTAMP = 1509445620
2
SIZE (recoll-1.21.6.tar.gz) = 2283386
2
SHA256 (recoll-1.23.3.tar.gz) = 15125871424ef32ac584eb1c3e4fdd4ac7ff32894db60a3ebff32fa7a45d2eb6
3
SIZE (recoll-1.23.3.tar.gz) = 2590148
(-)pkg-plist (-16 / +20 lines)
Lines 1-6 Link Here
1
%%QT4%%bin/recoll
1
%%QT4%%bin/recoll
2
bin/recollindex
2
bin/recollindex
3
bin/recollq
4
%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%
3
%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%
5
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.py
4
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.py
6
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
5
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
Lines 8-14 Link Here
8
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
7
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
9
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclextract.so
8
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclextract.so
10
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/recoll.so
9
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/recoll.so
11
lib/recoll/librecoll.so.%%VERSION%%
10
lib/recoll/librecoll-%%VERSION%%.so
11
lib/recoll/librecoll.so
12
%%QT4%%man/man1/recoll.1.gz
12
%%QT4%%man/man1/recoll.1.gz
13
man/man1/recollindex.1.gz
13
man/man1/recollindex.1.gz
14
man/man1/recollq.1.gz
14
man/man1/recollq.1.gz
Lines 39-48 Link Here
39
%%DATADIR%%/filters/rclchm
39
%%DATADIR%%/filters/rclchm
40
%%DATADIR%%/filters/rclconfig.py
40
%%DATADIR%%/filters/rclconfig.py
41
%%DATADIR%%/filters/rcldia
41
%%DATADIR%%/filters/rcldia
42
%%DATADIR%%/filters/rcldjvu
42
%%DATADIR%%/filters/rcldjvu.py
43
%%DATADIR%%/filters/rcldoc
43
%%DATADIR%%/filters/rcldoc.py
44
%%DATADIR%%/filters/rcldvi
44
%%DATADIR%%/filters/rcldvi
45
%%DATADIR%%/filters/rclepub
45
%%DATADIR%%/filters/rclepub
46
%%DATADIR%%/filters/rclepub1
47
%%DATADIR%%/filters/rclexec1.py
46
%%DATADIR%%/filters/rclexecm.py
48
%%DATADIR%%/filters/rclexecm.py
47
%%DATADIR%%/filters/rclfb2
49
%%DATADIR%%/filters/rclfb2
48
%%DATADIR%%/filters/rclgaim
50
%%DATADIR%%/filters/rclgaim
Lines 49-54 Link Here
49
%%DATADIR%%/filters/rclgnm
51
%%DATADIR%%/filters/rclgnm
50
%%DATADIR%%/filters/rclics
52
%%DATADIR%%/filters/rclics
51
%%DATADIR%%/filters/rclimg
53
%%DATADIR%%/filters/rclimg
54
%%DATADIR%%/filters/rclimg.py
52
%%DATADIR%%/filters/rclinfo
55
%%DATADIR%%/filters/rclinfo
53
%%DATADIR%%/filters/rclkar
56
%%DATADIR%%/filters/rclkar
54
%%DATADIR%%/filters/rclkwd
57
%%DATADIR%%/filters/rclkwd
Lines 56-87 Link Here
56
%%DATADIR%%/filters/rcllatinstops.zip
59
%%DATADIR%%/filters/rcllatinstops.zip
57
%%DATADIR%%/filters/rcllyx
60
%%DATADIR%%/filters/rcllyx
58
%%DATADIR%%/filters/rclman
61
%%DATADIR%%/filters/rclman
59
%%DATADIR%%/filters/rclmpdf
60
%%DATADIR%%/filters/rclnull
61
%%DATADIR%%/filters/rclokulnote
62
%%DATADIR%%/filters/rclokulnote
62
%%DATADIR%%/filters/rclopxml
63
%%DATADIR%%/filters/rclopxml.py
63
%%DATADIR%%/filters/rclpdf
64
%%DATADIR%%/filters/rclpdf.py
64
%%DATADIR%%/filters/rclppt
65
%%DATADIR%%/filters/rclppt.py
65
%%DATADIR%%/filters/rclps
66
%%DATADIR%%/filters/rclps
66
%%DATADIR%%/filters/rclpurple
67
%%DATADIR%%/filters/rclpurple
67
%%DATADIR%%/filters/rclpython
68
%%DATADIR%%/filters/rclpython
68
%%DATADIR%%/filters/rclrar
69
%%DATADIR%%/filters/rclrar
69
%%DATADIR%%/filters/rclrtf
70
%%DATADIR%%/filters/rclrtf.py
70
%%DATADIR%%/filters/rclscribus
71
%%DATADIR%%/filters/rclscribus
71
%%DATADIR%%/filters/rclshowinfo
72
%%DATADIR%%/filters/rclshowinfo
72
%%DATADIR%%/filters/rclsiduxman
73
%%DATADIR%%/filters/rclsiduxman
73
%%DATADIR%%/filters/rclsoff
74
%%DATADIR%%/filters/rclsoff-flat.py
74
%%DATADIR%%/filters/rclsvg
75
%%DATADIR%%/filters/rclsoff.py
76
%%DATADIR%%/filters/rclsvg.py
75
%%DATADIR%%/filters/rcltar
77
%%DATADIR%%/filters/rcltar
76
%%DATADIR%%/filters/rcltex
78
%%DATADIR%%/filters/rcltex
77
%%DATADIR%%/filters/rcltext
79
%%DATADIR%%/filters/rcltext.py
78
%%DATADIR%%/filters/rcluncomp
80
%%DATADIR%%/filters/rcluncomp
81
%%DATADIR%%/filters/rcluncomp.py
79
%%DATADIR%%/filters/rclwar
82
%%DATADIR%%/filters/rclwar
80
%%DATADIR%%/filters/rclwpd
83
%%DATADIR%%/filters/rclwpd
81
%%DATADIR%%/filters/rclxls
84
%%DATADIR%%/filters/rclxls.py
82
%%DATADIR%%/filters/rclxml
85
%%DATADIR%%/filters/rclxml.py
86
%%DATADIR%%/filters/rclxmp.py
87
%%DATADIR%%/filters/rclxslt.py
83
%%DATADIR%%/filters/rclzip
88
%%DATADIR%%/filters/rclzip
84
%%DATADIR%%/filters/xdg-open
85
%%DATADIR%%/filters/xls-dump.py
89
%%DATADIR%%/filters/xls-dump.py
86
%%DATADIR%%/filters/xlsxmltocsv.py
90
%%DATADIR%%/filters/xlsxmltocsv.py
87
%%DATADIR%%/images/aptosid-book.png
91
%%DATADIR%%/images/aptosid-book.png

Return to bug 219481