- Remove editors/emacs21, and editors/emacs22 as they're no longer maintained

upstream - Also remove dependent ports - Add UPDATING entry informing users of the same - Add MOVED entries Approved by: portmgr (bapt)
svn path=/head/; revision=359512
2024-11-21 00:25:50 +00:00 · 2014-06-27 12:34:52 +00:00 · 2014-06-27 12:34:52 +00:00 · fba661e8a6 · 2021-03-31 03:12:20 +00:00
commit fba661e8a6
parent 237f8bd9c9
130 changed files with 37 additions and 7881 deletions
--- a/24
+++ b/24
@ -6156,3 +6156,27 @@ print/pkg-texinfo|print/texinfo-minimal|2014-06-24|Has been renamed
 sysutils/pc-sysinstall|sysutils/pcbsd-utils|2014-06-24|Removed: pc-sysinstall is included in sysutils/pcbsd-utils
 print/texinfo-minimal|print/texinfo-lite|2014-06-24|Has been renamed
 devel/gmake-minimal|devel/gmake-lite|2014-06-24|Has been renamed
+converters/mule-ucs||2014-06-27|Removed: dependent on editors/emacs21
+devel/elib-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+editors/apel-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+editors/apel-emacs22||2014-06-27|Removed: dependent on editors/emacs22
+editors/emacs21||2014-06-27|Removed: unmaintained upstream
+editors/emacs22||2014-06-27|Removed: unmaintained upstream
+editors/flim-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+editors/flim-emacs22||2014-06-27|Removed: dependent on editors/emacs22
+editors/semi-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+editors/semi-emacs22||2014-06-27|Removed: dependent on editors/emacs22
+irc/riece-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+japanese/emacs-emcws||2014-06-27|Removed: dependent on editors/emacs21
+japanese/lookup-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+japanese/migemo-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+japanese/migemo-emacs22||2014-06-27|Removed: dependent on editors/emacs22
+mail/c-sig-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+mail/wanderlust-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+mail/wanderlust-emacs22||2014-06-27|Removed: dependent on editors/emacs22
+math/emacs-calc||2014-06-27|Removed: dependent on editors/emacs21
+textproc/uim-el-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+textproc/uim-el-emacs22||2014-06-27|Removed: dependent on editors/emacs22
+textproc/yaml-mode.el-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+www/emacs-w3m-emacs21||2014-06-27|Removed: dependent on editors/emacs21
+www/emacs-w3m-emacs22||2014-06-27|Removed: dependent on editors/emacs22
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@ -63,42 +63,8 @@ EMACS_PORT_NAME?=	emacs24

 EMACS_MASTERDIR_PKGFILES?=	NO

-# Emacs-21.x
-.if (${EMACS_PORT_NAME} == "emacs21")
-EMACS_NAME=		emacs
-EMACS_VER=		21.3
-EMACS_MAJOR_VER=	21
-EMACS_LIBDIR?=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs21
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		YES
-EMACS_NO_SUBDIRSEL=	NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?=                 ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-.endif
-
-# Emacs-22.x
-.elif (${EMACS_PORT_NAME} == "emacs22")
-EMACS_NAME=		emacs
-EMACS_VER=		22.3
-EMACS_MAJOR_VER=	22
-EMACS_LIBDIR?=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs22
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		YES
-EMACS_NO_SUBDIRSEL=	NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-.endif
-
 # Emacs-23.x
-.elif (${EMACS_PORT_NAME} == "emacs23")
+.if (${EMACS_PORT_NAME} == "emacs23")
 EMACS_NAME=		emacs
 EMACS_VER=		23.4
 EMACS_MAJOR_VER=	23
@ -225,8 +191,7 @@ PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 check-makevars::
 	@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
 	@${ECHO} "Valid values are:"
-	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs23 emacs24"
-	@${ECHO} "                     emacs-devel"
+	@${ECHO} "	Emacs  family: emacs23 emacs24 emacs-devel"
 	@${ECHO} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
 	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
 	@${FALSE}
--- a/10
+++ b/10
@ -5,6 +5,16 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20140427:
+  AFFECTS: users of editors/emacs21 and editors/emacs22
+  AUTHOR: ashish@FreeBSD.org
+
+  editors/emacs21, and editors/emacs22 are removed as they were
+  unmaintained upstream for a while. Their dependent ports are removed
+  as well. Please switch to editors/emacs (Emacs 24 release), or
+  editors/emacs23 (Emacs 23 release), or editors/emacs-devel (Emacs
+  development branch) ports.
+
 20140626:
  AFFECTS: users of mail/qmail-spamcontrol
  AUTHOR: bdrewery@FreeBSD.org
--- a/converters/Makefile
+++ b/converters/Makefile
@ -49,7 +49,6 @@
    SUBDIR += mimelib
    SUBDIR += mmencode
    SUBDIR += mpack
-    SUBDIR += mule-ucs
    SUBDIR += nomyso
    SUBDIR += o3read
    SUBDIR += osm2mp
