Attachment 182854 Details for Bug 219481 – svn-diff_deskutils_recoll_v2

[patch] svn-diff_deskutils_recoll_v2

svn-diff_deskutils_recoll (text/plain), 6.83 KB, created by Walter Schwarzenfeld on 2017-05-24 08:13:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2017-05-24 08:13:38 UTC

Size: 6.83 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 441535)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	recoll
>-PORTVERSION=	1.21.6
>-PORTREVISION=	1
>+PORTVERSION=	1.23.2
> 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 desktop/hotrecoll.py filters/rclpdf.py
> USE_GNOME=	libxslt:run
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-pic
>@@ -28,12 +27,13 @@
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>+USE_LDCONFIG=	yes
> 
> PLIST_SUB=	VERSION="${PORTVERSION}"
> 
> 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
>@@ -51,7 +51,7 @@
> PYTHON_USES=		python
> PYTHON_CONFIGURE_ENABLE=	python-module
> PYTHON_PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
>-PYTHON_VARS= 		PYDISTUTILS_PKGNAME=Recoll \
>+PYTHON_VARS=		PYDISTUTILS_PKGNAME=Recoll \
> 			PYDISTUTILS_PKGVERSION=1.0
> QT4_USE=		qt4=moc_build,qmake_build,rcc_build,uic_build \
> 			qt4=iconengines_run,imageformats_run \
>@@ -62,26 +62,26 @@
> QT4_VARS=		QT_NONSTANDARD=yes
> SOUND_RUN_DEPENDS=	mutagen-pony:audio/py-mutagen \
> 			pykaraoke:audio/py-karaoke
>-X11MON_DESC=		X11 session monitoring support
>+X11MON_DESC=		X11 session monitoring support (BROKEN)
>+X11MON_BROKEN=		Does not link
> X11MON_USES=		fam
> X11MON_USE=		xorg=ice,sm,x11
> X11MON_CONFIGURE_ENABLE=	x11mon
> X11MON_CONFIGURE_WITH=	fam
> 
>+INSTALLS_ICONS=	yes
>+
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		's|@QMAKE@|${TRUE}|' \
>-		${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e \
> 		's|/usr/local/lib|${LOCALBASE}/lib|' \
> 		${WRKSRC}/configure
>+post-configure:
> 	@${REINPLACE_CMD} -e \
>-		's|@NOCMDLINE@|| ; \
>-		 s|python setup.py|${PYTHON_CMD} setup.py|' \
>-		${WRKSRC}/recollinstall.in
>-	@${REINPLACE_CMD} -e \
> 		's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \
> 		${WRKSRC}/python/recoll/Makefile
>+	@${REINPLACE_CMD} -e \
>+		's|@QMAKE@|${TRUE}|' \
>+		${WRKSRC}/Makefile.in
> 
> pre-build-QT4-on:
> 	@(cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \
>@@ -88,7 +88,7 @@
> 		${QMAKE_ARGS} recoll.pro)
> 
> post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/recoll/librecoll.so.[0-9].*
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/recoll/librecoll*.so
> 
> post-install-PYTHON-on:
> .for l in recoll rclextract
>Index: distinfo
>===================================================================
>--- distinfo	(revision 441535)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (recoll-1.21.6.tar.gz) = 561341ca835d18de0c4c2d24f766bec2cb5de690cead10341c4e7278e45f28e3
>-SIZE (recoll-1.21.6.tar.gz) = 2283386
>+TIMESTAMP = 1495576519
>+SHA256 (recoll-1.23.2.tar.gz) = 0e93e6be0dc2225b03a4850887bd29da47a61e07652fde51be254ef9f8310048
>+SIZE (recoll-1.23.2.tar.gz) = 2546793
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 441535)
>+++ pkg-plist	(working copy)
>@@ -1,22 +1,22 @@
>-%%QT4%%bin/recoll
>+bin/recoll
> bin/recollindex
>-bin/recollq
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclextract.so
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/recoll.so
>-lib/recoll/librecoll.so.%%VERSION%%
>-%%QT4%%man/man1/recoll.1.gz
>+%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%
>+%%PYTHON_SITELIBDIR%%/recoll/__init__.py
>+%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/recoll/rclconfig.py
>+%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
>+%%PYTHON_SITELIBDIR%%/recoll/rclextract.so
>+%%PYTHON_SITELIBDIR%%/recoll/recoll.so
>+lib/recoll/librecoll-%%VERSION%%.so
>+lib/recoll/librecoll.so
>+man/man1/recoll.1.gz
> man/man1/recollindex.1.gz
> man/man1/recollq.1.gz
> man/man5/recoll.conf.5.gz
>-%%QT4%%share/appdata/recoll.appdata.xml
>-%%QT4%%share/applications/recoll-searchgui.desktop
>-%%QT4%%share/icons/hicolor/48x48/apps/recoll.png
>-%%QT4%%share/pixmaps/recoll.png
>+share/appdata/recoll.appdata.xml
>+share/applications/recoll-searchgui.desktop
>+share/icons/hicolor/48x48/apps/recoll.png
>+share/pixmaps/recoll.png
> %%DATADIR%%/doc/docbook-xsl.css
> %%DATADIR%%/doc/usermanual.html
> %%DATADIR%%/examples/fields
>@@ -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
>@@ -125,4 +129,3 @@
> %%DATADIR%%/translations/recoll_xx.qm
> %%DATADIR%%/translations/recoll_zh.qm
> %%DATADIR%%/translations/recoll_zh_CN.qm
>-%%NO_QT4%%@dir share/icons/hicolor/48x48/apps

Actions: View | Diff

Attachments on bug 219481: 182845 | 182854 | 187622