mutt: major overhaul; removed stale patches, updated compressed_folders,

trash_folder and message_count so that they actually work with the current versions, cvs -> mercurial with DOWNLOAD script, converted [ ] tests to bash [[ ]] tests, etc.
author: Remko van der Vossen 2008-09-30 22:02:46 +0200
committer: Remko van der Vossen 2008-09-30 22:02:46 +0200
commit: f464753b9e8764d65f73b6680dbd512bc066758a (patch)
tree: 3220cb98b55289d3b4f8186df6d7b1ac90af1f1b
parent: 8cc55feb9235ef4ac316189e4335cacdc2ab0f97 (diff)
83 files changed, 157 insertions, 255 deletions
diff --git a/mail/mutt/BUILD b/mail/mutt/BUILD
index f3fa0d53ab..1d9ffea6b1 100755
--- a/mail/mutt/BUILD
+++ b/mail/mutt/BUILD
@@ -8,6 +8,6 @@ OPTS="--build=${BUILD}
 
 default_build &&
 
-if [ "${UPDATE_DOC}" == "y" ]; then
+if [[ "$UPDATE_DOC" == "y" ]]; then
   make update-doc
 fi
diff --git a/mail/mutt/CONFIGURE b/mail/mutt/CONFIGURE
index fb417a8f1d..4d003d4d2b 100755
--- a/mail/mutt/CONFIGURE
+++ b/mail/mutt/CONFIGURE
@@ -1,26 +1,3 @@
-# temporary, to migrate old preferences
-persistent_add PATCHES &&
-if [ "${PATCH_SMTP}" == "y" ]; then
-  PATCHES="${PATCHES} libesmtp"
-  persistent_remove PATCH_SMTP
-fi &&
-if [ "${PATCH_SIGNATURE}" == "y" ]; then
-  PATCHES="${PATCHES} signatures_menu"
-  persistent_remove PATCH_SIGNATURE
-fi &&
-if [ "${PATCH_TRASH}" == "y" ]; then
-  PATCHES="${PATCHES} trash_folder"
-  persistent_remove PATCH_TRASH
-fi &&
-if [ "${MAILDIR_CACHE}" == "y" ]; then
-  PATCHES="${PATCHES} maildir_cache"
-  persistent_remove MAILDIR_CACHE
-fi &&
-if [ "${PATCHBAR}" == "y" ]; then
-  PATCHES="${PATCHES} sidebar"
-  persistent_remove PATCHBAR
-fi &&
-
 # $PATCHES stores the user preferences.  $REAL_PATCHES is the subset of
 # $PATCHES that is valid for this build.
 persistent_add REAL_PATCHES &&
@@ -57,11 +34,11 @@ if spell_ok "linuxdoc-tools"; then
 else
   UPDATE_DOC_DEFAULT="n"
 fi &&
-if [ "${BRANCH}" == "cvs" ]; then
+if [[ "${BRANCH}" == "scm" ]]; then
   config_query UPDATE_DOC                                              \
     "Build documentation? (requires linuxdoc-tools)"                   \
     "${UPDATE_DOC_DEFAULT}"
-elif [ ! -z "${REAL_PATCHES}" ]; then
+elif [[ ! -z "${REAL_PATCHES}" ]]; then
   config_query UPDATE_DOC                                              \
     "Rebuild documentation affected by patches? (requires linuxdoc-tools)" \
     "${UPDATE_DOC_DEFAULT}"
@@ -78,12 +55,12 @@ config_query_option MUTT_OPTS "Enable IMAP support?"                 \
                               "--disable-imap"                       &&
 
 for PATCH in ${REAL_PATCHES}; do
-  if [ -x "${PATCH_DIRECTORY}/${PATCH}/PATCH_CONFIGURE" ]; then
+  if [[ -x "${PATCH_DIRECTORY}/${PATCH}/PATCH_CONFIGURE" ]]; then
     . "${PATCH_DIRECTORY}/${PATCH}/PATCH_CONFIGURE"
   fi
 done
 
-if [ "${BRANCH}" != "stable" ]; then 
+if [[ "${BRANCH}" != "stable" ]]; then 
   config_query_option MUTT_OPTS "Enable the header cache?"           \
                                 "n"                                  \
                                 "--enable-hcache"                    \
diff --git a/mail/mutt/DEPENDS b/mail/mutt/DEPENDS
index 1b35f443bf..d21abb5039 100755
--- a/mail/mutt/DEPENDS
+++ b/mail/mutt/DEPENDS
@@ -6,8 +6,8 @@ optional_depends   "MAIL-TRANSPORT-AGENT"                       \
                    ""                                           \
                    "to send mail"                               &&
                     
-if [ "${BRANCH}" == "cvs" ]; then 
-	depends "CVS"
+if [[ "$BRANCH" == "scm" ]]; then 
+	depends mercurial
 fi &&
 
 config_query_list TERMINAL_LIBRARY                              \
@@ -21,7 +21,7 @@ optional_depends   "gnupg"                                      \
                    "--disable-pgp"                              \
                    "to support PGP signing and encrypting messages" &&
 
-if [ "${BRANCH}" != "stable" ]; then
+if [[ "$BRANCH" != "stable" ]]; then
   # Do NOT add --with-ssl here, that only works if POP/IMAP are used.  This is
   # mostly just here to prompt for openssl if they don't have it and want
   # S/MIME.
@@ -39,7 +39,7 @@ if [ "${BRANCH}" != "stable" ]; then
     config_query_list HCACHE_BACKEND                            \
                       "Use which header cache backend?"         \
                       gdbm db                                   &&
-    if [ "${HCACHE_BACKEND}" == "db" ]; then
+    if [[ "$HCACHE_BACKEND" == "db" ]]; then
       TMP_MUTT_OPTS="${TMP_MUTT_OPTS} --without-gdbm --with-bdb"
     fi &&
     depends "${HCACHE_BACKEND}"
@@ -58,7 +58,7 @@ if list_find "${MUTT_OPTS}" "--enable-pop" || list_find "${MUTT_OPTS}" "--enable
                    ""                                           \
                    "to enable SSL support for POP/IMAP"         &&
 
-  if [ "${BRANCH}" != "stable" ]; then
+  if [[ "$BRANCH" != "stable" ]]; then
     optional_depends "gnutls"                                   \
                      "--with-gnutls"                            \
                      ""                                         \
@@ -78,16 +78,16 @@ if list_find "${MUTT_OPTS}" "--enable-imap"; then
                    "to enable GSSAPI authentication for IMAP"
 fi &&
 
