Update to 9.22.

7 files changed, 11 insertions, 11 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 1c261b890b64..8e22fc46d2dd 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	apel for emacs
-# Version required:	9.20
+# Version required:	9.22
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/apel/ \
 MAINTAINER?=	shige@FreeBSD.org
 
 # distfile version
-APEL_VER=	9.20
+APEL_VER=	9.22
 # setupel filename
 APEL_SETUPEL=	apel-setupel.el
 # document install directory by install-doc target
@@ -61,7 +61,7 @@ PLIST_SUB+=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
 		APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
-MAKE_FLAGS+=	EMACS=${EMACS_CMD}
+MAKE_FLAGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
diff --git a/editors/apel/distinfo b/editors/apel/distinfo
index 6b28c119a757..99fdd169e0cb 100644
--- a/editors/apel/distinfo
+++ b/editors/apel/distinfo
@@ -1 +1 @@
-MD5 (apel-9.20.tar.gz) = cf4903ae15d869f60a31b4a5d8e98bbc
+MD5 (apel-9.22.tar.gz) = 736d1c0dc6a4a71b61779cfd276941d6
diff --git a/editors/apel/pkg-descr.emacs19 b/editors/apel/pkg-descr.emacs19
index 89892b883b77..6d82f4e598d2 100644
--- a/editors/apel/pkg-descr.emacs19
+++ b/editors/apel/pkg-descr.emacs19
@@ -2,7 +2,7 @@ A Portable Emacs Library.
 
 --- Emacs Library Porting
 
-APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
+APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
diff --git a/editors/apel/pkg-descr.emacs20 b/editors/apel/pkg-descr.emacs20
index 21fd589c1384..54cfaba9b16a 100644
--- a/editors/apel/pkg-descr.emacs20
+++ b/editors/apel/pkg-descr.emacs20
@@ -2,7 +2,7 @@ A Portable Emacs Library.
 
 --- Emacs Library Porting
 
-APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
+APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
@@ -27,6 +27,6 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
-	${PREFIX}/share/emacs/20.3/site-lisp/emu/	--- emu
+	${PREFIX}/share/emacs/20.4/site-lisp/emu/	--- emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/apel/pkg-descr.emacs21 b/editors/apel/pkg-descr.emacs21
index 21fd589c1384..54cfaba9b16a 100644
--- a/editors/apel/pkg-descr.emacs21
+++ b/editors/apel/pkg-descr.emacs21
@@ -2,7 +2,7 @@ A Portable Emacs Library.
 
 --- Emacs Library Porting
 
-APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
+APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
@@ -27,6 +27,6 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
-	${PREFIX}/share/emacs/20.3/site-lisp/emu/	--- emu
+	${PREFIX}/share/emacs/20.4/site-lisp/emu/	--- emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/apel/pkg-descr.mule b/editors/apel/pkg-descr.mule
index 2416afc1f4fe..6fe1e9776963 100644
--- a/editors/apel/pkg-descr.mule
+++ b/editors/apel/pkg-descr.mule
@@ -2,7 +2,7 @@ A Portable Emacs Library.
 
 --- Emacs Library Porting
 
-APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
+APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
diff --git a/editors/apel/pkg-descr.xemacs21-mule b/editors/apel/pkg-descr.xemacs21-mule
index fc6bfe11b126..bd882c0ec163 100644
--- a/editors/apel/pkg-descr.xemacs21-mule
+++ b/editors/apel/pkg-descr.xemacs21-mule
@@ -2,7 +2,7 @@ A Portable Emacs Library.
 
 --- Emacs Library Porting
 
-APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
+APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules: