Changes to editors/emacs and Mk/bsd.emacs.mk were taken from

PR/137956 by Ashish SHUKLA (thanks!).  [1]

Those ports which define EMACS_PORT_NAME to be "emacs21" were
not touched (this time). They may be converted to the new
world order by removing the above mentioned assignment.

Four ports were marked as BROKEN with EMACS_PORT_NAME=emacs23
(they do not compile):
. lang/bigloo;
. mail/wanderlust;
. mail/wanderlust-devel;
. www/emacs-w3m.

Three ports were marked as IGNORE with EMACS_PORT_NAME=emacs23:
. japanese/egg-canna (the port version is dated as of 2001,
  does not compile with Emacs 23 and seems it cannot be fixed);
. deskutils/remember.el (was incorporated into Emacs 23);
. editors/nxml (was incorporated into Emacs 23).

Changes that were made after (and as a result of) exp run. For
those ports:
. japanese/migemo-emacs21;
. japanese/migemo-emacs22
EMACS_PORT_NAME?= was changed to EMACS_PORT_NAME= to the apropriate
emacs port name.

PR:		ports/137956 [1], ports/141369 [2]
Submitted by:	Ashish SHUKLA <wahjava at gmail.com>  [1],
		bsam (me)  [2]
Exp-run by: miwi

5 files changed, 12 insertions, 3 deletions

diff --git a/mail/emh/Makefile b/mail/emh/Makefile
index 1a15d4096302..008132b91724 100644
--- a/mail/emh/Makefile
+++ b/mail/emh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emh
 PORTVERSION=	1.14.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ring.aist.go.jp/pub/elisp/semi/semi-1.14-for-flim-1.14/ \
 		http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/semi/semi-1.14-for-flim-1.14/
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 154a4877dd52..4e311ed1a084 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mew
 PORTVERSION=	6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.Mew.org/Release/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -20,7 +20,6 @@ OPTIONS=	DATABASE "Database feature support (with Ruby & Sqlite3)" on
 
 # emacs port setup
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs22
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/vm/Makefile b/mail/vm/Makefile
index 0d23344c52e9..efab9bb1e5af 100644
--- a/mail/vm/Makefile
+++ b/mail/vm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vm
 PORTVERSION=	8.0.12
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	viewmail
diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile
index 5a374947b021..3040ca5d546c 100644
--- a/mail/wanderlust-devel/Makefile
+++ b/mail/wanderlust-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wanderlust
 PORTVERSION=	2.15.7.b.${SNAPDATE}
+PORTREVISION=	1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://people.freebsd.org/~nobutaka/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -25,6 +26,10 @@ NO_LATEST_LINK=	yes
 
 .include <bsd.port.pre.mk>
 
+.if (${EMACS_PORT_NAME} == "emacs23")
+BROKEN=     can not be installed with Emacs 23
+.endif
+
 MIMEUI_PORT_NAME=	${MIMEUI_PRODUCT}
 MIMEUI_PRODUCT=	semi
 MIMEUI_VERSION=	1.14
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index fa16b9e34519..11f541b9d1d2 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -24,6 +24,10 @@ CONFLICTS=	wanderlust-*-2.15.*
 
 .include <bsd.port.pre.mk>
 
+.if (${EMACS_PORT_NAME} == "emacs23")
+BROKEN=		can not be installed with Emacs 23
+.endif
+
 EMACS_W3M_PORT_NAME?=	emacs-w3m
 EMACS_W3M_LISP_FILE?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el