-if [ ! -z "${REAL_PATCHES}" ] || [ "${BRANCH}" == "cvs" ]; then
+if [[ ! -z "$REAL_PATCHES" ]] || [[ "$BRANCH" == "scm" ]]; then
   depends "automake"
 fi &&
 
 for PATCH in ${REAL_PATCHES}; do
-  if [ -x "${PATCH_DIRECTORY}/${PATCH}/PATCH_DEPENDS" ]; then
-    . "${PATCH_DIRECTORY}/${PATCH}/PATCH_DEPENDS"
+  if [[ -x "$PATCH_DIRECTORY/$PATCH/PATCH_DEPENDS" ]]; then
+    . "$PATCH_DIRECTORY/$PATCH/PATCH_DEPENDS"
   fi
 done
 
-if [ "${UPDATE_DOC}" == "y" ]; then
+if [[ "$UPDATE_DOC" == "y" ]]; then
   depends linuxdoc-tools
 fi
diff --git a/mail/mutt/DETAILS b/mail/mutt/DETAILS
index 6d94a1a605..15aa0f94eb 100755
--- a/mail/mutt/DETAILS
+++ b/mail/mutt/DETAILS
@@ -1,24 +1,20 @@
            SPELL=mutt
- PATCH_DIRECTORY=${SCRIPT_DIRECTORY}/patches
+ PATCH_DIRECTORY=$SCRIPT_DIRECTORY/patches
 
-   case ${BRANCH} in
-      cvs)
-
-       if [ "${MUTT_CVS_AUTOUPDATE}" == "y" ]; then
-         VERSION=$(date +%Y%m%d)
+   case $BRANCH in
+     scm)
+       if [[ $MUTT_SCM_AUTOUPDATE == "y" ]]; then
+         VERSION=mercurial_$(date +%Y%m%d)
        else
-         VERSION=cvs
+         VERSION=mercurial
        fi
-          SOURCE=${SPELL}-cvs.tar.bz2
-   SOURCE_URL[0]=cvs://:pserver:anonymous:anonymous@cvs.mutt.org:/home/roessler/cvs:mutt
-   SOURCE_URL[1]=cvs://:pserver:anonymous:anonymous@dev.mutt.org:/cvsroots:mutt
-  FORCE_DOWNLOAD=on 
+          SOURCE=$SPELL-mercurial.tar.bz2
+   SOURCE_URL[0]=hg_http://dev.mutt.org/hg/mutt:$SPELL-mercurial:HEAD
+  FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
-
-      ;;
-      devel)
-
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-mercurial
+     ;;
+     devel)
          VERSION=1.5.18
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=${SOURCE}.asc
@@ -29,27 +25,23 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
       SOURCE_GPG=mutt.gpg:${SOURCE2}
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-
-      ;;
-      *)
-
+     ;;
+     *)
          VERSION=1.4.2.3
           SOURCE=${SPELL}-${VERSION}.tar.gz
-         SOURCE2=${SOURCE}.sig
+         SOURCE2=${SOURCE}.asc
    SOURCE_URL[0]=ftp://ftp.mutt.org/mutt/${SOURCE}
    SOURCE_URL[1]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-  SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+  SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
       SOURCE_GPG=mutt.gpg:${SOURCE2}
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
   SECURITY_PATCH=1
-      ;;
+     ;;
    esac
-
         WEB_SITE=http://www.mutt.org/
          ENTERED=20010922
-         UPDATED=20020530
          LICENSE=GPL
         KEYWORDS="mail"
            SHORT="mutt is a text-based MIME mail client."
diff --git a/mail/mutt/DOWNLOAD b/mail/mutt/DOWNLOAD
new file mode 100755
index 0000000000..3a411726f4
--- /dev/null
+++ b/mail/mutt/DOWNLOAD
@@ -0,0 +1,45 @@
+#once the hg download handler hits stable sorcery this DOWNLOAD script would
+#only need to be removed, SOURCE_URL is compatible with the planned hg handler
+
+function my_url_hg_http_crack() {
+
+  URL=$(url_strip_prefix "$1" hg_http)
+  HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
+  HG_ROOT=http://$HG_ROOT
+  local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
+  HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
+  local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
+  HG_TAG=${HG_TAGNAME:=default}
+
+}
+
+if [[ "$BRANCH" != "scm" ]]; then
+  default_download &&
+  return $?
+fi &&
+
+message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
+        "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"  &&
+my_url_hg_http_crack $SOURCE_URL &&
+if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
+  message "${MESSAGE_COLOR}Previous source found unpacking...${DEFAULT_COLOR}" &&
+  tar -jxf $SOURCE_CACHE/$SOURCE &&
+  message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
+  ( cd $HG_DIRECTORY &&
+    echo hg pull $HG_ROOT &&
+    hg pull $HG_ROOT &&
+    echo hg update $HG_TAG &&
+    hg update $HG_TAG )
+else
+  message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
+  echo hg clone $HG_ROOT $HG_DIRECTORY
+  hg clone $HG_ROOT $HG_DIRECTORY &&
+  ( cd $HG_DIRECTORY &&
+    echo hg update $HG_TAG &&
+    hg update $HG_TAG )
+fi &&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
+tar -jcf $SOURCE $HG_DIRECTORY &&
+cp $SOURCE $SOURCE_CACHE/$SOURCE &&
+rm $SOURCE &&
+message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
diff --git a/mail/mutt/FINAL b/mail/mutt/FINAL
index e28069b3f3..dea92281fb 100755
--- a/mail/mutt/FINAL
+++ b/mail/mutt/FINAL
@@ -1,13 +1,13 @@
 # if it is a SGML install from scratch, you need a /var/spool/mail dir,
 # and a /var/spool/mail/root file...
-if [ ! -d ${INSTALL_ROOT}/var/spool/mail ]; then
+if [[ ! -d $INSTALL_ROOT/var/spool/mail ]]; then
   if query "${INSTALL_ROOT}/var/spool/mail directory missing... do you want to create one ?" y
   then
     mkdir -p ${INSTALL_ROOT}/var/spool/mail
   fi
 fi &&
 
-if [ ! -e ${INSTALL_ROOT}/var/spool/mail/root ] && [ -d ${INSTALL_ROOT}/var/spool/mail ]; then
+if [[ ! -e $INSTALL_ROOT/var/spool/mail/root ]] && [[ -d $INSTALL_ROOT/var/spool/mail ]]; then
   if query "${INSTALL_ROOT}/var/spool/mail/root mailbox is missing... do you want to create one ?" y
   then
     touch ${INSTALL_ROOT}/var/spool/mail/root &&
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index 2b22be3961..5d499c4479 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,11 @@
+2008-09-30 Remko van der Vossen <wich@sourcemage.org>
+	* DETAILS, PREPARE, CONFIGURE, DEPENDS: cvs -> mercurial
+	* PREPARE, patches: removed all patches except for compressed_folder,
+	  trash_folder and the recently added message_count patch
+	* PREPARE, DETAILS, CONFIGURE, DEPENDS, PRE_BUILD, BUILD, FINAL:
+	  use bash tests
+	* patches: fixed remaining patches for new versions and scm version
+
 2008-08-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* patches/PATCH_ORDER, patches/message_count/PATCH,
 	  patches/message_count/PATCH_DETAILS,
