Attachment 165574 Details for Bug 206243 – deskutils_recoll.diff

[patch] deskutils_recoll.diff

deskutils_recoll.diff (text/plain), 3.50 KB, created by tkato432 on 2016-01-14 18:30:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-01-14 18:30:35 UTC

Size: 3.50 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/recoll/Makefile deskutils/recoll/Makefile
>--- /usr/ports/deskutils/recoll/Makefile	2015-11-13 07:38:39.205055000 +0900
>+++ deskutils/recoll/Makefile	2016-01-15 00:00:00.000000000 +0900
>@@ -2,23 +2,21 @@
> # $FreeBSD: head/deskutils/recoll/Makefile 401394 2015-11-12 20:06:15Z madpilot $
> 
> PORTNAME=	recoll
>-PORTVERSION=	1.21.3
>+PORTVERSION=	1.21.4
> CATEGORIES=	deskutils
>-MASTER_SITES=	http://www.lesbonscomptes.com/${PORTNAME}/
>+MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Personal full text search package, based on Xapian
> 
>-LICENSE=	GPLv2
>+LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	xapian-core>=0:${PORTSDIR}/databases/xapian-core
>-RUN_DEPENDS:=	${BUILD_DEPENDS} \
>+LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core
>+RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
> 		antiword:${PORTSDIR}/textproc/antiword \
> 		catdoc:${PORTSDIR}/textproc/catdoc \
> 		wpd2html:${PORTSDIR}/textproc/libwpd010 \
>-		xsltproc:${PORTSDIR}/textproc/libxslt \
>-		unrar:${PORTSDIR}/archivers/unrar \
> 		unrtf:${PORTSDIR}/textproc/unrtf
> 
> USES=		bison gmake iconv shebangfix
>@@ -46,15 +44,21 @@
> IMAGE_RUN_DEPENDS=	exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool
> KONQUEROR_DESC=		Konqueror webarchive format with Python
> KONQUEROR_RUN_DEPENDS=	kwebkitpart>0:${PORTSDIR}/www/kwebkitpart
>-LATEX_USE=		tex=dvipsk:run
>+LATEX_USE=		tex=dvipsk:run,latex:run
> PDF_RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
> PS_RUN_DEPENDS=		pstotext:${PORTSDIR}/print/pstotext
> PYTHON_USES=		python
> PYTHON_CONFIGURE_ENABLE=	python-module
>+PYTHON_PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
>+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 \
> 			qt4=corelib,gui,xml,webkit
> QT4_CONFIGURE_ENABLE=	qtgui
>+QT4_CONFIGURE_ENV=	QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
>+			QTDIR="${QT_PREFIX}"
>+QT4_VARS=		QT_NONSTANDARD=yes
> SOUND_RUN_DEPENDS=	mutagen-pony:${PORTSDIR}/audio/py-mutagen \
> 			pykaraoke:${PORTSDIR}/audio/py-karaoke
> X11MON_DESC=		X11 session monitoring support
>@@ -63,21 +67,11 @@
> X11MON_CONFIGURE_ENABLE=	x11mon
> X11MON_CONFIGURE_WITH=	fam
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MPYTHON}
>-PYDISTUTILS_PKGNAME=	Recoll
>-PYDISTUTILS_PKGVERSION=	1.0
>-PLIST_SUB+=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
>-.endif
>-
>-.if ${PORT_OPTIONS:MQT4}
>-QT_NONSTANDARD=	yes
>-CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e \
>+		'/recoll.pro/s|^|#|' \
>+		${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e \
> 		's|/usr/local/lib|${LOCALBASE}/lib|' \
> 		${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e \
>@@ -94,6 +88,10 @@
> 		's|python setup.py|${PYTHON_CMD} setup.py|' \
> 		${WRKSRC}/python/recoll/Makefile
> 
>+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].*
> 
>diff -urN /usr/ports/deskutils/recoll/distinfo deskutils/recoll/distinfo
>--- /usr/ports/deskutils/recoll/distinfo	2015-11-13 07:38:39.205371000 +0900
>+++ deskutils/recoll/distinfo	2016-01-15 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (recoll-1.21.3.tar.gz) = 66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a
>-SIZE (recoll-1.21.3.tar.gz) = 2240527
>+SHA256 (recoll-1.21.4.tar.gz) = bd6d4576214799bf9471bded2fd650df5d5f23b92eeb8d904d655e60606909a3
>+SIZE (recoll-1.21.4.tar.gz) = 2247088

Actions: View | Diff

Attachments on bug 206243: 165574