--- a/converters/mule-ucs/Makefile
+++ b/converters/mule-ucs/Makefile
@ -1,75 +0,0 @@
-# Created by: OKAZAKI Tetsurou
-# $FreeBSD$
-
-PORTNAME=	mule-ucs
-PORTVERSION=	0.85.r3
-PORTREVISION=	5
-CATEGORIES=	converters elisp
-MASTER_SITES=	${MASTER_SITE_M17N}
-MASTER_SITE_SUBDIR=	mule/Mule-UCS/test
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	Mule-UCS-current
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	Universal encoding system for GNU Emacs 21
-
-MASTER_SITE_M17N+=	\
-		ftp://ftp.m17n.org/pub/%SUBDIR%/ \
-		ftp://ftp.kddlabs.co.jp/Japan/m17n.org/%SUBDIR%/
-
-# This is a master port.
-PORTCLASS?=	master
-
-.if (${PORTCLASS} == "master")
-USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
-.endif
-
-MULEUCS_DESTDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs
-EMACS_ARGS=	-q --no-site-file -batch
-
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-do-build:
-	cd ${WRKSRC}/lisp/big5conv && \
-	    ${EMACS_CMD} ${EMACS_ARGS} -l big5-comp.el
-	cd ${WRKSRC}/lisp/jisx0213 && \
-	    ${EMACS_CMD} ${EMACS_ARGS} -l x0213-comp.el
-	cd ${WRKSRC} && \
-	    ${EMACS_CMD} ${EMACS_ARGS} -l mucs-comp.el
-
-do-install:
-	@${MKDIR} ${MULEUCS_DESTDIR}
-	cd ${WRKSRC}/lisp; \
-	for dir in . big5conv jisx0213 ; do \
-		${MKDIR} ${MULEUCS_DESTDIR}/$${dir} ; \
-		${INSTALL_DATA} $${dir}/*.el ${MULEUCS_DESTDIR}/$${dir} ; \
-		${INSTALL_DATA} $${dir}/*.elc ${MULEUCS_DESTDIR}/$${dir} ; \
-	done
-	${MKDIR} ${MULEUCS_DESTDIR}/reldata
-	cd ${WRKSRC}/lisp; \
-		${INSTALL_DATA} reldata/*.el ${MULEUCS_DESTDIR}/reldata
-	@${RM} ${MULEUCS_DESTDIR}/big5conv/big5-comp.el
-	@${RM} ${MULEUCS_DESTDIR}/jisx0213/x0213-comp.el
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/lisp; \
-	for i in ChangeLog MuleUni.txt README* ; do \
-		${INSTALL_DATA} $${i} ${DOCSDIR} ; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/lisp/big5conv/README \
-			 ${DOCSDIR}/README.big5conv
-	${INSTALL_DATA} ${WRKSRC}/lisp/jisx0213/ChangeLog \
-			 ${DOCSDIR}/ChangeLog.jisx0213
-	${INSTALL_DATA} ${WRKSRC}/lisp/jisx0213/readme.txt \
-			 ${DOCSDIR}/README.jisx0213
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
--- a/converters/mule-ucs/distinfo
+++ b/converters/mule-ucs/distinfo
@ -1,2 +0,0 @@
-SHA256 (Mule-UCS-current.tar.gz) = 04999b8d29a169ea5c146c25444129a7ae0c2c87708be19961ec34b7bf770d56
-SIZE (Mule-UCS-current.tar.gz) = 740887
--- a/converters/mule-ucs/pkg-descr
+++ b/converters/mule-ucs/pkg-descr
@ -1,21 +0,0 @@
-Mule-UCS is an Emacs Lisp library to define encoding/decoding schemes by
-rather simple translation rule.
-
-Emacs prepares encoding/decoding schemes in the following 2 mechanisms.
-
-  (A) ... built-in ISO/IEC 2022 encoder/decoder
-  (B) ... Code Conversion Language(CCL) engine
-
-Although (A) provides powerful encoding/decoding schemes as to
-ISO/IEC 2022, we cannot utilize this for any other encoding schemes.
-(B) is a simple register machine. However, CCL program is arcane
-language because it is mysterious and obscure:-P.
-
-Mule-UCS provides flexible and comprehensible encoding mechanism to Emacs.
-Currently, Mule-UCS generates CCL program from the translation rule, but
-in the future, Mule-UCS may support another conversion engine on Emacs.
-
-Predefined conversions for Mule-UCS included in this package are:
-  (1) ... Unicode(UTF-7/8/16) support.
-  (2) ... Big5 <-> CNS conversion support.
-  (3) ... JIS X 0213 support.
--- a/converters/mule-ucs/pkg-message
+++ b/converters/mule-ucs/pkg-message
@ -1,29 +0,0 @@
-If you want to use Unicode support included in Mule-UCS package,
-please put one line as below:
-
-(require 'un-define)
-
-in your .emacs, site-start.el, or any other start up configuration file.
-If you want to use auto detection feature on UTF-8/16, add one more:
-
-(require 'un-tools)
-
-See PREFIX/share/doc/mule-ucs/README.Unicode for details.
-
-If you want to use BIG5 conversion support, add the below line either:
-
-(require 'big5c-ucs)
-
-or
-
-(require 'big5c-cns)
-
-to your .emacs depends on which conversion methods you would like to use.
-See PREFIX/share/doc/mule-ucs/README.big5conv for details.
-
-If you want to use JIS X 0213 support, add the following line:
-
-(require 'jisx0213)
-
-to your .emacs.  See PREFIX/share/doc/mule-ucs/README.jisx0213
-(written in Japanese) for details.
--- a/converters/mule-ucs/pkg-plist
+++ b/converters/mule-ucs/pkg-plist
@ -1,107 +0,0 @@
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv/big5c-cns.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv/big5c-cns.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv/big5c-ucs.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv/big5c-ucs.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv/big5conv.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv/big5conv.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv/big5type.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv/big5type.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/egg-sim-jisx0213.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/jisx0213.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-cdef.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-cdef.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-char.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-char.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-csys.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-csys.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-font.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-font.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-mime.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-mime.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-sjis.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-udef.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-udef.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-util.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/x0213-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213/ujisx0213.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mccl-font.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mccl-font.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs-ccl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs-ccl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs-error.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs-error.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs-type.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs-type.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mule-uni.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mule-uni.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-2.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-4.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-6.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-7.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uascii.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ubig5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uethiopic.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ugb2312.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uipa.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiscii.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-2.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-4.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-5.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-6.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-7.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-8.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-9.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-14.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-15.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ujisx0201.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ujisx0208.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ujisx0212.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uksc5601.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ulao.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/usisheng.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/usupple.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/utibetan.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/utis620.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uviscii.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/tae.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/tae.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/tbl-mg.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/tbl-mg.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/trans-util.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/trans-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/txt-tbl.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/txt-tbl.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-data.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-data.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-define.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-define.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-supple.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-supple.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-tools.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-tools.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-trbase.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/unicode.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/unicode.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/unidata.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/unidata.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/utf.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/utf.elc
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.jisx0213
-%%PORTDOCS%%%%DOCSDIR%%/MuleUni.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.Unicode
-%%PORTDOCS%%%%DOCSDIR%%/README.big5conv
-%%PORTDOCS%%%%DOCSDIR%%/README.jisx0213
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- a/deskutils/etask/Makefile
+++ b/deskutils/etask/Makefile
@ -14,7 +14,6 @@ COMMENT=	Manage your projects or tasks within GNU Emacs
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf

 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
 USE_GHOSTSCRIPT_RUN=	yes
 USE_TEX=	latex dvipsk

--- a/devel/Makefile
+++ b/devel/Makefile
@ -407,7 +407,6 @@
    SUBDIR += elfsh
    SUBDIR += elftoaout
    SUBDIR += elib
-    SUBDIR += elib-emacs21
    SUBDIR += entity
    SUBDIR += epm
    SUBDIR += epl.el
--- a/devel/eieio/Makefile
+++ b/devel/eieio/Makefile
@ -15,7 +15,6 @@ MAINTAINER=	dryice@dryice.name
 COMMENT=	Enhanced Integration of Emacs Interpreted Objects

 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21

 .if ${EMACS_PORT_NAME} != "emacs21"
 PORTNAMESUFFIX=	${PKGNAMESUFFIX}
--- a/devel/elib-emacs21/Makefile
+++ b/devel/elib-emacs21/Makefile
@ -1,16 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	ports@FreeBSD.org
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../devel/elib
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-
-NO_STAGE=	yes
-.include "${MASTERDIR}/Makefile"
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@ -15,7 +15,6 @@ MAINTAINER=	dryice@dryice.name
 COMMENT=	Lexer, parser-generator, and parser for Emacs

 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21

 .if ${EMACS_PORT_NAME} != "emacs21"
 PORTNAMESUFFIX=	${PKGNAMESUFFIX}
--- a/editors/Makefile
+++ b/editors/Makefile
@ -9,8 +9,6 @@
    SUBDIR += aee
    SUBDIR += aewan
    SUBDIR += apel
-    SUBDIR += apel-emacs21
-    SUBDIR += apel-emacs22
    SUBDIR += asedit
    SUBDIR += beav
    SUBDIR += biew
@ -60,13 +58,9 @@
    SUBDIR += emacs
    SUBDIR += emacs-devel
    SUBDIR += emacs-nox11
-    SUBDIR += emacs21
-    SUBDIR += emacs22
    SUBDIR += emacs23
    SUBDIR += fb
    SUBDIR += flim
-    SUBDIR += flim-emacs21
-    SUBDIR += flim-emacs22
    SUBDIR += flim-xemacs21-mule
    SUBDIR += fpc-ide
    SUBDIR += fte
@ -242,8 +236,6 @@
    SUBDIR += scribes
    SUBDIR += se
    SUBDIR += semi
-    SUBDIR += semi-emacs21
-    SUBDIR += semi-emacs22
    SUBDIR += semi-xemacs21-mule
    SUBDIR += setedit
    SUBDIR += slime
--- a/editors/apel-emacs21/Makefile
+++ b/editors/apel-emacs21/Makefile
@ -1,16 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	Portable Emacs Library for emacs21
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/apel
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/apel-emacs22/Makefile
+++ b/editors/apel-emacs22/Makefile
@ -1,16 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	Portable Emacs Library for emacs22
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/apel
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs22
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@ -1,92 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
-# $FreeBSD$
-
-PORTNAME=	emacs
-PORTVERSION=	21.3
-PORTREVISION=	16
-CATEGORIES=	editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU:C/\/gnu\//\/old-gnu\//g}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	21
-
-.if defined(WITH_MENUBAR_FONTSET)
-PATCH_SITES=		http://nijino.homelinux.net/emacs/
-PATCHFILES=		emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
-PATCH_DIST_STRIP=	-p1
-.endif
-
-MAINTAINER=	ashish@FreeBSD.org
-COMMENT=	GNU editing macros
-
-CONFLICTS=	emacs-19.* emacs22-* emacs23-* emacs24-* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
-		emacs-devel-* emacs-nox11-*
-
-SSP_UNSAFE=	yes
-
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		tiff:${PORTSDIR}/graphics/tiff \
-		gif:${PORTSDIR}/graphics/giflib \
-		png15:${PORTSDIR}/graphics/png
-USE_XORG=	xpm
-.endif
-
-USE_AUTOTOOLS=	autoconf213
-USES=		gmake makeinfo
-
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS=		--with-x=no
-.endif
-.if defined(WITHOUT_XIM)
-CONFIGURE_ARGS+=	--without-xim
-.endif
-
-MAN1=		ctags.1 emacs.1 etags.1 gfdl.1
-PLIST_SUB=	EMACS_VER=${PORTVERSION} EMACS_ARCH=${CONFIGURE_TARGET}
-TEXIFILES=	ada-mode autotype cc-mode cl dired-x ebrowse ediff \
-		faq emacs emacs-mime eshell eudc forms gnus idlwave \
-		info message mh-e pcl-cvs reftex sc speedbar vip \
-		viper widget woman
-INFO=		ada-mode autotype ccmode cl dired-x ebrowse ediff \
-		efaq emacs emacs-mime eshell eudc forms gnus idlwave \
-		info message mh-e pcl-cvs reftex sc speedbar vip \
-		viper widget woman
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-CFLAGS:=	${CFLAGS:C/-O.?/-O0/g}
-.endif
-
-pre-everything::
-.if !defined(WITH_MENUBAR_FONTSET)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To enable menubar fontset support, define WITH_MENUBAR_FONTSET"
-	@${ECHO_MSG} "====>"
-.endif
-
-post-patch:
-	@${RM} -f ${WRKSRC}/info/*
-	@(cd ${WRKSRC}/man ; \
-	for f in ${TEXIFILES} ; do \
-	${CP} $${f}.texi $${f}.texi.orig ; \
-	${SED} -e "s/@dircategory Emacs/@dircategory The Emacs editor and associated tools/" < $${f}.texi.orig > $${f}.texi ; \
-	${RM} $${f}.texi.orig ; \
-	done)
-
-post-build:
-	(cd ${WRKSRC}/lisp ; \
-	 ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} recompile ; \
-	 ${RM} ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${PORTVERSION}.1 ; \
-	 cd ${WRKSRC}/src ; \
-	 ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@ -1,6 +0,0 @@
-SHA256 (emacs-21.3.tar.gz) = 95364d2478349d48015cb58433cd890f2a9548d32c9e5813f9dab2b2f9fbea90
-SIZE (emacs-21.3.tar.gz) = 20399831
-SHA256 (emacs-21.1-fontset.patch) = 05820a588065a2975843febe3a407e1286c2f06abeac78fb7754317ce83d8b53
-SIZE (emacs-21.1-fontset.patch) = 8647
-SHA256 (emacs-21.2-menu-encode.patch) = aa63732d15596f1683960a69dd8c02a04ac74cac6401d9995803d67b62177df8
-SIZE (emacs-21.2-menu-encode.patch) = 3517
--- a/editors/emacs21/files/patch-Makefile.in
+++ b/editors/emacs21/files/patch-Makefile.in
@ -1,37 +0,0 @@
--- Makefile.in.orig	Sat Oct 19 10:21:01 2002
-+++ Makefile.in	Fri Dec  9 01:25:01 2005
-@@ -348,14 +348,6 @@
- ## as a workaround for a bug in tar on Ultrix 4.2.
- install-arch-indep: mkdir info
- 	-set ${COPYDESTS} ; \
-	unset CDPATH; \
-	for dir in ${COPYDIR} ; do \
-	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
-	    rm -rf $$1 ; \
-	  fi ; \
-	  shift ; \
-	done
-	-set ${COPYDESTS} ; \
- 	mkdir ${COPYDESTS} ; \
- 	chmod ugo+rx ${COPYDESTS} ; \
- 	unset CDPATH; \
-@@ -432,8 +424,8 @@
- 	   cd ${srcdir}/info ; \
- 	   for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \
- 	     (cd $${thisdir}; \
-	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
-	      chmod a+r ${infodir}/$$f); \
-+	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f.info; \
-+	      chmod a+r ${infodir}/$$f.info); \
- 	   done); \
- 	else true; fi
- 	-unset CDPATH; \
-@@ -442,7 +434,7 @@
- 	then \
- 	  for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \
- 	    (cd $${thisdir}; \
-	     ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
-+	     ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f.info); \
- 	  done; \
- 	else true; fi
- 	-chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
--- a/editors/emacs21/files/patch-configure.in
+++ b/editors/emacs21/files/patch-configure.in
@ -1,30 +0,0 @@
--- configure.in.orig	Sun Mar 16 17:06:05 2003
-+++ configure.in	Thu Jul  7 00:14:52 2005
-@@ -179,6 +179,19 @@
- machine='' opsys='' unported=no
- case "${canonical}" in
- 
-+  ## FreeBSD ports
-+  *-*-freebsd* )
-+    opsys=freebsd
-+    case "${canonical}" in
-+      alpha*-*-freebsd*)       machine=alpha ;;
-+      amd64-*-freebsd*)        machine=amd64 ;;
-+      ia64-*-freebsd*)         machine=ia64 ;;
-+      i[3456]86-*-freebsd*)    machine=intel386 ;;
-+      sparc64-*-freebsd*)      machine=sparc ;;
-+      powerpc-*-freebsd*)      machine=macppc ;;
-+    esac
-+  ;;
-+
-   ## NetBSD ports
-   *-*-netbsd* )
-     opsys=netbsd
-@@ -1032,7 +1045,6 @@
- 				;;
-       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
-       *-386bsd* )	        opsys=386bsd ;;
-      *-freebsd* )	        opsys=freebsd ;;
-       *-nextstep* )             opsys=nextstep ;;
-       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
-     esac
--- a/editors/emacs21/files/patch-lib-src:Makefile.in
+++ b/editors/emacs21/files/patch-lib-src:Makefile.in
@ -1,27 +0,0 @@
--- lib-src/Makefile.in.orig	Wed Aug 30 02:12:42 2000
-+++ lib-src/Makefile.in	Thu Oct 11 01:54:10 2001
-@@ -85,6 +85,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- # By default, we uphold the dignity of our programs.
- INSTALL_STRIP =
- 
-@@ -278,7 +279,7 @@
-         if [ `(cd ${archlibdir} && /bin/pwd)` \
-              != `(cd ${srcdir} && /bin/pwd)` ]; then \
- 	  for file in ${SCRIPTS}; do \
-	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
-+	    $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \
- 	  done ; \
- 	fi
- 
-@@ -290,7 +291,7 @@
- 	  chmod a+rx ${bindir}/$${file}; \
- 	done
- 	for file in ${INSTALLABLE_SCRIPTS} ; do \
-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
-+	  $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file} ; \
- 	  chmod a+rx ${bindir}/$${file}; \
- 	done
--- a/editors/emacs21/files/patch-lib-src:movemail.c
+++ b/editors/emacs21/files/patch-lib-src:movemail.c
@ -1,11 +0,0 @@
--- lib-src/movemail.c.orig	Mon Feb 14 11:29:49 2005
-+++ lib-src/movemail.c	Mon Feb 14 11:33:06 2005
-@@ -787,7 +787,7 @@
-       mbx_delimit_begin (mbf);
-       if (pop_retr (server, i, mbf) != OK)
- 	{
-	  error (Errmsg, 0, 0);
-+	  error ("%s", Errmsg, 0);
- 	  close (mbfi);
- 	  return (1);
- 	}
--- a/editors/emacs21/files/patch-lisp:vc-hooks.el
+++ b/editors/emacs21/files/patch-lisp:vc-hooks.el
@ -1,24 +0,0 @@
--- lisp/vc-hooks.el.orig	Mon Nov 12 23:37:38 2001
-+++ lisp/vc-hooks.el	Tue Nov 13 12:56:08 2001
-@@ -475,10 +475,9 @@
-   (if regexp
-       (concat (regexp-quote (file-name-nondirectory file))
-               "\\.~[0-9.]+" (unless manual "\\.") "~")
-    (expand-file-name (concat (file-name-nondirectory file) 
-                              ".~" (or rev (vc-workfile-version file)) 
-                              (unless manual ".") "~")
-                      (file-name-directory file))))
-+    (concat (make-backup-file-name-1 file)
-+	    ".~" (or rev (vc-workfile-version file))
-+	    (unless manual ".") "~")))
- 
- (defun vc-delete-automatic-version-backups (file)
-   "Delete all existing automatic version backups for FILE."
-@@ -509,6 +508,7 @@
- 	 (vc-up-to-date-p file)
- 	 (eq (vc-checkout-model file) 'implicit)
- 	 (vc-call make-version-backups-p file)
-+	 vc-make-backup-files
-          (vc-make-version-backup file))))
- 
- (defun vc-after-save ()
--- a/editors/emacs21/files/patch-lisp_dired.el
+++ b/editors/emacs21/files/patch-lisp_dired.el
@ -1,19 +0,0 @@
--- lisp/dired.el.orig	Fri Feb  7 20:48:13 2003
-+++ lisp/dired.el	Fri Mar 21 18:08:54 2003
-@@ -1535,6 +1535,7 @@
- 			          "\\|" yyyy s s "?"
- 			          "\\|" s "?" yyyy
- 			     "\\)"))
-+	 (freebsd-ja (concat s mm "\\(" s "\\|/\\)" dd s "\\(" HH:MM "\\|" s yyyy "\\)"))
- 	 (japanese
- 	  (concat mm k "?" s dd k "?" s "+"
- 		  "\\(" HH:MM "\\|" yyyy k "?" "\\)")))
-@@ -1546,7 +1547,7 @@
- 	 ;; This avoids recognizing `jservice  10  1024' as a date in the line:
- 	 ;; drwxr-xr-x  3 jservice  10  1024 Jul  2  1997 esg-host
-     (concat ".*[0-9][kKMGTPEZY]?" 
-	    s "\\(" western "\\|" japanese "\\|" iso "\\)" s))
-+	    s "\\(" western "\\|" freebsd-ja "\\|" japanese "\\|" iso "\\)" s))
-   "Regular expression to match up to the file name in a directory listing.
- The default value is designed to recognize dates and times
- regardless of the language.")
--- a/editors/emacs21/files/patch-man:Makefile.in
+++ b/editors/emacs21/files/patch-man:Makefile.in
@ -1,11 +0,0 @@
--- man/Makefile.in.orig	Thu Apr 26 02:17:33 2001
-+++ man/Makefile.in	Mon Oct 22 20:43:45 2001
-@@ -31,7 +31,7 @@
- 
- 
- # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/info ../info/message ../info/mh-e ../info/reftex \
--- a/editors/emacs21/files/patch-oldXMenu_XDelAssoc.c
+++ b/editors/emacs21/files/patch-oldXMenu_XDelAssoc.c
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- oldXMenu/XDelAssoc.c.orig
-+++ oldXMenu/XDelAssoc.c
-@@ -27,7 +27,7 @@
-  * an XId.  An association may be removed only once.  Redundant
-  * deletes are meaningless (but cause no problems).
-  */
-XDeleteAssoc(dpy, table, x_id)
-+void XDeleteAssoc(dpy, table, x_id)
-         register Display *dpy;
- 	register XAssocTable *table;
- 	register XID x_id;
--- a/editors/emacs21/files/patch-oldXMenu_XMakeAssoc.c
+++ b/editors/emacs21/files/patch-oldXMenu_XMakeAssoc.c
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- oldXMenu/XMakeAssoc.c.orig
-+++ oldXMenu/XMakeAssoc.c
-@@ -37,7 +37,7 @@
-  * meaningless (but cause no problems).  The queue in each association
-  * bucket is sorted (lowest XId to highest XId).
-  */
-XMakeAssoc(dpy, table, x_id, data)
-+void XMakeAssoc(dpy, table, x_id, data)
- 	register Display *dpy;
- 	register XAssocTable *table;
- 	register XID x_id;
--- a/editors/emacs21/files/patch-src-xfns.c
+++ b/editors/emacs21/files/patch-src-xfns.c
@ -1,38 +0,0 @@
--- src/xfns.c.orig	2002-12-06 18:05:35.000000000 +0100
-+++ src/xfns.c	2012-05-02 19:50:40.000000000 +0200
-@@ -8541,7 +8541,7 @@
- {
-   xassert (png_ptr != NULL);
-   image_error ("PNG error: %s", build_string (msg), Qnil);
-  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf(png_ptr), 1);
- }
- 
- 
-@@ -8641,7 +8641,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
-	  || !png_check_sig (sig, sizeof sig))
-+	  || png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -8658,7 +8658,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
-	  || !png_check_sig (tbr.bytes, sizeof sig))
-+	  || png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;
-@@ -8699,7 +8699,7 @@
- 
-   /* Set error jump-back.  We come back here when the PNG library
-      detects an error.  */
-  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf(png_ptr)))
-     {
-     error:
-       if (png_ptr)
--- a/editors/emacs21/files/patch-src:Makefile.in
+++ b/editors/emacs21/files/patch-src:Makefile.in
@ -1,13 +0,0 @@
--- src/Makefile.in.orig	Mon Dec 17 23:09:32 2001
-+++ src/Makefile.in	Mon Oct 21 13:37:26 2002
-@@ -155,6 +155,10 @@
- /* This holds special options for linking temacs
-    that should be used for linking anything else.  */
- #ifndef LD_SWITCH_SYSTEM_TEMACS
-+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
-+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
-+#else
- #define LD_SWITCH_SYSTEM_TEMACS
-+#endif
- #endif
- 
--- a/editors/emacs21/files/patch-src:alloc.c
+++ b/editors/emacs21/files/patch-src:alloc.c
@ -1,45 +0,0 @@
--- src/alloc.c.orig	Thu Sep 12 13:50:01 2002
-+++ src/alloc.c	Thu Sep 12 13:48:11 2002
-@@ -685,6 +685,9 @@
- #endif /* GC_MALLOC_CHECK */
-   
-   __free_hook = old_free_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
-   free (ptr);
-   
-   /* If we released our reserve (due to running out of memory),
-@@ -728,6 +731,9 @@
- 
-   BLOCK_INPUT;
-   __malloc_hook = old_malloc_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
- #ifdef DOUG_LEA_MALLOC
-     mallopt (M_TOP_PAD, malloc_hysteresis * 4096);
- #else
-@@ -776,6 +782,9 @@
- 
-   BLOCK_INPUT;
-   __realloc_hook = old_realloc_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
- 
- #ifdef GC_MALLOC_CHECK
-   if (ptr)
-@@ -3723,8 +3732,12 @@
-   /* This trick flushes the register windows so that all the state of
-      the process is contained in the stack.  */
- #ifdef sparc
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
- #endif
-+#endif
-   
-   /* Save registers that we need to see on the stack.  We need to see
-      registers used to hold register variables and registers used to
--- a/editors/emacs21/files/patch-src:m:alpha.h
+++ b/editors/emacs21/files/patch-src:m:alpha.h
@ -1,11 +0,0 @@
--- src/m/alpha.h.orig	Mon Oct  2 23:30:39 2000
-+++ src/m/alpha.h	Wed Feb 13 09:05:57 2002
-@@ -198,7 +198,7 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- 
--- a/editors/emacs21/files/patch-src:m:amd64.h
+++ b/editors/emacs21/files/patch-src:m:amd64.h
@ -1,184 +0,0 @@
--- src/m/amd64.h~      Wed Dec 31 18:00:00 1969
-+++ src/m/amd64.h       Thu Dec 18 00:21:51 2003
-@@ -0,0 +1,181 @@
-+/* machine description file For the amd64 chip.
-+   Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 1, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+
-+/* The following line tells the configuration script what sort of
-+   operating system this machine is likely to run.
-+   USUAL-OPSYS="note"
-+
-+NOTE-START
-+Use -opsystem=freebsd
-+NOTE-END
-+
-+*/
-+
-+#define BITS_PER_LONG 64
-+#define BITS_PER_EMACS_INT 64
-+#ifndef _LP64
-+#define _LP64
-+#endif
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments.  */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+   does not define it automatically:
-+   Ones defined so far include vax, m68000, ns16000, pyramid,
-+   orion, tahoe, APOLLO and many others */
-+
-+/* __amd64__ defined automatically */
-+
-+
-+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines.  */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define the type to use.  */
-+#define EMACS_INT long
-+#define EMACS_UINT unsigned long
-+#define SPECIAL_EMACS_INT
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+   the 24-bit bit field into an int.  In other words, if bit fields
-+   are always unsigned.
-+
-+   If you use NO_UNION_TYPE, this flag does not matter.  */
-+
-+#undef EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+   and the one written in C should be used instead.
-+   Define HAVE_ALLOCA to say that the system provides a properly
-+   working alloca function and it should be used.
-+   Define neither one if an assembler-language alloca
-+   in the file alloca.s should be used.  */
-+
-+#define HAVE_ALLOCA
-+
-+/* GNU malloc and the relocating allocator do not work together
-+   with X.   [Who wrote that?]  */
-+
-+/* May 1995: reportedly [Rainer Schoepf <schoepf at uni-mainz.de>] both the
-+   system and the gnu malloc system work with "alpha-dec-osf3.0" and
-+   "alpha-dec-osf3.2".  */
-+
-+/* May 1995: it seems to me [Morten Welinder <terra at diku.dk>] that both
-+   mallocs work with "alpha-dec-osf2.0", but I daren't break anything
-+   right now.  Feel free to play if you want.  */
-+
-+/* #define SYSTEM_MALLOC */
-+
-+#ifdef __ELF__
-+/* With ELF, make sure that all common symbols get allocated to in the
-+   data section.  Otherwise, the dump of temacs may miss variables in
-+   the shared library that have been initialized.  For example, with
-+   GNU libc, __malloc_initialized would normally be resolved to the
-+   shared library's .bss section, which is fatal.  */
-+# ifdef __GNUC__
-+#  define C_SWITCH_MACHINE     -fno-common
-+# else
-+#  error What gives?  Fix me if DEC Unix supports ELF now.
-+# endif
-+#endif
-+
-+#if defined(__OpenBSD__)
-+#define ORDINARY_LINK
-+#endif
-+
-+#ifdef __ELF__
-+#undef UNEXEC
-+#define UNEXEC unexelf.o
-+#endif
-+
-+#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6
-+/* This controls a conditional in main.  */
-+#define LINUX_SBRK_BUG
-+#endif
-+
-+
-+#define PNTR_COMPARISON_TYPE unsigned long
-+
-+/* On the 64 bit architecture, we can use 60 bits for addresses */
-+
-+#define VALBITS         60
-+
-+
-+/* This definition of MARKBIT is necessary because of the comparison of
-+   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
-+
-+/* #define MARKBIT         0x8000000000000000L */
-+
-+
-+/* Define XINT and XUINT so that they can take arguments of type int */
-+
-+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+
-+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
-+
-+#define XPNTR(a) XUINT (a)
-+
-+#ifndef NOT_C_CODE
-+/* We need these because pointers are larger than the default ints.  */
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
-+#include <alloca.h>
-+#endif
-+#endif /* not NOT_C_CODE */
-+
-+/* On the Alpha it's best to avoid including TERMIO since struct
-+   termio and struct termios are mutually incompatible.  */
-+/* #define NO_TERMIO */
-+
-+#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
-+# define TEXT_END ({ extern int _etext; &_etext; })
-+# ifndef __ELF__
-+#  define COFF
-+#  define DATA_END ({ extern int _EDATA; &_EDATA; })
-+# endif /* notdef __ELF__ */
-+#endif
-+
-+#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
-+   they generate code that uses a signaling NaN instead of DBL_MIN.
-+   Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
-+   this avoids the assembler bug.  */
-+/* #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 */
--- a/editors/emacs21/files/patch-src:m:ia64.h
+++ b/editors/emacs21/files/patch-src:m:ia64.h
@ -1,19 +0,0 @@
--- src/m/ia64.h.orig	Fri Sep 29 06:00:37 2000
-+++ src/m/ia64.h	Sun Sep  5 11:57:57 2004
-@@ -147,7 +147,7 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-# if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+# if !defined(__NetBSD__) && !defined(__OpenBSD__)  && !defined(__FreeBSD__)
- #  include <alloca.h>
- # else
- #  include <stdlib.h>
-@@ -178,6 +178,6 @@
- 
- #endif /* not NOT_C_CODE */
- 
-#define DATA_SEG_BITS	0x6000000000000000
-+#define DATA_SEG_BITS	0x2000000000000000
- 
- #define HAVE_TEXT_START
--- a/editors/emacs21/files/patch-src:m:intel386.h
+++ b/editors/emacs21/files/patch-src:m:intel386.h
@ -1,11 +0,0 @@
--- src/m/intel386.h.orig	1997-08-30 09:18:39.000000000 +0200
-+++ src/m/intel386.h	2013-09-14 16:52:48.000000000 +0200
-@@ -57,7 +57,7 @@
- /* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-  * group of arguments and treat it as an array of the arguments.  */
- 
-/* #define NO_ARG_ARRAY */
-+#define NO_ARG_ARRAY
- 
- /* Define WORD_MACHINE if addresses and such have
-  * to be corrected before they can be used as byte counts.  */
--- a/editors/emacs21/files/patch-src:m:sparc.h
+++ b/editors/emacs21/files/patch-src:m:sparc.h
@ -1,11 +0,0 @@
--- src/m/sparc.h.orig	Thu Sep 12 02:25:09 2002
-+++ src/m/sparc.h	Thu Sep 12 12:33:36 2002
-@@ -89,7 +89,7 @@
- #define PURESIZE 130000
- #endif
- 
-#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
-+#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
- /* This really belongs in s/sun.h.  */
- 
- /* Say that the text segment of a.out includes the header;
--- a/editors/emacs21/files/patch-src:mem-limits.h
+++ b/editors/emacs21/files/patch-src:mem-limits.h
@ -1,11 +0,0 @@
--- src/mem-limits.h.~1~        Wed Mar  8 12:49:46 2000
-+++ src/mem-limits.h    Wed Dec 17 03:15:24 2003
-@@ -98,7 +98,7 @@
- static POINTER data_space_start;
-
- /* Number of bytes of writable memory we can expect to be able to get */
-static unsigned long lim_data;
-+static rlim_t lim_data;
-
- #ifdef NO_LIM_DATA
- static void
--- a/editors/emacs21/files/patch-src:process.c
+++ b/editors/emacs21/files/patch-src:process.c
@ -1,72 +0,0 @@
--- src/process.c.orig	Mon Mar 17 07:06:56 2003
-+++ src/process.c	Fri Apr 23 19:28:58 2004
-@@ -1891,10 +1891,34 @@
- 	   Likewise for immediate_quit.  */
- 	break;
- 
-+#if 1
-+      if ( (errno == EINTR ) || (errno == EINPROGRESS)){
-+	fd_set fds;
-+	int e;
-+	struct timeval tv;
-+	tv.tv_sec =60;
-+	tv.tv_usec = 0;
-+	FD_ZERO(&fds);
-+	FD_SET(s, &fds);
-+      resel:
-+        QUIT;
-+	e = select(s+1, NULL, &fds, NULL, &tv);
-+
-+	if( e == -1){
-+	  if(errno == EINTR)
-+	    goto resel;
-+	  else
-+	    xerrno = ETIMEDOUT;
-+	}
-+	else {
-+	  xerrno = 0;
-+	  break;
-+	}
-+      }
-+#endif
-+
-       immediate_quit = 0;
- 
-      if (xerrno == EINTR)
-	goto loop;
-       if (xerrno == EADDRINUSE && retry < 20)
- 	{
- 	  /* A delay here is needed on some FreeBSD systems,
-@@ -2001,10 +2025,30 @@
-     {
-       int xerrno = errno;
- 
-+#if 1
-+      if ( (errno == EINTR ) || (errno == EINPROGRESS)){
-+	fd_set fds;
-+	int e;
-+	struct timeval tv;
-+	tv.tv_sec =60;
-+	tv_tv_usec = 0;
-+	FD_CLEAR(&fds);
-+	FD_SET(s, &fds);
-+      resel:
-+        QUIT;
-+	e = select(s+1, NULL, fds, NULL, &tv);
-+	if( e != 0){
-+	  if(errno == EINTR)
-+	    goto resel;
-+	  else
-+	    xerrno = ETIMEDOUT;
-+	}
-+	else 
-+	  xerrno = 0;
-+      }
-+#endif
-       immediate_quit = 0;
- 
-      if (errno == EINTR)
-	goto loop;
-       if (errno == EADDRINUSE && retry < 20)
- 	{
- 	  /* A delay here is needed on some FreeBSD systems,
--- a/editors/emacs21/files/patch-src:s:freebsd.h
+++ b/editors/emacs21/files/patch-src:s:freebsd.h
@ -1,14 +0,0 @@
--- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
-+++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
-@@ -68,6 +68,11 @@
- #define LIBS_SYSTEM -lutil
- #if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
-+#else
-+#ifdef HAVE_LIBNCURSES
-+#define TERMINFO
-+#define LIBS_TERMCAP -lncurses
-+#endif
- #endif
- 
- #define SYSV_SYSTEM_DIR
--- a/editors/emacs21/files/patch-src:utmpx.c
+++ b/editors/emacs21/files/patch-src:utmpx.c
@ -1,35 +0,0 @@
--- src/filelock.c.orig	2008-01-07 23:30:11.000000000 -0500
-+++ src/filelock.c	2010-02-12 18:40:07.000000000 -0500
-@@ -64,7 +64,13 @@
- 
- #ifdef CLASH_DETECTION
- 
-+#if __FreeBSD_version >= 900007
-+#include <utmpx.h>
-+#undef BOOT_TIME
-+#define ut_time ut_tv.tv_sec
-+#else
- #include <utmp.h>
-+#endif
- 
- #if !defined (S_ISLNK) && defined (S_IFLNK)
- #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-@@ -253,13 +259,17 @@
-    the first reboot record otherwise.
-    Ignore all reboot records on or before BOOT_TIME.
-    Success is indicated by setting BOOT_TIME to a larger value.  */
-
- void
- get_boot_time_1 (filename, newest)
-      char *filename;
-      int newest;
- {
-+#if __FreeBSD_version >= 900007
-+  struct utmpx ut, *utp;
-+#else
-   struct utmp ut, *utp;
-+#endif
-+
-   int desc;
- 
-   if (filename)
--- a/editors/emacs21/files/patch-src:xterm.c
+++ b/editors/emacs21/files/patch-src:xterm.c
@ -1,42 +0,0 @@
--- src/xterm.c.orig	Tue Oct 15 23:21:45 2002
-+++ src/xterm.c	Wed Aug 31 09:18:48 2005
-@@ -118,8 +118,6 @@
- #ifdef HAVE_XAW3D
- #include <X11/Xaw3d/Simple.h>
- #include <X11/Xaw3d/Scrollbar.h>
-#define ARROW_SCROLLBAR
-#include <X11/Xaw3d/ScrollbarP.h>
- #else /* !HAVE_XAW3D */
- #include <X11/Xaw/Simple.h>
- #include <X11/Xaw/Scrollbar.h>
-@@ -8863,30 +8861,12 @@
- 	  XawScrollbarSetThumb (widget, top, shown);
- 	else
- 	  {
-#ifdef HAVE_XAW3D
-	    ScrollbarWidget sb = (ScrollbarWidget) widget;
-	    int scroll_mode = 0;
-	    
-	    /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR.  */
-	    if (xaw3d_arrow_scroll)
-	      {
-		/* Xaw3d stupidly ignores resize requests while dragging
-		   so we have to make it believe it's not in dragging mode.  */
-		scroll_mode = sb->scrollbar.scroll_mode;
-		if (scroll_mode == 2)
-		  sb->scrollbar.scroll_mode = 0;
-	      }
-#endif
- 	    /* Try to make the scrolling a tad smoother.  */
- 	    if (!xaw3d_pick_top)
- 	      shown = min (shown, old_shown);
- 	    
- 	    XawScrollbarSetThumb (widget, top, shown);
- 	    
-#ifdef HAVE_XAW3D
-	    if (xaw3d_arrow_scroll && scroll_mode == 2)
-	      sb->scrollbar.scroll_mode = scroll_mode;
-#endif
- 	  }
-       }
-   }
--- a/editors/emacs21/files/patch-src:xterm.h
+++ b/editors/emacs21/files/patch-src:xterm.h
@ -1,11 +0,0 @@
--- src/xterm.h.orig	Mon Feb 28 13:53:40 2005
-+++ src/xterm.h	Mon Feb 28 13:53:57 2005
-@@ -21,8 +21,8 @@
- 
- #include <X11/Xlib.h>
- #include <X11/cursorfont.h>
-#include <X11/Xutil.h>
- #include <X11/keysym.h>
-+#include <X11/Xutil.h>
- #include <X11/Xatom.h>
- #include <X11/Xresource.h>
--- a/editors/emacs21/files/patch-src_dispnew.c
+++ b/editors/emacs21/files/patch-src_dispnew.c
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- src/dispnew.c.orig
-+++ src/dispnew.c
-@@ -1256,7 +1256,7 @@
- /* Copy glyph row structure FROM to glyph row structure TO, except
-    that glyph pointers in the structures are left unchanged.  */
- 
-INLINE void
-+static INLINE void
- copy_row_except_pointers (to, from)
-      struct glyph_row *to, *from;
- {
--- a/editors/emacs21/files/patch-src_syntax.c
+++ b/editors/emacs21/files/patch-src_syntax.c
@ -1,23 +0,0 @@
-
-$FreeBSD$
-
--- src/syntax.c.orig
-+++ src/syntax.c
-@@ -316,7 +316,7 @@
- /* Return the bytepos one character after BYTEPOS.
-    We assume that BYTEPOS is not at the end of the buffer.  */
- 
-INLINE int
-+static INLINE int
- inc_bytepos (bytepos)
-      int bytepos;
- {
-@@ -330,7 +330,7 @@
- /* Return the bytepos one character before BYTEPOS.
-    We assume that BYTEPOS is not at the start of the buffer.  */
- 
-INLINE int
-+static INLINE int
- dec_bytepos (bytepos)
-      int bytepos;
- {
--- a/editors/emacs21/pkg-descr
+++ b/editors/emacs21/pkg-descr
@ -1,15 +0,0 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
-
-WWW: http://www.gnu.org/software/emacs/
--- a/editors/emacs21/pkg-message
+++ b/editors/emacs21/pkg-message
@ -1,15 +0,0 @@
-********************************************************************
-* NOTE:                                                            *
-*   This package does not include                                  *
-*     LEIM: Libraries of Emacs Input Method                        *
-*   package.                                                       *
-*   You can find leim port in the following directory:             *
-*     ${PORTSDIR}/editors/leim21                                    *
-*                                                                  *
-*   If you want to use multibyte characters in the menubar,        *
-*     make WITH_MENUBAR_FONTSET=yes install                        *
-*   then set fontset in ~/.Xresources as                           *
-*     Emacs*menubar*fontSet: -misc-fixed-medium-r-normal--14-130-* *
-*   and set coding system for it appropriately in ~/.emacs like    *
-*     (setq menu-coding-system 'euc-jp)                            *
-********************************************************************
--- a/editors/emacs21/pkg-plist
+++ b/editors/emacs21/pkg-plist
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@ -1,90 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
-# $FreeBSD$
-
-PORTNAME=	emacs
-PORTVERSION=	${EMACS_VER}
-PORTREVISION=	7
-PORTEPOCH=	1
-CATEGORIES=	editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	22
-
-MAINTAINER=	ashish@FreeBSD.org
-COMMENT=	GNU editing macros
-
-.if !defined(WITHOUT_X11)
-.if defined(WITHOUT_GTK)
-LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-.endif
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
-		tiff:${PORTSDIR}/graphics/tiff \
-		gif:${PORTSDIR}/graphics/giflib \
-		png15:${PORTSDIR}/graphics/png
-.endif
-
-CONFLICTS=	emacs-19.* emacs21-* emacs23-* emacs24-* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
-		emacs-devel-* emacs-nox11-*
-
-EMACS_VER=	22.3
-GNU_CONFIGURE=	yes
-USES=		gmake makeinfo pkgconfig
-
-.if !defined(WITHOUT_X11)
-.if !defined(WITHOUT_GTK)
-USE_GNOME=	gtk20
-.else
-USE_XORG=	x11
-.endif
-USE_XORG=	xpm xft
-.endif
-
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS=		--with-x=no
-.else
-.if !defined(WITHOUT_GTK)
-CONFIGURE_ARGS=		--with-gtk
-.endif
-.endif
-
-.if defined(WITHOUT_XIM)
-CONFIGURE_ARGS+=	--without-xim
-.endif
-
-PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
-
-MAKE_ENV=	LC_ALL=C
-
-INFO=		ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
-		efaq eintr elisp emacs-mime emacs erc eshell eudc \
-		flymake forms gnus idlwave message mh-e newsticker \
-		org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar \
-		tramp url vip viper widget woman
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-BROKEN=	Emacs 22.X does not currently build on ia64
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_X11) && !defined(WITHOUT_GTK)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To disable GTK+ interface support, define WITHOUT_X11 or WITHOUT_GTK"
-	@${ECHO_MSG} "====>"
-.endif
-.if !defined(WITHOUT_X11) && !defined(WITHOUT_XIM)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To disable X11 Input Method support, define WITHOUT_XIM"
-	@${ECHO_MSG} "====>"
-.endif
-
-post-patch:
-	@${RM} -f ${WRKSRC}/info/*
-
-post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/info/info*
-
-.include <bsd.port.post.mk>
--- a/editors/emacs22/distinfo
+++ b/editors/emacs22/distinfo
@ -1,2 +0,0 @@
-SHA256 (emacs-22.3.tar.gz) = 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
-SIZE (emacs-22.3.tar.gz) = 39587396
--- a/editors/emacs22/files/patch-Makefile.in
+++ b/editors/emacs22/files/patch-Makefile.in
@ -1,39 +0,0 @@
--- Makefile.in.orig	2008-09-07 05:23:59.000000000 +0300
-+++ Makefile.in	2008-09-07 05:23:59.000000000 +0300
-@@ -419,14 +419,6 @@
- ## That flag is also used in leim/Makefile.in
- install-arch-indep: mkdir info
- 	-set ${COPYDESTS} ; \
-	unset CDPATH; \
-	for dir in ${COPYDIR} ; do \
-	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
-	    rm -rf $$1 ; \
-	  fi ; \
-	  shift ; \
-	done
-	-set ${COPYDESTS} ; \
- 	mkdir ${COPYDESTS} ; \
- 	chmod ugo+rx ${COPYDESTS} ; \
- 	unset CDPATH; \
-@@ -513,9 +505,9 @@
- 	   fi; \
- 	   cd ${srcdir}/info ; \
- 	   for elt in $(INFO_FILES); do \
-	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
-	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
-	        chmod a+r $(DESTDIR)${infodir}/$$f; \
-+	      for f in `ls $$elt 2>/dev/null`; do \
-+	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f.info; \
-+	        chmod a+r $(DESTDIR)${infodir}/$$f.info; \
- 	      done; \
- 	   done); \
- 	else true; fi
-@@ -525,7 +517,7 @@
- 	then \
- 	  for elt in $(INFO_FILES); do \
- 	    (cd $${thisdir}; \
-	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-+	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt.info); \
- 	  done; \
- 	else true; fi
- 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
--- a/editors/emacs22/files/patch-lispintro-Makefile.in
+++ b/editors/emacs22/files/patch-lispintro-Makefile.in
@ -1,11 +0,0 @@
--- lispintro/Makefile.in.orig	2008-09-07 05:24:38.000000000 +0300
-+++ lispintro/Makefile.in	2008-09-07 05:24:38.000000000 +0300
-@@ -34,7 +34,7 @@
- INFO_TARGETS = ${infodir}/eintr
- DVI_TARGETS = emacs-lisp-intro.dvi
- 
-MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- TEXI2DVI = texi2dvi
- DVIPS = dvips
- 
--- a/editors/emacs22/files/patch-lispref-Makefile.in
+++ b/editors/emacs22/files/patch-lispref-Makefile.in
@ -1,38 +0,0 @@
--- lispref/Makefile.in.orig	2008-09-07 05:24:57.000000000 +0300
-+++ lispref/Makefile.in	2008-09-07 05:24:57.000000000 +0300
-@@ -33,7 +33,7 @@
- TEXI2DVI = texi2dvi
- SHELL = /bin/sh
- INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- 
- # The name of the manual:
- VERSION=2.9
-@@ -110,7 +110,7 @@
- # This is for use in a separate distro of the Emacs Lisp manual.
- install: elisp
- 	$(srcdir)/mkinstalldirs $(infodir)
-	cp elisp elisp-[1-9] elisp-[1-9][0-9] $(infodir)
-+	cp elisp $(infodir)
- 	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
- 
- # This is for use in a separate distro of the Emacs Lisp manual.
-@@ -126,7 +126,7 @@
- 
- maintainer-clean: clean
- 	rm -f elisp.dvi elisp.oaux
-	cd $(infodir); rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
-+	cd $(infodir); rm -f elisp
- 
- dist: $(infodir)/elisp elisp.dvi
- 	-rm -rf temp
-@@ -136,7 +136,7 @@
-  $(srcdir)/Makefile.in $(srcs) \
-  $(srcdir)/../man/texinfo.tex \
-  elisp.dvi elisp.aux elisp.??s \
- $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
-+ $(infodir)/elisp \
-  temp/$(manual)
- 	-(cd temp/$(manual); rm -f mkinstalldirs)
- 	cp $(srcdir)/mkinstalldirs temp/$(manual)
--- a/editors/emacs22/files/patch-man-Makefile.in
+++ b/editors/emacs22/files/patch-man-Makefile.in
@ -1,11 +0,0 @@
--- ./man/Makefile.in.orig	Sat May  6 18:54:21 2006
-+++ ./man/Makefile.in	Fri Sep  1 21:10:08 2006
-@@ -32,7 +32,7 @@
- 
- # The makeinfo program is part of the Texinfo distribution.
- # Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
-+MAKEINFO = makeinfo --force --no-split
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
--- a/editors/emacs22/files/patch-src-filelock.c
+++ b/editors/emacs22/files/patch-src-filelock.c
@ -1,86 +0,0 @@
-
-$FreeBSD$
-
--- src/filelock.c.orig
-+++ src/filelock.c
-@@ -64,7 +64,12 @@
- 
- #ifdef CLASH_DETECTION
- 
-+#if __FreeBSD_version >= 900007
-+#include <utmpx.h>
-+#define ut_time ut_tv.tv_sec
-+#else
- #include <utmp.h>
-+#endif
- 
- #if !defined (S_ISLNK) && defined (S_IFLNK)
- #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-@@ -253,13 +258,17 @@
-    the first reboot record otherwise.
-    Ignore all reboot records on or before BOOT_TIME.
-    Success is indicated by setting BOOT_TIME to a larger value.  */
-
- void
- get_boot_time_1 (filename, newest)
-      char *filename;
-      int newest;
- {
-+#if __FreeBSD_version >= 900007
-+  struct utmpx ut, *utp;
-+#else
-   struct utmp ut, *utp;
-+#endif
-+
-   int desc;
- 
-   if (filename)
-@@ -272,16 +281,28 @@
- 
-       emacs_close (desc);
- 
-+#if __FreeBSD_version >= 900007
-+	  setutxdb (UTXDB_ACTIVE, filename);
-+#else
-       utmpname (filename);
-+#endif
-     }
- 
-+#if __FreeBSD_version >= 900007
-+  setutxent ();
-+#else
-   setutent ();
-+#endif
- 
-   while (1)
-     {
-       /* Find the next reboot record.  */
-       ut.ut_type = BOOT_TIME;
-+#if __FreeBSD_version >= 900007
-+      utp = getutxid (&ut);
-+#else
-       utp = getutid (&ut);
-+#endif
-       if (! utp)
- 	break;
-       /* Compare reboot times and use the newest one.  */
-@@ -293,11 +314,19 @@
- 	}
-       /* Advance on element in the file
- 	 so that getutid won't repeat the same one.  */
-+#if __FreeBSD_version >= 900007
-+	  utp = getutxent ();
-+#else
-       utp = getutent ();
-+#endif
-       if (! utp)
- 	break;
-     }
-+#if __FreeBSD_version >= 900007
-+  endutxent();
-+#else
-   endutent ();
-+#endif
- }
- #endif /* BOOT_TIME */
- 
--- a/editors/emacs22/files/patch-src-image.c
+++ b/editors/emacs22/files/patch-src-image.c
@ -1,65 +0,0 @@
--- src/image.c.orig	2008-08-26 00:18:33.000000000 +0200
-+++ src/image.c	2012-06-03 11:17:01.000000000 +0200
-@@ -6338,7 +6338,7 @@
- /* PNG library details.  */
- 
- DEF_IMGLIB_FN (png_get_io_ptr);
-DEF_IMGLIB_FN (png_check_sig);
-+DEF_IMGLIB_FN (png_sig_cmp);
- DEF_IMGLIB_FN (png_create_read_struct);
- DEF_IMGLIB_FN (png_create_info_struct);
- DEF_IMGLIB_FN (png_destroy_read_struct);
-@@ -6369,7 +6369,7 @@
-     return 0;
- 
-   LOAD_IMGLIB_FN (library, png_get_io_ptr);
-  LOAD_IMGLIB_FN (library, png_check_sig);
-+  LOAD_IMGLIB_FN (library, png_sig_cmp);
-   LOAD_IMGLIB_FN (library, png_create_read_struct);
-   LOAD_IMGLIB_FN (library, png_create_info_struct);
-   LOAD_IMGLIB_FN (library, png_destroy_read_struct);
-@@ -6394,7 +6394,7 @@
- #else
- 
- #define fn_png_get_io_ptr		png_get_io_ptr
-#define fn_png_check_sig		png_check_sig
-+#define fn_png_sig_cmp			png_sig_cmp
- #define fn_png_create_read_struct	png_create_read_struct
- #define fn_png_create_info_struct	png_create_info_struct
- #define fn_png_destroy_read_struct	png_destroy_read_struct
-@@ -6427,7 +6427,7 @@
- {
-   xassert (png_ptr != NULL);
-   image_error ("PNG error: %s", build_string (msg), Qnil);
-  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf(png_ptr), 1);
- }
- 
- 
-@@ -6541,7 +6541,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
-	  || !fn_png_check_sig (sig, sizeof sig))
-+	  || fn_png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -6558,7 +6558,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
-	  || !fn_png_check_sig (tbr.bytes, sizeof sig))
-+	  || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;
-@@ -6603,7 +6603,7 @@
- 
-   /* Set error jump-back.  We come back here when the PNG library
-      detects an error.  */
-  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf(png_ptr)))
-     {
-     error:
-       if (png_ptr)
--- a/editors/emacs22/files/patch-src__alloc.c
+++ b/editors/emacs22/files/patch-src__alloc.c
@ -1,45 +0,0 @@
--- src/alloc.c.orig	2008-08-12 20:35:44.000000000 +0200
-+++ src/alloc.c	2013-09-07 21:52:46.000000000 +0200
-@@ -1205,6 +1205,9 @@
- #endif /* GC_MALLOC_CHECK */
- 
-   __free_hook = old_free_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
-   free (ptr);
- 
-   /* If we released our reserve (due to running out of memory),
-@@ -1236,6 +1239,9 @@
- 
-   BLOCK_INPUT_ALLOC;
-   __malloc_hook = old_malloc_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
- #ifdef DOUG_LEA_MALLOC
-     mallopt (M_TOP_PAD, malloc_hysteresis * 4096);
- #else
-@@ -1285,6 +1291,9 @@
- 
-   BLOCK_INPUT_ALLOC;
-   __realloc_hook = old_realloc_hook;
-+#ifdef __GNUC__
-+  __asm __volatile ("" : : : "memory");
-+#endif
- 
- #ifdef GC_MALLOC_CHECK
-   if (ptr)
-@@ -4573,8 +4582,12 @@
-      needed on ia64 too.  See mach_dep.c, where it also says inline
-      assembler doesn't work with relevant proprietary compilers.  */
- #ifdef __sparc__
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
- #endif
-+#endif
- 
-   /* Save registers that we need to see on the stack.  We need to see
-      registers used to hold register variables and registers used to
--- a/editors/emacs22/files/patch-srcmintel386.h
+++ b/editors/emacs22/files/patch-srcmintel386.h
@ -1,11 +0,0 @@
--- src/m/intel386.h.orig	2008-02-28 00:32:04.000000000 +0100
-+++ src/m/intel386.h	2013-09-14 16:14:18.000000000 +0200
-@@ -58,7 +58,7 @@ NOTE-END */
- /* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-  * group of arguments and treat it as an array of the arguments.  */
- 
-/* #define NO_ARG_ARRAY */
-+#define NO_ARG_ARRAY
- 
- /* Define WORD_MACHINE if addresses and such have
-  * to be corrected before they can be used as byte counts.  */
--- a/editors/emacs22/pkg-descr
+++ b/editors/emacs22/pkg-descr
@ -1,15 +0,0 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
-
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser.  It is easily
-extensible since its editing commands are written in Lisp.
-
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
-
-WWW: http://www.gnu.org/software/emacs/
--- a/editors/emacs22/pkg-plist
+++ b/editors/emacs22/pkg-plist
--- a/editors/flim-emacs21/Makefile
+++ b/editors/flim-emacs21/Makefile
@ -1,16 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	FLIM, message representation or encoding elisp library for emacs21
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/flim
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/flim-emacs22/Makefile
+++ b/editors/flim-emacs22/Makefile
@ -1,16 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	FLIM, message representation or encoding elisp library for emacs22
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/flim
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs22
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/semi-emacs21/Makefile
+++ b/editors/semi-emacs21/Makefile
@ -1,16 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs21
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/semi
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/semi-emacs22/Makefile
+++ b/editors/semi-emacs22/Makefile
@ -1,16 +0,0 @@
-# Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs22
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/semi
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs22
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@ -15,7 +15,6 @@ MAINTAINER=	dryice@dryice.name
 COMMENT=	Quick access to files and tags in an Emacs frame

 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21

 USES=		gmake
 CONFLICTS=	cedet*
--- a/graphics/xface.el/Makefile
+++ b/graphics/xface.el/Makefile
@ -19,15 +19,9 @@ COMMENT=	X-Face encoder/decoder/viewer for Emacsen
 RUN_DEPENDS=	compface:${PORTSDIR}/mail/faces

 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21

 LISP_FILES=	x-face
-.if (${EMACS_PORT_NAME} == emacs21)
-LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/x-face
-LISP_FILES+=	x-face-e21
-PLIST_SUB+=	E21_ONLY="" \
-		XEMACS_ONLY="@comment "
-.elif (${EMACS_PORT_NAME} == xemacs21 || ${EMACS_PORT_NAME} == xemacs21-mule)
+.if (${EMACS_PORT_NAME} == xemacs21 || ${EMACS_PORT_NAME} == xemacs21-mule)
 LISPDIR=	${EMACS_SITE_LISPDIR}/x-face
 LISP_FILES+=	x-face-xmas
 PLIST_SUB+=	E21_ONLY="@comment " \
@ -42,17 +36,6 @@ PLIST_SUB+=	LISPDIR=${LISPDIR} \

 OPTIONS_DEFINE=	DOCS

-post-extract:
-.if (${EMACS_PORT_NAME} == emacs21)
-	${CP} ${DISTDIR}/x-face-e21.el.gz ${WRKSRC}
-	${GUNZIP_CMD} ${WRKSRC}/x-face-e21.el.gz
-.endif
-post-build:
-.if (${EMACS_PORT_NAME} == emacs21)
-	(cd ${WRKSRC}; \
-	${EMACS_CMD} -batch -q -no-site-file \
-	-f batch-byte-compile x-face-e21.el)
-.endif
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${LISPDIR}
 .for i in ${LISP_FILES}
--- a/irc/Makefile
+++ b/irc/Makefile
@ -105,7 +105,6 @@
    SUBDIR += ratbox-services
    SUBDIR += rbot
    SUBDIR += riece
-    SUBDIR += riece-emacs21
    SUBDIR += roxirc
    SUBDIR += ruby-irc
    SUBDIR += ruby-rica
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@ -1,8 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../riece
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-
-.include "${MASTERDIR}/Makefile"
--- a/japanese/Makefile
+++ b/japanese/Makefile
@ -54,7 +54,6 @@
    SUBDIR += egg-canna
    SUBDIR += eijiro-fpw
    SUBDIR += elisa8x8
-    SUBDIR += emacs-emcws
    SUBDIR += epwutil
    SUBDIR += esecanna
    SUBDIR += esecanna-module-vje25
@ -152,7 +151,6 @@
    SUBDIR += libtomoe-gtk
    SUBDIR += lipsf
    SUBDIR += lookup
-    SUBDIR += lookup-emacs21
    SUBDIR += lsd-fpw
    SUBDIR += lynx
    SUBDIR += lynx-current
@ -168,8 +166,6 @@
    SUBDIR += mg
    SUBDIR += mh
    SUBDIR += migemo
-    SUBDIR += migemo-emacs21
-    SUBDIR += migemo-emacs22
    SUBDIR += migemo-emacs23
    SUBDIR += migemo-xemacs-devel-mule
    SUBDIR += mikachan-ttfonts
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@ -1,221 +0,0 @@
-# Created by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
-# $FreeBSD$
-
-PORTNAME=	emcws
-PORTVERSION=	${EMACS_VER}
-PORTREVISION=	16
-CATEGORIES=	japanese editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	emacs
-DISTNAME=	emacs-${PORTVERSION}
-
-PATCH_SITES=	ftp://ftp.ki.nu/pub/emcws/ \
-		ftp://ftp.jpl.org/pub/misc/
-PATCHFILES=	emcws-${EMACS_VER}-20031213.gz
-PATCH_DIST_STRIP=	-p1
-.if defined(WITH_MENUBAR_FONTSET)
-PATCH_SITES+=		http://www.nijino.com/ari/emacs/
-PATCHFILES+=		emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
-.endif
-
-MAINTAINER=	nakaji@jp.freebsd.org
-COMMENT=	Emacs + Canna + Wnn + Sj3
-
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
-
-USE_EMACS=		yes
-EMACS_PORT_NAME=	emacs21
-
-CONFLICTS=	emacs-19.* emacs-20.* emacs-22.* \
-		ja-emcws-20.* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
-
-WRKSRC=		${WRKDIR}/emacs-${EMACS_VER}
-
-USE_AUTOTOOLS=	autoconf213
-USES=		gmake
-
-# Change these as you like.
-WITH_WNN6?=	NO
-WITH_WNN7?=	YES
-WITH_FREEWNN?=	NO
-WITH_CANNA?=	YES
-WITH_SJ3?=	NO
-
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-
-.if !defined(NO_X11)
-CONFIGURE_ARGS=	--with-x-toolkit --with-pop
-USE_XORG=	x11 xaw
-.else
-CONFIGURE_ARGS=	--with-x=no --with-pop
-.endif
-
-.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES")
-CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
-		--with-wnn-libraries=${LOCALBASE}/lib/libwnn6.so
-LIB_DEPENDS+=	wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
-.endif
-
-.if (${WITH_WNN7} == "yes" || ${WITH_WNN7} == "YES")
-CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn7/wnn \
-		--with-wnn-libraries=${LOCALBASE}/lib/libwnn7.so
-LIB_DEPENDS+=	wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
-.endif
-
-.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
-CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
-		--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
-LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
-.endif
-
-.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
-CONFIGURE_ARGS+=	--with-canna \
-			--with-canna-includes=${LOCALBASE}/include \
-			--with-canna-libraries=${LOCALBASE}/lib
-LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/canna-lib
-.endif
-
-.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
-CONFIGURE_ARGS+=	--with-sj3
-BUILD_DEPENDS+=		sj3serv:${PORTSDIR}/japanese/sj3-lib
-.endif
-
-DOC_FILE=	DOC-EMCWS-${EMACS_VER}.1
-EMCWS_ELCS=	busyu.el \
-		can-n-egg.el \
-		canna.el \
-		egg-jsymbol.el \
-		egg-keymap.el \
-		egg.el \
-		eggrc-sj3 \
-		eggrc-v41 \
-		eggrc-wnn \
-		isearch-ext.el \
-		isearch-ext.elc \
-		its/han-kata.el \
-		its/hankaku.el \
-		its/hira.el \
-		its/kanainput.el \
-		its/kata.el \
-		its/zenkaku.el \
-		mule-inst.el \
-		sj3-client.el \
-		sj3-egg.el \
-		wnn-client.el \
-		wnn-egg.el
-
-.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_WNN7} == "yes" || ${WITH_WNN7} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
-EMCWS_ELCS+=	egg.elc \
-		wnn-egg.elc
-PLIST_SUB+=	WITH_WNN=""
-.else
-PLIST_SUB+=	WITH_WNN="@comment "
-.endif
-
-.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
-EMCWS_ELCS+=	canna.elc
-PLIST_SUB+=	WITH_CANNA=""
-.else
-PLIST_SUB+=	WITH_CANNA="@comment "
-.endif
-
-.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
-EMCWS_ELCS+=	sj3-client.elc \
-		sj3-egg.elc
-PLIST_SUB+=	WITH_SJ3=""
-.else
-PLIST_SUB+=	WITH_SJ3="@comment "
-.endif
-
-MULE_PATCHED_ELS=	help.el help.elc \
-			international/ccl.el international/mule-cmds.el \
-			international/mule-conf.el international/mule.el \
-			international/titdic-cnv.el \
-			international/ccl.elc international/mule-cmds.elc \
-			international/mule.elc \
-			international/titdic-cnv.elc \
-			loaddefs.el loadup.el
-
-PLIST_SUB+=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \
-		DOC_FILE=${DOC_FILE}
-
-SCRIPTS_ENV=	SED=${SED} MV=${MV} \
-		DOC_FILE=${DOC_FILE}
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-BROKEN=		Segfault during build on ia64
-CFLAGS:=	${CFLAGS:C/-O.?/-O0/g}
-.endif
-
-pre-everything::
-	@${CAT} ${FILESDIR}/emcws-message
-.if !defined(WITH_MENUBAR_FONTSET)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To enable menubar fontset support, define WITH_MENUBAR_FONTSET"
-	@${ECHO_MSG} "====>"
-.endif
-
-pre-build:
-	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
-	${RM} -rf ${WRKSRC}/info/*
-	@(cd ${WRKSRC}/src/../lisp; \
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${EMACS_CMD})
-	@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
-	@(cd ${WRKSRC}/src/../lisp; \
-	${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \
-	egg.el wnn-egg.el \
-	help.el international/ccl.el international/mule-cmds.el \
-	international/mule.el international/titdic-cnv.el)
-	${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1
-	${RM} -f ${WRKSRC}/etc/${DOC_FILE}
-	${RM} -f ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/emacs ${PREFIX}/bin/emcws-${EMACS_VER}
-	@${RM} -f ${PREFIX}/bin/emcws
-	@${LN} ${PREFIX}/bin/emcws-${EMACS_VER} ${PREFIX}/bin/emcws
-	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc || \
-		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc
-	@${INSTALL_DATA} ${WRKSRC}/etc/${DOC_FILE} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc/${DOC_FILE}
-	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its || \
-		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its
-	@for i in ${EMCWS_ELCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/lisp/$$i \
-		${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \
-	done
-	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/international || \
-		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/international
-	@for i in ${MULE_PATCHED_ELS}; do \
-		${INSTALL_DATA} ${WRKSRC}/lisp/$$i \
-		${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \
-	done
-	@test -d ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} || \
-		${MKDIR} ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
-	@${INSTALL_DATA} ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el \
-		${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/fns-emcws-${EMACS_VER}.1.el
-	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \
-		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp
-	@if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ]; then \
-	  (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-	   ${ECHO_CMD} "    (normal-top-level-add-subdirs-to-load-path))") \
-	  > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ; \
-	fi
-	@if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ]; then \
-	  (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-	   ${ECHO_CMD} "    (normal-top-level-add-subdirs-to-load-path))") \
-	  > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ; \
-	fi
-
-post-install:
-.if defined(WITH_MENUBAR_FONTSET)
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To use Japanese menu, you need menu-tree.el which is available from http://www.is.titech.ac.jp/~yagi/emacs/menu-tree.el"
-	@${ECHO_MSG} "====>"
-.endif
-
-.include <bsd.port.post.mk>
--- a/japanese/emacs-emcws/distinfo
+++ b/japanese/emacs-emcws/distinfo
@ -1,8 +0,0 @@
-SHA256 (emacs-21.3.tar.gz) = 95364d2478349d48015cb58433cd890f2a9548d32c9e5813f9dab2b2f9fbea90
-SIZE (emacs-21.3.tar.gz) = 20399831
-SHA256 (emcws-21.3-20031213.gz) = 8d6ea57a037807336e8b74b4b916d981bd7934ce45d91523c02fc155889ff546
-SIZE (emcws-21.3-20031213.gz) = 190300
-SHA256 (emacs-21.1-fontset.patch) = 05820a588065a2975843febe3a407e1286c2f06abeac78fb7754317ce83d8b53
-SIZE (emacs-21.1-fontset.patch) = 8647
-SHA256 (emacs-21.2-menu-encode.patch) = aa63732d15596f1683960a69dd8c02a04ac74cac6401d9995803d67b62177df8
-SIZE (emacs-21.2-menu-encode.patch) = 3517
--- a/japanese/emacs-emcws/files/emcws-message
+++ b/japanese/emacs-emcws/files/emcws-message
@ -1,17 +0,0 @@
-****************************************************************************
- NOTE: Warning message about Emcws
-
- You can define which input method you use with following variables.
-
-	WITH_WNN6	to use Wnn6
-	WITH_WNN7	to use Wnn7
-	WITH_FREEWNN	to use FreeWnn
-	WITH_CANNA	to use Canna
-	WITH_SJ3	to use sj3
-
- In default, WITH_WNN7 and WITH_CANNA are set.
-
- If you want to use Emcws with Canna and FreeWnn, run
-
-	make install WITH_FREEWNN=yes WITH_CANNA=yes
-****************************************************************************
--- a/japanese/emacs-emcws/files/patch-Makefile.in
+++ b/japanese/emacs-emcws/files/patch-Makefile.in
@ -1,17 +0,0 @@
--- Makefile.in.orig	Thu Mar  7 00:13:23 2002
-+++ Makefile.in	Thu Mar  7 00:14:30 2002
-@@ -348,14 +348,6 @@
- ## as a workaround for a bug in tar on Ultrix 4.2.
- install-arch-indep: mkdir info
- 	-set ${COPYDESTS} ; \
-	unset CDPATH; \
-	for dir in ${COPYDIR} ; do \
-	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
-	    rm -rf $$1 ; \
-	  fi ; \
-	  shift ; \
-	done
-	-set ${COPYDESTS} ; \
- 	mkdir ${COPYDESTS} ; \
- 	chmod ugo+rx ${COPYDESTS} ; \
- 	unset CDPATH; \
--- a/japanese/emacs-emcws/files/patch-configure.in
+++ b/japanese/emacs-emcws/files/patch-configure.in
@ -1,60 +0,0 @@
--- configure.in.orig	Fri Mar 19 11:20:26 2004
-+++ configure.in	Fri Mar 19 11:22:24 2004
-@@ -36,18 +36,26 @@
- dnl A case that the LEIM package does not exist.
- dnl
-   locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
-'${datadir}/emacs/site-lisp'
-+'${datadir}/emacs/site-lisp:'\
-+'${datadir}/emacs/${version}/site-lisp:'\
-+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
-+'${datadir}/emacs/${version}/lisp'
- else
- dnl
- dnl A case that the LEIM package exists.
- dnl
-   locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim'
-+'${datadir}/emacs/site-lisp:'\
-+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim:'\
-+'${datadir}/emacs/${version}/site-lisp:'\
-+'${datadir}/emacs/${version}/leim:'\
-+'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
-+'${datadir}/emacs/${version}/lisp'
- fi
- 
- lisppath='${locallisppath}:${lispdir}'
-etcdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
-archlibdir='${libexecdir}/emacs/${version}$(EMACS_POSTFIX)/${configuration}'
-+etcdir='${datadir}/emacs/${version}/etc'
-+archlibdir='${libexecdir}/emacs/${version}/${configuration}'
- docdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
- 
- AC_ARG_WITH(gcc,
-@@ -224,6 +232,18 @@
- machine='' opsys='' unported=no
- case "${canonical}" in
- 
-+  ## FreeBSD ports
-+  *-*-freebsd* )
-+    opsys=freebsd
-+    case "${canonical}" in
-+      alpha*-*-freebsd*)       machine=alpha ;;
-+      amd64-*-freebsd*)        machine=amd64 ;;
-+      ia64-*-freebsd*)         machine=ia64 ;;
-+      i[3456]86-*-freebsd*)    machine=intel386 ;;
-+      sparc64-*-freebsd*)      machine=sparc ;;
-+    esac
-+  ;;
-+
-   ## NetBSD ports
-   *-*-netbsd* )
-     opsys=netbsd
-@@ -1077,7 +1097,6 @@
- 				;;
-       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
-       *-386bsd* )	        opsys=386bsd ;;
-      *-freebsd* )	        opsys=freebsd ;;
-       *-nextstep* )             opsys=nextstep ;;
-       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
-     esac
--- a/japanese/emacs-emcws/files/patch-lib-src:Makefile.in
+++ b/japanese/emacs-emcws/files/patch-lib-src:Makefile.in
@ -1,27 +0,0 @@
--- lib-src/Makefile.in.orig	Wed Aug 30 02:12:42 2000
-+++ lib-src/Makefile.in	Thu Oct 11 01:54:10 2001
-@@ -85,6 +85,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- # By default, we uphold the dignity of our programs.
- INSTALL_STRIP =
- 
-@@ -278,7 +279,7 @@
-         if [ `(cd ${archlibdir} && /bin/pwd)` \
-              != `(cd ${srcdir} && /bin/pwd)` ]; then \
- 	  for file in ${SCRIPTS}; do \
-	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
-+	    $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \
- 	  done ; \
- 	fi
- 
-@@ -290,7 +291,7 @@
- 	  chmod a+rx ${bindir}/$${file}; \
- 	done
- 	for file in ${INSTALLABLE_SCRIPTS} ; do \
-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
-+	  $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file} ; \
- 	  chmod a+rx ${bindir}/$${file}; \
- 	done
--- a/japanese/emacs-emcws/files/patch-lib-src:movemail.c
+++ b/japanese/emacs-emcws/files/patch-lib-src:movemail.c
@ -1,11 +0,0 @@
--- lib-src/movemail.c.orig	Mon Feb 14 11:29:49 2005
-+++ lib-src/movemail.c	Mon Feb 14 11:33:06 2005
-@@ -787,7 +787,7 @@
-       mbx_delimit_begin (mbf);
-       if (pop_retr (server, i, mbf) != OK)
- 	{
-	  error (Errmsg, 0, 0);
-+	  error ("%s", Errmsg, 0);
- 	  close (mbfi);
- 	  return (1);
- 	}
--- a/japanese/emacs-emcws/files/patch-lisp:Makefile.in
+++ b/japanese/emacs-emcws/files/patch-lisp:Makefile.in
@ -1,29 +0,0 @@
--- lisp/Makefile.in.orig	Wed Apr 10 17:50:14 2002
-+++ lisp/Makefile.in	Wed Apr 10 17:53:38 2002
-@@ -91,7 +91,25 @@
- 	$(lisp)/term/vt420.el \
- 	$(lisp)/term/wyse50.el \
- 	$(lisp)/term/xterm.el \
-	$(lisp)/version.el
-+	$(lisp)/version.el \
-+	$(lisp)/busyu.el \
-+	$(lisp)/can-n-egg.el \
-+	$(lisp)/canna.el \
-+	$(lisp)/egg-jsymbol.el \
-+	$(lisp)/egg-keymap.el \
-+	$(lisp)/egg.el \
-+	$(lisp)/isearch-ext.el \
-+	$(lisp)/its/han-kata.el \
-+	$(lisp)/its/hankaku.el \
-+	$(lisp)/its/hira.el \
-+	$(lisp)/its/kanainput.el \
-+	$(lisp)/its/kata.el \
-+	$(lisp)/its/zenkaku.el \
-+	$(lisp)/mule-inst.el \
-+	$(lisp)/sj3-client.el \
-+	$(lisp)/sj3-egg.el \
-+	$(lisp)/wnn-client.el \
-+	$(lisp)/wnn-egg.el
- 
- # Files to compile before others during a bootstrap.  This is done to
- # speed up the bootstrap process.  The CC files are compiled first
--- a/japanese/emacs-emcws/files/patch-lisp:help.el
+++ b/japanese/emacs-emcws/files/patch-lisp:help.el
@ -1,13 +0,0 @@
--- lisp/help.el.orig	Mon Oct  1 16:01:24 2001
-+++ lisp/help.el	Wed Apr 10 16:55:14 2002
-@@ -593,8 +593,8 @@
-     (load (expand-file-name
- 	   ;; fns-XX.YY.ZZ.el does not work on DOS filesystem.
- 	   (if (eq system-type 'ms-dos)
-	       "fns.el"
-	     (format "fns-%s.el" emacs-version))
-+	       "fnsemcws.el"
-+	     (format "fns-emcws-%s.el" emacs-version))
- 	   exec-directory)
- 	  ;; The file name fns-%s.el already has a .el extension.
- 	  nil nil t)
--- a/japanese/emacs-emcws/files/patch-lisp:loadup.el
+++ b/japanese/emacs-emcws/files/patch-lisp:loadup.el
@ -1,26 +0,0 @@
--- lisp/loadup.el.orig	Wed Apr 10 16:53:14 2002
-+++ lisp/loadup.el	Wed Apr 10 16:55:48 2002
-@@ -264,7 +264,7 @@
-       (if (memq system-type '(ms-dos windows-nt))
- 	  (setq name (expand-file-name
- 		      (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
-	(setq name (concat (expand-file-name "../etc/DOC-") name))
-+	(setq name (concat (expand-file-name "../etc/DOC-EMCWS-") name))
- 	(if (file-exists-p name)
- 	    (delete-file name))
- 	(copy-file (expand-file-name "../etc/DOC") name t))
-@@ -300,11 +300,11 @@
- 		    (expand-file-name
- 		     (cond
- 		      ((eq system-type 'ms-dos)
-		       "../lib-src/fns.el")
-+		       "../lib-src/fnsemcws.el")
- 		      ((eq system-type 'windows-nt)
-		       (format "../../../lib-src/fns-%s.el" emacs-version))
-+		       (format "../../../lib-src/fns-emcws-%s.el" emacs-version))
- 		      (t
-		       (format "../lib-src/fns-%s.el" emacs-version)))
-+		       (format "../lib-src/fns-emcws-%s.el" emacs-version)))
- 		     invocation-directory))
-       (erase-buffer)
-       (setq load-history nil))
--- a/japanese/emacs-emcws/files/patch-lisp:vc-hooks.el
+++ b/japanese/emacs-emcws/files/patch-lisp:vc-hooks.el
@ -1,24 +0,0 @@
--- lisp/vc-hooks.el.orig	Mon Nov 12 23:37:38 2001
-+++ lisp/vc-hooks.el	Tue Nov 13 12:56:08 2001
-@@ -475,10 +475,9 @@
-   (if regexp
-       (concat (regexp-quote (file-name-nondirectory file))
-               "\\.~[0-9.]+" (unless manual "\\.") "~")
-    (expand-file-name (concat (file-name-nondirectory file) 
-                              ".~" (or rev (vc-workfile-version file)) 
-                              (unless manual ".") "~")
-                      (file-name-directory file))))
-+    (concat (make-backup-file-name-1 file)
-+	    ".~" (or rev (vc-workfile-version file))
-+	    (unless manual ".") "~")))
- 
- (defun vc-delete-automatic-version-backups (file)
-   "Delete all existing automatic version backups for FILE."
-@@ -509,6 +508,7 @@
- 	 (vc-up-to-date-p file)
- 	 (eq (vc-checkout-model file) 'implicit)
- 	 (vc-call make-version-backups-p file)
-+	 vc-make-backup-files
-          (vc-make-version-backup file))))
- 
- (defun vc-after-save ()
--- a/japanese/emacs-emcws/files/patch-lisp_dired.el
+++ b/japanese/emacs-emcws/files/patch-lisp_dired.el
@ -1,19 +0,0 @@
--- lisp/dired.el.orig	Fri Feb  7 20:48:13 2003
-+++ lisp/dired.el	Thu Mar 27 12:12:15 2003
-@@ -1535,6 +1535,7 @@
- 			          "\\|" yyyy s s "?"
- 			          "\\|" s "?" yyyy
- 			     "\\)"))
-+	 (freebsd-ja (concat s mm "/" dd s "\\(" HH:MM "\\|" s yyyy "\\)"))
- 	 (japanese
- 	  (concat mm k "?" s dd k "?" s "+"
- 		  "\\(" HH:MM "\\|" yyyy k "?" "\\)")))
-@@ -1546,7 +1547,7 @@
- 	 ;; This avoids recognizing `jservice  10  1024' as a date in the line:
- 	 ;; drwxr-xr-x  3 jservice  10  1024 Jul  2  1997 esg-host
-     (concat ".*[0-9][kKMGTPEZY]?" 
-	    s "\\(" western "\\|" japanese "\\|" iso "\\)" s))
-+	    s "\\(" western "\\|" freebsd-ja "\\|" japanese "\\|" iso "\\)" s))
-   "Regular expression to match up to the file name in a directory listing.
- The default value is designed to recognize dates and times
- regardless of the language.")
--- a/japanese/emacs-emcws/files/patch-man:Makefile.in
+++ b/japanese/emacs-emcws/files/patch-man:Makefile.in
@ -1,11 +0,0 @@
--- man/Makefile.in.orig	Thu Apr 26 02:17:33 2001
-+++ man/Makefile.in	Mon Oct 22 20:43:45 2001
-@@ -31,7 +31,7 @@
- 
- 
- # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
- 	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
- 		../info/info ../info/message ../info/mh-e ../info/reftex \
--- a/japanese/emacs-emcws/files/patch-src-xfns.c
+++ b/japanese/emacs-emcws/files/patch-src-xfns.c
@ -1,38 +0,0 @@
--- src/xfns.c.orig	2002-12-06 18:05:35.000000000 +0100
-+++ src/xfns.c	2012-05-02 19:50:40.000000000 +0200
-@@ -8541,7 +8541,7 @@
- {
-   xassert (png_ptr != NULL);
-   image_error ("PNG error: %s", build_string (msg), Qnil);
-  longjmp (png_ptr->jmpbuf, 1);
-+  longjmp (png_jmpbuf(png_ptr), 1);
- }
- 
- 
-@@ -8641,7 +8641,7 @@
- 
-       /* Check PNG signature.  */
-       if (fread (sig, 1, sizeof sig, fp) != sizeof sig
-	  || !png_check_sig (sig, sizeof sig))
-+	  || png_sig_cmp (sig, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG file: `%s'", file, Qnil);
- 	  UNGCPRO;
-@@ -8658,7 +8658,7 @@
- 
-       /* Check PNG signature.  */
-       if (tbr.len < sizeof sig
-	  || !png_check_sig (tbr.bytes, sizeof sig))
-+	  || png_sig_cmp (tbr.bytes, 0, sizeof sig))
- 	{
- 	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
- 	  UNGCPRO;
-@@ -8699,7 +8699,7 @@
- 
-   /* Set error jump-back.  We come back here when the PNG library
-      detects an error.  */
-  if (setjmp (png_ptr->jmpbuf))
-+  if (setjmp (png_jmpbuf(png_ptr)))
-     {
-     error:
-       if (png_ptr)
--- a/japanese/emacs-emcws/files/patch-src:Makefile.in
+++ b/japanese/emacs-emcws/files/patch-src:Makefile.in
@ -1,13 +0,0 @@
--- src/Makefile.in.orig	Mon Dec 17 23:09:32 2001
-+++ src/Makefile.in	Mon Oct 21 13:37:26 2002
-@@ -155,6 +155,10 @@
- /* This holds special options for linking temacs
-    that should be used for linking anything else.  */
- #ifndef LD_SWITCH_SYSTEM_TEMACS
-+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
-+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
-+#else
- #define LD_SWITCH_SYSTEM_TEMACS
-+#endif
- #endif
- 
--- a/japanese/emacs-emcws/files/patch-src:alloc.c
+++ b/japanese/emacs-emcws/files/patch-src:alloc.c
@ -1,14 +0,0 @@
--- src/alloc.c.orig	Thu Sep 12 13:50:01 2002
-+++ src/alloc.c	Thu Sep 12 13:48:11 2002
-@@ -3723,7 +3723,11 @@
-   /* This trick flushes the register windows so that all the state of
-      the process is contained in the stack.  */
- #ifdef sparc
-+#ifdef __sparc64__
-+  asm ("flushw");
-+#else
-   asm ("ta 3");
-+#endif
- #endif
-   
-   /* Save registers that we need to see on the stack.  We need to see
--- a/japanese/emacs-emcws/files/patch-src:filelock.c
+++ b/japanese/emacs-emcws/files/patch-src:filelock.c
@ -1,28 +0,0 @@
--- src/filelock.c.orig	2010-11-04 11:03:51.000000000 +0900
-+++ src/filelock.c	2010-11-04 11:15:59.000000000 +0900
-@@ -65,7 +65,13 @@
- 
- #ifdef CLASH_DETECTION
- 
-+#if __FreeBSD_version >= 900007
-+#include <utmpx.h>
-+#undef BOOT_TIME
-+#define ut_time ut_tv.tv_sec
-+#else
- #include <utmp.h>
-+#endif
- 
- /* A file whose last-modified time is just after the most recent boot.
-    Define this to be NULL to disable checking for this file.  */
-@@ -256,7 +262,11 @@
-      char *filename;
-      int newest;
- {
-+#if __FreeBSD_version >= 900007
-+  struct utmpx ut, *utp;
-+#else
-   struct utmp ut, *utp;
-+#endif
-   int desc;
- 
-   if (filename)
--- a/japanese/emacs-emcws/files/patch-src:m:alpha.h
+++ b/japanese/emacs-emcws/files/patch-src:m:alpha.h
@ -1,11 +0,0 @@
--- src/m/alpha.h.orig	Mon Oct  2 23:30:39 2000
-+++ src/m/alpha.h	Wed Feb 13 09:05:57 2002
-@@ -198,7 +198,7 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- 
--- a/japanese/emacs-emcws/files/patch-src:m:amd64.h
+++ b/japanese/emacs-emcws/files/patch-src:m:amd64.h
@ -1,184 +0,0 @@
--- src/m/amd64.h~      Wed Dec 31 18:00:00 1969
-+++ src/m/amd64.h       Thu Dec 18 00:21:51 2003
-@@ -0,0 +1,181 @@
-+/* machine description file For the amd64 chip.
-+   Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
-+
-+This file is part of GNU Emacs.
-+
-+GNU Emacs is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 1, or (at your option)
-+any later version.
-+
-+GNU Emacs is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GNU Emacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+
-+/* The following line tells the configuration script what sort of
-+   operating system this machine is likely to run.
-+   USUAL-OPSYS="note"
-+
-+NOTE-START
-+Use -opsystem=freebsd
-+NOTE-END
-+
-+*/
-+
-+#define BITS_PER_LONG 64
-+#define BITS_PER_EMACS_INT 64
-+#ifndef _LP64
-+#define _LP64
-+#endif
-+
-+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-+   is the most significant byte.  */
-+
-+#undef WORDS_BIG_ENDIAN
-+
-+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
-+ * group of arguments and treat it as an array of the arguments.  */
-+
-+#define NO_ARG_ARRAY
-+
-+/* Now define a symbol for the cpu type, if your compiler
-+   does not define it automatically:
-+   Ones defined so far include vax, m68000, ns16000, pyramid,
-+   orion, tahoe, APOLLO and many others */
-+
-+/* __amd64__ defined automatically */
-+
-+
-+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
-+/* This is desirable for most machines.  */
-+
-+#define NO_UNION_TYPE
-+
-+/* Define the type to use.  */
-+#define EMACS_INT long
-+#define EMACS_UINT unsigned long
-+#define SPECIAL_EMACS_INT
-+
-+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-+   the 24-bit bit field into an int.  In other words, if bit fields
-+   are always unsigned.
-+
-+   If you use NO_UNION_TYPE, this flag does not matter.  */
-+
-+#undef EXPLICIT_SIGN_EXTEND
-+
-+/* Data type of load average, as read out of kmem.  */
-+
-+#define LOAD_AVE_TYPE long
-+
-+/* Convert that into an integer that is 100 for a load average of 1.0  */
-+
-+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-+
-+/* Define C_ALLOCA if this machine does not support a true alloca
-+   and the one written in C should be used instead.
-+   Define HAVE_ALLOCA to say that the system provides a properly
-+   working alloca function and it should be used.
-+   Define neither one if an assembler-language alloca
-+   in the file alloca.s should be used.  */
-+
-+#define HAVE_ALLOCA
-+
-+/* GNU malloc and the relocating allocator do not work together
-+   with X.   [Who wrote that?]  */
-+
-+/* May 1995: reportedly [Rainer Schoepf <schoepf at uni-mainz.de>] both the
-+   system and the gnu malloc system work with "alpha-dec-osf3.0" and
-+   "alpha-dec-osf3.2".  */
-+
-+/* May 1995: it seems to me [Morten Welinder <terra at diku.dk>] that both
-+   mallocs work with "alpha-dec-osf2.0", but I daren't break anything
-+   right now.  Feel free to play if you want.  */
-+
-+/* #define SYSTEM_MALLOC */
-+
-+#ifdef __ELF__
-+/* With ELF, make sure that all common symbols get allocated to in the
-+   data section.  Otherwise, the dump of temacs may miss variables in
-+   the shared library that have been initialized.  For example, with
-+   GNU libc, __malloc_initialized would normally be resolved to the
-+   shared library's .bss section, which is fatal.  */
-+# ifdef __GNUC__
-+#  define C_SWITCH_MACHINE     -fno-common
-+# else
-+#  error What gives?  Fix me if DEC Unix supports ELF now.
-+# endif
-+#endif
-+
-+#if defined(__OpenBSD__)
-+#define ORDINARY_LINK
-+#endif
-+
-+#ifdef __ELF__
-+#undef UNEXEC
-+#define UNEXEC unexelf.o
-+#endif
-+
-+#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6
-+/* This controls a conditional in main.  */
-+#define LINUX_SBRK_BUG
-+#endif
-+
-+
-+#define PNTR_COMPARISON_TYPE unsigned long
-+
-+/* On the 64 bit architecture, we can use 60 bits for addresses */
-+
-+#define VALBITS         60
-+
-+
-+/* This definition of MARKBIT is necessary because of the comparison of
-+   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
-+
-+/* #define MARKBIT         0x8000000000000000L */
-+
-+
-+/* Define XINT and XUINT so that they can take arguments of type int */
-+
-+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-+#define XUINT(a) ((long) (a) & VALMASK)
-+
-+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
-+
-+#define XPNTR(a) XUINT (a)
-+
-+#ifndef NOT_C_CODE
-+/* We need these because pointers are larger than the default ints.  */
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
-+#include <alloca.h>
-+#endif
-+#endif /* not NOT_C_CODE */
-+
-+/* On the Alpha it's best to avoid including TERMIO since struct
-+   termio and struct termios are mutually incompatible.  */
-+/* #define NO_TERMIO */
-+
-+#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
-+# define TEXT_END ({ extern int _etext; &_etext; })
-+# ifndef __ELF__
-+#  define COFF
-+#  define DATA_END ({ extern int _EDATA; &_EDATA; })
-+# endif /* notdef __ELF__ */
-+#endif
-+
-+#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
-+   they generate code that uses a signaling NaN instead of DBL_MIN.
-+   Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
-+   this avoids the assembler bug.  */
-+/* #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 */
--- a/japanese/emacs-emcws/files/patch-src:m:ia64.h
+++ b/japanese/emacs-emcws/files/patch-src:m:ia64.h
@ -1,11 +0,0 @@
--- src/m/ia64.h.orig	Fri Sep 29 06:00:37 2000
-+++ src/m/ia64.h	Thu Nov 20 13:44:02 2003
-@@ -147,7 +147,7 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-# if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+# if !defined(__NetBSD__) && !defined(__OpenBSD__)  && !defined(__FreeBSD__)
- #  include <alloca.h>
- # else
- #  include <stdlib.h>
--- a/japanese/emacs-emcws/files/patch-src:m:sparc.h
+++ b/japanese/emacs-emcws/files/patch-src:m:sparc.h
@ -1,11 +0,0 @@
--- src/m/sparc.h.orig	Thu Sep 12 02:25:09 2002
-+++ src/m/sparc.h	Thu Sep 12 12:33:36 2002
-@@ -89,7 +89,7 @@
- #define PURESIZE 130000
- #endif
- 
-#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
-+#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
- /* This really belongs in s/sun.h.  */
- 
- /* Say that the text segment of a.out includes the header;
--- a/japanese/emacs-emcws/files/patch-src:mem-limits.h
+++ b/japanese/emacs-emcws/files/patch-src:mem-limits.h
@ -1,11 +0,0 @@
--- src/mem-limits.h.~1~        Wed Mar  8 12:49:46 2000
-+++ src/mem-limits.h    Wed Dec 17 03:15:24 2003
-@@ -98,7 +98,7 @@
- static POINTER data_space_start;
-
- /* Number of bytes of writable memory we can expect to be able to get */
-static unsigned long lim_data;
-+static rlim_t lim_data;
-
- #ifdef NO_LIM_DATA
- static void
--- a/japanese/emacs-emcws/files/patch-src:process.c
+++ b/japanese/emacs-emcws/files/patch-src:process.c
@ -1,91 +0,0 @@
--- src/process.c.orig	Mon Mar 17 07:06:56 2003
-+++ src/process.c	Tue Aug 12 01:17:12 2003
-@@ -1850,6 +1850,7 @@
-   for (lres = res; lres; lres = lres->ai_next)
-     {
-       s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
-+
-       if (s < 0)
- 	{
- 	  xerrno = errno;
-@@ -1882,19 +1883,43 @@
- 	 It'd be nice to be able to control the connect timeout
- 	 though.  Would non-blocking connect calls be portable?  */
-       turn_on_atimers (0);
-+      
-       ret = connect (s, lres->ai_addr, lres->ai_addrlen);
-       xerrno = errno;
-       turn_on_atimers (1);
- 
-      if (ret == 0 || xerrno == EISCONN)
-+      if (ret == 0 || xerrno == EISCONN )
- 	/* The unwind-protect will be discarded afterwards.
- 	   Likewise for immediate_quit.  */
- 	break;
- 
-       immediate_quit = 0;
- 
-      if (xerrno == EINTR)
-	goto loop;
-+#if 1
-+      if ( (errno == EINTR ) || (errno == EINPROGRESS)){
-+	fd_set fds;
-+	int e;
-+	struct timeval tv;
-+	tv.tv_sec =60;
-+	tv.tv_usec = 0;
-+	FD_ZERO(&fds);
-+	FD_SET(s, &fds);
-+      resel:
-+	e = select(s+1, NULL, &fds, NULL, &tv);
-+
-+	if( e == -1){
-+	  if(errno == EINTR)
-+	    goto resel;
-+	  else
-+	    xerrno = ETIMEDOUT;
-+	}
-+	else {
-+	  xerrno = 0;
-+	  break;
-+	}
-+      }
-+#endif
-+
-       if (xerrno == EADDRINUSE && retry < 20)
- 	{
- 	  /* A delay here is needed on some FreeBSD systems,
-@@ -2000,11 +2025,30 @@
-       && errno != EISCONN)
-     {
-       int xerrno = errno;
-
-+      
-       immediate_quit = 0;
- 
-      if (errno == EINTR)
-	goto loop;
-+#if 1
-+      if ( (errno == EINTR ) || (errno == EINPROGRESS)){
-+	fd_set fds;
-+	int e;
-+	struct timeval tv;
-+	tv.tv_sec =60;
-+	tv_tv_usec = 0;
-+	FD_CLEAR(&fds);
-+	FD_SET(s, &fds);
-+      resel:
-+	e = select(s+1, NULL, fds, NULL, &tv);
-+	if( e != 0){
-+	  if(errno == EINTR)
-+	    goto resel;
-+	  else
-+	    xerrno = ETIMEDOUT;
-+	}
-+	else 
-+	  xerrno = 0;
-+      }
-+#endif
-       if (errno == EADDRINUSE && retry < 20)
- 	{
- 	  /* A delay here is needed on some FreeBSD systems,
--- a/japanese/emacs-emcws/files/patch-src:s:freebsd.h
+++ b/japanese/emacs-emcws/files/patch-src:s:freebsd.h
@ -1,14 +0,0 @@
--- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
-+++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
-@@ -68,6 +68,11 @@
- #define LIBS_SYSTEM -lutil
- #if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
-+#else
-+#ifdef HAVE_LIBNCURSES
-+#define TERMINFO
-+#define LIBS_TERMCAP -lncurses
-+#endif
- #endif
- 
- #define SYSV_SYSTEM_DIR
--- a/japanese/emacs-emcws/files/patch-src:wnnfns.c
+++ b/japanese/emacs-emcws/files/patch-src:wnnfns.c
@ -1,57 +0,0 @@
--- src/wnnfns.c.orig	Mon Dec 25 18:05:08 2006
-+++ src/wnnfns.c	Mon Dec 25 18:07:15 2006
-@@ -341,6 +341,9 @@
- static int wnnfns_norm;
- static unsigned char lc_wnn_server_type[NSERVER] = {LCJP, LCCN, LCINV, LCKR};
- 
-+static int yes_or_no();
-+static void puts2();
-+
- /* Lisp Variables and Constants Definition */
- Lisp_Object	Qjserver;
- Lisp_Object	Qcserver;
-@@ -452,8 +455,6 @@
-      int			nargs;
-      register Lisp_Object	*args;
- {
-  static int yes_or_no();
-  static void puts2();
-   struct gcpro gcpro1;
-   int	snum;
-   CHECK_STRING (args[0], 0);
-@@ -1293,8 +1294,6 @@
-      int                        nargs;
-      register Lisp_Object       *args;
- {
-  static int yes_or_no();
-  static void puts2();
-   struct gcpro gcpro1;
-   int   snum;
-   CHECK_STRING (args[0], 0);
-@@ -1329,8 +1328,6 @@
-      int                        nargs;
-      register Lisp_Object       *args;
- {
-  static int yes_or_no();
-  static void puts2();
-   struct gcpro gcpro1;
-   int   snum;
-   CHECK_STRING (args[0], 0);
-@@ -1365,8 +1362,6 @@
-      int                        nargs;
-      register Lisp_Object       *args;
- {
-  static int yes_or_no();
-  static void puts2();
-   struct gcpro gcpro1;
-   int   snum;
-   int	dic_no;
-@@ -1427,8 +1422,6 @@
-      int                        nargs;
-      register Lisp_Object       *args;
- {
-  static int yes_or_no();
-  static void puts2();
-   struct gcpro gcpro1;
-   int   snum;
-   int   dic_no;
--- a/japanese/emacs-emcws/files/patch-src:xterm.c
+++ b/japanese/emacs-emcws/files/patch-src:xterm.c
@ -1,42 +0,0 @@
--- src/xterm.c.orig	Tue Oct 15 23:21:45 2002
-+++ src/xterm.c	Wed Aug 31 09:18:48 2005
-@@ -118,8 +118,6 @@
- #ifdef HAVE_XAW3D
- #include <X11/Xaw3d/Simple.h>
- #include <X11/Xaw3d/Scrollbar.h>
-#define ARROW_SCROLLBAR
-#include <X11/Xaw3d/ScrollbarP.h>
- #else /* !HAVE_XAW3D */
- #include <X11/Xaw/Simple.h>
- #include <X11/Xaw/Scrollbar.h>
-@@ -8863,30 +8861,12 @@
- 	  XawScrollbarSetThumb (widget, top, shown);
- 	else
- 	  {
-#ifdef HAVE_XAW3D
-	    ScrollbarWidget sb = (ScrollbarWidget) widget;
-	    int scroll_mode = 0;
-	    
-	    /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR.  */
-	    if (xaw3d_arrow_scroll)
-	      {
-		/* Xaw3d stupidly ignores resize requests while dragging
-		   so we have to make it believe it's not in dragging mode.  */
-		scroll_mode = sb->scrollbar.scroll_mode;
-		if (scroll_mode == 2)
-		  sb->scrollbar.scroll_mode = 0;
-	      }
-#endif
- 	    /* Try to make the scrolling a tad smoother.  */
- 	    if (!xaw3d_pick_top)
- 	      shown = min (shown, old_shown);
- 	    
- 	    XawScrollbarSetThumb (widget, top, shown);
- 	    
-#ifdef HAVE_XAW3D
-	    if (xaw3d_arrow_scroll && scroll_mode == 2)
-	      sb->scrollbar.scroll_mode = scroll_mode;
-#endif
- 	  }
-       }
-   }
--- a/japanese/emacs-emcws/files/patch-src:xterm.h
+++ b/japanese/emacs-emcws/files/patch-src:xterm.h
@ -1,11 +0,0 @@
--- src/xterm.h.orig	Mon Feb 28 13:53:40 2005
-+++ src/xterm.h	Mon Feb 28 13:53:57 2005
-@@ -21,8 +21,8 @@
- 
- #include <X11/Xlib.h>
- #include <X11/cursorfont.h>
-#include <X11/Xutil.h>
- #include <X11/keysym.h>
-+#include <X11/Xutil.h>
- #include <X11/Xatom.h>
- #include <X11/Xresource.h>
--- a/japanese/emacs-emcws/files/site-init.el.tmpl
+++ b/japanese/emacs-emcws/files/site-init.el.tmpl
@ -1,10 +0,0 @@
-;;; site-init.el -- site-dependent initialization file
-
-;;
-;; Init file for FreeBSD port: emacs21-emcws
-;;
-
-; change a default file name of the internal DOC-string.
-(Snarf-documentation "%%DOC_FILE%%")
-
-;;; site-init.el ends here
--- a/japanese/emacs-emcws/pkg-descr
+++ b/japanese/emacs-emcws/pkg-descr
@ -1,5 +0,0 @@
-Emcws stands for Emacs + Canna + Wnn + Sj3,
-which is interim solutions to input 2 bytes chars by communicating with
-Kana Kanji conversion server. 
-
-WWW: ftp://ftp.ki.nu/pub/emcws/README.html
--- a/japanese/emacs-emcws/pkg-plist
+++ b/japanese/emacs-emcws/pkg-plist
@ -1,52 +0,0 @@
-bin/emcws-%%EMACS_VER%%
-bin/emcws
-libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fns-emcws-%%EMACS_VER%%.1.el
-share/emacs/%%EMACS_VER%%-emcws/etc/%%DOC_FILE%%
-share/emacs/%%EMACS_VER%%-emcws/lisp/busyu.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/can-n-egg.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/canna.el
-%%WITH_CANNA%%share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/egg-jsymbol.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/egg-keymap.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/egg.el
-%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/egg.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-sj3
-share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-v41
-share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-wnn
-share/emacs/%%EMACS_VER%%-emcws/lisp/help.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/help.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/isearch-ext.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/isearch-ext.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/ccl.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/ccl.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-cmds.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-cmds.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-conf.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/titdic-cnv.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/international/titdic-cnv.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/han-kata.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/hankaku.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/hira.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/kanainput.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/kata.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/its/zenkaku.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/loaddefs.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/loadup.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/mule-inst.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.el
-%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.el
-%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.elc
-share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-client.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.el
-%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
-share/emacs/%%EMACS_VER%%-emcws/site-lisp/subdirs.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/subdirs.el
-@dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/its
-@dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/international
-@dirrm share/emacs/%%EMACS_VER%%-emcws/lisp
-@dirrm share/emacs/%%EMACS_VER%%-emcws/site-lisp
-@dirrm share/emacs/%%EMACS_VER%%-emcws/etc
-@dirrm share/emacs/%%EMACS_VER%%-emcws
--- a/japanese/emacs-emcws/scripts/configure
+++ b/japanese/emacs-emcws/scripts/configure
@ -1,6 +0,0 @@
-#! /bin/sh
-
-for f in site-init.el; do
-	${SED} -e "s,%%DOC_FILE%%,${DOC_FILE},g" \
-		< ${FILESDIR}/${f}.tmpl > ${WRKSRC}/lisp/${f}
-done
--- a/japanese/lookup-emacs21/Makefile
+++ b/japanese/lookup-emacs21/Makefile
@ -1,9 +0,0 @@
-# Created by: Satoshi Taoka <taoka@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../lookup
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-
-.include "${MASTERDIR}/Makefile"
--- a/Show More
+++ b/Show More