Attachment #204624 for bug #238147




# $FreeBSD$

PORTNAME=	recoll
DISTVERSION=	1.25.16
PORTREVISION=	1
CATEGORIES=	deskutils
MASTER_SITES=	https://www.lesbonscomptes.com/recoll/

MAINTAINER=	jjuanino@gmail.com
COMMENT=	Personal full text search package, based on Xapian

LICENSE=	GPLv2+

		wpd2html:textproc/libwpd010 \
		unrtf:textproc/unrtf

USES=		bison gmake gnome iconv libtool localbase python:2.7+ shebangfix
USE_LDCONFIG=	yes

SHEBANG_FILES=	filters/*.py filters/rcl7z filters/rclaudio \
		filters/rclchm filters/rcldia filters/rclepub \
		filters/rclepub1 filters/rclics filters/rclimg \
		filters/rclinfo filters/rclkar filters/rclpython \
		filters/rclrar filters/rcltar filters/rclwar \
		filters/rclzip desktop/hotrecoll.py

USE_PYTHON=	py3kplist
USE_GNOME=	libxslt:run
GNU_CONFIGURE=	yes

ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
ASPELL_CONFIGURE_WITH=	aspell
CHM_DESC=		CHM via CHMLIB
CHM_LIB_DEPENDS=	libchm.so:misc/chmlib
CHM_RUN_DEPENDS=	pychm>0:textproc/pychm
CHM_CONFIGURE_ENABLE=	python-chm
DJVU_RUN_DEPENDS=	djvutxt:graphics/djvulibre
IMAGE_DESC=		Store personal tags or textual descriptions in images
IMAGE_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool

X11MON_BROKEN=		does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2'

post-patch:
	@${REINPLACE_CMD} -e \
		's|@QMAKE@|${TRUE}|' \
		${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e \
		's|/usr/local/lib|${LOCALBASE}/lib|' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \
		${WRKSRC}/python/recoll/Makefile
	@${REINPLACE_CMD} -e \
		's|python setup.py|${PYTHON_CMD} setup.py|' \
		${WRKSRC}/Makefile.in

pre-build-QT5-on:
	@cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \

	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \
		${STAGEDIR}${PREFIX}/lib/recoll/*.so

post-install-CHM-on:
	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recollchm/*.so

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/deskutils/recoll/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1549037086	1	TIMESTAMP = 1558855793
2	SHA256 (recoll-1.24.5.tar.gz) = 9b25f4494023fcea729ff96dd2bb525e78df14caf4ebab3a93377a0b1f50a382	2	SHA256 (recoll-1.25.16.tar.gz) = a0e19c8fc71f62eb1b7ebed271afb2f440402362f589bc663c7164c52e5c223c
3	SIZE (recoll-1.24.5.tar.gz) = 2675385	3	SIZE (recoll-1.25.16.tar.gz) = 2843267




--- Makefile.in.orig	2019-05-22 12:46:15 UTC
+++ Makefile.in
@@ -436,7 +436,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-QMAKE = @QMAKE@
+QMAKE = true
 QMAKEPATH = @QMAKEPATH@
 QMAKE_DISABLE_WEBENGINE = @QMAKE_DISABLE_WEBENGINE@
 QMAKE_DISABLE_WEBKIT = @QMAKE_DISABLE_WEBKIT@
@@ -2397,16 +2397,12 @@ PicStatic: $(librecoll_la_OBJECTS)
 @MAKEPYTHON_TRUE@clean-local:: recollpython-clean
 @MAKEPYTHON_TRUE@recollpython: librecoll.la
 @MAKEPYTHON_TRUE@	(cd python/recoll; set -x; \
-@MAKEPYTHON_TRUE@        for v in 2 3;do test -n "`which python$${v}`" && \
-@MAKEPYTHON_TRUE@        libdir=$(libdir) python$${v} setup.py build; \
-@MAKEPYTHON_TRUE@        done \
+@MAKEPYTHON_TRUE@        libdir=$(libdir) ${PYTHON_CMD} setup.py build; \
 @MAKEPYTHON_TRUE@        )
 @MAKEPYTHON_TRUE@recollpython-install:
 @MAKEPYTHON_TRUE@	(cd python/recoll; set -x; \
-@MAKEPYTHON_TRUE@        for v in 2 3;do test -n "`which python$${v}`" && \
-@MAKEPYTHON_TRUE@        python$${v} setup.py install \
+@MAKEPYTHON_TRUE@        ${PYTHON_CMD} setup.py install \
 @MAKEPYTHON_TRUE@         --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \
-@MAKEPYTHON_TRUE@        done; \
 @MAKEPYTHON_TRUE@         )
 @MAKEPYTHON_TRUE@recollpython-clean:
 @MAKEPYTHON_TRUE@	rm -f python/recoll/*.pyc
@@ -2422,16 +2418,12 @@ PicStatic: $(librecoll_la_OBJECTS)
 @MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean
 @MAKEPYTHONCHM_TRUE@rclpychm:
 @MAKEPYTHONCHM_TRUE@	(cd python/pychm; set -x; \
-@MAKEPYTHONCHM_TRUE@        for v in 2 3;do \
-@MAKEPYTHONCHM_TRUE@        test -n "`which python$${v}`" && python$${v} setup.py build;\
-@MAKEPYTHONCHM_TRUE@        done \
+@MAKEPYTHONCHM_TRUE@        ${PYTHON_CMD} setup.py build;\
 @MAKEPYTHONCHM_TRUE@        )
 @MAKEPYTHONCHM_TRUE@rclpychm-install:
 @MAKEPYTHONCHM_TRUE@	(cd python/pychm; set -x; \
-@MAKEPYTHONCHM_TRUE@        for v in 2 3;do test -n "`which python$${v}`" && \
-@MAKEPYTHONCHM_TRUE@        python$${v} setup.py install \
+@MAKEPYTHONCHM_TRUE@        ${PYTHON_CMD} setup.py install \
 @MAKEPYTHONCHM_TRUE@         --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \
-@MAKEPYTHONCHM_TRUE@        done \
 @MAKEPYTHONCHM_TRUE@        )
 @MAKEPYTHONCHM_TRUE@rclpychm-clean:
 @MAKEPYTHONCHM_TRUE@	rm -rf python/pychm/build

Lines 1-17 Link Here

(-)b/deskutils/recoll/pkg-plist (-8 / +38 lines)
1	%%QT5%%bin/recoll	1	%%QT5%%bin/recoll
2	bin/recollindex	2	bin/recollindex
3	%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%	3	%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/PKG-INFO
		4	%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/SOURCES.txt
		5	%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/dependency_links.txt
		6	%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/top_level.txt
4	%%PYTHON_SITELIBDIR%%/recoll/__init__.py	7	%%PYTHON_SITELIBDIR%%/recoll/__init__.py
5	%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc	8	%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
		9	%%PYTHON_SITELIBDIR%%/recoll/conftree.py
		10	%%PYTHON_SITELIBDIR%%/recoll/conftree.pyc
6	%%PYTHON_SITELIBDIR%%/recoll/rclconfig.py	11	%%PYTHON_SITELIBDIR%%/recoll/rclconfig.py
7	%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc	12	%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
8	%%PYTHON_SITELIBDIR%%/recoll/rclextract.so	13	%%PYTHON_SITELIBDIR%%/recoll/rclextract.so
9	%%PYTHON_SITELIBDIR%%/recoll/recoll.so	14	%%PYTHON_SITELIBDIR%%/recoll/recoll.so
		15	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/PKG-INFO
		16	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/SOURCES.txt
		17	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/dependency_links.txt
		18	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/top_level.txt
		19	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__init__.py
		20	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__init__.pyc
		21	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/_chmlib.so
		22	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chm.py
		23	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chm.pyc
		24	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chmlib.py
		25	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chmlib.pyc
		26	%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/extra.so
10	lib/recoll/librecoll-%%VERSION%%.so	27	lib/recoll/librecoll-%%VERSION%%.so
11	lib/recoll/librecoll.so	28	lib/recoll/librecoll.so
12	%%QT5%%man/man1/recoll.1.gz	29	%%QT5%%man/man1/recoll.1.gz
13	man/man1/recollindex.1.gz	30	man/man1/recollindex.1.gz
14	man/man1/recollq.1.gz	31	man/man1/recollq.1.gz
		32	man/man1/xadump.1.gz
15	man/man5/recoll.conf.5.gz	33	man/man5/recoll.conf.5.gz
16	%%QT5%%share/appdata/recoll.appdata.xml	34	%%QT5%%share/appdata/recoll.appdata.xml
17	%%QT5%%share/applications/recoll-searchgui.desktop	35	%%QT5%%share/applications/recoll-searchgui.desktop
Lines 28-40 man/man5/recoll.conf.5.gz Link Here
28	%%DATADIR%%/examples/recoll.conf	46	%%DATADIR%%/examples/recoll.conf
29	%%DATADIR%%/examples/recoll.qss	47	%%DATADIR%%/examples/recoll.qss
30	%%DATADIR%%/examples/recollindex.desktop	48	%%DATADIR%%/examples/recollindex.desktop
		49	%%DATADIR%%/filters/abiword.xsl
		50	%%DATADIR%%/filters/conftree.py
		51	%%DATADIR%%/filters/fb2.xsl
		52	%%DATADIR%%/filters/gnumeric.xsl
31	%%DATADIR%%/filters/hotrecoll.py	53	%%DATADIR%%/filters/hotrecoll.py
32	%%DATADIR%%/filters/msodump.zip	54	%%DATADIR%%/filters/msodump.zip
		55	%%DATADIR%%/filters/okular-note.xsl
		56	%%DATADIR%%/filters/opendoc-body.xsl
		57	%%DATADIR%%/filters/opendoc-flat.xsl
		58	%%DATADIR%%/filters/opendoc-meta.xsl
		59	%%DATADIR%%/filters/openxml-meta.xsl
		60	%%DATADIR%%/filters/openxml-word-body.xsl
		61	%%DATADIR%%/filters/openxml-xls-body.xsl
33	%%DATADIR%%/filters/ppt-dump.py	62	%%DATADIR%%/filters/ppt-dump.py
34	%%DATADIR%%/filters/rcl7z	63	%%DATADIR%%/filters/rcl7z
35	%%DATADIR%%/filters/rclabw	64	%%DATADIR%%/filters/rclabw.py
36	%%DATADIR%%/filters/rclaptosidman	65	%%DATADIR%%/filters/rclaptosidman
37	%%DATADIR%%/filters/rclaudio	66	%%DATADIR%%/filters/rclaudio
		67	%%DATADIR%%/filters/rclbasehandler.py
38	%%DATADIR%%/filters/rclbibtex.sh	68	%%DATADIR%%/filters/rclbibtex.sh
39	%%DATADIR%%/filters/rclcheckneedretry.sh	69	%%DATADIR%%/filters/rclcheckneedretry.sh
40	%%DATADIR%%/filters/rclchm	70	%%DATADIR%%/filters/rclchm
Lines 47-55 man/man5/recoll.conf.5.gz Link Here
47	%%DATADIR%%/filters/rclepub1	77	%%DATADIR%%/filters/rclepub1
48	%%DATADIR%%/filters/rclexec1.py	78	%%DATADIR%%/filters/rclexec1.py
49	%%DATADIR%%/filters/rclexecm.py	79	%%DATADIR%%/filters/rclexecm.py
50	%%DATADIR%%/filters/rclfb2	80	%%DATADIR%%/filters/rclfb2.py
51	%%DATADIR%%/filters/rclgaim	81	%%DATADIR%%/filters/rclgaim
52	%%DATADIR%%/filters/rclgnm	82	%%DATADIR%%/filters/rclgenxslt.py
		83	%%DATADIR%%/filters/rclgnm.py
53	%%DATADIR%%/filters/rclics	84	%%DATADIR%%/filters/rclics
54	%%DATADIR%%/filters/rclimg	85	%%DATADIR%%/filters/rclimg
55	%%DATADIR%%/filters/rclimg.py	86	%%DATADIR%%/filters/rclimg.py
Lines 61-67 man/man5/recoll.conf.5.gz Link Here
61	%%DATADIR%%/filters/rcllyx	92	%%DATADIR%%/filters/rcllyx
62	%%DATADIR%%/filters/rclman	93	%%DATADIR%%/filters/rclman
63	%%DATADIR%%/filters/rclmidi.py	94	%%DATADIR%%/filters/rclmidi.py
64	%%DATADIR%%/filters/rclokulnote	95	%%DATADIR%%/filters/rclokulnote.py
65	%%DATADIR%%/filters/rclopxml.py	96	%%DATADIR%%/filters/rclopxml.py
66	%%DATADIR%%/filters/rclpdf.py	97	%%DATADIR%%/filters/rclpdf.py
67	%%DATADIR%%/filters/rclppt.py	98	%%DATADIR%%/filters/rclppt.py
Lines 72-78 man/man5/recoll.conf.5.gz Link Here
72	%%DATADIR%%/filters/rclrtf.py	103	%%DATADIR%%/filters/rclrtf.py
73	%%DATADIR%%/filters/rclscribus	104	%%DATADIR%%/filters/rclscribus
74	%%DATADIR%%/filters/rclshowinfo	105	%%DATADIR%%/filters/rclshowinfo
75	%%DATADIR%%/filters/rclsiduxman
76	%%DATADIR%%/filters/rclsoff-flat.py	106	%%DATADIR%%/filters/rclsoff-flat.py
77	%%DATADIR%%/filters/rclsoff.py	107	%%DATADIR%%/filters/rclsoff.py
78	%%DATADIR%%/filters/rclsvg.py	108	%%DATADIR%%/filters/rclsvg.py
Lines 82-88 man/man5/recoll.conf.5.gz Link Here
82	%%DATADIR%%/filters/rcluncomp	112	%%DATADIR%%/filters/rcluncomp
83	%%DATADIR%%/filters/rcluncomp.py	113	%%DATADIR%%/filters/rcluncomp.py
84	%%DATADIR%%/filters/rclwar	114	%%DATADIR%%/filters/rclwar
85	%%DATADIR%%/filters/rclwpd
86	%%DATADIR%%/filters/rclxls.py	115	%%DATADIR%%/filters/rclxls.py
87	%%DATADIR%%/filters/rclxml.py	116	%%DATADIR%%/filters/rclxml.py
88	%%DATADIR%%/filters/rclxmp.py	117	%%DATADIR%%/filters/rclxmp.py
Lines 90-97 man/man5/recoll.conf.5.gz Link Here
90	%%DATADIR%%/filters/rclzip	119	%%DATADIR%%/filters/rclzip
91	%%DATADIR%%/filters/recoll-we-move-files.py	120	%%DATADIR%%/filters/recoll-we-move-files.py
92	%%DATADIR%%/filters/recollepub.zip	121	%%DATADIR%%/filters/recollepub.zip
		122	%%DATADIR%%/filters/svg.xsl
93	%%DATADIR%%/filters/xls-dump.py	123	%%DATADIR%%/filters/xls-dump.py
94	%%DATADIR%%/filters/xlsxmltocsv.py	124	%%DATADIR%%/filters/xlsxmltocsv.py
		125	%%DATADIR%%/filters/xml.xsl
95	%%QT5%%%%DATADIR%%/images/aptosid-book.png	126	%%QT5%%%%DATADIR%%/images/aptosid-book.png
96	%%QT5%%%%DATADIR%%/images/aptosid-manual.png	127	%%QT5%%%%DATADIR%%/images/aptosid-manual.png
97	%%QT5%%%%DATADIR%%/images/archive.png	128	%%QT5%%%%DATADIR%%/images/archive.png
98	-

Return to bug 238147

Lines 2-13 Link Here

(-)b/deskutils/recoll/Makefile (-12 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= recoll	4	PORTNAME= recoll
5	DISTVERSION= 1.24.5	5	DISTVERSION= 1.25.16
6	PORTREVISION= 1
7	CATEGORIES= deskutils	6	CATEGORIES= deskutils
8	MASTER_SITES= https://www.lesbonscomptes.com/recoll/	7	MASTER_SITES= https://www.lesbonscomptes.com/recoll/
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= jjuanino@gmail.com
11	COMMENT= Personal full text search package, based on Xapian	10	COMMENT= Personal full text search package, based on Xapian
12		11
13	LICENSE= GPLv2+	12	LICENSE= GPLv2+
Lines 20-33 RUN_DEPENDS= unrar:archivers/unrar \ Link Here
20	wpd2html:textproc/libwpd010 \	19	wpd2html:textproc/libwpd010 \
21	unrtf:textproc/unrtf	20	unrtf:textproc/unrtf
22		21
23	USES= bison gmake gnome iconv libtool localbase python:2.7 shebangfix	22	USES= bison gmake gnome iconv libtool localbase python:2.7+ shebangfix
24	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
		24
25	SHEBANG_FILES= filters/*.py filters/rcl7z filters/rclaudio \	25	SHEBANG_FILES= filters/*.py filters/rcl7z filters/rclaudio \
26	filters/rclchm filters/rcldia filters/rclepub \	26	filters/rclchm filters/rcldia filters/rclepub \
27	filters/rclepub1 filters/rclics filters/rclimg \	27	filters/rclepub1 filters/rclics filters/rclimg \
28	filters/rclinfo filters/rclkar filters/rclpython \	28	filters/rclinfo filters/rclkar filters/rclpython \
29	filters/rclrar filters/rcltar filters/rclwar \	29	filters/rclrar filters/rcltar filters/rclwar \
30	filters/rclzip desktop/hotrecoll.py	30	filters/rclzip desktop/hotrecoll.py
		31
31	USE_PYTHON= py3kplist	32	USE_PYTHON= py3kplist
32	USE_GNOME= libxslt:run	33	USE_GNOME= libxslt:run
33	GNU_CONFIGURE= yes	34	GNU_CONFIGURE= yes
Lines 47-53 OPTIONS_SUB= yes Link Here
47	ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell	48	ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell
48	ASPELL_CONFIGURE_WITH= aspell	49	ASPELL_CONFIGURE_WITH= aspell
49	CHM_DESC= CHM via CHMLIB	50	CHM_DESC= CHM via CHMLIB
		51	CHM_LIB_DEPENDS= libchm.so:misc/chmlib
50	CHM_RUN_DEPENDS= pychm>0:textproc/pychm	52	CHM_RUN_DEPENDS= pychm>0:textproc/pychm
		53	CHM_CONFIGURE_ENABLE= python-chm
51	DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre	54	DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre
52	IMAGE_DESC= Store personal tags or textual descriptions in images	55	IMAGE_DESC= Store personal tags or textual descriptions in images
53	IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool	56	IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool
Lines 70-87 X11MON_CONFIGURE_WITH= fam Link Here
70	X11MON_BROKEN= does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2'	73	X11MON_BROKEN= does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2'
71		74
72	post-patch:	75	post-patch:
73	@${REINPLACE_CMD} -e \
74	's\|@QMAKE@\|${TRUE}\|' \
75	${WRKSRC}/Makefile.in
76	@${REINPLACE_CMD} -e \	76	@${REINPLACE_CMD} -e \
77	's\|/usr/local/lib\|${LOCALBASE}/lib\|' \	77	's\|/usr/local/lib\|${LOCALBASE}/lib\|' \
78	${WRKSRC}/configure	78	${WRKSRC}/configure
79	@${REINPLACE_CMD} -e \	79	@${REINPLACE_CMD} -e \
80	's\|python setup.py\|${PYTHON_CMD} setup.py\|; s\|sudo\|\|' \	80	's\|python setup.py\|${PYTHON_CMD} setup.py\|; s\|sudo\|\|' \
81	${WRKSRC}/python/recoll/Makefile.in	81	${WRKSRC}/python/recoll/Makefile
82	@${REINPLACE_CMD} -e \
83	's\|python setup.py\|${PYTHON_CMD} setup.py\|' \
84	${WRKSRC}/Makefile.in
85		82
86	pre-build-QT5-on:	83	pre-build-QT5-on:
87	@cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \	84	@cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \
Lines 91-94 post-install: Link Here
91	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \	88	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \
92	${STAGEDIR}${PREFIX}/lib/recoll/*.so	89	${STAGEDIR}${PREFIX}/lib/recoll/*.so
93		90
		91	post-install-CHM-on:
		92	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recollchm/*.so
		93
94	.include <bsd.port.mk>	94	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)b/deskutils/recoll/files/patch-Makefile.in (-8 / +46 lines)
1	--- Makefile.in.orig 2017-11-06 17:57:14 UTC	1	--- Makefile.in.orig 2019-05-22 12:46:15 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -2206,7 +2206,7 @@ PicStatic: $(librecoll_la_OBJECTS)	3	@@ -436,7 +436,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
4	@MAKEPYTHON_TRUE@ OPTSFORPYTHON=--install-layout=deb; \	4	PACKAGE_URL = @PACKAGE_URL@
5	@MAKEPYTHON_TRUE@ fi; \	5	PACKAGE_VERSION = @PACKAGE_VERSION@
6	@MAKEPYTHON_TRUE@ set -x; \	6	PATH_SEPARATOR = @PATH_SEPARATOR@
7	-@MAKEPYTHON_TRUE@ python setup.py install \	7	-QMAKE = @QMAKE@
		8	+QMAKE = true
		9	QMAKEPATH = @QMAKEPATH@
		10	QMAKE_DISABLE_WEBENGINE = @QMAKE_DISABLE_WEBENGINE@
		11	QMAKE_DISABLE_WEBKIT = @QMAKE_DISABLE_WEBKIT@
		12	@@ -2397,16 +2397,12 @@ PicStatic: $(librecoll_la_OBJECTS)
		13	@MAKEPYTHON_TRUE@clean-local:: recollpython-clean
		14	@MAKEPYTHON_TRUE@recollpython: librecoll.la
		15	@MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \
		16	-@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \
		17	-@MAKEPYTHON_TRUE@ libdir=$(libdir) python$${v} setup.py build; \
		18	-@MAKEPYTHON_TRUE@ done \
		19	+@MAKEPYTHON_TRUE@ libdir=$(libdir) ${PYTHON_CMD} setup.py build; \
		20	@MAKEPYTHON_TRUE@ )
		21	@MAKEPYTHON_TRUE@recollpython-install:
		22	@MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \
		23	-@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \
		24	-@MAKEPYTHON_TRUE@ python$${v} setup.py install \
8	+@MAKEPYTHON_TRUE@ ${PYTHON_CMD} setup.py install \	25	+@MAKEPYTHON_TRUE@ ${PYTHON_CMD} setup.py install \
9	@MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $${OPTSFORPYTHON})	26	@MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \
10	@MAKEPYTHON_TRUE@clean-local: recollpython-clean	27	-@MAKEPYTHON_TRUE@ done; \
		28	@MAKEPYTHON_TRUE@ )
11	@MAKEPYTHON_TRUE@recollpython-clean:	29	@MAKEPYTHON_TRUE@recollpython-clean:
		30	@MAKEPYTHON_TRUE@ rm -f python/recoll/*.pyc
		31	@@ -2422,16 +2418,12 @@ PicStatic: $(librecoll_la_OBJECTS)
		32	@MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean
		33	@MAKEPYTHONCHM_TRUE@rclpychm:
		34	@MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \
		35	-@MAKEPYTHONCHM_TRUE@ for v in 2 3;do \
		36	-@MAKEPYTHONCHM_TRUE@ test -n "`which python$${v}`" && python$${v} setup.py build;\
		37	-@MAKEPYTHONCHM_TRUE@ done \
		38	+@MAKEPYTHONCHM_TRUE@ ${PYTHON_CMD} setup.py build;\
		39	@MAKEPYTHONCHM_TRUE@ )
		40	@MAKEPYTHONCHM_TRUE@rclpychm-install:
		41	@MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \
		42	-@MAKEPYTHONCHM_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \
		43	-@MAKEPYTHONCHM_TRUE@ python$${v} setup.py install \
		44	+@MAKEPYTHONCHM_TRUE@ ${PYTHON_CMD} setup.py install \
		45	@MAKEPYTHONCHM_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \
		46	-@MAKEPYTHONCHM_TRUE@ done \
		47	@MAKEPYTHONCHM_TRUE@ )
		48	@MAKEPYTHONCHM_TRUE@rclpychm-clean:
		49	@MAKEPYTHONCHM_TRUE@ rm -rf python/pychm/build