diff --git a/mail/mutt/PREPARE b/mail/mutt/PREPARE
index 6ef104e1c4..00d7b3eedd 100755
--- a/mail/mutt/PREPARE
+++ b/mail/mutt/PREPARE
@@ -1,14 +1,58 @@
-# temporary, to migrate old branch preference
-if  [ "${CVS}" == "y" ]; then
-  persistent_add BRANCH &&
-  BRANCH="cvs" &&
-  persistent_remove CVS
+# temporary, to migrate old patch preferences
+OLD_PATCHES="$PATCHES" &&
+list_remove OLD_PATCHES "compressed_folders" "message_count" "trash_folder" &&
+list_remove OLD_PATCHES "-attachment_counting" "-current_shortcut" \
+     "-date_conditional" "-deepif" "-edit_threads" "-indexcolor" "-isalias" \
+     "-libesmpt" "-maildir_header_cache" "-purge_message" "-sidebar" \
+     "-signatures_menu" "-xtitles" "-compressed_folders" "-message_count" \
+     "-trash_folder" &&
+list_remove PATCHES "attachment_counting" "current_shortcut" \
+     "date_conditional" "deepif" "edit_threads" "indexcolor" "isalias" \
+     "libesmtp" "maildir_header_cache" "purge_message" "sidebar" \
+     "signatures_menu" "xtitles" &&
+list_remove PATCHES "-attachment_counting" "-current_shortcut" \
+     "-date_conditional" "-deepif" "-edit_threads" "-indexcolor" "-isalias" \
+     "-libesmpt" "-maildir_header_cache" "-purge_message" "-sidebar" \
+     "-signatures_menu" "-xtitles" &&
+
+if [[ $OLD_PATCHES ]]; then
+  message "$PROBLEM_COLOR" &&
+  message "This new version of the mutt spell only includes the" &&
+  message "compressed_folders, trash_folder and message_count patches, you" &&
+  message "were using other patches, you can continue casting without these" &&
+  message "patches or abort. If you'd like a particular patch to be available" &&
+  message "again in the future, please post a request on bugs.sourcemage.org" &&
+  message "Perhaps you should consider using the devel or scm version of mutt" &&
+  message "which already includes some of the patches available earlier" &&
+  message "You had the following, now unavailable, patches enabled:" &&
+  message "$OLD_PATCHES" &&
+  message "$DEFAULT_COLOR" &&
+  if ! query "Do you wish to continue casting mutt without these patches?" n; then
+    return 1
+  fi
+fi
+
+# temporary, to migrate old autoupdate pref
+if [[ "${MUTT_CVS_AUTOUPDATE}" == "y" ]]; then
+  persistent_add MUTT_SCM_AUTOUPDATE &&
+  MUTT_SCM_AUTOUPDATE="y" &&
+  persistent_remove MUTT_CVS_AUTOUPDATE
 fi &&
 
-config_query_list BRANCH "Build which version?" stable devel cvs &&
+# temporary, to migrate old branch pref
+if [[ "${BRANCH}" == "cvs" ]]; then
+  BRANCH="scm"
+fi &&
+
+message "The mutt spell provides three different versions of mutt; stable," &&
+message "which apart from security fixes has not been developed in a long" &&
+message "time, devel, the current development releases and scm, which pulls" &&
+message "a snapshot from the mutt source repository." &&
+
+config_query_list BRANCH "Build which version?" stable devel scm &&
 
-if [ "${BRANCH}" == "cvs" ]; then
-  config_query  MUTT_CVS_AUTOUPDATE                                     \
-                "Update to the latest CVS automatically on every cast?" \
-                n
+if [[ "${BRANCH}" == "scm" ]]; then
+  config_query MUTT_SCM_AUTOUPDATE \
+    "Update to the latest scm checkout automatically on every cast?" \
+    n
 fi
