View | Details | Raw Unified | Return to bug 238418 | Differences between
and this patch

Collapse All | Expand All

(-)mail/notmuch-emacs/Makefile (-4 lines)
Lines 56-65 do-configure: Link Here
56
		${CONFIGURE_ARGS} \
56
		${CONFIGURE_ARGS} \
57
		> ${WRKSRC}/Makefile.config
57
		> ${WRKSRC}/Makefile.config
58
58
59
# work around race condition in Sphinx (cf. PR-227460)
60
pre-build:
61
	@${MKDIR} ${WRKSRC}/doc/_build/doctrees
62
63
post-install:
59
post-install:
64
	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
60
	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
65
61
(-)mail/notmuch/Makefile (-9 / +10 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	notmuch
4
PORTNAME=	notmuch
5
PORTVERSION=	0.28.2
5
PORTVERSION=	0.29.1
6
CATEGORIES?=	mail
6
CATEGORIES?=	mail
7
MASTER_SITES=	https://notmuchmail.org/releases/
7
MASTER_SITES=	https://notmuchmail.org/releases/
8
8
Lines 13-19 LICENSE= GPLv3 Link Here
13
LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
13
LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
14
14
15
.ifndef MASTERDIR
15
.ifndef MASTERDIR
16
LIB_DEPENDS=	libgmime-2.6.so:mail/gmime26 \
16
LIB_DEPENDS=	libgmime-3.0.so:mail/gmime30 \
17
		libxapian.so:databases/xapian-core \
17
		libxapian.so:databases/xapian-core \
18
		libtalloc.so:devel/talloc
18
		libtalloc.so:devel/talloc
19
TEST_DEPENDS=	bash:shells/bash \
19
TEST_DEPENDS=	bash:shells/bash \
Lines 30-36 TEST_DEPENDS= bash:shells/bash \ Link Here
30
USES=		compiler:c++11-lang gmake gnome pkgconfig python:build,test
30
USES=		compiler:c++11-lang gmake gnome pkgconfig python:build,test
31
USE_GNOME=	glib20
31
USE_GNOME=	glib20
32
USE_LDCONFIG=	yes
32
USE_LDCONFIG=	yes
33
.endif
33
34
35
USES+=		tar:xz
36
37
.ifndef MASTERDIR
34
HAS_CONFIGURE=	yes
38
HAS_CONFIGURE=	yes
35
CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
39
CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
36
		--mandir=${MANPREFIX}/man \
40
		--mandir=${MANPREFIX}/man \
Lines 60-79 DOXYGEN_CONFIGURE_WITH= api-docs Link Here
60
MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
64
MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
61
MANPAGES_CONFIGURE_WITH=	docs
65
MANPAGES_CONFIGURE_WITH=	docs
62
66
63
post-patch:
64
# Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
67
# Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
68
post-patch:
65
	@${REINPLACE_CMD} -i .c++20 's/-I$$(srcdir)/-iquote$$(srcdir)/' \
69
	@${REINPLACE_CMD} -i .c++20 's/-I$$(srcdir)/-iquote$$(srcdir)/' \
66
		${WRKSRC}/*/Makefile.local
70
		${WRKSRC}/*/Makefile.local
67
71
68
# Install bash completions without incurring a dependcy on
72
# Install bash completions without incurring a dependency on
69
# shells/bash-completion.  Also avoid automatic installation of
73
# shells/bash-completion.
70
# info pages on FreeBSD 10.
71
post-configure:
74
post-configure:
72
	${REINPLACE_CMD} \
75
	${REINPLACE_CMD} \
73
		-e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \
76
		-e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \
74
		-e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \
77
		-e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \
75
		-e '/^HAVE_INSTALL_INFO[[:blank:]]*=/s/=.*/=0/' \
76
		-e '/^HAVE_MAKEINFO[[:blank:]]*=/s/=.*/=0/' \
77
		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \
78
		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \
78
		${WRKSRC}/Makefile.config
79
		${WRKSRC}/Makefile.config
79
80
Lines 81-87 post-install: Link Here
81
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
82
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
82
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?*
83
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?*
83
84
84
# keep poudriere testport happy
85
# Keep poudriere-testport(8) happy.
85
post-install-MANPAGES-on:
86
post-install-MANPAGES-on:
86
	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz
87
	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz
87
.endif
88
.endif
(-)mail/notmuch/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1551537254
1
TIMESTAMP = 1560452810
2
SHA256 (notmuch-0.28.2.tar.gz) = 85a6498033451e188bcebbb3a4841e77c8d07b7fb1db89f17a74d6038f73e931
2
SHA256 (notmuch-0.29.1.tar.xz) = 9846fc8e32d415cee41f6644581a4de7b0d2e6bc98e1ba86db918f061fcfe365
3
SIZE (notmuch-0.28.2.tar.gz) = 921580
3
SIZE (notmuch-0.29.1.tar.xz) = 660352
(-)mail/notmuch/files/patch-doc_Makefile.local (-11 lines)
Removed Link Here
1
--- doc/Makefile.local.orig	2018-06-16 21:06:47 UTC
2
+++ doc/Makefile.local
3
@@ -44,7 +44,7 @@ sphinx-texinfo:
4
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(DOCBUILDDIR)/texinfo
5
 
6
 sphinx-info: sphinx-texinfo
7
-	make -C $(DOCBUILDDIR)/texinfo info
8
+	$(MAKE) -C $(DOCBUILDDIR)/texinfo info
9
 
10
 # Use the man page converter that is available. We should never depend
11
 # on MAN_ROFF_FILES if a converter is not available.

Return to bug 238418