diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile index eb8809c50d57..5eddbb423810 100644 --- a/mail/notmuch-emacs/Makefile +++ b/mail/notmuch-emacs/Makefile @@ -1,74 +1,74 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= mail elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX:S/^$/-emacs/} COMMENT= Emacs major-mode for the Notmuch email search and tagging application LICENSE= GPLv3 RUN_DEPENDS= notmuch:mail/notmuch USES= emacs gmake INSTALL_TARGET= install-emacs MASTERDIR= ${.CURDIR}/../notmuch NO_ARCH= yes OPTIONS_DEFINE= DESKTOP DOCS MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes DESKTOP_DESC= Install .desktop file for notmuch-emacs-mua DESKTOP_CONFIGURE_ON= WITH_DESKTOP=1 DESKTOP_USES= desktop-file-utils DOCS_ALL_TARGET= build-info DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_CONFIGURE_ON= HAVE_INSTALL_INFO=1 HAVE_MAKEINFO=1 HAVE_SPHINX=1 DOCS_INFO= notmuch-emacs DOCS_INSTALL_TARGET= install-info DOCS_USES= makeinfo MANPAGES_ALL_TARGET= build-man MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_ON= HAVE_SPHINX=1 MANPAGES_INSTALL_TARGET= install-man PORTSCOUT= limit:^[0-9\.]*$$ # fake ./configure to avoid unneeded dependencies do-configure: @${CP} ${WRKSRC}/version.txt ${WRKSRC}/version.stamp @${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local @${PRINTF} \ '%s\n' \ BASH_ABSOLUTE=/bin/sh \ desktop_dir=${PREFIX}/share/applications \ emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \ HAVE_BASH=1 \ HAVE_EMACS=1 \ infodir=${PREFIX}/${INFO_PATH} \ mandir=${MANPREFIX}/man \ NOTMUCH_SRCDIR=${WRKSRC} \ prefix=${PREFIX} \ srcdir=. \ subdirs='doc emacs' \ WITH_EMACS=1 \ ${CONFIGURE_ARGS} \ > ${WRKSRC}/Makefile.config @${PRINTF} "tags.add('WITH_EMACS')\nrsti_dir = '${WRKSRC}/emacs'\n" \ > ${WRKSRC}/sphinx.config post-install: @${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el # keep poudriere testport happy post-install-DOCS-on: @${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} ! -type d ! -name notmuch-emacs.info -delete post-install-MANPAGES-on: @${FIND} ${STAGEDIR}${MANPREFIX}/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete # modify what Mk/Uses/emacs.mk set MAKE_ARGS+= EMACS+=--quick .include "${MASTERDIR}/Makefile" diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index 67d1a6ac7e0e..7fc663ab4640 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -1,96 +1,96 @@ # Created by: DarwinSurvivor PORTNAME= notmuch -DISTVERSION= 0.34.1 +DISTVERSION= 0.34.2 PORTREVISION?= 0 CATEGORIES?= mail MASTER_SITES= https://notmuchmail.org/releases/ MAINTAINER= jrm@FreeBSD.org COMMENT?= Thread-based email index, search and tagging application LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3 .ifndef MASTERDIR LIB_DEPENDS= libgmime-3.0.so:mail/gmime30 \ libsexp.so:devel/sfsexp \ libtalloc.so:devel/talloc \ libxapian.so:databases/xapian-core TEST_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb \ bash:shells/bash \ dtach:misc/dtach \ emacs:editors/emacs@nox \ gbase64:sysutils/coreutils \ gdate:sysutils/coreutils \ gpg:security/gnupg \ gsed:textproc/gsed \ gsha256sum:sysutils/coreutils \ gwc:sysutils/coreutils USES= compiler:c++11-lang gmake gnome pkgconfig \ python:3.5+,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 \ --prefix=${PREFIX} \ --with-bash-completion \ --with-retry-lock \ --with-zsh-completion \ --without-emacs CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} TEST_ENV+= NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] message-property.6 regexp-query.21" \ TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ TEST_GDB=${LOCALBASE}/bin/gdb \ V=1 TEST_TARGET= test .endif PKGDIR= ${.CURDIR} .ifndef MASTERDIR PORTSCOUT= limit:^[0-9\.]*$$ .endif PATCH_WRKSRC= ${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g} .ifndef MASTERDIR OPTIONS_DEFINE= DOXYGEN MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CONFIGURE_WITH= api-docs MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_WITH= docs # Avoid conflict with C++20 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 dependency on # shells/bash-completion. post-configure: ${REINPLACE_CMD} \ -e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \ -e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \ -e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \ ${WRKSRC}/Makefile.config post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?* # Keep poudriere-testport(8) happy. post-install-MANPAGES-on: @${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz .endif .include diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo index 3eee2372b11d..2331f0da5827 100644 --- a/mail/notmuch/distinfo +++ b/mail/notmuch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636218691 -SHA256 (notmuch-0.34.1.tar.xz) = 457acf7cc4815280a76b0c4a95c64815b6d7e3d9c0342168e6d96e741f31d816 -SIZE (notmuch-0.34.1.tar.xz) = 748444 +TIMESTAMP = 1639167296 +SHA256 (notmuch-0.34.2.tar.xz) = c1f2ceee47f689711222d7205af2a3fe7a4a9d8c32e4e0b24ad66f88df6a47d3 +SIZE (notmuch-0.34.2.tar.xz) = 749384 diff --git a/mail/py-notmuch2/Makefile b/mail/py-notmuch2/Makefile index 5ac69b9abe9f..a9bbd5e43e5b 100644 --- a/mail/py-notmuch2/Makefile +++ b/mail/py-notmuch2/Makefile @@ -1,24 +1,24 @@ CATEGORIES= mail python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 2 +PKGNAMESUFFIX= 0 COMMENT= Pythonic bindings for the notmuch mail database using CFFI LICENSE= GPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} LIB_DEPENDS= libnotmuch.so:mail/notmuch USES= python:3.5+ uniquefiles:dirs USE_PYTHON= autoplist distutils MASTERDIR= ${.CURDIR}/../notmuch WRKSRC_SUBDIR= bindings/python-cffi PORTSCOUT= limit:^[0-9\.]*$$ post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/notmuch2/_capi.abi3*.so .include "${MASTERDIR}/Makefile"