- Convert to options helpers when possible

- Add URLVIEW option (on by default)
- Add patch to make parent directory entry (..) always on top of browser menu (with any $sort_browser value)
- Clean up MASTER_SITES

PR:	206092
Approved by:	udo.schweigert@siemens.com (maintainer)

2 files changed, 41 insertions, 1 deletions

diff --git a/mail/mutt/files/extra-patch-doc-ref b/mail/mutt/files/extra-patch-doc-ref
index 9679f4c276f1..38002304433d 100644
--- a/mail/mutt/files/extra-patch-doc-ref
+++ b/mail/mutt/files/extra-patch-doc-ref
@@ -6,7 +6,7 @@
  mail under unix operating systems, including support for color terminals, MIME,
 -OpenPGP, and a threaded sorting mode.
 +OpenPGP, and a threaded sorting mode. Details of how to use all of this is
-+available in \fI${DOCSDIR}\fP.
++available in @docdir@.
  .PP
  .I Note:
  .IR
diff --git a/mail/mutt/files/patch-browser.c b/mail/mutt/files/patch-browser.c
new file mode 100644
index 000000000000..45f206e92ef8
--- /dev/null
+++ b/mail/mutt/files/patch-browser.c
@@ -0,0 +1,40 @@
+Index: browser.c
+@@ -80,6 +80,12 @@
+   struct folder_file *pa = (struct folder_file *) a;
+   struct folder_file *pb = (struct folder_file *) b;
+ 
++  /* Always keep '..' in first menu position */
++  if (!strncmp(pa->name, "..", 2))
++	  return(-1);
++  if (!strncmp(pb->name, "..", 2))
++	  return(1);
++
+   int r = mutt_strcoll (pa->name, pb->name);
+ 
+   return ((BrowserSort & SORT_REVERSE) ? -r : r);
+@@ -90,6 +96,12 @@
+   struct folder_file *pa = (struct folder_file *) a;
+   struct folder_file *pb = (struct folder_file *) b;
+ 
++  /* Always keep '..' in first menu position */
++  if (!strncmp(pa->name, "..", 2))
++	  return(-1);
++  if (!strncmp(pb->name, "..", 2))
++	  return(1);
++
+   int r = pa->mtime - pb->mtime;
+ 
+   return ((BrowserSort & SORT_REVERSE) ? -r : r);
+@@ -100,6 +112,12 @@
+   struct folder_file *pa = (struct folder_file *) a;
+   struct folder_file *pb = (struct folder_file *) b;
+ 
++  /* Always keep '..' in first menu position */
++  if (!strncmp(pa->name, "..", 2))
++	  return(-1);
++  if (!strncmp(pb->name, "..", 2))
++	  return(1);
++
+   int r = pa->size - pb->size;
+ 
+   return ((BrowserSort & SORT_REVERSE) ? -r : r);