From owner-svn-ports-head@freebsd.org Thu Apr 4 04:07:19 2019 Return-Path: Delivered-To: svn-ports-head@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 C39F415607D9; Thu, 4 Apr 2019 04:07:18 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 623F38338D; Thu, 4 Apr 2019 04:07:18 +0000 (UTC) (envelope-from ak@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 2272320023; Thu, 4 Apr 2019 04:07:18 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3447Ixh010536; Thu, 4 Apr 2019 04:07:18 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3447IQB010535; Thu, 4 Apr 2019 04:07:18 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201904040407.x3447IQB010535@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Thu, 4 Apr 2019 04:07:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r497785 - in head/mail/mutt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ak X-SVN-Commit-Paths: in head/mail/mutt: . files X-SVN-Commit-Revision: 497785 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 623F38338D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2019 04:07:19 -0000 Author: ak Date: Thu Apr 4 04:07:17 2019 New Revision: 497785 URL: https://svnweb.freebsd.org/changeset/ports/497785 Log: - Cleanup LDFLAGS, CONFIGURE_ENV [1] - Fix non-default LOCALBASE for aspell [1] - Remove unused extra-patch-parent-child-match PR: 236189 Submitted by: John Hein [1] Approved by: Derek Schrock (maintainer) Deleted: head/mail/mutt/files/extra-patch-aspell head/mail/mutt/files/extra-patch-parent-child-match Modified: head/mail/mutt/Makefile Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Thu Apr 4 04:03:30 2019 (r497784) +++ head/mail/mutt/Makefile Thu Apr 4 04:07:17 2019 (r497785) @@ -30,7 +30,6 @@ USES= cpe shebangfix ssl CONFLICTS= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* -CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \ --enable-external-dotlock --enable-pop --enable-imap \ @@ -130,20 +129,19 @@ GSSAPI_NONE_CONFIGURE_ON= --without-gss HCACHE_NONE_CONFIGURE_ON= --disable-hcache HCACHE_NONE_CONFIGURE_OFF= --enable-hcache --without-qdbm --without-gdbm -HCACHE_BDB_CONFIGURE_WITH= bdb +HCACHE_BDB_CONFIGURE_WITH= bdb=${LOCALBASE} HCACHE_BDB_USES= bdb:42+ -HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet +HCACHE_TOKYOCABINET_CONFIGURE_WITH= tokyocabinet=${LOCALBASE} HCACHE_TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet -HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet +HCACHE_KYOTOCABINET_CONFIGURE_WITH= kyotocabinet=${LOCALBASE} HCACHE_KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet ICONV_USES= iconv:translit ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --disable-iconv -ASPELL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aspell REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -158,7 +156,7 @@ LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring -IDN_CONFIGURE_WITH= idn2 +IDN_CONFIGURE_WITH= idn2=${LOCALBASE} IDN_IMPLIES= ICONV IFDEF_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ifdef @@ -197,8 +195,6 @@ VVV_PATCH_VERSION= ${PORTVERSION} GREETING_PATCH_VERSION= ${PORTVERSION} .endif -LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow - post-patch-NNTP-on: # Restore timestamps for autotools sources @${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac @@ -240,6 +236,11 @@ pre-configure:: ${WRKSRC}/init.h @${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \ ${WRKSRC}/contrib/Makefile.in + +pre-configure-ASPELL-on: + @${REINPLACE_CMD} -e '/^# append-hook/p' \ + -e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \ + ${WRKSRC}/doc/Muttrc.head pre-configure-HCACHE_BDB-on: @${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \