Attachment 143838 Details for Bug 191093 – deskutils_recoll.diff

[patch] deskutils_recoll.diff

deskutils_recoll.diff (text/plain), 7.88 KB, created by tkato432 on 2014-06-16 18:31:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-06-16 18:31:08 UTC

Size: 7.88 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/recoll/Makefile deskutils/recoll/Makefile
>--- /usr/ports/deskutils/recoll/Makefile	2014-05-29 22:14:59.000000000 +0900
>+++ deskutils/recoll/Makefile	2014-06-17 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/deskutils/recoll/Makefile 355681 2014-05-29 09:31:59Z nemysis $
> 
> PORTNAME=	recoll
>-PORTVERSION=	1.19.13
>-PORTREVISION=	1
>+PORTVERSION=	1.19.14
> CATEGORIES=	deskutils
> MASTER_SITES=	http://www.lesbonscomptes.com/${PORTNAME}/
> 
>@@ -14,12 +13,12 @@
> 
> BUILD_DEPENDS=	xapian-core>=0:${PORTSDIR}/databases/xapian-core
> RUN_DEPENDS:=	${BUILD_DEPENDS} \
>-		xsltproc:${PORTSDIR}/textproc/libxslt \
> 		antiword:${PORTSDIR}/textproc/antiword \
> 		catdoc:${PORTSDIR}/textproc/catdoc \
> 		wpd2html:${PORTSDIR}/textproc/libwpd \
>-		unrtf:${PORTSDIR}/textproc/unrtf \
>-		unrar:${PORTSDIR}/archivers/unrar
>+		xsltproc:${PORTSDIR}/textproc/libxslt \
>+		unrar:${PORTSDIR}/archivers/unrar \
>+		unrtf:${PORTSDIR}/textproc/unrtf
> 
> USES=		gmake iconv shebangfix
> SHEBANG_FILES=	filters/rclimg desktop/hotrecoll.py
>@@ -29,92 +28,81 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE=	ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON SOUND \
>-		QT4 X11MON
>-CHM_DESC=	CHM via CHMLIB
>-IMAGE_DESC=	Store personal tags or textual descriptions in images
>-X11MON_DESC=	X11 session monitoring support
>-KONQUEROR_DESC=	Konqueror webarchive format with Python
>-OPTIONS_DEFAULT=ASPELL IMAGE PDF PS PYTHON SOUND QT4 X11MON
>-
>-OPTIONS_SUB=	yes
>-
>-ASPELL_LIB_DEPENDS=		libaspell.so:${PORTSDIR}/textproc/aspell
>-ASPELL_CONFIGURE_WITH=		aspell
>-
>-CHM_RUN_DEPENDS=		pychm:${PORTSDIR}/textproc/pychm
>-
>-DJVU_RUN_DEPENDS=		djvutxt:${PORTSDIR}/graphics/djvulibre
>-
>-KONQUEROR_RUN_DEPENDS=		kwebkitpart:${PORTSDIR}/www/kwebkitpart
>-
>-LATEX_RUN_DEPENDS=		detex:${PORTSDIR}/print/detex \
>-				dvips:${PORTSDIR}/print/dvips
>-
>-IMAGE_RUN_DEPENDS=		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool-devel
>-
>-PDF_RUN_DEPENDS=		xpdf:${PORTSDIR}/graphics/xpdf
>-
>-PS_RUN_DEPENDS=			pstotext:${PORTSDIR}/print/pstotext
>+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_SUB=		yes
>+
>+ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
>+ASPELL_CONFIGURE_WITH=	aspell
>+CHM_DESC=		CHM via CHMLIB
>+CHM_RUN_DEPENDS=	pychm:${PORTSDIR}/textproc/pychm
>+DJVU_RUN_DEPENDS=	djvutxt:${PORTSDIR}/graphics/djvulibre
>+IMAGE_DESC=		Store personal tags or textual descriptions in images
>+IMAGE_RUN_DEPENDS=	exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool-devel
>+KONQUEROR_DESC=		Konqueror webarchive format with Python
>+KONQUEROR_RUN_DEPENDS=	kwebkitpart:${PORTSDIR}/www/kwebkitpart
>+LATEX_RUN_DEPENDS=	detex:${PORTSDIR}/print/detex \
>+			dvips:${PORTSDIR}/print/dvips
>+PDF_RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
>+PS_RUN_DEPENDS=		pstotext:${PORTSDIR}/print/pstotext
>+PYTHON_USE=		python=yes
> PYTHON_CONFIGURE_ENABLE=	python-module
>-
>-SOUND_RUN_DEPENDS=		mutagen-pony:${PORTSDIR}/audio/py-mutagen \
>-				pykaraoke:${PORTSDIR}/audio/py-karaoke
>-
>-QT4_CONFIGURE_ENABLE=		qtgui
>-
>+QT4_USE=		qt4=moc_build,qmake_build,rcc_build,uic_build \
>+			qt4=iconengines_run,imageformats_run \
>+			qt4=corelib,gui,xml,webkit
>+QT4_CONFIGURE_ENABLE=	qtgui
>+SOUND_RUN_DEPENDS=	mutagen-pony:${PORTSDIR}/audio/py-mutagen \
>+			pykaraoke:${PORTSDIR}/audio/py-karaoke
>+X11MON_DESC=		X11 session monitoring support
>+X11MON_USES=		fam
>+X11MON_USE=		xorg=ice,sm,x11
> X11MON_CONFIGURE_ENABLE=	x11mon
>+X11MON_CONFIGURE_WITH=	fam
> 
> .include <bsd.port.options.mk>
> 
>-VERSION=	${PORTVERSION}
>-PLIST_SUB+=	VERSION=${VERSION}
>-
> .if ${PORT_OPTIONS:MPYTHON}
>-USE_PYTHON=	yes
>-INSTALLS_EGGINFO=	yes
>-PYDISTUTILS_EGGINFO=	Recoll-1.0-py${PYTHON_VER}.egg-info
>+PYDISTUTILS_PKGNAME=	Recoll
>+PYDISTUTILS_PKGVERSION=	1.0
>+PLIST_SUB+=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
> .endif
> 
> .if ${PORT_OPTIONS:MQT4}
>-USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines_run \
>-		imageformats_run corelib gui xml webkit
> QT_NONSTANDARD=	yes
> CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
> INSTALLS_ICONS=	yes
> .endif
> 
>-.if ${PORT_OPTIONS:MX11MON}
>-USE_XORG+=	ice sm x11
>-USES+=		fam
>-CONFIGURE_ARGS+=--with-fam
>-.endif
>-
> post-patch:
>-	@${REINPLACE_CMD} \
>-		-e 's|/usr/local/lib|${LOCALBASE}/lib|' ${WRKSRC}/configure
>-	@${REINPLACE_CMD} \
>-		-e 's|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in
>-	@${REINPLACE_CMD} \
>-		-e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS}
>-	@${REINPLACE_CMD} -e 's|@NOCMDLINE@||g ; \
>-		s|@prefix@|${PREFIX}| ; \
>-		s|REALPREFIX=$$PREFIX|REALPREFIX=${STAGEDIR}$$PREFIX| ; \
>-		s|$${ROOTFORPYTHON}||' \
>-		${WRKSRC}/recollinstall.in
>-	@${REINPLACE_CMD} -e 's|python setup.py|${PYTHON_CMD} setup.py|' \
>-		${WRKSRC}/python/recoll/Makefile \
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/local/lib|${LOCALBASE}/lib|' \
>+		${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		's|= -g -O2|=|' \
>+		${WRKSRC}/mk/localdefs.in
>+	@${REINPLACE_CMD} -e \
>+		's|@NOCMDLINE@||g ; \
>+	 	 s|@prefix@|${PREFIX}| ; \
>+		 s|REALPREFIX=$$PREFIX|REALPREFIX=$$DESTDIR$$PREFIX| ; \
>+		 s|python setup.py|${PYTHON_CMD} setup.py| ; \
>+		 s|$${ROOTFORPYTHON}||' \
> 		${WRKSRC}/recollinstall.in
>+	@${REINPLACE_CMD} -e \
>+		's|python setup.py|${PYTHON_CMD} setup.py|' \
>+		${WRKSRC}/python/recoll/Makefile
> 
> post-install:
>-	@(cd ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR}/recoll && ${RM} *.pyc)
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/recoll/librecoll.so.${VERSION}
>-
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/recoll/librecoll.so.[0-9].*
> .if ${PORT_OPTIONS:MPYTHON}
>-. for l in recoll rclextract
>-	${STRIP_CMD} ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR}/recoll/${l}.so
>-. endfor
>+.for l in recoll rclextract
>+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/${l}.so
>+.endfor
>+	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
>+		-d ${PYTHONPREFIX_SITELIBDIR} \
>+		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/deskutils/recoll/distinfo deskutils/recoll/distinfo
>--- /usr/ports/deskutils/recoll/distinfo	2014-05-08 04:34:42.000000000 +0900
>+++ deskutils/recoll/distinfo	2014-06-17 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (recoll-1.19.13.tar.gz) = 5918ef4565fd22856e79996bafd7b8857f3963fa716cda39c5e8cb803fbfc1a0
>-SIZE (recoll-1.19.13.tar.gz) = 2066817
>+SHA256 (recoll-1.19.14.tar.gz) = e802d20f1dca9ad6e4ba5664121053198aba2e2dcfbff68c11dbf1c3d90d3b89
>+SIZE (recoll-1.19.14.tar.gz) = 2067212
>diff -urN /usr/ports/deskutils/recoll/pkg-plist deskutils/recoll/pkg-plist
>--- /usr/ports/deskutils/recoll/pkg-plist	2014-05-29 22:14:59.000000000 +0900
>+++ deskutils/recoll/pkg-plist	2014-06-17 00:00:00.000000000 +0900
>@@ -1,8 +1,11 @@
> %%QT4%%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%%
>@@ -10,6 +13,7 @@
> 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
>@@ -115,11 +119,12 @@
> %%DATADIR%%/translations/recoll_xx.qm
> %%DATADIR%%/translations/recoll_zh.qm
> %%DATADIR%%/translations/recoll_zh_CN.qm
>-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/recoll
>-@dirrm lib/recoll
>-@dirrm %%DATADIR%%/doc
>-@dirrm %%DATADIR%%/examples
>-@dirrm %%DATADIR%%/filters
>-@dirrm %%DATADIR%%/images
> @dirrm %%DATADIR%%/translations
>+@dirrm %%DATADIR%%/images
>+@dirrm %%DATADIR%%/filters
>+@dirrm %%DATADIR%%/examples
>+@dirrm %%DATADIR%%/doc
> @dirrm %%DATADIR%%
>+%%QT4%%@dirrmtry share/appdata
>+@dirrm lib/recoll
>+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/recoll

Actions: View | Diff

Attachments on bug 191093: 143838