- 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 <jcfyecrayz@liamekaens.com> [1]
Approved by:	Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)

3 files changed, 9 insertions, 190 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 65db75a46c06..6ac1ed3e7d97 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -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
@@ -241,6 +237,11 @@ pre-configure::
 	@${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} /' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/mail/mutt/files/extra-patch-aspell b/mail/mutt/files/extra-patch-aspell
deleted file mode 100644
index b039427f2b6e..000000000000
--- a/mail/mutt/files/extra-patch-aspell
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Muttrc.head.orig	2018-05-19 20:33:53 UTC
-+++ doc/Muttrc.head
-@@ -35,6 +35,8 @@
- # close-hook  '\.gz$'  "gzip -c   '%t' >  '%f'"
- # append-hook '\.gz$'  "gzip -c   '%t' >> '%f'"
- 
-+set ispell="/usr/local/bin/aspell --mode=email check"
-+
- # If Mutt is unable to determine your site's domain name correctly, you can
- # set the default here.
- #
diff --git a/mail/mutt/files/extra-patch-parent-child-match b/mail/mutt/files/extra-patch-parent-child-match
deleted file mode 100644
index 687c520e6852..000000000000
--- a/mail/mutt/files/extra-patch-parent-child-match
+++ /dev/null
@@ -1,171 +0,0 @@
---- doc/manual.xml.head.orig	2017-05-30 19:27:52 UTC
-+++ doc/manual.xml.head
-@@ -4265,6 +4265,22 @@ variable <quote>all</quote>, which allow
- their system defaults.
- </para>
- 
-+<para>
-+<emphasis role="bold">Parent and child match</emphasis>.
-+You can tell mutt that the following pattern has to be matched against
-+the parent message with &lt; or one of its childs with &gt;.
-+This example matches all mails which have at least an unread duplicate
-+message:
-+</para>
-+
-+<para>
-+
-+<screen>
-+>(~= ~N)
-+</screen>
-+
-+</para>
-+
- </sect2>
- 
- <sect2 id="set-myvar">
---- mutt.h.orig	2017-06-03 23:16:03 UTC
-+++ mutt.h
-@@ -865,6 +865,8 @@ typedef struct pattern_t
-   unsigned int alladdr : 1;
-   unsigned int stringmatch : 1;
-   unsigned int groupmatch : 1;
-+  unsigned int parentmatch : 1;
-+  unsigned int childsmatch : 1;
-   unsigned int ign_case : 1;		/* ignore case for local stringmatch searches */
-   unsigned int isalias : 1;
-   int min;
---- pattern.c.orig	2017-05-30 19:26:40 UTC
-+++ pattern.c
-@@ -46,6 +46,7 @@ static int eat_regexp (pattern_t *pat, B
- static int eat_date (pattern_t *pat, BUFFER *, BUFFER *);
- static int eat_range (pattern_t *pat, BUFFER *, BUFFER *);
- static int patmatch (const pattern_t *pat, const char *buf);
-+static int pattern_exec (struct pattern_t *pat, pattern_exec_flag flags, CONTEXT *ctx, HEADER *h, pattern_cache_t *cache);
- 
- static const struct pattern_flags
- {
-@@ -781,6 +782,8 @@ pattern_t *mutt_pattern_comp (/* const *
-   pattern_t *last = NULL;
-   int not = 0;
-   int alladdr = 0;
-+  int parentmatch = 0;
-+  int childsmatch = 0;
-   int or = 0;
-   int implicit = 1;	/* used to detect logical AND operator */
-   int isalias = 0;
-@@ -810,6 +813,24 @@ pattern_t *mutt_pattern_comp (/* const *
- 	ps.dptr++;
- 	isalias = !isalias;
- 	break;
-+      case '<':
-+	ps.dptr++;
-+	if (childsmatch) {
-+	  snprintf (err->data, err->dsize, _("cannot use both < and > as a pattern modifier"));
-+	  mutt_pattern_free (&curlist);
-+	  return NULL;
-+	}
-+	parentmatch = 1;
-+	break;
-+      case '>':
-+	ps.dptr++;
-+	if (parentmatch) {
-+	  snprintf (err->data, err->dsize, _("cannot use both < and > as a pattern modifier"));
-+	  mutt_pattern_free (&curlist);
-+	  return NULL;
-+	}
-+	childsmatch = 1;
-+	break;
-       case '|':
- 	if (!or)
- 	{
-@@ -835,6 +856,8 @@ pattern_t *mutt_pattern_comp (/* const *
- 	implicit = 0;
- 	not = 0;
- 	alladdr = 0;
-+	parentmatch = 0;
-+	childsmatch = 0;
- 	isalias = 0;
- 	break;
-       case '%':
-@@ -865,9 +888,13 @@ pattern_t *mutt_pattern_comp (/* const *
- 	  last = tmp;
- 	  tmp->not ^= not;
- 	  tmp->alladdr |= alladdr;
-+	  tmp->parentmatch |= parentmatch;
-+	  tmp->childsmatch |= childsmatch;
- 	  tmp->isalias |= isalias;
- 	  not = 0;
- 	  alladdr = 0;
-+	  parentmatch = 0;
-+	  childsmatch = 0;
- 	  isalias = 0;
- 	  /* compile the sub-expression */
- 	  buf = mutt_substrdup (ps.dptr + 1, p);
-@@ -896,11 +923,15 @@ pattern_t *mutt_pattern_comp (/* const *
- 	tmp = new_pattern ();
- 	tmp->not = not;
- 	tmp->alladdr = alladdr;
-+	tmp->parentmatch = parentmatch;
-+	tmp->childsmatch = childsmatch;
- 	tmp->isalias = isalias;
-         tmp->stringmatch = (*ps.dptr == '=') ? 1 : 0;
-         tmp->groupmatch  = (*ps.dptr == '%') ? 1 : 0;
- 	not = 0;
- 	alladdr = 0;
-+	parentmatch = 0;
-+	childsmatch = 0;
- 	isalias = 0;
- 
- 	if (last)
-@@ -967,9 +998,13 @@ pattern_t *mutt_pattern_comp (/* const *
- 	last = tmp;
- 	tmp->not ^= not;
- 	tmp->alladdr |= alladdr;
-+	tmp->parentmatch |= parentmatch;
-+	tmp->childsmatch |= childsmatch;
- 	tmp->isalias |= isalias;
- 	not = 0;
- 	alladdr = 0;
-+	parentmatch = 0;
-+	childsmatch = 0;
- 	isalias = 0;
- 	ps.dptr = p + 1; /* restore location */
- 	break;
-@@ -1137,6 +1172,37 @@ int
- mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags, CONTEXT *ctx, HEADER *h,
-                    pattern_cache_t *cache)
- {
-+  THREAD *t;
-+
-+  if (pat->parentmatch) {
-+    if (h->thread && h->thread->parent && h->thread->parent->message)
-+      return pattern_exec (pat, flags, ctx, h->thread->parent->message, cache);
-+    else
-+      return pat->not;
-+  }
-+  if (pat->childsmatch) {
-+    if (!h->thread)
-+      return pat->not;
-+    if (!h->thread->child)
-+      return pat->not;
-+    t = h->thread->child;
-+    while (t->prev)
-+      t = t->prev;
-+    for (; t; t = t->next) {
-+      if (!t->message)
-+	continue;
-+      if (pattern_exec (pat, flags, ctx, t->message, cache))
-+	return !pat->not;
-+    }
-+    return pat->not;
-+  }
-+  return pattern_exec (pat, flags, ctx, h, cache);
-+}
-+
-+static int
-+pattern_exec (struct pattern_t *pat, pattern_exec_flag flags, CONTEXT *ctx, HEADER *h,
-+			  pattern_cache_t *cache)
-+{
-   int result;
-   int *cache_entry;
-