Attachment 187622 Details for Bug 219481 – patch

[patch] patch

recoll.diff (text/plain), 5.89 KB, created by Kurt Jaeger on 2017-10-31 17:53:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2017-10-31 17:53:38 UTC

Size: 5.89 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 453222)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	recoll
>-PORTVERSION=	1.21.6
>-PORTREVISION=	1
>+PORTVERSION=	1.23.3
> CATEGORIES=	deskutils
> MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
> 
>@@ -20,8 +19,8 @@
> 		wpd2html:textproc/libwpd010 \
> 		unrtf:textproc/unrtf
> 
>-USES=		bison gmake iconv shebangfix
>-SHEBANG_FILES=	filters/rclimg filters/rclpdf desktop/hotrecoll.py
>+USES=		bison gmake iconv libtool shebangfix
>+SHEBANG_FILES=	filters/rclimg filters/rclpdf.py desktop/hotrecoll.py
> USE_GNOME=	libxslt:run
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-pic
>@@ -33,7 +32,7 @@
> 
> OPTIONS_DEFINE=		ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON \
> 			SOUND QT4 X11MON
>-OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS PYTHON SOUND QT4 X11MON
>+OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS PYTHON SOUND QT4
> OPTIONS_SUB=		yes
> 
> ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
>@@ -48,7 +47,7 @@
> LATEX_USE=		tex=dvipsk:run,latex:run
> PDF_RUN_DEPENDS=	pdftotext:graphics/poppler-utils
> PS_RUN_DEPENDS=		pstotext:print/pstotext
>-PYTHON_USES=		python
>+PYTHON_USES=		python:build,run
> PYTHON_CONFIGURE_ENABLE=	python-module
> PYTHON_PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
> PYTHON_VARS= 		PYDISTUTILS_PKGNAME=Recoll \
>@@ -69,33 +68,29 @@
> X11MON_CONFIGURE_WITH=	fam
> 
> post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|@QMAKE@|${TRUE}|' \
>-		${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e \
>+	${REINPLACE_CMD} -e \
>+                's|@QMAKE@|${TRUE}|' \
>+                ${WRKSRC}/Makefile.in
>+	${REINPLACE_CMD} -e \
> 		's|/usr/local/lib|${LOCALBASE}/lib|' \
> 		${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e \
>-		's|@NOCMDLINE@|| ; \
>-		 s|python setup.py|${PYTHON_CMD} setup.py|' \
>-		${WRKSRC}/recollinstall.in
>-	@${REINPLACE_CMD} -e \
>+	${REINPLACE_CMD} -e \
> 		's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \
>-		${WRKSRC}/python/recoll/Makefile
>+		${WRKSRC}/python/recoll/Makefile.in
>+	${REINPLACE_CMD} -e \
>+		's|python setup.py|${PYTHON_CMD} setup.py|' \
>+		${WRKSRC}/Makefile.in
> 
> pre-build-QT4-on:
> 	@(cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \
> 		${QMAKE_ARGS} recoll.pro)
> 
>-post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/recoll/librecoll.so.[0-9].*
>-
> post-install-PYTHON-on:
> .for l in recoll rclextract
>-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/${l}.so
>+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/${l}.so
> .endfor
>-	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
>+	cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
> 		-d ${PYTHONPREFIX_SITELIBDIR} \
>-		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
>+		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 453222)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (recoll-1.21.6.tar.gz) = 561341ca835d18de0c4c2d24f766bec2cb5de690cead10341c4e7278e45f28e3
>-SIZE (recoll-1.21.6.tar.gz) = 2283386
>+TIMESTAMP = 1509445620
>+SHA256 (recoll-1.23.3.tar.gz) = 15125871424ef32ac584eb1c3e4fdd4ac7ff32894db60a3ebff32fa7a45d2eb6
>+SIZE (recoll-1.23.3.tar.gz) = 2590148
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 453222)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,5 @@
> %%QT4%%bin/recoll
> bin/recollindex
>-bin/recollq
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.py
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
>@@ -8,7 +7,8 @@
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclextract.so
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/recoll.so
>-lib/recoll/librecoll.so.%%VERSION%%
>+lib/recoll/librecoll-%%VERSION%%.so
>+lib/recoll/librecoll.so
> %%QT4%%man/man1/recoll.1.gz
> man/man1/recollindex.1.gz
> man/man1/recollq.1.gz
>@@ -39,10 +39,12 @@
> %%DATADIR%%/filters/rclchm
> %%DATADIR%%/filters/rclconfig.py
> %%DATADIR%%/filters/rcldia
>-%%DATADIR%%/filters/rcldjvu
>-%%DATADIR%%/filters/rcldoc
>+%%DATADIR%%/filters/rcldjvu.py
>+%%DATADIR%%/filters/rcldoc.py
> %%DATADIR%%/filters/rcldvi
> %%DATADIR%%/filters/rclepub
>+%%DATADIR%%/filters/rclepub1
>+%%DATADIR%%/filters/rclexec1.py
> %%DATADIR%%/filters/rclexecm.py
> %%DATADIR%%/filters/rclfb2
> %%DATADIR%%/filters/rclgaim
>@@ -49,6 +51,7 @@
> %%DATADIR%%/filters/rclgnm
> %%DATADIR%%/filters/rclics
> %%DATADIR%%/filters/rclimg
>+%%DATADIR%%/filters/rclimg.py
> %%DATADIR%%/filters/rclinfo
> %%DATADIR%%/filters/rclkar
> %%DATADIR%%/filters/rclkwd
>@@ -56,32 +59,33 @@
> %%DATADIR%%/filters/rcllatinstops.zip
> %%DATADIR%%/filters/rcllyx
> %%DATADIR%%/filters/rclman
>-%%DATADIR%%/filters/rclmpdf
>-%%DATADIR%%/filters/rclnull
> %%DATADIR%%/filters/rclokulnote
>-%%DATADIR%%/filters/rclopxml
>-%%DATADIR%%/filters/rclpdf
>-%%DATADIR%%/filters/rclppt
>+%%DATADIR%%/filters/rclopxml.py
>+%%DATADIR%%/filters/rclpdf.py
>+%%DATADIR%%/filters/rclppt.py
> %%DATADIR%%/filters/rclps
> %%DATADIR%%/filters/rclpurple
> %%DATADIR%%/filters/rclpython
> %%DATADIR%%/filters/rclrar
>-%%DATADIR%%/filters/rclrtf
>+%%DATADIR%%/filters/rclrtf.py
> %%DATADIR%%/filters/rclscribus
> %%DATADIR%%/filters/rclshowinfo
> %%DATADIR%%/filters/rclsiduxman
>-%%DATADIR%%/filters/rclsoff
>-%%DATADIR%%/filters/rclsvg
>+%%DATADIR%%/filters/rclsoff-flat.py
>+%%DATADIR%%/filters/rclsoff.py
>+%%DATADIR%%/filters/rclsvg.py
> %%DATADIR%%/filters/rcltar
> %%DATADIR%%/filters/rcltex
>-%%DATADIR%%/filters/rcltext
>+%%DATADIR%%/filters/rcltext.py
> %%DATADIR%%/filters/rcluncomp
>+%%DATADIR%%/filters/rcluncomp.py
> %%DATADIR%%/filters/rclwar
> %%DATADIR%%/filters/rclwpd
>-%%DATADIR%%/filters/rclxls
>-%%DATADIR%%/filters/rclxml
>+%%DATADIR%%/filters/rclxls.py
>+%%DATADIR%%/filters/rclxml.py
>+%%DATADIR%%/filters/rclxmp.py
>+%%DATADIR%%/filters/rclxslt.py
> %%DATADIR%%/filters/rclzip
>-%%DATADIR%%/filters/xdg-open
> %%DATADIR%%/filters/xls-dump.py
> %%DATADIR%%/filters/xlsxmltocsv.py
> %%DATADIR%%/images/aptosid-book.png

Actions: View | Diff

Attachments on bug 219481: 182845 | 182854 | 187622