diff --git a/mail/mutt/PRE_BUILD b/mail/mutt/PRE_BUILD
index 800147e7c8..fb394e0227 100755
--- a/mail/mutt/PRE_BUILD
+++ b/mail/mutt/PRE_BUILD
@@ -1,12 +1,12 @@
 function mutt_default_patch() {
   . "${PATCH_DIRECTORY}/${PATCH}/PATCH_DETAILS" &&
   bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.bz2" > "${PATCH_SOURCE}" &&
-  if [ -f "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${BRANCH}.smgl.diff.bz2" ]; then
+  if [[ -f "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${BRANCH}.smgl.diff.bz2" ]]; then
     bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${BRANCH}.smgl.diff.bz2" > "${PATCH_SOURCE}.smgl.diff"
-  elif [ -f "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.smgl.diff.bz2" ]; then
+  elif [[ -f "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.smgl.diff.bz2" ]]; then
     bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.smgl.diff.bz2" > "${PATCH_SOURCE}.smgl.diff"
   fi &&
-  if [ -f "${PATCH_SOURCE}.smgl.diff" ]; then
+  if [[ -f "${PATCH_SOURCE}.smgl.diff" ]]; then
     patch -p0 < "${PATCH_SOURCE}.smgl.diff"
   fi &&
   patch -p"${PATCH_STRIP:-1}" < "${PATCH_SOURCE}"
@@ -20,14 +20,14 @@ for PATCH in ${REAL_PATCHES}; do
   message "${MESSAGE_COLOR}Applying patch ${PATCH}${DEFAULT_COLOR}" &&
   PATCH_SOURCE=""
   PATCH_STRIP=""
-  if [ -x "${PATCH_DIRECTORY}/${PATCH}/PATCH" ]; then
+  if [[ -x "$PATCH_DIRECTORY/$PATCH/PATCH" ]]; then
     . "${PATCH_DIRECTORY}/${PATCH}/PATCH" || return 1
   else
     mutt_default_patch
   fi
 done &&
 
-if [ ! -z "${REAL_PATCHES}" ] || [ ! -x ./configure ]; then
+if [[ ! -z "$REAL_PATCHES" ]] || [[ ! -x ./configure ]]; then
   ./prepare
 fi  &&
 
diff --git a/mail/mutt/mutt-old.gpg b/mail/mutt/mutt-old.gpg
deleted file mode 100644
index d0f9e3728d..0000000000
--- a/mail/mutt/mutt-old.gpg
+++ /dev/null
diff --git a/mail/mutt/patches/PATCH_ORDER b/mail/mutt/patches/PATCH_ORDER
index 175122a0d8..c7148e4fd6 100644
--- a/mail/mutt/patches/PATCH_ORDER
+++ b/mail/mutt/patches/PATCH_ORDER
@@ -2,18 +2,5 @@
 # Note that patches must also have an executable PATCH_DETAILS file to be
 # attempted.
 compressed_folders
-edit_threads
 trash_folder
-purge_message
-signatures_menu
-maildir_header_cache
-sidebar
-attachment_counting
-isalias
-deepif
-date_conditional
-current_shortcut
-indexcolor
-libesmtp
-xtitles
 message_count
diff --git a/mail/mutt/patches/attachment_counting/PATCH_DETAILS b/mail/mutt/patches/attachment_counting/PATCH_DETAILS
deleted file mode 100755
index 2215a08d7a..0000000000
--- a/mail/mutt/patches/attachment_counting/PATCH_DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-PATCH_SITE="http://home.uchicago.edu/~dgc/mutt/"
-PATCH_BRANCHES="stable devel cvs"
-
-case "${BRANCH}" in
-  stable)
-    PATCH_SOURCE="patch-1.4.dgc.attach.5"
-  ;;
-  devel)
-    PATCH_SOURCE="patch-1.5.8.dgc.attach.5"
-  ;;
-  cvs)
-    PATCH_SOURCE="patch-1.5.8.dgc.attach.5"
-  ;;
-esac
diff --git a/mail/mutt/patches/attachment_counting/patch-1.4.dgc.attach.5.bz2 b/mail/mutt/patches/attachment_counting/patch-1.4.dgc.attach.5.bz2
deleted file mode 100644
index e775133396..0000000000
--- a/mail/mutt/patches/attachment_counting/patch-1.4.dgc.attach.5.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/attachment_counting/patch-1.4.dgc.attach.5.smgl.diff.bz2 b/mail/mutt/patches/attachment_counting/patch-1.4.dgc.attach.5.smgl.diff.bz2
deleted file mode 100644
index e68c9602be..0000000000
--- a/mail/mutt/patches/attachment_counting/patch-1.4.dgc.attach.5.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/attachment_counting/patch-1.5.8.dgc.attach.5.bz2 b/mail/mutt/patches/attachment_counting/patch-1.5.8.dgc.attach.5.bz2
deleted file mode 100644
index bc62a162b4..0000000000
--- a/mail/mutt/patches/attachment_counting/patch-1.5.8.dgc.attach.5.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/attachment_counting/patch-1.5.8.dgc.attach.5.cvs.smgl.diff.bz2 b/mail/mutt/patches/attachment_counting/patch-1.5.8.dgc.attach.5.cvs.smgl.diff.bz2
deleted file mode 100644
index 5b65aa1af2..0000000000
--- a/mail/mutt/patches/attachment_counting/patch-1.5.8.dgc.attach.5.cvs.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/compressed_folders/PATCH_DETAILS b/mail/mutt/patches/compressed_folders/PATCH_DETAILS
index 30b198a634..e91be339d2 100755
--- a/mail/mutt/patches/compressed_folders/PATCH_DETAILS
+++ b/mail/mutt/patches/compressed_folders/PATCH_DETAILS
@@ -1,11 +1,11 @@
 PATCH_SITE="http://www.spinnaker.de/mutt/compressed/"
-PATCH_BRANCHES="stable devel cvs"
+PATCH_BRANCHES="stable devel scm"
 
 case "${BRANCH}" in
   stable)
-    PATCH_SOURCE="patch-1.4.2.2.rr.compressed.1"
+    PATCH_SOURCE="patch-1.4.2.3.rr.compressed.1"
   ;;
-  devel|cvs)
-    PATCH_SOURCE="patch-1.5.9.rr.compressed.1"
+  devel|scm)
+    PATCH_SOURCE="patch-1.5.18.rr.compressed.1"
   ;;
 esac
