From owner-svn-ports-all@freebsd.org Thu Nov 8 07:35:33 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D0E7111097B; Thu, 8 Nov 2018 07:35:33 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1681272467; Thu, 8 Nov 2018 07:35:32 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E82872184D; Thu, 8 Nov 2018 07:35:31 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA87ZV8W049819; Thu, 8 Nov 2018 07:35:31 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA87ZUDF049812; Thu, 8 Nov 2018 07:35:30 GMT (envelope-from krion@FreeBSD.org) Message-Id: <201811080735.wA87ZUDF049812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarev Date: Thu, 8 Nov 2018 07:35:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484432 - in head/mail: notmuch notmuch-emacs notmuch-emacs/files notmuch-mutt notmuch/files X-SVN-Group: ports-head X-SVN-Commit-Author: krion X-SVN-Commit-Paths: in head/mail: notmuch notmuch-emacs notmuch-emacs/files notmuch-mutt notmuch/files X-SVN-Commit-Revision: 484432 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1681272467 X-Spamd-Result: default: False [-103.10 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.99)[-0.990,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2018 07:35:33 -0000 Author: krion Date: Thu Nov 8 07:35:30 2018 New Revision: 484432 URL: https://svnweb.freebsd.org/changeset/ports/484432 Log: Update to 0.28 PR: 232310 Submitted by: maintainer Added: head/mail/notmuch/files/patch-configure (contents, props changed) head/mail/notmuch/files/patch-contrib_notmuch-mutt_Makefile (contents, props changed) Deleted: head/mail/notmuch-emacs/files/ Modified: head/mail/notmuch-emacs/Makefile head/mail/notmuch-mutt/Makefile head/mail/notmuch/Makefile head/mail/notmuch/distinfo head/mail/notmuch/pkg-plist Modified: head/mail/notmuch-emacs/Makefile ============================================================================== --- head/mail/notmuch-emacs/Makefile Thu Nov 8 07:18:42 2018 (r484431) +++ head/mail/notmuch-emacs/Makefile Thu Nov 8 07:35:30 2018 (r484432) @@ -40,9 +40,11 @@ do-configure: @${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 \ Modified: head/mail/notmuch-mutt/Makefile ============================================================================== --- head/mail/notmuch-mutt/Makefile Thu Nov 8 07:18:42 2018 (r484431) +++ head/mail/notmuch-mutt/Makefile Thu Nov 8 07:35:30 2018 (r484432) @@ -14,6 +14,7 @@ RUN_DEPENDS= mutt:mail/mutt \ USES= gmake perl5 +MAKE_ARGS+= mandir=${MANPREFIX}/man prefix=${PREFIX} MASTERDIR= ${.CURDIR}/../notmuch NO_ARCH= yes WRKSRC_SUBDIR= contrib/notmuch-mutt @@ -22,14 +23,15 @@ OPTIONS_DEFINE= EXAMPLES MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/notmuch-mutt ${STAGEDIR}${PREFIX}/bin +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${MV} ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc + @${RMDIR} ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d -do-install-EXAMPLES-on: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc +post-install-EXAMPLES-off: + @${RM} -r ${STAGEDIR}${LOCALBASE}/etc/Muttrc.d -do-install-MANPAGES-on: - ${INSTALL_MAN} ${WRKSRC}/notmuch-mutt.1 ${STAGEDIR}${MANPREFIX}/man/man1 +post-install-MANPAGES-off: + @${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-mutt.1 .include "${MASTERDIR}/Makefile" Modified: head/mail/notmuch/Makefile ============================================================================== --- head/mail/notmuch/Makefile Thu Nov 8 07:18:42 2018 (r484431) +++ head/mail/notmuch/Makefile Thu Nov 8 07:35:30 2018 (r484432) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.27 +PORTVERSION= 0.28 CATEGORIES?= mail MASTER_SITES= https://notmuchmail.org/releases/ @@ -27,7 +27,7 @@ TEST_DEPENDS= bash:shells/bash \ gwc:sysutils/coreutils \ ${LOCALBASE}/bin/gdb:devel/gdb -USES= compiler:c++11-lang gmake pkgconfig python:build,test +USES= compiler:c++11-lang gmake gnome pkgconfig python:build,test USE_GNOME= glib20 USE_LDCONFIG= yes @@ -60,12 +60,16 @@ DOXYGEN_CONFIGURE_WITH= api-docs MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_WITH= docs -# install completions even in absence of shells/bash-completions +# Install bash completions without incurring a dependcy on +# shells/bash-completion. Also avoid automatic installation of +# info pages on FreeBSD 10. 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/' \ + -e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \ ${WRKSRC}/Makefile.config post-install: Modified: head/mail/notmuch/distinfo ============================================================================== --- head/mail/notmuch/distinfo Thu Nov 8 07:18:42 2018 (r484431) +++ head/mail/notmuch/distinfo Thu Nov 8 07:35:30 2018 (r484432) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529138705 -SHA256 (notmuch-0.27.tar.gz) = 40d3192f8f130f227b511fc80be86310c7f60ccb6d043b563f201fa505de0876 -SIZE (notmuch-0.27.tar.gz) = 912583 +TIMESTAMP = 1539421796 +SHA256 (notmuch-0.28.tar.gz) = acca75cec91651ccd2a7e31f7004e2ae14eff4ae38e375b8a88414c464cd0a37 +SIZE (notmuch-0.28.tar.gz) = 921069 Added: head/mail/notmuch/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/notmuch/files/patch-configure Thu Nov 8 07:35:30 2018 (r484432) @@ -0,0 +1,18 @@ +--- configure.orig 2018-10-16 07:56:32 UTC ++++ configure +@@ -566,6 +566,7 @@ if command -v ${BASH} > /dev/null; then + printf "Yes (%s).\n" "$bash_absolute" + else + have_bash=0 ++ bash_absolute= + printf "No. (%s not found)\n" "${BASH}" + fi + +@@ -576,6 +577,7 @@ if command -v ${PERL} > /dev/null; then + printf "Yes (%s).\n" "$perl_absolute" + else + have_perl=0 ++ perl_absolute= + printf "No. (%s not found)\n" "${PERL}" + fi + Added: head/mail/notmuch/files/patch-contrib_notmuch-mutt_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/notmuch/files/patch-contrib_notmuch-mutt_Makefile Thu Nov 8 07:35:30 2018 (r484432) @@ -0,0 +1,15 @@ +--- contrib/notmuch-mutt/Makefile.orig 2018-10-13 17:57:20 UTC ++++ contrib/notmuch-mutt/Makefile +@@ -18,8 +18,10 @@ install: all + mkdir -p $(DESTDIR)$(prefix)/bin + sed "1s|^#!.*|#! $(PERL_ABSOLUTE)|" < $(NAME) > $(DESTDIR)$(prefix)/bin/$(NAME) + chmod 755 $(DESTDIR)$(prefix)/bin/$(NAME) +- install -D -m 644 $(NAME).1 $(DESTDIR)$(mandir)/man1/$(NAME).1 +- install -D -m 644 $(NAME).rc $(DESTDIR)$(sysconfdir)/Muttrc.d/$(NAME).rc ++ mkdir -p $(DESTDIR)$(mandir)/man1 ++ install -m 644 $(NAME).1 $(DESTDIR)$(mandir)/man1/$(NAME).1 ++ mkdir -p $(DESTDIR)$(sysconfdir)/Muttrc.d ++ install -m 644 $(NAME).rc $(DESTDIR)$(sysconfdir)/Muttrc.d/$(NAME).rc + + clean: + rm -f notmuch-mutt.1 README.html Modified: head/mail/notmuch/pkg-plist ============================================================================== --- head/mail/notmuch/pkg-plist Thu Nov 8 07:18:42 2018 (r484431) +++ head/mail/notmuch/pkg-plist Thu Nov 8 07:35:30 2018 (r484432) @@ -23,4 +23,5 @@ lib/libnotmuch.so lib/libnotmuch.so.5 lib/libnotmuch.so.5.2.0 share/bash-completion/completions/notmuch +share/zsh/functions/Completion/Unix/_email-notmuch share/zsh/functions/Completion/Unix/_notmuch