From a6f7bd08e1a4da1e789569ef4bc2af2dd3bd963b Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Mon, 14 Nov 2016 11:23:36 +0000 Subject: - Update to version 0.23.1 [1] - Allow build on FreeBSD 9 - Move options block to correct place PR: 213240 [1] Submitted by: maintainer [1] --- mail/notmuch/Makefile | 24 +++++++----- mail/notmuch/distinfo | 6 +-- mail/notmuch/files/patch-configure | 44 --------------------- mail/notmuch/pkg-plist | 78 +++++++++++++++++++------------------- 4 files changed, 58 insertions(+), 94 deletions(-) delete mode 100644 mail/notmuch/files/patch-configure diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index ea97814fee1a..f5bb8a5f58f5 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.22.2 +PORTVERSION= 0.23.1 CATEGORIES= mail MASTER_SITES= http://notmuchmail.org/releases/ @@ -19,6 +19,14 @@ LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ BROKEN_powerpc64= Does not build +HAS_CONFIGURE= yes +USES= gmake pkgconfig python:build +USE_GNOME= glib20 +CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man +USE_LDCONFIG= yes + +MAKE_ENV+= PYTHONCMD=${PYTHON_CMD} + OPTIONS_DEFINE= BASH DOXYGEN EMACS MANPAGES RUBY ZSH EMACS_DESC= Install EMACS lisp files (requires emacs) OPTIONS_SUB= yes @@ -36,16 +44,14 @@ MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx RUBY_USE= RUBY=yes ZSH_CONFIGURE_WITH= zsh-completion -HAS_CONFIGURE= yes -USES= gmake pkgconfig python:build -USE_GNOME= glib20 -CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man -USE_LDCONFIG= yes +.include -MAKE_ENV+= PYTHONCMD=${PYTHON_CMD} +.if ${OSVERSION} < 1000000 +CONFIGURE_ENV= zlib_cflags="" zlib_ldflags="-lz" PKG_CONFIG_PATH="" +.endif post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.3.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.4.4.0 -.include +.include diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo index b1dba6f85157..90b42a252703 100644 --- a/mail/notmuch/distinfo +++ b/mail/notmuch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473408075 -SHA256 (notmuch-0.22.2.tar.gz) = 6cd19c61634079981b2d8f4b7cb4eb953cba2a36272520603682d813d2bd7ed1 -SIZE (notmuch-0.22.2.tar.gz) = 683796 +TIMESTAMP = 1477336281 +SHA256 (notmuch-0.23.1.tar.gz) = e8012a1aa9afa47dfeb78f826610577e6bf9714e0933f28139c8611aad96d180 +SIZE (notmuch-0.23.1.tar.gz) = 690069 diff --git a/mail/notmuch/files/patch-configure b/mail/notmuch/files/patch-configure deleted file mode 100644 index 5b382b9bbffb..000000000000 --- a/mail/notmuch/files/patch-configure +++ /dev/null @@ -1,44 +0,0 @@ ---- configure.orig 2016-07-19 09:43:20 UTC -+++ configure -@@ -66,6 +66,7 @@ PYTHON=${PYTHON:-} - PREFIX=/usr/local - LIBDIR= - WITH_DOCS=1 -+WITH_API_DOCS=1 - WITH_EMACS=1 - WITH_BASH=1 - WITH_RUBY=1 -@@ -134,7 +135,8 @@ Some features can be disabled (--with-fe - --without-feature) : - - --without-bash-completion Do not install bash completions files -- --without-docs Do not install documentation and man pages -+ --without-docs Do not install man pages -+ --without-api-docs Do not install API documentation - --without-emacs Do not install lisp file - --without-ruby Do not install ruby bindings - --without-zsh-completion Do not install zsh completions files -@@ -185,6 +187,14 @@ for option; do - fi - elif [ "${option}" = '--without-docs' ] ; then - WITH_DOCS=0 -+ elif [ "${option%%=*}" = '--with-api-docs' ]; then -+ if [ "${option#*=}" = 'no' ]; then -+ WITH_API_DOCS=0 -+ else -+ WITH_API_DOCS=1 -+ fi -+ elif [ "${option}" = '--without-api-docs' ] ; then -+ WITH_API_DOCS=0 - elif [ "${option%%=*}" = '--with-emacs' ]; then - if [ "${option#*=}" = 'no' ]; then - WITH_EMACS=0 -@@ -507,7 +517,7 @@ else - fi - - have_doxygen=0 --if [ $WITH_DOCS = "1" ] ; then -+if [ $WITH_API_DOCS = "1" ] ; then - printf "Checking if doxygen is available... " - if command -v doxygen > /dev/null; then - printf "Yes.\n" diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist index 52d91041e088..076a1271c80a 100644 --- a/mail/notmuch/pkg-plist +++ b/mail/notmuch/pkg-plist @@ -2,7 +2,7 @@ bin/notmuch include/notmuch.h lib/libnotmuch.so lib/libnotmuch.so.4 -lib/libnotmuch.so.4.3.0 +lib/libnotmuch.so.4.4.0 %%MANPAGES%%man/man1/notmuch-address.1.gz %%MANPAGES%%man/man1/notmuch-compact.1.gz %%MANPAGES%%man/man1/notmuch-config.1.gz @@ -22,41 +22,43 @@ lib/libnotmuch.so.4.3.0 %%MANPAGES%%man/man5/notmuch-hooks.5.gz %%MANPAGES%%man/man7/notmuch-search-terms.7.gz %%BASH%%etc/bash_completion.d/notmuch -%%EMACS%%share/emacs/site-lisp/coolj.el -%%EMACS%%share/emacs/site-lisp/coolj.elc -%%EMACS%%share/emacs/site-lisp/notmuch-address.el -%%EMACS%%share/emacs/site-lisp/notmuch-address.elc -%%EMACS%%share/emacs/site-lisp/notmuch-crypto.el -%%EMACS%%share/emacs/site-lisp/notmuch-crypto.elc -%%EMACS%%share/emacs/site-lisp/notmuch-hello.el -%%EMACS%%share/emacs/site-lisp/notmuch-hello.elc -%%EMACS%%share/emacs/site-lisp/notmuch-jump.el -%%EMACS%%share/emacs/site-lisp/notmuch-jump.elc -%%EMACS%%share/emacs/site-lisp/notmuch-lib.el -%%EMACS%%share/emacs/site-lisp/notmuch-lib.elc -%%EMACS%%share/emacs/site-lisp/notmuch-logo.png -%%EMACS%%share/emacs/site-lisp/notmuch-maildir-fcc.el -%%EMACS%%share/emacs/site-lisp/notmuch-maildir-fcc.elc -%%EMACS%%share/emacs/site-lisp/notmuch-message.el -%%EMACS%%share/emacs/site-lisp/notmuch-message.elc -%%EMACS%%share/emacs/site-lisp/notmuch-mua.el -%%EMACS%%share/emacs/site-lisp/notmuch-mua.elc -%%EMACS%%share/emacs/site-lisp/notmuch-parser.el -%%EMACS%%share/emacs/site-lisp/notmuch-parser.elc -%%EMACS%%share/emacs/site-lisp/notmuch-print.el -%%EMACS%%share/emacs/site-lisp/notmuch-print.elc -%%EMACS%%share/emacs/site-lisp/notmuch-query.el -%%EMACS%%share/emacs/site-lisp/notmuch-query.elc -%%EMACS%%share/emacs/site-lisp/notmuch-show.el -%%EMACS%%share/emacs/site-lisp/notmuch-show.elc -%%EMACS%%share/emacs/site-lisp/notmuch-tag.el -%%EMACS%%share/emacs/site-lisp/notmuch-tag.elc -%%EMACS%%share/emacs/site-lisp/notmuch-tree.el -%%EMACS%%share/emacs/site-lisp/notmuch-tree.elc -%%EMACS%%share/emacs/site-lisp/notmuch-version.el -%%EMACS%%share/emacs/site-lisp/notmuch-version.elc -%%EMACS%%share/emacs/site-lisp/notmuch-wash.el -%%EMACS%%share/emacs/site-lisp/notmuch-wash.elc -%%EMACS%%share/emacs/site-lisp/notmuch.el -%%EMACS%%share/emacs/site-lisp/notmuch.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/coolj.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-address.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-crypto.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-hello.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-jump.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-lib.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-lib.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-logo.png +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-message.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-message.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-mua.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-mua.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-parser.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-parser.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-print.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-print.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-query.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-query.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-show.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-show.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tag.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tag.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tree.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-tree.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-version.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-version.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-wash.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/notmuch-company.elc %%ZSH%%share/zsh/functions/Completion/Unix/_notmuch -- cgit v1.2.3