7 files changed, 3 insertions, 26 deletions
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index f3abd3b8ce09..ab2f32e65523 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -99,8 +99,8 @@ AUTOSIEVE_BROKEN=	Not buildable with autosieve patch
 
 DRAC_EXTRA_PATCHES=	${WRKSRC}/contrib/drac_auth.patch \
 			${FILESDIR}/extra-patch-configure.in \
-			${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
-			${FILESDIR}/extra-patch-cmulocal::sasl2.m4
+			${FILESDIR}/extra-patch-cmulocal_ucdsnmp.m4 \
+			${FILESDIR}/extra-patch-cmulocal_sasl2.m4
 DRAC_USE=	AUTOTOOLS=autoconf,autoheader
 
 MANDIRS=	${CYRUS_PREFIX}/man
diff --git a/mail/cyrus-imapd23/files/extra-patch-cmulocal::sasl2.m4 b/mail/cyrus-imapd23/files/extra-patch-cmulocal_sasl2.m4
index 53131668fcfd..53131668fcfd 100644
--- a/mail/cyrus-imapd23/files/extra-patch-cmulocal::sasl2.m4
+++ b/mail/cyrus-imapd23/files/extra-patch-cmulocal_sasl2.m4
diff --git a/mail/cyrus-imapd23/files/extra-patch-cmulocal::ucdsnmp.m4 b/mail/cyrus-imapd23/files/extra-patch-cmulocal_ucdsnmp.m4
index 829d92d23585..829d92d23585 100644
--- a/mail/cyrus-imapd23/files/extra-patch-cmulocal::ucdsnmp.m4
+++ b/mail/cyrus-imapd23/files/extra-patch-cmulocal_ucdsnmp.m4
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index fab2ebfc69e4..0677c0577fd0 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -109,7 +109,7 @@ AUTOSIEVE_PATCH_SITES=	LOCAL/mm:autosieve
 AUTOSIEVE_PATCHFILES=	${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch:-p1:autosieve
 AUTOSIEVE_EXTRA_PATCHES=${FILESDIR}/extra-patch-imap__lmtp_sieve.c
 
-DRAC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-cmulocal::sasl2.m4
+DRAC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-cmulocal_sasl2.m4
 DRAC_USE=	AUTOTOOLS=autoconf,autoheader
 
 MANDIRS=	${CYRUS_PREFIX}/man
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::sasl2.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal_sasl2.m4
index 53131668fcfd..53131668fcfd 100644
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::sasl2.m4
+++ b/mail/cyrus-imapd24/files/extra-patch-cmulocal_sasl2.m4
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index af58e144ca88..7ef85fa3604a 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -21,7 +21,6 @@ CONFLICTS=	wanderlust-*-2.15.*
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
-.include <bsd.port.options.mk>
 
 EMACS_W3M_PORT_NAME?=	emacs-w3m
 EMACS_W3M_LISP_FILE?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
diff --git a/mail/wanderlust/files/extra-patch-elmo:elmo-version.el b/mail/wanderlust/files/extra-patch-elmo:elmo-version.el
deleted file mode 100644
index 11c8b6effda4..000000000000
--- a/mail/wanderlust/files/extra-patch-elmo:elmo-version.el
+++ /dev/null
@@ -1,22 +0,0 @@
---- elmo/elmo-version.el.orig	Sun Nov 27 22:34:49 2005
-+++ elmo/elmo-version.el	Sun Nov 27 22:41:22 2005
-@@ -42,6 +42,19 @@
-   ;; Don't forget to check `wl-version.el' and Info.
-   (product-define "ELMO" nil '(2 14 0)))
- 
-+(defun product-version-as-string (product)
-+  "Return version number of product as a string.
-+PRODUCT is a product structure which returned by `product-define'.
-+If optional argument UPDATE is non-nil, then regenerate
-+`produce-version-string' from `product-version'."
-+  (setq product (product-find product))
-+  (or (product-version-string product)
-+      (and (product-version product)
-+           (product-set-version-string product
-+                                       (mapconcat (function int-to-string)
-+                                                  (product-version product)
-+                                                  ".")))))
-+
- ;; set version-string
- (product-version-as-string 'elmo-version)
-