diff --git a/mail/mutt/patches/compressed_folders/patch-1.4.2.2.rr.compressed.1.bz2 b/mail/mutt/patches/compressed_folders/patch-1.4.2.2.rr.compressed.1.bz2
deleted file mode 100644
index 528ea0f8fe..0000000000
--- a/mail/mutt/patches/compressed_folders/patch-1.4.2.2.rr.compressed.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/compressed_folders/patch-1.4.2.3.rr.compressed.1.bz2 b/mail/mutt/patches/compressed_folders/patch-1.4.2.3.rr.compressed.1.bz2
new file mode 100644
index 0000000000..501770f44a
--- /dev/null
+++ b/mail/mutt/patches/compressed_folders/patch-1.4.2.3.rr.compressed.1.bz2
diff --git a/mail/mutt/patches/compressed_folders/patch-1.5.18.rr.compressed.1.bz2 b/mail/mutt/patches/compressed_folders/patch-1.5.18.rr.compressed.1.bz2
new file mode 100644
index 0000000000..833b5e7ea8
--- /dev/null
+++ b/mail/mutt/patches/compressed_folders/patch-1.5.18.rr.compressed.1.bz2
diff --git a/mail/mutt/patches/compressed_folders/patch-1.5.18.rr.compressed.1.scm.smgl.diff.bz2 b/mail/mutt/patches/compressed_folders/patch-1.5.18.rr.compressed.1.scm.smgl.diff.bz2
new file mode 100644
index 0000000000..f141236f41
--- /dev/null
+++ b/mail/mutt/patches/compressed_folders/patch-1.5.18.rr.compressed.1.scm.smgl.diff.bz2
diff --git a/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.bz2 b/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.bz2
deleted file mode 100644
index 0b15a40096..0000000000
--- a/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.cvs.smgl.diff.bz2 b/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.cvs.smgl.diff.bz2
deleted file mode 100644
index a4a916ce9d..0000000000
--- a/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.cvs.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.devel.smgl.diff.bz2 b/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.devel.smgl.diff.bz2
deleted file mode 100644
index 2de49553d5..0000000000
--- a/mail/mutt/patches/compressed_folders/patch-1.5.9.rr.compressed.1.devel.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/current_shortcut/PATCH_DETAILS b/mail/mutt/patches/current_shortcut/PATCH_DETAILS
deleted file mode 100755
index 54f0561b88..0000000000
--- a/mail/mutt/patches/current_shortcut/PATCH_DETAILS
+++ /dev/null
@@ -1,3 +0,0 @@
-PATCH_SITE="http://www.df7cb.de/projects/mutt/"
-PATCH_BRANCHES="stable devel"
-PATCH_SOURCE="current-shortcut.2"
diff --git a/mail/mutt/patches/current_shortcut/current-shortcut.2.bz2 b/mail/mutt/patches/current_shortcut/current-shortcut.2.bz2
deleted file mode 100644
index 51bf560ae4..0000000000
--- a/mail/mutt/patches/current_shortcut/current-shortcut.2.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/date_conditional/PATCH_DETAILS b/mail/mutt/patches/date_conditional/PATCH_DETAILS
deleted file mode 100755
index bc5859952d..0000000000
--- a/mail/mutt/patches/date_conditional/PATCH_DETAILS
+++ /dev/null
@@ -1,12 +0,0 @@
-PATCH_SITE="http://www.schrab.com/aaron/mutt/old/"
-PATCH_BRANCHES="stable devel cvs"
-
-case "${BRANCH}" in
-  stable)
-    PATCH_SOURCE="patch-1.3.24.ats.date_optional.1"
-    PATCH_STRIP="0"
-  ;;
-  devel|cvs)
-    PATCH_SOURCE="patch-1.5.8.ats.date_conditional.1"
-  ;;
-esac
diff --git a/mail/mutt/patches/date_conditional/patch-1.3.24.ats.date_optional.1.bz2 b/mail/mutt/patches/date_conditional/patch-1.3.24.ats.date_optional.1.bz2
deleted file mode 100644
index e4d0d79f79..0000000000
--- a/mail/mutt/patches/date_conditional/patch-1.3.24.ats.date_optional.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/date_conditional/patch-1.5.8.ats.date_conditional.1.bz2 b/mail/mutt/patches/date_conditional/patch-1.5.8.ats.date_conditional.1.bz2
deleted file mode 100644
index 6aec9017d8..0000000000
--- a/mail/mutt/patches/date_conditional/patch-1.5.8.ats.date_conditional.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/deepif/PATCH_DETAILS b/mail/mutt/patches/deepif/PATCH_DETAILS
deleted file mode 100755
index 43f9c12777..0000000000
--- a/mail/mutt/patches/deepif/PATCH_DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-PATCH_SITE="http://home.uchicago.edu/~dgc/mutt/"
-PATCH_BRANCHES="stable devel cvs"
-
-case "${BRANCH}" in
-  stable)
-    PATCH_SOURCE="patch-1.4.dgc.deepif.1"
-  ;;
-  devel|cvs)
-    PATCH_SOURCE="patch-1.5.8.dgc.deepif.1"
-  ;;
-esac
diff --git a/mail/mutt/patches/deepif/patch-1.4.dgc.deepif.1.bz2 b/mail/mutt/patches/deepif/patch-1.4.dgc.deepif.1.bz2
deleted file mode 100644
index 152c17b184..0000000000
--- a/mail/mutt/patches/deepif/patch-1.4.dgc.deepif.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/deepif/patch-1.4.dgc.deepif.1.smgl.diff.bz2 b/mail/mutt/patches/deepif/patch-1.4.dgc.deepif.1.smgl.diff.bz2
deleted file mode 100644
index 6456aa92de..0000000000
--- a/mail/mutt/patches/deepif/patch-1.4.dgc.deepif.1.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/deepif/patch-1.5.8.dgc.deepif.1.bz2 b/mail/mutt/patches/deepif/patch-1.5.8.dgc.deepif.1.bz2
deleted file mode 100644
index b2f20d97d8..0000000000
--- a/mail/mutt/patches/deepif/patch-1.5.8.dgc.deepif.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/edit_threads/PATCH b/mail/mutt/patches/edit_threads/PATCH
deleted file mode 100755
index 6c171d3bb1..0000000000
--- a/mail/mutt/patches/edit_threads/PATCH
+++ /dev/null
@@ -1,7 +0,0 @@
-mutt_default_patch &&
-
-# do this here instead of in the patch to play nicely with other patches
-cat << EOF >> OPS
-OP_MAIN_BREAK_THREAD "break the thread in two"
-OP_MAIN_LINK_THREADS "link tagged message to the current one"
-EOF
diff --git a/mail/mutt/patches/edit_threads/PATCH_CONFIGURE b/mail/mutt/patches/edit_threads/PATCH_CONFIGURE
deleted file mode 100755
index 571cb2edf5..0000000000
--- a/mail/mutt/patches/edit_threads/PATCH_CONFIGURE
+++ /dev/null
@@ -1,6 +0,0 @@
-if list_find "${MUTT_OPTS}" "--enable-imap"; then
-  config_query_option MUTT_OPTS "Enable thread editing for IMAP?" \
-                                "y"                               \
-                                 "--enable-imap-edit-threads"     \
-                                 ""
-fi
diff --git a/mail/mutt/patches/edit_threads/PATCH_DETAILS b/mail/mutt/patches/edit_threads/PATCH_DETAILS
deleted file mode 100755
index d6bff37a56..0000000000
--- a/mail/mutt/patches/edit_threads/PATCH_DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-PATCH_SITE="http://cedricduval.free.fr/mutt/patches/"
-PATCH_BRANCHES="stable devel"
-
-case "${BRANCH}" in
-  stable)
-    PATCH_SOURCE="patch-1.4.0.cd.edit_threads.9.5"
-  ;;
-  devel)
-    PATCH_SOURCE="patch-1.5.8.cd.edit_threads.9.5"
-  ;;
-esac
diff --git a/mail/mutt/patches/edit_threads/patch-1.4.0.cd.edit_threads.9.5.bz2 b/mail/mutt/patches/edit_threads/patch-1.4.0.cd.edit_threads.9.5.bz2
deleted file mode 100644
index f572c3f43c..0000000000
--- a/mail/mutt/patches/edit_threads/patch-1.4.0.cd.edit_threads.9.5.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/edit_threads/patch-1.4.0.cd.edit_threads.9.5.smgl.diff.bz2 b/mail/mutt/patches/edit_threads/patch-1.4.0.cd.edit_threads.9.5.smgl.diff.bz2
deleted file mode 100644
index 0fd274d9e7..0000000000
--- a/mail/mutt/patches/edit_threads/patch-1.4.0.cd.edit_threads.9.5.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/edit_threads/patch-1.5.8.cd.edit_threads.9.5.bz2 b/mail/mutt/patches/edit_threads/patch-1.5.8.cd.edit_threads.9.5.bz2
deleted file mode 100644
index fe1b457ad3..0000000000
--- a/mail/mutt/patches/edit_threads/patch-1.5.8.cd.edit_threads.9.5.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/edit_threads/patch-1.5.8.cd.edit_threads.9.5.devel.smgl.diff.bz2 b/mail/mutt/patches/edit_threads/patch-1.5.8.cd.edit_threads.9.5.devel.smgl.diff.bz2
deleted file mode 100644
index a46574b73c..0000000000
--- a/mail/mutt/patches/edit_threads/patch-1.5.8.cd.edit_threads.9.5.devel.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/indexcolor/PATCH_DETAILS b/mail/mutt/patches/indexcolor/PATCH_DETAILS
deleted file mode 100644
index c382538c6d..0000000000
--- a/mail/mutt/patches/indexcolor/PATCH_DETAILS
+++ /dev/null
@@ -1,3 +0,0 @@
-PATCH_SITE="http://www.greek0.net/~greek0/mutt"
-PATCH_BRANCHES="devel cvs"
-PATCH_SOURCE="mutt-1.5.8-indexcolor-3.diff"
diff --git a/mail/mutt/patches/indexcolor/mutt-1.5.8-indexcolor-3.diff.bz2 b/mail/mutt/patches/indexcolor/mutt-1.5.8-indexcolor-3.diff.bz2
deleted file mode 100644
index 5c25c99d7f..0000000000
--- a/mail/mutt/patches/indexcolor/mutt-1.5.8-indexcolor-3.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/isalias/PATCH_DETAILS b/mail/mutt/patches/isalias/PATCH_DETAILS
deleted file mode 100755
index 9e4e0cabda..0000000000
--- a/mail/mutt/patches/isalias/PATCH_DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-PATCH_SITE="http://home.uchicago.edu/~dgc/mutt/"
-PATCH_BRANCHES="stable devel cvs"
-
-case "${BRANCH}" in
-  stable)
-    PATCH_SOURCE="patch-1.4.dgc.isalias.1"
-  ;;
-  devel|cvs)
-    PATCH_SOURCE="patch-1.5.8.dgc.isalias.2"
-  ;;
-esac
diff --git a/mail/mutt/patches/isalias/patch-1.4.dgc.isalias.1.bz2 b/mail/mutt/patches/isalias/patch-1.4.dgc.isalias.1.bz2
deleted file mode 100644
index 8c323c0c4b..0000000000
--- a/mail/mutt/patches/isalias/patch-1.4.dgc.isalias.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/isalias/patch-1.4.dgc.isalias.1.smgl.diff.bz2 b/mail/mutt/patches/isalias/patch-1.4.dgc.isalias.1.smgl.diff.bz2
deleted file mode 100644
index 947d5865b6..0000000000
--- a/mail/mutt/patches/isalias/patch-1.4.dgc.isalias.1.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/isalias/patch-1.5.8.dgc.isalias.2.bz2 b/mail/mutt/patches/isalias/patch-1.5.8.dgc.isalias.2.bz2
deleted file mode 100644
index 3a2bcda2d9..0000000000
--- a/mail/mutt/patches/isalias/patch-1.5.8.dgc.isalias.2.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/libesmtp/PATCH_DEPENDS b/mail/mutt/patches/libesmtp/PATCH_DEPENDS
deleted file mode 100755
index 189d25efb2..0000000000
--- a/mail/mutt/patches/libesmtp/PATCH_DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-optional_depends "libesmtp"                        \
-                 "--with-libesmtp"                 \
-                 "--without-libesmtp"              \
-                 "to enable internal SMTP support"
diff --git a/mail/mutt/patches/libesmtp/PATCH_DETAILS b/mail/mutt/patches/libesmtp/PATCH_DETAILS
deleted file mode 100755
index eb585a2711..0000000000
--- a/mail/mutt/patches/libesmtp/PATCH_DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-PATCH_SITE="http://www.deez.info/sengelha/projects/mutt/"
-PATCH_BRANCHES="stable"
-
-case "${BRANCH}" in
-  stable)
-    PATCH_SOURCE="patch-1.4.sde.libesmtp.3"
-  ;;
-  devel|cvs)
-    PATCH_SOURCE="patch-1.5.3.sde.libesmtp.3"
-  ;;
-esac
diff --git a/mail/mutt/patches/libesmtp/patch-1.4.sde.libesmtp.3.bz2 b/mail/mutt/patches/libesmtp/patch-1.4.sde.libesmtp.3.bz2
deleted file mode 100644
index 3793aef29d..0000000000
--- a/mail/mutt/patches/libesmtp/patch-1.4.sde.libesmtp.3.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/libesmtp/patch-1.4.sde.libesmtp.3.smgl.diff.bz2 b/mail/mutt/patches/libesmtp/patch-1.4.sde.libesmtp.3.smgl.diff.bz2
deleted file mode 100644
index 6a400e8e68..0000000000
--- a/mail/mutt/patches/libesmtp/patch-1.4.sde.libesmtp.3.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/libesmtp/patch-1.5.3.sde.libesmtp.3.bz2 b/mail/mutt/patches/libesmtp/patch-1.5.3.sde.libesmtp.3.bz2
deleted file mode 100644
index 98fdb337aa..0000000000
--- a/mail/mutt/patches/libesmtp/patch-1.5.3.sde.libesmtp.3.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/libesmtp/patch-1.5.3.sde.libesmtp.3.smgl.diff.bz2 b/mail/mutt/patches/libesmtp/patch-1.5.3.sde.libesmtp.3.smgl.diff.bz2
deleted file mode 100644
index c6925d56f9..0000000000
--- a/mail/mutt/patches/libesmtp/patch-1.5.3.sde.libesmtp.3.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/maildir_header_cache/PATCH_DETAILS b/mail/mutt/patches/maildir_header_cache/PATCH_DETAILS
deleted file mode 100755
index 3d365d2993..0000000000
--- a/mail/mutt/patches/maildir_header_cache/PATCH_DETAILS
+++ /dev/null
@@ -1,3 +0,0 @@
-PATCH_SITE="http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/"
-PATCH_BRANCHES="devel"
-PATCH_SOURCE="mutt-cvs-header-cache.29"
diff --git a/mail/mutt/patches/maildir_header_cache/mutt-cvs-header-cache.29.bz2 b/mail/mutt/patches/maildir_header_cache/mutt-cvs-header-cache.29.bz2
deleted file mode 100644
index edcc05ef34..0000000000
--- a/mail/mutt/patches/maildir_header_cache/mutt-cvs-header-cache.29.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/message_count/PATCH b/mail/mutt/patches/message_count/PATCH
deleted file mode 100755
index 825d19b035..0000000000
--- a/mail/mutt/patches/message_count/PATCH
+++ /dev/null
@@ -1 +0,0 @@
-mutt_default_patch
diff --git a/mail/mutt/patches/message_count/PATCH_DETAILS b/mail/mutt/patches/message_count/PATCH_DETAILS
index 5958e864a9..a9a4ed36b5 100755
--- a/mail/mutt/patches/message_count/PATCH_DETAILS
+++ b/mail/mutt/patches/message_count/PATCH_DETAILS
@@ -1,3 +1,3 @@
 PATCH_SITE="http://danborn.net/patches/"
