Attachment 204905 Details for Bug 238418 – notmuch-0.29.diff

[patch] notmuch-0.29.diff

notmuch-0.29.patch (text/plain), 3.67 KB, created by Sebastian Schwarz on 2019-06-08 16:05:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Schwarz

Created: 2019-06-08 16:05:00 UTC

Size: 3.67 KB

patch

obsolete

>diff --git mail/notmuch-emacs/Makefile mail/notmuch-emacs/Makefile
>index fe3f1aebfce4..514193f36afb 100644
>--- mail/notmuch-emacs/Makefile
>+++ mail/notmuch-emacs/Makefile
>@@ -56,10 +56,6 @@ do-configure:
> 		${CONFIGURE_ARGS} \
> 		> ${WRKSRC}/Makefile.config
> 
>-# work around race condition in Sphinx (cf. PR-227460)
>-pre-build:
>-	@${MKDIR} ${WRKSRC}/doc/_build/doctrees
>-
> post-install:
> 	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
> 
>diff --git mail/notmuch/Makefile mail/notmuch/Makefile
>index 994e033d06d9..e17e84a40f6a 100644
>--- mail/notmuch/Makefile
>+++ mail/notmuch/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	notmuch
>-PORTVERSION=	0.28.2
>+PORTVERSION=	0.29
> CATEGORIES?=	mail
> MASTER_SITES=	https://notmuchmail.org/releases/
> 
>@@ -13,7 +13,7 @@ LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
> 
> .ifndef MASTERDIR
>-LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
>+LIB_DEPENDS=	libgmime-3.0.so:mail/gmime30 \
> 		libxapian.so:databases/xapian-core \
> 		libtalloc.so:devel/talloc
> TEST_DEPENDS=	bash:shells/bash \
>@@ -30,7 +30,11 @@ TEST_DEPENDS=	bash:shells/bash \
> USES=		compiler:c++11-lang gmake gnome pkgconfig python:build,test
> USE_GNOME=	glib20
> USE_LDCONFIG=	yes
>+.endif
> 
>+USES+=		tar:xz
>+
>+.ifndef MASTERDIR
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
> 		--mandir=${MANPREFIX}/man \
>@@ -60,20 +64,17 @@ DOXYGEN_CONFIGURE_WITH=	api-docs
> MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
> MANPAGES_CONFIGURE_WITH=	docs
> 
>-post-patch:
> # Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
>+post-patch:
> 	@${REINPLACE_CMD} -i .c++20 's/-I$$(srcdir)/-iquote$$(srcdir)/' \
> 		${WRKSRC}/*/Makefile.local
> 
>-# Install bash completions without incurring a dependcy on
>-# shells/bash-completion.  Also avoid automatic installation of
>-# info pages on FreeBSD 10.
>+# Install bash completions without incurring a dependency on
>+# shells/bash-completion.
> post-configure:
> 	${REINPLACE_CMD} \
> 		-e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \
> 		-e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \
>-		-e '/^HAVE_INSTALL_INFO[[:blank:]]*=/s/=.*/=0/' \
>-		-e '/^HAVE_MAKEINFO[[:blank:]]*=/s/=.*/=0/' \
> 		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \
> 		${WRKSRC}/Makefile.config
> 
>@@ -81,7 +82,7 @@ post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?*
> 
>-# keep poudriere testport happy
>+# Keep poudriere-testport(8) happy.
> post-install-MANPAGES-on:
> 	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz
> .endif
>diff --git mail/notmuch/distinfo mail/notmuch/distinfo
>index bc3936fb0656..04d6d5c7c10d 100644
>--- mail/notmuch/distinfo
>+++ mail/notmuch/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1551537254
>-SHA256 (notmuch-0.28.2.tar.gz) = 85a6498033451e188bcebbb3a4841e77c8d07b7fb1db89f17a74d6038f73e931
>-SIZE (notmuch-0.28.2.tar.gz) = 921580
>+TIMESTAMP = 1559937880
>+SHA256 (notmuch-0.29.tar.xz) = 08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
>+SIZE (notmuch-0.29.tar.xz) = 660284
>diff --git mail/notmuch/files/patch-doc_Makefile.local mail/notmuch/files/patch-doc_Makefile.local
>deleted file mode 100644
>index 08b8ad5de116..000000000000
>--- mail/notmuch/files/patch-doc_Makefile.local
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- doc/Makefile.local.orig	2018-06-16 21:06:47 UTC
>-+++ doc/Makefile.local
>-@@ -44,7 +44,7 @@ sphinx-texinfo:
>- 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
>- 
>- sphinx-info: sphinx-texinfo
>--	make -C $(DOCBUILDDIR)/texinfo info
>-+	$(MAKE) -C $(DOCBUILDDIR)/texinfo info
>- 
>- # Use the man page converter that is available. We should never depend
>- # on MAN_ROFF_FILES if a converter is not available.

Actions: View | Diff

Attachments on bug 238418: 204905 | 205038