Chase emacs upgrade to 20.6.

19 files changed, 22 insertions, 23 deletions

diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index 2d1f9e4..8b4232a 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.5
+EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/bitmap-emacs20/Makefile b/editors/bitmap-emacs20/Makefile
index b53ef9d..32a5817 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.5
+EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/bitmap/Makefile b/editors/bitmap/Makefile
index b53ef9d..32a5817 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.5
+EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/flim-emacs20-current/Makefile b/editors/flim-emacs20-current/Makefile
index 907654f..e59b127 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.5
+EMACS_VER=	20.6
 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 669fd3a..ef642c7 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.5
+EMACS_VER=	20.6
 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 907654f..e59b127 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.5
+EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index ff17246..771e1a6 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	LEIM for emacs20
-# Version required:	20.5a
+# Version required:	20.6
 # Date created:		10 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	leim-20.5a
+DISTNAME=	leim-20.6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -17,8 +17,7 @@ BUILD_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
 RUN_DEPENDS=	emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
 
 USE_GMAKE=	yes
-
-EMACS_VER=	20.5
+EMACS_VER=	20.6
 WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}/leim
 PLIST_SUB=	EMACS_VER=${EMACS_VER}
 SCRIPTS_ENV=	EMACS_VER=${EMACS_VER}
diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile
index fdd8097..cb846f0 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.5
+EMACS_VER=	20.6
 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 3e74416..46bdae0 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.5
+EMACS_VER=	20.6
 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 af3f597..e729f76 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.5
+EMACS_VER=	20.6
 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 3e74416..46bdae0 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.5
+EMACS_VER=	20.6
 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 93ae2b2..d887c00 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.5
+EMACS_VER=	20.6
 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 3e3246d..7e64307 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.5
+EMACS_VER=	20.6
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile
index 0d24cc3..4789ba3 100644
--- a/japanese/emacs-manual/Makefile
+++ b/japanese/emacs-manual/Makefile
@@ -19,14 +19,14 @@ MAINTAINER=	okazaki@be.to
 BUILD_DEPENDS=	${EMACS}:${PORTSDIR}/editors/emacs20
 
 EXTRACT_ONLY=	${DISTNAME}.tgz
-EMACS_DISTNAME= emacs-20.5
+EMACS_DISTNAME= emacs-20.6
 EMACS_ARC=	${EMACS_DISTNAME}a.tar.gz
 EMACS_SRCDIR=	${WRKDIR}/${EMACS_DISTNAME}
 EXTRACT_FILES=	${EMACS_DISTNAME}/man/ack.texi \
 		${EMACS_DISTNAME}/lisp/textmodes/texinfmt.el
 
 # We use emacs20 to format texinfo files.
-EMACS=		emacs-20.5
+EMACS=		emacs-20.6
 
 MAKE_ENV=	EMACS="${EMACS}"
 
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile
index 6fee684d1..97de0f0 100644
--- a/japanese/emacs20-dl-canna/Makefile
+++ b/japanese/emacs20-dl-canna/Makefile
@@ -31,7 +31,7 @@ PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \
 		DLCANNA_VER=${DLCANNA_VER} LISPDIR=${LISPDIR} DOCDIR=${DOCDIR}
 
 # ports variables
-EMACS_VER=	20.5
+EMACS_VER=	20.6
 EMACSDL_DIR=	${.CURDIR}/../../editors/emacs20-dl
 EMACSDL_SRCDIR=	${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}/src
 APEL_DEPENDS=	${PREFIX}/share/emacs/${EMACS_VER}/site-lisp/emu/emu.el
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index 86bb2b5..229e804 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -29,7 +29,7 @@ PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \
 		DOCDIR=${DOCDIR}
 
 DOCDIR=		share/doc/emacs20-dl-wnn6
-EMACS_VER=	20.5
+EMACS_VER=	20.6
 EMACSDL_DIR=	${.CURDIR}/../../editors/emacs20-dl
 EMACSDL_SRCDIR=	${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}
 # hack to allow parallel build to work
diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
index 24f2afe..bc8ac6a 100644
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ b/japanese/skk10-elisp-emacs20/Makefile
@@ -23,7 +23,7 @@ PORT_CLASS?=	master
 EMACS_PORT_NAME=	emacs20
 # emacsen-information
 EMACS_NAME=		emacs
-EMACS_VER=		20.5
+EMACS_VER=		20.6
 EMACS_CMD=		${LOCALBASE}/bin/${EMACS_NAME}-${EMACS_VER}
 EMACS_LIBDIR=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index a80cec2..a77ce93 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -77,7 +77,7 @@ EMACS_SITELISPDIR=	${EMACS_LIBDIR}/site-lisp
 SITE_STARTUP_FILE=	mew-startup.el
 .elif (${EMACS_PORT_NAME} == "emacs20")
 EMACS_NAME=		emacs
-EMACS_VER=		20.5
+EMACS_VER=		20.6
 EMACS_MAJOR_VER=	20
 EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
 EMACS_LIBDIR=		share/${EMACS_NAME}
diff --git a/mail/wanderlust-emacs20/Makefile b/mail/wanderlust-emacs20/Makefile
index 7f9e146..61fb8b2 100644
--- a/mail/wanderlust-emacs20/Makefile
+++ b/mail/wanderlust-emacs20/Makefile
@@ -12,7 +12,7 @@ MASTERDIR=	${.CURDIR}/../../mail/wanderlust-emacs
 
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
-EMACS_VER=	20.5
+EMACS_VER=	20.6
 EMACS_LIBDIR=	share/emacs
 
 IS_SLAVE=	yes