Update to 20.5.

20 files changed, 31 insertions, 29 deletions

diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index 4d84f581fea3..2d1f9e4785ec 100644
--- a/editors/apel-emacs20/Makefile
+++ b/editors/apel-emacs20/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/apel-emacs20/pkg-descr b/editors/apel-emacs20/pkg-descr
index 54cfaba9b16a..292bf8fda9a4 100644
--- a/editors/apel-emacs20/pkg-descr
+++ b/editors/apel-emacs20/pkg-descr
@@ -27,6 +27,6 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
-	${PREFIX}/share/emacs/20.4/site-lisp/emu/	--- emu
+	${PREFIX}/share/emacs/20.5/site-lisp/emu/	--- emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/apel/pkg-descr.emacs20 b/editors/apel/pkg-descr.emacs20
index 54cfaba9b16a..292bf8fda9a4 100644
--- a/editors/apel/pkg-descr.emacs20
+++ b/editors/apel/pkg-descr.emacs20
@@ -27,6 +27,6 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
-	${PREFIX}/share/emacs/20.4/site-lisp/emu/	--- emu
+	${PREFIX}/share/emacs/20.5/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 54cfaba9b16a..292bf8fda9a4 100644
--- a/editors/apel/pkg-descr.emacs21
+++ b/editors/apel/pkg-descr.emacs21
@@ -27,6 +27,6 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
-	${PREFIX}/share/emacs/20.4/site-lisp/emu/	--- emu
+	${PREFIX}/share/emacs/20.5/site-lisp/emu/	--- emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/bitmap-emacs20/Makefile b/editors/bitmap-emacs20/Makefile
index 7e602a3c7e89..d3124fb12b1f 100644
--- a/editors/bitmap-emacs20/Makefile
+++ b/editors/bitmap-emacs20/Makefile
@@ -21,7 +21,7 @@ BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz
 # emacs20
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index 7e602a3c7e89..d3124fb12b1f 100644
--- a/editors/bitmap/Makefile
+++ b/editors/bitmap/Makefile
@@ -21,7 +21,7 @@ BITMAP_FONT=	${X11BASE}/lib/X11/fonts/local/etl8x16-bitmap.pcf.gz
 # emacs20
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index 6ee0e10ae80c..13a64157d877 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	GNU emacs with dl
-# Version required:	20.4
+# Version required:	20.5a
 # Date created:		10 October 1998
 # Whom:			shige
 #
 # $FreeBSD$
 #
 
-DISTNAME=	emacs-20.4
-PKGNAME=	emacs-dl-20.4
+DISTNAME=	emacs-20.5a
+PKGNAME=	emacs-dl-20.5a
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -18,12 +18,14 @@ PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	shige@FreeBSD.org
 
-RUN_DEPENDS=	emacs-20.4:${PORTSDIR}/editors/emacs20
+WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
+
+RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
 
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if !defined(NO_X11)
 CONFIGURE_ARGS= --with-x-toolkit --with-pop
diff --git a/editors/emacs20-dl/distinfo b/editors/emacs20-dl/distinfo
index fc996b0d2856..93ab5db6efae 100644
--- a/editors/emacs20-dl/distinfo
+++ b/editors/emacs20-dl/distinfo
@@ -1,2 +1,2 @@
-MD5 (emacs-20.4.tar.gz) = 695614f204d918db617ba3ae849b273d
+MD5 (emacs-20.5a.tar.gz) = d3852880bcd144c79be1b9537d28490c
 MD5 (emacs-20.4-dl3.diff.gz) = c7d5891607236066cd1a7f187d6100bc
diff --git a/editors/emacs20-dl/pkg-descr b/editors/emacs20-dl/pkg-descr
index f972c1f91fb3..640a9b1020a5 100644
--- a/editors/emacs20-dl/pkg-descr
+++ b/editors/emacs20-dl/pkg-descr
@@ -4,7 +4,7 @@ display editor (emacs binary only).
 This package's emacs has a dynamic loading module function.
 
 Emacs binary is:
-    ${PREFIX}/bin/emacs-dl-20.4
+    ${PREFIX}/bin/emacs-dl-20.5
 
 Dynamic loading patch:
     http://www.etl.go.jp/~tomo/comp/emacsen/emacs-20.4-dl3.diff.gz
diff --git a/editors/flim-emacs20-current/Makefile b/editors/flim-emacs20-current/Makefile
index 86ab3588fbd9..907654f39dfc 100644
--- a/editors/flim-emacs20-current/Makefile
+++ b/editors/flim-emacs20-current/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile
index 3e36b0476577..669fd3a69199 100644
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/flim-emacs
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile
index 86ab3588fbd9..907654f39dfc 100644
--- a/editors/flim113-emacs20/Makefile
+++ b/editors/flim113-emacs20/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/flim-emacs-current
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 4c329a14688f..ff172463d1d8 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,24 +1,24 @@
 # New ports collection makefile for:	LEIM for emacs20
-# Version required:	20.4
+# Version required:	20.5a
 # Date created:		10 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	leim-20.4
+DISTNAME=	leim-20.5a
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
 
 MAINTAINER=	shige@FreeBSD.org
 
-BUILD_DEPENDS=	emacs-20.4:${PORTSDIR}/editors/emacs20
-RUN_DEPENDS=	emacs-20.4:${PORTSDIR}/editors/emacs20
+BUILD_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
+RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
 
 USE_GMAKE=	yes
 
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}/leim
 PLIST_SUB=	EMACS_VER=${EMACS_VER}
 SCRIPTS_ENV=	EMACS_VER=${EMACS_VER}
diff --git a/editors/leim20/distinfo b/editors/leim20/distinfo
index 1d730e269250..412de30da1f1 100644
--- a/editors/leim20/distinfo
+++ b/editors/leim20/distinfo
@@ -1 +1 @@
-MD5 (leim-20.4.tar.gz) = c1506034117769b19945a6169911b0e3
+MD5 (leim-20.5a.tar.gz) = bbf2dfcb55fa95d178844e7551c497b5
diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile
index 032a4eb9cf9c..fdd8097f76b1 100644
--- a/editors/psgml-emacs20/Makefile
+++ b/editors/psgml-emacs20/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../psgml-emacs
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=	share/${EMACS_NAME}
 
 # pkg/* files are used in ${.CURDIR}
diff --git a/editors/semi-emacs20-current/Makefile b/editors/semi-emacs20-current/Makefile
index 52eedc7b306d..3e74416347d4 100644
--- a/editors/semi-emacs20-current/Makefile
+++ b/editors/semi-emacs20-current/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index 1efed4b00193..af3f5976c870 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile
index 52eedc7b306d..3e74416347d4 100644
--- a/editors/semi113-emacs20/Makefile
+++ b/editors/semi113-emacs20/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/semi-emacs-current
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/wemi-emacs20-current/Makefile b/editors/wemi-emacs20-current/Makefile
index 6994fcd20e34..2171acc1bee8 100644
--- a/editors/wemi-emacs20-current/Makefile
+++ b/editors/wemi-emacs20-current/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs-current
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/wemi-emacs20/Makefile b/editors/wemi-emacs20/Makefile
index d17f9febc216..3e3246d4cc81 100644
--- a/editors/wemi-emacs20/Makefile
+++ b/editors/wemi-emacs20/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../editors/wemi-emacs
 # emacs port setup
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.4
+EMACS_VER=	20.5
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}