-PATCH_BRANCHES="devel cvs"
+PATCH_BRANCHES="devel scm"
 PATCH_SOURCE="mutt-danborn.1.5.18.patch"
diff --git a/mail/mutt/patches/message_count/mutt-danborn.1.5.18.patch.bz2 b/mail/mutt/patches/message_count/mutt-danborn.1.5.18.patch.bz2
index af9eca6b78..4e5fed9b9a 100644
--- a/mail/mutt/patches/message_count/mutt-danborn.1.5.18.patch.bz2
+++ b/mail/mutt/patches/message_count/mutt-danborn.1.5.18.patch.bz2
diff --git a/mail/mutt/patches/message_count/mutt-danborn.1.5.18.patch.scm.smgl.diff.bz2 b/mail/mutt/patches/message_count/mutt-danborn.1.5.18.patch.scm.smgl.diff.bz2
new file mode 100644
index 0000000000..dbae9db7b9
--- /dev/null
+++ b/mail/mutt/patches/message_count/mutt-danborn.1.5.18.patch.scm.smgl.diff.bz2
diff --git a/mail/mutt/patches/purge_message/PATCH b/mail/mutt/patches/purge_message/PATCH
deleted file mode 100755
index 544fdae932..0000000000
--- a/mail/mutt/patches/purge_message/PATCH
+++ /dev/null
@@ -1,6 +0,0 @@
-mutt_default_patch &&
-
-# do this here instead of in the patch to play nicely with other patches
-cat << EOF >> OPS
-OP_PURGE_MESSAGE "really delete the current entry, bypassing the trash folder"
-EOF
diff --git a/mail/mutt/patches/purge_message/PATCH_DETAILS b/mail/mutt/patches/purge_message/PATCH_DETAILS
deleted file mode 100755
index a46041d3d7..0000000000
--- a/mail/mutt/patches/purge_message/PATCH_DETAILS
+++ /dev/null
@@ -1,12 +0,0 @@
-PATCH_SITE="http://cedricduval.free.fr/mutt/patches/"
-PATCH_BRANCHES="stable devel cvs"
-PATCH_NEEDS="trash_folder"
-
-case "${BRANCH}" in
-  stable)
-    PATCH_SOURCE="patch-1.4.0.cd.purge_message.3"
-  ;;
-  devel|cvs)
-    PATCH_SOURCE="patch-1.5.5.1.cd.purge_message.3.4"
-  ;;
-esac
diff --git a/mail/mutt/patches/purge_message/patch-1.4.0.cd.purge_message.3.bz2 b/mail/mutt/patches/purge_message/patch-1.4.0.cd.purge_message.3.bz2
deleted file mode 100644
index a00b859ff7..0000000000
--- a/mail/mutt/patches/purge_message/patch-1.4.0.cd.purge_message.3.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/purge_message/patch-1.4.0.cd.purge_message.3.smgl.diff.bz2 b/mail/mutt/patches/purge_message/patch-1.4.0.cd.purge_message.3.smgl.diff.bz2
deleted file mode 100644
index 2857cb8dfd..0000000000
--- a/mail/mutt/patches/purge_message/patch-1.4.0.cd.purge_message.3.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/purge_message/patch-1.5.5.1.cd.purge_message.3.4.bz2 b/mail/mutt/patches/purge_message/patch-1.5.5.1.cd.purge_message.3.4.bz2
deleted file mode 100644
index 0994562901..0000000000
--- a/mail/mutt/patches/purge_message/patch-1.5.5.1.cd.purge_message.3.4.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/purge_message/patch-1.5.5.1.cd.purge_message.3.4.smgl.diff.bz2 b/mail/mutt/patches/purge_message/patch-1.5.5.1.cd.purge_message.3.4.smgl.diff.bz2
deleted file mode 100644
index 03a4c6c95d..0000000000
--- a/mail/mutt/patches/purge_message/patch-1.5.5.1.cd.purge_message.3.4.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/sidebar/PATCH b/mail/mutt/patches/sidebar/PATCH
deleted file mode 100755
index adef6fc29e..0000000000
--- a/mail/mutt/patches/sidebar/PATCH
+++ /dev/null
@@ -1,10 +0,0 @@
-mutt_default_patch &&
-
-# do this here instead of in the patch to play nicely with other patches
-cat << EOF >> OPS
-OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page"
-OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page"
-OP_SIDEBAR_NEXT "go down to next mailbox"
-OP_SIDEBAR_PREV "go to previous mailbox"
-OP_SIDEBAR_OPEN "open hilighted mailbox"
-EOF
diff --git a/mail/mutt/patches/sidebar/PATCH_DETAILS b/mail/mutt/patches/sidebar/PATCH_DETAILS
deleted file mode 100755
index fe60888a25..0000000000
--- a/mail/mutt/patches/sidebar/PATCH_DETAILS
+++ /dev/null
@@ -1,3 +0,0 @@
-PATCH_SITE="http://thomer.com/mutt/"
-PATCH_BRANCHES="devel cvs"
-PATCH_SOURCE="patch-1.5.8i.sidebar.20050224.txt"
diff --git a/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.bz2 b/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.bz2
deleted file mode 100644
index dedd5a118e..0000000000
--- a/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.cvs.smgl.diff.bz2 b/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.cvs.smgl.diff.bz2
deleted file mode 100644
index 884d9e9b49..0000000000
--- a/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.cvs.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.devel.smgl.diff.bz2 b/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.devel.smgl.diff.bz2
deleted file mode 100644
index 41e72fc777..0000000000
--- a/mail/mutt/patches/sidebar/patch-1.5.8i.sidebar.20050224.txt.devel.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/signatures_menu/PATCH b/mail/mutt/patches/signatures_menu/PATCH
deleted file mode 100755
index 9be0d060a4..0000000000
--- a/mail/mutt/patches/signatures_menu/PATCH
+++ /dev/null
@@ -1,10 +0,0 @@
-mutt_default_patch &&
-
-# do this here instead of in the patch to play nicely with other patches
-cat << EOF >> OPS
-OP_COMPOSE_SIG "choose a signature"
-OP_NEXT_SIG "move to the next signature"
-OP_PREV_SIG "move to the previous signature"
-OP_RANDOM_SIG "pick a signature at random"
-OP_SIG_SEARCH "search signatures matching a pattern"
-EOF
diff --git a/mail/mutt/patches/signatures_menu/PATCH_DETAILS b/mail/mutt/patches/signatures_menu/PATCH_DETAILS
deleted file mode 100755
index 14eb67f5b8..0000000000
--- a/mail/mutt/patches/signatures_menu/PATCH_DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-PATCH_SITE="http://cedricduval.free.fr/mutt/patches/"
-PATCH_BRANCHES="stable"
-
-case "${BRANCH}" in
-  stable)
-    PATCH_SOURCE="patch-1.4.0.cd.signatures_menu.2.1"
-  ;;
-  devel|cvs)
-    PATCH_SOURCE="patch-1.5.5.1.cd.signatures_menu.2.1"
-  ;;
-esac
diff --git a/mail/mutt/patches/signatures_menu/patch-1.4.0.cd.signatures_menu.2.1.bz2 b/mail/mutt/patches/signatures_menu/patch-1.4.0.cd.signatures_menu.2.1.bz2
deleted file mode 100644
index e1e9794c38..0000000000
--- a/mail/mutt/patches/signatures_menu/patch-1.4.0.cd.signatures_menu.2.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/signatures_menu/patch-1.4.0.cd.signatures_menu.2.1.smgl.diff.bz2 b/mail/mutt/patches/signatures_menu/patch-1.4.0.cd.signatures_menu.2.1.smgl.diff.bz2
deleted file mode 100644
index eab24275cf..0000000000
--- a/mail/mutt/patches/signatures_menu/patch-1.4.0.cd.signatures_menu.2.1.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/signatures_menu/patch-1.5.5.1.cd.signatures_menu.2.1.bz2 b/mail/mutt/patches/signatures_menu/patch-1.5.5.1.cd.signatures_menu.2.1.bz2
deleted file mode 100644
index 835817410f..0000000000
--- a/mail/mutt/patches/signatures_menu/patch-1.5.5.1.cd.signatures_menu.2.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/signatures_menu/patch-1.5.5.1.cd.signatures_menu.2.1.smgl.diff.bz2 b/mail/mutt/patches/signatures_menu/patch-1.5.5.1.cd.signatures_menu.2.1.smgl.diff.bz2
deleted file mode 100644
index 20808f4bc0..0000000000
--- a/mail/mutt/patches/signatures_menu/patch-1.5.5.1.cd.signatures_menu.2.1.smgl.diff.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/trash_folder/PATCH_DETAILS b/mail/mutt/patches/trash_folder/PATCH_DETAILS
index 243e3f8e1c..7e9591290d 100755
--- a/mail/mutt/patches/trash_folder/PATCH_DETAILS
+++ b/mail/mutt/patches/trash_folder/PATCH_DETAILS
@@ -1,11 +1,12 @@
-PATCH_SITE="http://cedricduval.free.fr/mutt/patches/"
-PATCH_BRANCHES="stable devel cvs"
+#PATCH_SITE="http://cedricduval.free.fr/mutt/patches/"
+PATCH_SITE="http://scie.nti.st/2007/6/21/mutt-trash-folder-patch-for-1-5-16"
+PATCH_BRANCHES="stable devel scm"
 
 case "${BRANCH}" in
   stable)
-    PATCH_SOURCE="patch-1.4.0.cd.trash_folder.3.1"
+    PATCH_SOURCE="patch-1.4.2.3.cd.trash_folder.3.1"
   ;;
-  devel|cvs)
-    PATCH_SOURCE="patch-1.5.5.1.cd.trash_folder.3.4"
+  devel|scm)
+    PATCH_SOURCE="trash_folder-1.5.18.patch"
   ;;
 esac
diff --git a/mail/mutt/patches/trash_folder/patch-1.4.0.cd.trash_folder.3.1.bz2 b/mail/mutt/patches/trash_folder/patch-1.4.0.cd.trash_folder.3.1.bz2
deleted file mode 100644
index 2353321365..0000000000
--- a/mail/mutt/patches/trash_folder/patch-1.4.0.cd.trash_folder.3.1.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/trash_folder/patch-1.4.2.3.cd.trash_folder.3.1.bz2 b/mail/mutt/patches/trash_folder/patch-1.4.2.3.cd.trash_folder.3.1.bz2
new file mode 100644
index 0000000000..5157b79ba4
--- /dev/null
+++ b/mail/mutt/patches/trash_folder/patch-1.4.2.3.cd.trash_folder.3.1.bz2
diff --git a/mail/mutt/patches/trash_folder/patch-1.5.5.1.cd.trash_folder.3.4.bz2 b/mail/mutt/patches/trash_folder/patch-1.5.5.1.cd.trash_folder.3.4.bz2
deleted file mode 100644
index 0ff21c1b57..0000000000
--- a/mail/mutt/patches/trash_folder/patch-1.5.5.1.cd.trash_folder.3.4.bz2
+++ /dev/null
diff --git a/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.bz2 b/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.bz2
new file mode 100644
index 0000000000..52b42681fe
--- /dev/null
+++ b/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.bz2
diff --git a/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.scm.smgl.diff.bz2 b/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.scm.smgl.diff.bz2
new file mode 100644
index 0000000000..613d43debb
--- /dev/null
+++ b/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.scm.smgl.diff.bz2
diff --git a/mail/mutt/patches/xtitles/PATCH_DETAILS b/mail/mutt/patches/xtitles/PATCH_DETAILS
deleted file mode 100755
index e70ec9e79a..0000000000
--- a/mail/mutt/patches/xtitles/PATCH_DETAILS
+++ /dev/null
@@ -1,3 +0,0 @@
-PATCH_SITE="http://does-not-exist.org/mail-archives/mutt-dev/msg02073.html"
-PATCH_BRANCHES="devel cvs"
-PATCH_SOURCE="patch-1.5.5.1.nt.xtitles.3.ab.1"
diff --git a/mail/mutt/patches/xtitles/patch-1.5.5.1.nt.xtitles.3.ab.1.bz2 b/mail/mutt/patches/xtitles/patch-1.5.5.1.nt.xtitles.3.ab.1.bz2
deleted file mode 100644
index 6ea91457ec..0000000000
--- a/mail/mutt/patches/xtitles/patch-1.5.5.1.nt.xtitles.3.ab.1.bz2
+++ /dev/null
author	Remko van der Vossen	2008-09-30 22:02:46 +0200
committer	Remko van der Vossen	2008-09-30 22:02:46 +0200
commit	f464753b9e8764d65f73b6680dbd512bc066758a (patch)
tree	3220cb98b55289d3b4f8186df6d7b1ac90af1f1b
parent	8cc55feb9235ef4ac316189e4335cacdc2ab0f97 (diff)