Remove expired Emacs ports and the surrounding expired ports:

2007-08-19 chinese/mule-freewnn: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 chinese/xemacs: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 converters/mule-ucs-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 devel/eieio-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 editors/apel-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 editors/bitmap-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 editors/emacs19: emacs19 is obsolete; please use a more recent version 2007-08-19 editors/emacs20: "editors/emacs is recommended instead for new installations" 2007-08-19 editors/flim-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 editors/mule-common: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 editors/mule: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 editors/semi-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 editors/speedbar-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 irc/irchat-pj-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 irc/pure-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/diclookup-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/diclookup-mule: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-canna+freewnn+sj3: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-canna+sj3+wnn6: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-canna+sj3+wnn7: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-canna+sj3: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-canna+wnn6: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-canna+wnn7: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-canna: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-freewnn: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-sj3: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-wnn6: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/mule-wnn7: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/navi2ch-emacs20: emacs20 and related ports are obsolete; please use a more recent version 2007-08-19 japanese/w3: distfile is 10 years old and depends on emacs19 which is obsolete 2007-08-19 korean/mule-freewnn: emacs19 and related ports are obsolete; please use a more recent version 2007-08-19 www/w3: distfile is 10 years old and depends on emacs19 which is obsolete
svn path=/head/; revision=201441
2025-01-31 10:46:16 +00:00 · 2007-10-14 10:10:01 +00:00 · 2007-10-14 10:10:01 +00:00 · 5e4e8ecf76 · 2021-03-31 03:12:20 +00:00
commit 5e4e8ecf76
parent 21040c8c51
188 changed files with 37 additions and 15118 deletions
--- a/32
+++ b/32
@ -3281,3 +3281,35 @@ graphics/xpcd||2007-10-11|Has expired: is an abandoned project and might be vuln
 comms/ixj||2007-10-11|Has expired: does not work on any supported FreeBSD version
 chinese/emacs20||2007-10-11|Has expired: "editors/emacs is recommended instead for new installations"
 java/collections||2007-10-11|Has expired: only needed for jdk1.1, which is obsolete
+chinese/mule-freewnn||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+chinese/xemacs||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+converters/mule-ucs-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+devel/eieio-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+editors/apel-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+editors/bitmap-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+editors/emacs19||2007-10-14|Has expired: emacs19 is obsolete; please use a more recent version
+editors/emacs20||2007-10-14|Has expired: "editors/emacs is recommended instead for new installations"
+editors/flim-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+editors/mule-common||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+editors/mule||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+editors/semi-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+editors/speedbar-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+irc/irchat-pj-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+irc/pure-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+japanese/diclookup-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+japanese/diclookup-mule||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-canna+freewnn+sj3||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-canna+sj3+wnn6||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-canna+sj3+wnn7||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-canna+sj3||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-canna+wnn6||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-canna+wnn7||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-canna||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-freewnn||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-sj3||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-wnn6||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/mule-wnn7||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+japanese/navi2ch-emacs20||2007-10-14|Has expired: emacs20 and related ports are obsolete; please use a more recent version
+japanese/w3||2007-10-14|Has expired: distfile is 10 years old and depends on emacs19 which is obsolete
+korean/mule-freewnn||2007-10-14|Has expired: emacs19 and related ports are obsolete; please use a more recent version
+www/w3||2007-10-14|Has expired: distfile is 10 years old and depends on emacs19 which is obsolete
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@ -1,5 +1,5 @@
 #
-#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.68 2007-08-04 11:37:23 gabor Exp $
+#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.69 2007-10-14 10:09:47 vd Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@ -63,42 +63,8 @@ EMACS_PORT_NAME?=	emacs22

 EMACS_MASTERDIR_PKGFILES?=	NO

-# Emacs-19.x
-.if (${EMACS_PORT_NAME} == "emacs19")
-EMACS_NAME=		emacs
-EMACS_VER=		19.34
-EMACS_MAJOR_VER=	19
-EMACS_LIBDIR?=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs19
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		NO
-EMACS_NO_SUBDIRSEL=	YES
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?=		${PKGDIR}/pkg-comment.emacs19
-DESCR?=                 ${PKGDIR}/pkg-descr.emacs19
-PLIST?=                 ${PKGDIR}/pkg-plist.emacs19
-.endif
-
-# Emacs-20.x
-.elif (${EMACS_PORT_NAME} == "emacs20")
-EMACS_NAME=		emacs
-EMACS_VER=		20.7
-EMACS_MAJOR_VER=	20
-EMACS_LIBDIR?=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs20
-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-21.x
-.elif (${EMACS_PORT_NAME} == "emacs21")
+.if (${EMACS_PORT_NAME} == "emacs21")
 EMACS_NAME=		emacs
 EMACS_VER=		21.3
 EMACS_MAJOR_VER=	21
@ -148,23 +114,6 @@ DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif

-# Mule-19.x
-.elif (${EMACS_PORT_NAME} == "mule")
-EMACS_NAME=		mule
-EMACS_VER=		19.34
-EMACS_MAJOR_VER=	19
-EMACS_LIBDIR?=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/mule
-EMACS_COMMON_PORT=	YES
-EMACS_HAS_MULE=		YES
-EMACS_NO_SUBDIRSEL=	YES
-.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
-
 # XEmacs-21.x
 .elif (${EMACS_PORT_NAME} == "xemacs21")
 EMACS_NAME=		xemacs
@ -242,9 +191,9 @@ 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: emacs19 mule emacs20 emacs21 emacs22"
-	@${ECHO} "	XEmacs family: xemacs xemacs20 xemacs21 xemacs21-mule"
-	@${ECHO} "	               xemacs-devel xemacs-devel-mule xemacs-mule-xft"
+	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs-devel"
+	@${ECHO} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
+	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
 	@${FALSE}
 .endif

--- a/chinese/Makefile
+++ b/chinese/Makefile
@ -72,7 +72,6 @@
    SUBDIR += moettf
    SUBDIR += mplayer-fonts
    SUBDIR += msttf
-    SUBDIR += mule-freewnn
    SUBDIR += muni
    SUBDIR += mutt
    SUBDIR += ntuttf
@ -134,7 +133,6 @@
    SUBDIR += wangttf
    SUBDIR += wenju
    SUBDIR += wordpress
-    SUBDIR += xemacs
    SUBDIR += xemacs21
    SUBDIR += xmms
    SUBDIR += xpdf
--- a/chinese/mule-freewnn/Makefile
+++ b/chinese/mule-freewnn/Makefile
@ -1,21 +0,0 @@
-# New ports collection makefile for:	mule with FreeWnn
-# Date created:		20 July 1997
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	chinese
-PKGNAMESUFFIX=	-freewnn
-
-MASTERDIR=	${.CURDIR}/../../editors/mule
-COMMENT=	Multilingual emacs, with FreeWnn support built in (Only the executables)
-
-DEPRECATED=	emacs19 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-PKGDIR=		${.CURDIR}
-
-CFREEWNN=	yes
-
-.include "${MASTERDIR}/Makefile"
--- a/chinese/mule-freewnn/pkg-descr
+++ b/chinese/mule-freewnn/pkg-descr
@ -1,32 +0,0 @@
-This package contains only the executables for mule-2.3, a multilingual
-editor based on emacs-19.34.
-
-You should install the mule-common-2.3 package containing emacs lisp
-files, info pages, and so on (except executables) for mule-2.3.
-
-This package is built with Chinese support, using FreeWnn.
-It supports the following input methods: jeonkak, hangul for
-Korean (Hanja), and quanjiao, zhuyin, erpin for Chinese (check out
-${LOCALBASE}/lib/mule/site-lisp/site-start.el).
-
-This package and the package, mule-common-2.3, *will* clobber any
-existing emacs installation.  In particular, the executables and man
-pages of etags/ctags are installed, and the info pages that come with
-the original emacs get installed too.
-
-Although this shouldn't cause any problems to run both mule and emacs,
-it may cause some confusion when one of them is pkg_delete'd.  If
-someone has a solution to this, please tell me.
-
-A info "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/
-subdirectory of the ports package.  Copy it into your /usr/local/info
-to read mule info pages, but also make sure you also add everything
-that may have been added to that file!
-
-[Notice]
-Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3.
-Patches for those are in 'mule-2.3-19.34.patch-YYMMDD.tar.gz' and are
-applied in this port.
-
- S. Taoka
-taoka@FreeBSD.org
--- a/chinese/xemacs/Makefile
+++ b/chinese/xemacs/Makefile
@ -1,102 +0,0 @@
-# New ports collection makefile for:	zh-XEmacs
-# Date created:		30 Oct 1999
-# Whom:			Keith Jang <keith@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xemacs
-PORTVERSION=	20.4
-PORTREVISION=	3
-CATEGORIES=	chinese editors
-MASTER_SITES=	ftp://ftp.tnt.uni-hannover.de/pub/editors/xemacs/20.4/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-mule${EXTRACT_SUFX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XEmacs text editor version 20, with XIM support and Big5 settings
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
-
-USE_GMAKE=	yes
-USE_XPM=	yes
-STRIP=
-HAS_CONFIGURE=	yes
-XEMACS_ARCH=	${MACHINE_ARCH}--freebsd
-CONFIGURE_ARGS=	${XEMACS_ARCH} --prefix=${PREFIX} \
-		--with-mule \
-		--with-xfs \
-		--with-clash-detection \
-		--lockdir=/var/run/emacs/lock \
-		--with-sound=native \
-		--site-includes=${LOCALBASE}/include \
-		--site-libraries=${LOCALBASE}/lib \
-		--sitelispdir="${LOCALBASE}/lib/xemacs/site-lisp ${LOCALBASE}/share/emacs/site-lisp" \
-		--with-session=yes \
-		--with-menubars=lucid --with-xim=xlib
-MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
-		gnuserv.1 xemacs.1
-ALL_TARGET=	all dist
-PLIST_SUB=	XEMACS_VER=20.4 XEMACS_ARCH=${XEMACS_ARCH}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != i386
-BROKEN=		Configure fails outside i386: unrecognized architecture
-.endif
-
-.if (${OSVERSION} >= 600000)
-BROKEN=		Does not build even with fix for -lxpg4
-.endif
-
-# Have
-pre-configure:
-.if defined(HAVE_MOTIF)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "If your MOTIF library is actually lesstif, you might"
-	@${ECHO_MSG} "occasionally experience locked-up frames."
-	@${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC"
-	@${ECHO_MSG} "and recompile, which will force the use of athena
-	@${ECHO_MSG} "widgets for dialogs."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Since XIM of LessTif is reported buggy, you have to set"
-	@${ECHO_MSG} "REAL_MOTIF if you really have Motif. Otherwise it is"
-	@${ECHO_MSG} "compiled with raw xlib by default."
-.endif
-
-# hack to avoid shipping binaries linked with Motif
-.if defined(MOTIF_STATIC)
-CONFIGURE_ARGS+=	--with-dialogs=athena
-.endif
-
-# Drop faces (libcompface) and offix (libDnd) if building package,
-# autodetect otherwise
-.if defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--with-xface=no --with-offix=no
-.endif
-
-post-install:
-.for file in b2m ctags etags gnuclient ${DISTNAME}
-	strip ${PREFIX}/bin/${file}
-.endfor
-# ``make install'' does not set the permissions like pkg_add does.
-	${CHMOD} 1777 /var/run/emacs/lock
-	${CHMOD} 755 ${PREFIX}/lib/xemacs/site-lisp
-	${CHMOD} 755 ${PREFIX}/share/emacs/site-lisp
-	${RM} -f ${PREFIX}/bin/send-pr
-	${RM} -f ${PREFIX}/lib/xemacs-20.4/lisp/mule/mule-init.el.orig
-# Install xemacs20.sh into ${PREFIX}/etc/rc.d
-	@if [ ! -d ${PREFIX}/etc/rc.d ]; then ${MKDIR} ${PREFIX}/etc/rc.d; fi
-	${INSTALL_SCRIPT} ${FILESDIR}/xemacs20.sh ${PREFIX}/etc/rc.d
-# Install Chinese Big5 related files.
-	@${MKDIR} ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
-	@${INSTALL_DATA} ${FILESDIR}/Emacs ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
-	@${INSTALL_DATA} ${FILESDIR}/sample.emacs ${PREFIX}/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5
-# Display XIM usages.
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
--- a/chinese/xemacs/distinfo
+++ b/chinese/xemacs/distinfo
@ -1,6 +0,0 @@
-MD5 (xemacs-20.4.tar.gz) = 56912174ed51f4a21b490a96704ee5c0
-SHA256 (xemacs-20.4.tar.gz) = 0b9ca2f3c2ee2b532634a21437dcef4a3a50c58ffd01f07a2589716e4e0a51a0
-SIZE (xemacs-20.4.tar.gz) = 13012447
-MD5 (xemacs-20.4-mule.tar.gz) = 25ad2761b0fc98dbed45be44ad03665c
-SHA256 (xemacs-20.4-mule.tar.gz) = 1dcb375d9c9712e57909392de9bb85cfded0aa9da3db5402dbdf2b1557e8959f
-SIZE (xemacs-20.4-mule.tar.gz) = 4220088
--- a/chinese/xemacs/files/Emacs
+++ b/chinese/xemacs/files/Emacs
@ -1,530 +0,0 @@
-! Chinese localization resources for XEmacs
-! Author: Clem Chuang (b5506056@csie.ntu.edu.tw)
-! modify from /usr/local/lib/xemacs-20.4/etc/app-defaults/ja/Emacs
-!
-! Updated by Jing-Tang Keith Jang (keith@FreeBSD.org)
-!
-
-! This file is consisted of two parts. The first one is a Big5-localized
-! menu, and the second one sets XIM servers, fonts, and other X-related
-! resources, thus it can be put in ${X11}/lib/X11/app-defaults.
-! Search for XRESOURCES to go directly to part 2.
-
-!
-! Part 1: Big5-localized menus
-!
-
-! Pulldown menu internationalization.  The first line of the file
-! "Emacs*XlwMenu.resourceLabels: True" has to be there to make sure
-! all the labelString will be read and displayed by X.
-Emacs*XlwMenu.resourceLabels: True
-
-!!! Default Menubar Top Level
-
-Emacs*XlwMenu.file.labelString: 檔案
-Emacs*XlwMenu.edit.labelString:	編輯
-Emacs*XlwMenu.mule.labelString:	多國語言
-Emacs*XlwMenu.apps.labelString:	應用程式
-Emacs*XlwMenu.options.labelString:	選項
-Emacs*XlwMenu.tools.labelString:	工具
-Emacs*XlwMenu.help.labelString:	說明
-
-!! File menu
-
-Emacs*XlwMenu.open___.labelString:	開檔...
-Emacs*XlwMenu.openInOtherWindow___.labelString:	開啟在新 Window 中...
-Emacs*XlwMenu.openInNewFrame___.labelString:	開啟在新 Frame 中...
-Emacs*XlwMenu.insertFile___.labelString:	插入檔案...
-Emacs*XlwMenu.viewFile___.labelString:	觀看檔案...
-Emacs*XlwMenu.save.labelString:	存檔:
-Emacs*XlwMenu.saveAs___.labelString:	存成新檔
-Emacs*XlwMenu.saveSomeBuffers.labelString:	選擇性儲存
-Emacs*XlwMenu.printBuffer.labelString:	列印:
-Emacs*XlwMenu.prettyPrintBuffer.labelString:	高品質列印:
-Emacs*XlwMenu.newFrame.labelString:	開新 Frame
-Emacs*XlwMenu.frameOnOtherDisplay___.labelString:	在別的 Display 上開新 Frame
-Emacs*XlwMenu.deleteFrame.labelString:	消除 Frame
-Emacs*XlwMenu.splitWindow.labelString:	分割 Window
-Emacs*XlwMenu.unSplitKeepThis.labelString:	放大這個 Window
-Emacs*XlwMenu.unSplitKeepOthers.labelString:	縮小這個 Window
-Emacs*XlwMenu.revertBuffer.labelString:	復原回原檔案:
-Emacs*XlwMenu.deleteBuffer.labelString:	清除 buffer:
-Emacs*XlwMenu.exitXEmacs.labelString:	離開 XEmacs 
-
-!! Edit menu
-
-Emacs*XlwMenu.undo.labelString:	復原
-Emacs*XlwMenu.cut.labelString: 剪下
-Emacs*XlwMenu.copy.labelString:	複製
-Emacs*XlwMenu.paste.labelString:	貼上
-Emacs*XlwMenu.clear.labelString:	消去
-Emacs*XlwMenu.search___.labelString:	搜索...
-Emacs*XlwMenu.searchBackward___.labelString:	向後搜索...
-Emacs*XlwMenu.replace___.labelString:	置換...
-Emacs*XlwMenu.searchRegexp___.labelString:	搜索(Regexp)...
-Emacs*XlwMenu.searchBackwardRegexp___.labelString:	向後搜索(Regexp)...
-Emacs*XlwMenu.replaceRegexp___.labelString:	置換(Regexp)...
-Emacs*XlwMenu.bookmarks.labelString:	書簽
-Emacs*XlwMenu.gotoLine___.labelString:	跳到某一行...
-Emacs*XlwMenu.whatLine.labelString:	目前行號
-Emacs*XlwMenu.startMacroRecording.labelString:	開始錄 Macro
-Emacs*XlwMenu.endMacroRecording.labelString:	結束錄 Macro
-Emacs*XlwMenu.showMessageLog.labelString:	顯示訊息紀錄
-Emacs*XlwMenu.executeLastMacro.labelString:	執行最近的
-Emacs*XlwMenu.jumpToBookmark.labelString:	跳到書簽
-Emacs*XlwMenu.setBookmark.labelString:	設定書簽
-Emacs*XlwMenu.insertContents.labelString:	插入內容
-Emacs*XlwMenu.insertLocation.labelString:	插入位置
-Emacs*XlwMenu.renameBookmark.labelString:	重新命名
-Emacs*XlwMenu.deleteBookmark.labelString:	刪除
-Emacs*XlwMenu.editBookmarkList.labelString:	編輯書簽列表
-Emacs*XlwMenu.saveBookmarks.labelString:	儲存書簽
-Emacs*XlwMenu.saveBookmarksAs___.labelString:	將書簽存成...
-Emacs*XlwMenu.loadABookmarkFile.labelString:	讀入書簽檔
-
-!! Apps menu
-
-Emacs*XlwMenu.readMailVM___.labelString:	讀信 (使用 VM)...
-Emacs*XlwMenu.readMailMH___.labelString:	讀信 (使用 MH)...
-Emacs*XlwMenu.sendMail___.labelString:	寄信...
-Emacs*XlwMenu.browseTheWeb.labelString:	流覽 WWW
-Emacs*XlwMenu.spellCheckBuffer.labelString:	拼字檢查程式
-Emacs*XlwMenu.toggleVIEmulation.labelString:	模擬 vi
-Emacs*XlwMenu.calendar.labelString:	月曆
-Emacs*XlwMenu.games.labelString:	遊戲
-Emacs*XlwMenu.3MonthCalendar.labelString:	最近三個月
-Emacs*XlwMenu.diary.labelString:	日記
-Emacs*XlwMenu.holidays.labelString:	節日
-Emacs*XlwMenu.phasesOfTheMoon.labelString:	月亮
-Emacs*XlwMenu.sunriseSunset.labelString:	日出/日落
-Emacs*XlwMenu.quoteFromZippy.labelString:	Zippy 格言集
-Emacs*XlwMenu.psychoanalyst.labelString:	精神醫生
-Emacs*XlwMenu.mineGame.labelString:	踩地雷
-Emacs*XlwMenu.tetris.labelString:	俄羅思方塊
-Emacs*XlwMenu.psychoanalyzeZippy.labelString:	精神分析 Zippy!
-Emacs*XlwMenu.randomFlames.labelString:	活得不耐煩
-Emacs*XlwMenu.dunnetAdventure.labelString:	Dunnet (冒險)
-Emacs*XlwMenu.towersOfHanoi.labelString:	河內之塔
-Emacs*XlwMenu.gameOfLife.labelString:	生命遊戲
-Emacs*XlwMenu.multiplicationPuzzle.labelString:	乘法遊戲
-
-!! Options menu
-
-Emacs*XlwMenu.readOnly.labelString:	唯讀
-Emacs*XlwMenu.editingOptions.labelString:	編輯選項
-Emacs*XlwMenu.generalOptions.labelString:	一般選項
-Emacs*XlwMenu.printingOptions.labelString:	列印選項
-Emacs*XlwMenu.otherWindowLocation.labelString:	"其它 Window" 的位置
-Emacs*XlwMenu.syntaxHighlighting.labelString:	依語法 Highlighting
-Emacs*XlwMenu.parenHighlighting.labelString:	對括號 Hightlighting
-Emacs*XlwMenu.frameAppearance.labelString:	Frame 外觀
-Emacs*XlwMenu.menubarAppearance.labelString:	選單外觀
-Emacs*XlwMenu.toolbarAppearance.labelString:	工具列外觀
-Emacs*XlwMenu.mouse.labelString: 滑鼠
-Emacs*XlwMenu.openURLsWith.labelString:	內定瀏覽器
-Emacs*XlwMenu.browseFaces___.labelString:	瀏覽 Faces...
-Emacs*XlwMenu.font.labelString:	字形
-Emacs*XlwMenu.size.labelString:	大小
-Emacs*XlwMenu.weight.labelString:	字體
-Emacs*XlwMenu.languageEnvironment.labelString:	語言環境
-Emacs*XlwMenu.saveOptions.labelString:	儲存選項
-
-!! Options -> Editing
-
-Emacs*XlwMenu.overstrike.labelString:	覆蓋
-Emacs*XlwMenu.caseSensitiveSearch.labelString:	在搜索時區分大小寫
-Emacs*XlwMenu.caseMatchingReplace.labelString:	在置換時區分大小寫
-Emacs*XlwMenu.autoDeleteSelection.labelString:	自動刪除 Selection
-Emacs*XlwMenu.mousePasteAtTextCursor.labelString:	滑鼠貼在在文字游標處
-
-!! Options -> General
-
-Emacs*XlwMenu.debugOnError.labelString:	在錯誤時 Debug
-Emacs*XlwMenu.debugOnQuit.labelString:	在結束時 Debug
-
-!! Options -> Printing Options
-
-Emacs*XlwMenu.commandLineSwitchesForLprLp___.labelString:	lp/lpr 的命令列參術
-Emacs*XlwMenu.prettyPrintWithColor.labelString:	在高品質列印下印彩色
-Emacs*XlwMenu.prettyPrintPaperSize.labelString:	高品質列印的紙張大小
-
-!! Options -> Other Window
-
-Emacs*XlwMenu.alwaysInSameFrame.labelString:	總是在同一個 Frame
-Emacs*XlwMenu.otherFrame2FramesMax.labelString:	其它 Frame (最大 2 個)
-Emacs*XlwMenu.otherFrame3FramesMax.labelString:	其他 Frame (最大 3 個)
-Emacs*XlwMenu.otherFrame4FramesMax.labelString:	其他 Frame (最大 4 個)
-Emacs*XlwMenu.otherFrame5FramesMax.labelString:	其他 Frame (最大 5 個)
-Emacs*XlwMenu.alwaysCreateNewFrame.labelString:	總是開新的 Frame
-Emacs*XlwMenu.tempBuffersAlwaysInSameFrame.labelString:	暫時性的 Buffer 待在同個 Frame
-Emacs*XlwMenu.tempBuffersLikeOtherBuffers.labelString:	暫時性 Buffer 不特別處理
-
-!! Options -> Syntax Highlighting
-
-Emacs*XlwMenu.inThisBuffer.labelString:	在本 Buffer
-Emacs*XlwMenu.automatic.labelString:	自動
-Emacs*XlwMenu.fonts.labelString:	字形
-Emacs*XlwMenu.colors.labelString:	顏色
-Emacs*XlwMenu.least.labelString:	最少
-Emacs*XlwMenu.more.labelString:	多
-Emacs*XlwMenu.evenMore.labelString:	更多
-Emacs*XlwMenu.most.labelString:	最大
-Emacs*XlwMenu.lazy.labelString:	延遲
-Emacs*XlwMenu.caching.labelString:	快取
-
-!! Options -> Paren Highlighting
-
-Emacs*XlwMenu.none.labelString:	無
-Emacs*XlwMenu.blinkingParen.labelString:	閃動括號
-Emacs*XlwMenu.steadyParen.labelString:	括號變色
-Emacs*XlwMenu.expression.labelString:	表示式
-
-!! Options -> Frame Appearance
-
-Emacs*XlwMenu.scrollbars.labelString:	捲軸
-Emacs*XlwMenu.3DModeline.labelString:	3D 狀態列
-Emacs*XlwMenu.truncateLines.labelString: 捲動橫軸顯示長行
-Emacs*XlwMenu.barCursor.labelString:	棒狀游標
-Emacs*XlwMenu.blinkingCursor.labelString:	閃動游標
-Emacs*XlwMenu.frameLocalFontMenu.labelString: 字形選單不影響其他 Frame
-
-!! Options -> Menubar Appearance
-
-Emacs*XlwMenu.buffersMenuLength___.labelString:	Buffers 選單長度...
-Emacs*XlwMenu.multiOperationBuffersSubMenus.labelString:	多功能 Buffers 子選單
-Emacs*XlwMenu.buffersMenuSorting.labelString:	Buffers 選單排序
-Emacs*XlwMenu.submenusForBufferGroups.labelString:	Buffer 群組子選單
-Emacs*XlwMenu.ignoreScaledFonts.labelString:	忽略縮放過的字形
-
-!! Options -> Menubar Appearance -> Buffers Menu Sorting
-
-Emacs*XlwMenu.mostRecentlyUsed.labelString:	使用日期
-Emacs*XlwMenu.alphabetically.labelString:	字母順序
-Emacs*XlwMenu.byMajorModeThenAlphabetically.labelString:	先依 Major Mode，再按字母順序
-
-!! Options -> Toolbar Appearance
-
-Emacs*XlwMenu.visible.labelString:	顯示
-Emacs*XlwMenu.captioned.labelString:	提供標題
-Emacs*XlwMenu.defaultLocation.labelString:	預設位置
-Emacs*XlwMenu.top.labelString:	上
-Emacs*XlwMenu.bottom.labelString:	下
-Emacs*XlwMenu.left.labelString:	左
-Emacs*XlwMenu.right.labelString:	右
-
-!! Options -> Language Environment
-
-Emacs*XlwMenu.arabic.labelString:	阿拉伯文
-Emacs*XlwMenu.chinese.labelString:	中文
-Emacs*XlwMenu.european.labelString:	西歐語系
-Emacs*XlwMenu.greek.labelString:	希臘文
-Emacs*XlwMenu.hebrew.labelString:	西伯來文
-Emacs*XlwMenu.japanese.labelString:	日文
-Emacs*XlwMenu.korean.labelString:	韓文
-Emacs*XlwMenu.thai.labelString:	泰文
-Emacs*XlwMenu.vietnamese.labelString:	越南文
-
-Emacs*XlwMenu.describeLanguageSupport.labelString: 描述語言的支援
-Emacs*XlwMenu.setLanguageEnvironment.labelString: 設定語言環境
-Emacs*XlwMenu.toggleInputMethod.labelString: 切換輸入法
-Emacs*XlwMenu.selectInputMethod.labelString: 選擇輸入法
-Emacs*XlwMenu.describeInputMethod.labelString: 描述輸入法
-Emacs*XlwMenu.describeCurrentCodingSystems.labelString: 描述目前編碼系統
-Emacs*XlwMenu.setCodingSystemOfBufferFile.labelString: 設定 Buffer 檔案的編碼系統
-Emacs*XlwMenu.setCodingSystemOfTerminal.labelString: 設定 Terminal 的編碼系統
-Emacs*XlwMenu.setCodingSystemOfKeyboard.labelString: 設定鍵盤輸入的編碼系統
-Emacs*XlwMenu.setCodingSystemOfProcess.labelString: 設定 Process 的編碼系統
-Emacs*XlwMenu.showCharacterTable.labelString: 顯示字元表
-!Emacs*XlwMenu.showDiagnosisOfMULE.labelString: 顯示 MULE 診斷
-Emacs*XlwMenu.showManyLanguages.labelString: 展示多國語言
-
-!! Buffers menu
-
-Emacs*XlwMenu.listAllBuffers.labelString:	全部 Buffers 清單
-
-!! below are Buffers submenus
-
-Emacs*XlwMenu.switchToBuffer.labelString:	切換到 Buffer
-Emacs*XlwMenu.switchToBufferOtherFrame.labelString:	在別的 Frame 切換 Buffer
-Emacs*XlwMenu.saveBuffer.labelString:	儲存 Buffer
-
-!! Tools menu
-
-Emacs*XlwMenu.compile___.labelString:	編譯
-Emacs*XlwMenu.shellCommand___.labelString:	Shell 指令
-Emacs*XlwMenu.shellCommandOnRegion___.labelString:	在 Region 上處理 Shell 指令
-Emacs*XlwMenu.debugGDB___.labelString:	除錯 (使用 gdb)...
-Emacs*XlwMenu.debugDBX___.labelString:	除錯 (使用 dbx)...
-Emacs*XlwMenu.vC.labelString:	版本管理 (VC)
-Emacs*XlwMenu.compare.labelString:	比較
-Emacs*XlwMenu.merge.labelString:	合併
-Emacs*XlwMenu.applyPatch.labelString:	執行 Patch
-
-!! Tools -> VC
-
-Emacs*XlwMenu.registerFile.labelString:	登錄檔案:
-Emacs*XlwMenu.checkInFile.labelString:	check in 檔案:
-Emacs*XlwMenu.checkOutFile.labelString:	check out 檔案:
-Emacs*XlwMenu.showStatusOf.labelString:	狀態表示
-Emacs*XlwMenu.revertToLastRevision.labelString:	復原到上次 Revision
-Emacs*XlwMenu.cancelLastCheckin.labelString:	取消上次的 Checkin
-Emacs*XlwMenu.renameFile.labelString: 重新命名:
-Emacs*XlwMenu.diffAgainstLastVersion.labelString: 與上次版本 Diff
-Emacs*XlwMenu.diffBetweenRevisions___.labelString: 對 Revisions 做 Diff...
-Emacs*XlwMenu.visitOtherVersion___.labelString: 查看其他版本...
-Emacs*XlwMenu.showEditHistory.labelString:	顯示編輯歷史
-Emacs*XlwMenu.createSnapshot.labelString:	製作 Snapshot
-Emacs*XlwMenu.retrieveSnapshot.labelString:	取回 Snapshot
-Emacs*XlwMenu.cVSUpdateDirectory.labelString:	CVS 更新目錄
-
-!! Tools -> Compare
-
-Emacs*XlwMenu.twoFiles___.labelString:	2 檔案...
-Emacs*XlwMenu.twoBuffers___.labelString:	2 Buffers...
-Emacs*XlwMenu.threeFiles___.labelString:	3 檔案...
-Emacs*XlwMenu.threeBuffers___.labelString:	3 Buffers...
-Emacs*XlwMenu.twoDirectories___.labelString:	2 目錄...
-Emacs*XlwMenu.threeDirectories___.labelString:	3 目錄...
-Emacs*XlwMenu.fileWithRevision___.labelString:	檔案及 Revision...
-Emacs*XlwMenu.directoryRevisions___.labelString:	目錄 Revisions...
-Emacs*XlwMenu.windowsWordByWord___.labelString:	一字一字比較 Windows...
-Emacs*XlwMenu.windowsLineByLine___.labelString:	一行一行比較 Windows...
-Emacs*XlwMenu.regionsWordByWord___.labelString:	一字一字比較 Region...
-Emacs*XlwMenu.regionsLineByLine___.labelString:	一行一行比較 Region...
-
-!! Tools -> Merge
-
-Emacs*XlwMenu.files___.labelString:	多檔...
-Emacs*XlwMenu.filesWithAncestor___.labelString:	檔案及其 Ancestor...
-Emacs*XlwMenu.buffers___.labelString:	多 Buffers...
-Emacs*XlwMenu.buffersWithAncestor___.labelString:	Buffers 及其 Ancestor...
-Emacs*XlwMenu.directories___.labelString:	目錄間...
-Emacs*XlwMenu.directoriesWithAncestor___.labelString:	目錄及其 Ancestor...
-Emacs*XlwMenu.revisionsWithAncestor___.labelString:	Revisions 及其 Ancestor...
-Emacs*XlwMenu.directoryRevisionsWithAncestor___.labelString:	目錄 Revisions 及其 Ancestor...
-
-!! Tools -> Apply Patch
-
-Emacs*XlwMenu.toAFile___.labelString:	到一個檔案上...
-Emacs*XlwMenu.toABuffer___.labelString:	到一個 buffer...
-
-!! Tools -> Ediff Miscellanea
-
-Emacs*XlwMenu.ediffMiscellanea.labelString:	Ediff 雜項
-Emacs*XlwMenu.listEdiffSessions___.labelString:	Ediff Sessions 一覽...
-Emacs*XlwMenu.ediffManual___.labelString:	Ediff 手冊...
-Emacs*XlwMenu.useSeparateFrameForEdiffControlBuffer___.labelString:  給控制 Ediff 的 buffer 一個獨立的 frame
-Emacs*XlwMenu.useAToolbarWithEdiffControlBuffer.labelString: 給控制 Ediff 的 buffer 一個特製工具列
-
-!! Tools -> Tags
-
-Emacs*XlwMenu.findTag___.labelString: 尋找 Tag...
-Emacs*XlwMenu.findOtherWindow___.labelString:	尋找 Tag 並輸出到別的 Window...
-Emacs*XlwMenu.nextTag___.labelString:	下個 Tag...
-Emacs*XlwMenu.nextOtherWindow___.labelString:	下個 Tag 並輸出到其它 Window...
-Emacs*XlwMenu.nextFile.labelString:	下個檔案
-Emacs*XlwMenu.tagsSearch___.labelString:	搜索 Tags...
-Emacs*XlwMenu.tagsReplace___.labelString:	置換 Tags...
-Emacs*XlwMenu.continueSearchReplace.labelString:	繼續前次搜索/置換
-Emacs*XlwMenu.apropos___.labelString:	接近字(Apropos)...
-Emacs*XlwMenu.setTagsTableFile___.labelString:	設定 Tags 表格檔...
-
-!! Help menu
-
-Emacs*XlwMenu.aboutXEmacs___.labelString:	關於 XEmacs ...
-Emacs*XlwMenu.basics.labelString:	基礎
-Emacs*XlwMenu.xEmacsWWWPage.labelString:	XEmacs WWW 網頁
-Emacs*XlwMenu.xEmacsFAQ.labelString:	XEmacs FAQ (常見問題集)
-Emacs*XlwMenu.fAQLocal.labelString:	FAQ (從檔案)
-Emacs*XlwMenu.fAQViaWWW.labelString:	FAQ (從WWW)
-Emacs*XlwMenu.homePage.labelString:	XEmacs 首頁
-
-Emacs*XlwMenu.tutorial.labelString:	一步步入門
-Emacs*XlwMenu.news.labelString:	XEmacs 最近消息
-
-Emacs*XlwMenu.sample.labelString:	範例檔:
-Emacs*XlwMenu.infoDetailedDocs.labelString:	Info (詳細文件)
-Emacs*XlwMenu.lookupInInfo.labelString:	查詢 Info
-Emacs*XlwMenu.packages.labelString:	瀏覽程式套件(Packages)
-Emacs*XlwMenu.splash.labelString:	歡迎畫面
-Emacs*XlwMenu.aproposDocumentation___.labelString:	由接近字(Apropos) 查文件...
-Emacs*XlwMenu.recentKeys.labelString:	最近的按鍵/訊息
-Emacs*XlwMenu.recentMessages.labelString:	最近的訊息
-Emacs*XlwMenu.submitBugReport.labelString:	回報程式的 Bug
-
-Emacs*XlwMenu.commandKeys.labelString:	指令及快速鍵...
-Emacs*XlwMenu.mode.labelString:	有關目前模式
-Emacs*XlwMenu.aproposDocs___.labelString:	文件中尋找接近字(Apropos)...
-Emacs*XlwMenu.key___.labelString:	描述某快速鍵...
-Emacs*XlwMenu.bindings.labelString:	目前所有快速鍵定義...
-
-Emacs*XlwMenu.describeKeyMouse___.labelString:	描述快速鍵/滑鼠定義...
-Emacs*XlwMenu.commandsKeys.labelString:	指令與快速鍵
-Emacs*XlwMenu.keyBinding___.labelString:	快速鍵定義...
-Emacs*XlwMenu.mouseBindings.labelString:	滑鼠定義一覽
-Emacs*XlwMenu.describeFunction___.labelString:	函式說明...
-Emacs*XlwMenu.describeVariable___.labelString:	變數說明...
-Emacs*XlwMenu.locateCommand___.labelString:	指令的快速鍵為...
-Emacs*XlwMenu.manuals.labelString:	使用手冊
-Emacs*XlwMenu.unixManual___.labelString:	Unix 使用手冊...
-Emacs*XlwMenu.misc.labelString:	雜項
-Emacs*XlwMenu.customize.labelString:	自定
-
-!! Help -> Lookup in Info
-
-Emacs*XlwMenu.keyMouseBinding___.labelString:	快速鍵/滑鼠定義...
-Emacs*XlwMenu.command___.labelString:	指令...
-Emacs*XlwMenu.topic___.labelString:	開啟 info 檔...
-
-!! Help -> Misc
-
-Emacs*XlwMenu.describeNoWarranty.labelString: 聲明本程式不負責任
-Emacs*XlwMenu.describeXEmacsLicense.labelString: XEmacs 的授權
-Emacs*XlwMenu.gettingTheLatestVersion.labelString: 取得最新版本
-
-!!! WorkShop
-
-!! WorkShop menu
-
-Emacs*XlwMenu.breakpoints.labelString:	中斷點
-Emacs*XlwMenu.program.labelString:	程式
-Emacs*XlwMenu.fix.labelString:	修正
-
-!! WorkShop -> Breakpoints
-
-Emacs*XlwMenu.stopAt.labelString:	停止在
-Emacs*XlwMenu.stopInSelected.labelString:	停止在選擇區
-Emacs*XlwMenu.deleteBreakpointAt.labelString:	刪除此處中斷點
-
-!! WorkShop -> Program
-
-Emacs*XlwMenu.start.labelString:	開始
-Emacs*XlwMenu.interrupt.labelString:	中斷
-
-!!! Modes:
-
-!!! Lisp-interaction mode and Lisp mode
-
-Emacs*XlwMenu.lispInteraction.labelString: 交談式 Lisp
-Emacs*XlwMenu.evaluateLastSExpression.labelString: Evalute 上個 S-expression
-Emacs*XlwMenu.evaluateEntireBuffer.labelString: Evaluate 整個 Buffer
-Emacs*XlwMenu.commentOutRegion.labelString: 將整個 Region 注解掉
-Emacs*XlwMenu.indentRegion.labelString: 縮排此 Region
-Emacs*XlwMenu.indentLine.labelString: 縮排此行
-
-!! C mode
-
-Emacs*XlwMenu.upConditional.labelString: 往上一個條件式
-Emacs*XlwMenu.backwardConditional.labelString: 往後一個條件式
-Emacs*XlwMenu.forwardConditional.labelString: 往前一個條件式
-Emacs*XlwMenu.backwardStatement.labelString: 往後一個指令
-Emacs*XlwMenu.forwardStatement.labelString: 往前一個指令
-
-!! Default edit popup menu
-
-Emacs*XlwMenu.xEmacsCommands.labelString:	XEmacs 指令
-Emacs*XlwMenu.selectBlock.labelString:	選擇區塊
-Emacs*XlwMenu.unsplitWindow.labelString:	放大 Window
-
-!! Default modeline popup menu
-
-Emacs*XlwMenu.deleteWindowAbove.labelString: 砍掉上面的 Window
-Emacs*XlwMenu.deleteOtherWindows.labelString: 砍掉另一個 Window
-Emacs*XlwMenu.splitWindowAbove.labelString: 分割上面的 Window
-Emacs*XlwMenu.splitWindowHorizontally.labelString: 水平分割 Window
-Emacs*XlwMenu.balanceWindows.labelString: 平衡 Windows 排列
-
-!! (Shell mode) History menu
-
-Emacs*XlwMenu.expandHistoryBeforePoint.labelString: 在指標前展開 History
-Emacs*XlwMenu.listInputHistory.labelString: 列出輸入的 History
-
-
-!
-! Part 2: XRESOURCES
-!
-
-Emacs.geometry:	80x30+10+10
-
-!
-! The Lucid Scrollbar supports two added resources, SliderStyle is either
-! "plain" (default) or "dimple".  Dimple puts a small dimple in the middle
-! of the slider that depresses when the slider is clicked on.  ArrowPosition is
-! either "opposite" (default) or "same".  Opposite puts the arrows at opposite
-! of the scrollbar, same puts both arrows at the same end, like the Amiga.
-!
-Emacs*XlwScrollBar.SliderStyle:		dimple
-Emacs*XlwScrollBar.ArrowPosition:	opposite
-
-! Fonts.
-! ======
-
-!! FontSet for the window frame and menus when you use USE_XFONTSET
-!Emacs.FontSet-0: -*-medium-r-normal--16-*,chinese-big5-unix:-arphic-*-medium-r-*-16-*-big5-0
-
-! CDE doesn't require this but OpenWindows does.
-! Lucid also need this to set menubar fonts.
-Emacs*fontList:	-*-medium-r-normal--16-*-iso8859-1;\
-		-arphic-ming-medium-r-normal--16-*-big5-0:
-
-! The default font for the text area of XEmacs is chosen at run-time
-! by lisp code which tries a number of different possibilities in order
-! of preference.  If you wish to override it, use this:
-! 
-Emacs.default.attributeFont:	-*-medium-r-normal--16-*
-
-! If you choose a font which does not have an italic version, you can specify
-! some other font to use for it here:
-! 
-Emacs.italic.attributeFont:	-*-medium-i-normal--16-*
-
-! Font of the modeline, menubar and pop-up menus.
-! Note that the menubar resources do not use the `face' syntax, since they
-! are X toolkit widgets and thus outside the domain of XEmacs proper.
-! 
-!Emacs*menubar*Font: 		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-!Emacs*popup*Font:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-
-! Font in the Motif dialog boxes.
-! (Motif uses `fontList' while most other things use `font' - if you don't
-! know why you probably don't want to.)
-! 
-!Emacs*XmDialogShell*FontList:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-!Emacs*XmTextField*FontList:	-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-!Emacs*XmText*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-!Emacs*XmList*FontList:		-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
-
-! Font in the Athena dialog boxes.
-! I think 14-point looks nicer than 12-point.
-! Some people use 12-point anyway because you get more text, but
-! there's no purpose at all in doing this for dialog boxes.
-
-!Emacs*Dialog*Font:		-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
-
-! XIM input method style 
-! ======================= 
-
-Emacs.inputMethod:	xcin
-Emacs.preeditType:	Root
-
-! ximStyles is a (whitespace or comma-separated) list of XIMStyles in
-! order of user's preference.  
-! Choose a subset of the following styles or reorder to taste
-Emacs*ximStyles: XIMPreeditPosition|XIMStatusArea\
-            XIMPreeditPosition|XIMStatusNothing\
-            XIMPreeditPosition|XIMStatusNone\
-            XIMPreeditNothing|XIMStatusArea\
-            XIMPreeditNothing|XIMStatusNothing\
-            XIMPreeditNothing|XIMStatusNone\
-            XIMPreeditNone|XIMStatusArea\
-            XIMPreeditNone|XIMStatusNothing\
-            XIMPreeditNone|XIMStatusNone
-
-! XIM Preedit and Status foreground and background
-!Emacs*EmacsFrame.ximForeground: black
-!Emacs*EmacsFrame.ximBackground: white
-
-! XIM fontset (defaults to system fontset default)
-! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*
-
-*cursorColor: IndianRed
--- a/chinese/xemacs/files/patch-af
+++ b/chinese/xemacs/files/patch-af
@ -1,11 +0,0 @@
--- configure	Thu Nov 20 03:13:44 1997
-+++ configure.n	Tue Dec  9 09:55:11 1997
-@@ -9706,7 +9706,7 @@
- 
-     fi
-   if test "$with_database_berkdb" = "yes"; then
-    for path in "db/db.h" "db.h"; do
-+    for path in "/usr/include/db.h" "db/db.h" "db.h"; do
- cat > conftest.$ac_ext <<EOF
- #line 9712 "configure"
- #include "confdefs.h"
--- a/chinese/xemacs/files/patch-ag
+++ b/chinese/xemacs/files/patch-ag
@ -1,21 +0,0 @@
-This patch eliminates a harmless warning which began to be emitted
-under FreeBSD-current when the dynamic linker was revamped to allocate
-its memory out of the application's arena.
-
--- src/unexfreebsd.c.orig	Wed Dec 18 14:44:07 1996
-+++ src/unexfreebsd.c	Thu Dec 11 18:06:31 1997
-@@ -680,13 +680,7 @@
- {
-       unsigned long current_sbrk = (unsigned long) sbrk (0);
- 
-      if (sbrk_of_0_at_unexec < current_sbrk)
-	{
-	  if (sbrk_of_0_at_unexec != 0)
-	    fprintf (stderr, "Absurd new brk addr = 0x%x (current = 0x%x)\n", 
-		     sbrk_of_0_at_unexec, current_sbrk);
-	}
-      else
-+      if (sbrk_of_0_at_unexec > current_sbrk)
-         {
-           errno = 0;
-           if (brk ((caddr_t) sbrk_of_0_at_unexec))
--- a/chinese/xemacs/files/patch-ah
+++ b/chinese/xemacs/files/patch-ah
@ -1,44 +0,0 @@
--- orig/s/freebsd.h	Mon Oct 13 13:47:36 1997
-+++ src/s/freebsd.h	Tue Sep 29 12:08:15 1998
-@@ -45,6 +45,20 @@
- 
- #define LIBS_TERMCAP "-ltermcap"
- 
-+#ifdef __ELF__ /* since from 3.0-CURRENT(maybe 19980831 or later) */
-+#ifndef NOT_C_CODE
-+#include <stddef.h>
-+#endif
-+#define LD_SWITCH_SYSTEM
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-+#define UNEXEC unexelf.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#define LINKER "$(CC) -nostdlib"
-+#undef LIB_GCC
-+#define LIB_GCC
-+
-+#else /* not __ELF__ */
-+
- #ifndef NO_SHARED_LIBS
- #if 0 /* mrb */
- #define LIB_GCC "-lgcc"
-@@ -74,6 +88,8 @@
- #define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
- #endif /* __FreeBSD__ */
- #endif /* NO_SHARED_LIBS */
-+
-+#endif /* not __ELF__ */
- 
- #define HAVE_GETLOADAVG
- /* #define NO_TERMIO */ /* detected in configure */
--- orig/unexelf.c	Fri Feb 13 08:28:06 1998
-+++ src/unexelf.c	Tue Sep 29 12:08:15 1998
-@@ -846,7 +846,9 @@
- 
-       for (; symp < symendp; symp ++)
- 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
-	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
-+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
- 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
-     }
--- a/chinese/xemacs/files/patch-ai
+++ b/chinese/xemacs/files/patch-ai
@ -1,20 +0,0 @@
--- lib-src/fakemail.c.orig	Tue Mar 23 22:09:58 1999
-+++ lib-src/fakemail.c	Tue Mar 23 22:12:20 1999
-@@ -157,9 +157,17 @@
- extern char *malloc (), *realloc ();
- #endif
- 
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
-+#define CURRENT_USER
-+#endif
-+
- #ifdef CURRENT_USER
- extern struct passwd *getpwuid ();
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
-+extern uid_t geteuid ();
-+#else
- extern unsigned short geteuid ();
-+#endif
- static struct passwd *my_entry;
- #define cuserid(s)				\
- (my_entry = getpwuid (((int) geteuid ())),	\
--- a/chinese/xemacs/files/patch-aj
+++ b/chinese/xemacs/files/patch-aj
@ -1,12 +0,0 @@
--- lisp/mule/mule-init.el.orig	Sun Oct 31 04:21:40 1999
-+++ lisp/mule/mule-init.el	Sun Oct 31 04:22:28 1999
-@@ -85,7 +85,8 @@
- 
- (defvar auto-language-alist
-   '(("^ja" . "Japanese")
-    ("^zh" . "Chinese")
-+    ("^zh.*5$" . "Chinese-BIG5")
-+    ("^zh" . "Chinese-GB")
-     ("^ko" . "Korean"))
-   "Alist of LANG patterns vs. corresponding language environment.
- Each element looks like (REGEXP . LANGUAGE-ENVIRONMENT).
--- a/chinese/xemacs/files/sample.emacs
+++ b/chinese/xemacs/files/sample.emacs
@ -1,34 +0,0 @@
-(set-language-environment 'Chinese-BIG5)
-; after this, (coding-priority-list) is right,
-; but describe current coding system under Mule menu 
-; is wrong
-
-(set-default-buffer-file-coding-system 'chinese-big5)
-; (prefer-coding-system 'chinese-big5)
-(set-input-mode nil nil t)
-(setq-default default-input-method 'chinese-zozy)
-
-(global-set-key (kbd "M-SPC") 'set-mark-command)
-
-; even the file isn't like big5 (such as bbs article with escape)
-; it would be opened in big5
-; some special files would be open in different coding system
-; see `file-coding-system-alist'
-(setq buffer-file-coding-system-for-read 'chinese-big5)
-(modify-coding-system-alist 'file "\\.jpg$" 'binary)
-(modify-coding-system-alist 'file "\\.gif$" 'binary)
-(modify-coding-system-alist 'file "\\.png$" 'binary)
-
-;gnus of XEmacs doesn't have seperate group decode/encode
-;it just use a universal coding-system 
-;anyway.. it's good enough for most people
-(modify-coding-system-alist 'network "nntp" 'chinese-big5)
-
-;recognize all process output as chinese (like ls,man...)
-;XEmacs use a lot of external programs, but if it require
-;some special encoding(like binary),it would explicitly
-;assign it. so don't worry.
-;use big5-unix is for those situation XEmacs can't guess
-;CR/LF.
-(modify-coding-system-alist 'process ".*" 'big5-unix)
-
--- a/chinese/xemacs/files/xemacs20.sh
+++ b/chinese/xemacs/files/xemacs20.sh
@ -1,27 +0,0 @@
-#!/bin/sh
-# script to create the lock directory in case it was
-# removed in /etc/rc
-#echo -n ' Xemacs'
-
-case $1 in
-start)
-	if [ -d /var/run/emacs/lock ]
-	then
-	# delete any junk which may have been left around
-		rm -f /var/run/emacs/lock/*
-	else
-		mkdir -p /var/run/emacs/lock
-	fi
-	# can always do this
-	chmod 1777 /var/run/emacs/lock
-	;;
-stop)
-	# nothing to do
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
--- a/chinese/xemacs/pkg-descr
+++ b/chinese/xemacs/pkg-descr
@ -1,8 +0,0 @@
-See /usr/ports/editors/xemacs20/pkg/DESCR for details. :)
-
-This port adds XIM support to XEmacs, thus you can use X input server
-to input Chinese. It also comes with Chinese Big5 settings,
-including Big5-localized menus and buffer-file support.
-
-The Big5-localized menus are contributed by
-Clem Chuang (b5506056@csie.ntu.edu.tw)
--- a/chinese/xemacs/pkg-message
+++ b/chinese/xemacs/pkg-message
@ -1,12 +0,0 @@
---
-Now you have installed zh-XEmacs, do the following:
-cp /usr/local/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5/Emacs ~/Emacs
-cp /usr/local/lib/xemacs-20.4/etc/app-defaults/zh_TW.Big5/sample.emacs ~/.emacs
-
-Change Emacs.inputMethod to the input method you are using, say oxim/gcin/scim
-in ~/Emacs.
-
-To use XIM, run any input method like oxim/gcin/scim first, set BOTH LANG
-and LC_CTYPE to zh_TW.Big5, then execute xemacs.  You should be able to
-input Chinese now.
---
--- a/chinese/xemacs/pkg-plist
+++ b/chinese/xemacs/pkg-plist
--- a/converters/Makefile
+++ b/converters/Makefile
@ -35,7 +35,6 @@
    SUBDIR += mmencode
    SUBDIR += mpack
    SUBDIR += mule-ucs
-    SUBDIR += mule-ucs-emacs20
    SUBDIR += nomyso
    SUBDIR += p5-Boulder
    SUBDIR += p5-Convert-ASCII-Armour
--- a/converters/mule-ucs-emacs20/Makefile
+++ b/converters/mule-ucs-emacs20/Makefile
@ -1,21 +0,0 @@
-# New ports collection makefile for:	Mule-UCS for GNU Emacs 20
-# Date created:		14 January 2000
-# Whom:			OKAZAKI Tetsurou
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Universal encoding system for GNU Emacs 20
-
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../converters/mule-ucs
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
--- a/devel/Makefile
+++ b/devel/Makefile
@ -274,7 +274,6 @@
    SUBDIR += eet
    SUBDIR += egypt
    SUBDIR += eieio
-    SUBDIR += eieio-emacs20
    SUBDIR += eiffelstudio
    SUBDIR += elf
    SUBDIR += elfio
--- a/devel/eieio-emacs20/Makefile
+++ b/devel/eieio-emacs20/Makefile
@ -1,16 +0,0 @@
-# New ports collection makefile for:   eieio for emacs20
-# Date created:                10 December 2001
-# Whom:                        Kimura Fuyuki <fuyuki@mj.0038.net>
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../eieio
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/Makefile
+++ b/editors/Makefile
@ -10,7 +10,6 @@
    SUBDIR += aee
    SUBDIR += aewan
    SUBDIR += apel
-    SUBDIR += apel-emacs20
    SUBDIR += apel-emacs21
    SUBDIR += asedit
    SUBDIR += axe
@ -19,7 +18,6 @@
    SUBDIR += biew
    SUBDIR += bitedit
    SUBDIR += bitmap
-    SUBDIR += bitmap-emacs20
    SUBDIR += bitmap-emacs21
    SUBDIR += bless
    SUBDIR += boiling-egg
@ -44,14 +42,11 @@
    SUBDIR += emacs
    SUBDIR += emacs-devel
    SUBDIR += emacs.app
-    SUBDIR += emacs19
-    SUBDIR += emacs20
    SUBDIR += emacs21
    SUBDIR += etoile-typewriter
    SUBDIR += f4l
    SUBDIR += fb
    SUBDIR += flim
-    SUBDIR += flim-emacs20
    SUBDIR += flim-emacs21
    SUBDIR += flim-xemacs21-mule
    SUBDIR += fpc-ide
@ -104,8 +99,6 @@
    SUBDIR += mousepad
    SUBDIR += mp
    SUBDIR += muggy
-    SUBDIR += mule
-    SUBDIR += mule-common
    SUBDIR += nano
    SUBDIR += ne
    SUBDIR += nedit
@ -133,7 +126,6 @@
    SUBDIR += scite
    SUBDIR += scribes
    SUBDIR += semi
-    SUBDIR += semi-emacs20
    SUBDIR += semi-emacs21
    SUBDIR += semi-xemacs21-mule
    SUBDIR += setedit
@ -141,7 +133,6 @@
    SUBDIR += softmaker-office
    SUBDIR += spe
    SUBDIR += speedbar
-    SUBDIR += speedbar-emacs20
    SUBDIR += ssam
    SUBDIR += ssed
    SUBDIR += staroffice5
--- a/editors/apel-emacs20/Makefile
+++ b/editors/apel-emacs20/Makefile
@ -1,23 +0,0 @@
-# New ports collection makefile for:	apel for emacs20
-# Date created:		22 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Portable Emacs Library for emacs20
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/apel
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/bitmap-emacs20/Makefile
+++ b/editors/bitmap-emacs20/Makefile
@ -1,23 +0,0 @@
-# New ports collection makefile for:	bitmap for emacs20
-# Date created:		23 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Bitmap-mule, Package to use bitmap in Emacs20
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/bitmap
-
-# Setup EMACS_PORT_NAME variable.
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@ -1,64 +0,0 @@
-# New ports collection makefile for:	GNU emacs
-# Date created:		29 October 1994
-# Whom:			jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	emacs
-PORTVERSION=	19.34b
-PORTREVISION=	2
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	emacs
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GNU editing macros
-
-CONFLICTS=	emacs-21.* emacs-22.* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
-
-ONLY_FOR_ARCHS=	i386
-DEPRECATED=	emacs19 is obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-EMACS_VERSION=	19.34
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-PLIST_SUB=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
-NO_LATEST_LINK=	yes
-WRKSRC=		${WRKDIR}/emacs-19.34
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS=	--with-x-toolkit --sharedstatedir=/var/run
-USE_XLIB=	yes
-USE_XORG=	xbitmaps
-.else
-CONFIGURE_ARGS=	--with-x=no --sharedstatedir=/var/run
-.endif
-
-STRIP=
-MAN1=		emacs.1 etags.1 ctags.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 600000
-PLIST_SUB+=	NOTON6="@comment "
-.else
-PLIST_SUB+=	NOTON6=""
-.endif
-
-post-install:
-.for file in emacs-19.34 emacsclient etags ctags b2m
-	${STRIP_CMD} ${PREFIX}/bin/${file}
-.endfor
-.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# install emacs.sh into ${PREFIX}/etc/rc.d
-	${CHMOD} 1777 /var/run/emacs/lock
-	@${MKDIR} ${PREFIX}/etc/rc.d
-	@${INSTALL_SCRIPT} ${FILESDIR}/emacs.sh ${PREFIX}/etc/rc.d
-
-.include <bsd.port.post.mk>
--- a/editors/emacs19/distinfo
+++ b/editors/emacs19/distinfo
@ -1,3 +0,0 @@
-MD5 (emacs-19.34b.tar.gz) = 9bd3c694a9019c2a2ebd703a9a0394e0
-SHA256 (emacs-19.34b.tar.gz) = 1db556a180294f5067724a03f7fc10d5930f48d958872db66c68d0a00248bcda
-SIZE (emacs-19.34b.tar.gz) = 10926430
--- a/editors/emacs19/files/emacs.sh
+++ b/editors/emacs19/files/emacs.sh
@ -1,21 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	if [ -d /var/run/emacs/lock ]
-	then
-	    rm -f /var/run/emacs/lock/*
-	else
-	    mkdir -p /var/run/emacs/lock
-	fi
-	chmod 1777 /var/run/emacs/lock
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
--- a/editors/emacs19/files/patch-aa
+++ b/editors/emacs19/files/patch-aa
@ -1,235 +0,0 @@
--- ./man/vip.texi.org	Fri Jun 16 15:31:11 1995
-+++ ./man/vip.texi	Tue May 20 01:28:33 1997
-@@ -2,6 +2,10 @@
- 
- @setfilename ../info/vip
- @settitle VIP
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIP: (vip).			A VI-emulation for Emacs.
-+@end direntry
- 
- @iftex
- @finalout
--- ./man/emacs.texi.org	Mon Aug 19 21:15:12 1996
-+++ ./man/emacs.texi	Tue May 20 01:20:11 1997
-@@ -49,6 +49,11 @@
- @settitle GNU Emacs Manual
- @setfilename ../info/emacs
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs: (emacs).		The extensible self-documenting text editor.
-+@end direntry
-+
- @c
- @c in general, keep the following line commented out, unless doing a
- @c copy of this manual that will be published.  the manual should go
--- ./man/viper.texi.org	Wed Aug  7 10:59:45 1996
-+++ ./man/viper.texi	Tue May 20 01:29:17 1997
-@@ -4,6 +4,10 @@
- \input texinfo
- 
- @setfilename ../info/viper
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
-+@end direntry
- 
- @iftex
- @finalout
--- ./man/forms.texi.org	Sat Mar 23 06:42:27 1996
-+++ ./man/forms.texi	Tue May 20 01:22:37 1997
-@@ -9,6 +9,11 @@
- @syncodeindex vr cp
- @syncodeindex fn cp
- @syncodeindex ky cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Forms: (forms).		Emacs package for editing data bases
-+				by filling in forms.
-+@end direntry
- @iftex
- @finalout
- @setchapternewpage odd
--- ./man/gnus.texi.org	Wed Jun 26 14:49:29 1996
-+++ ./man/gnus.texi	Tue May 20 01:23:15 1997
-@@ -5,6 +5,11 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* GNUS: (gnus).			The news reader GNUS.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
--- ./man/mh-e.texi.org	Sun Aug  4 00:00:29 1996
-+++ ./man/mh-e.texi	Tue May 20 01:23:49 1997
-@@ -4,6 +4,10 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* MH-E: (mh-e).			Emacs interface to the MH mail system.
-+@end direntry
- 
- @setchapternewpage odd
- 
--- ./man/cl.texi.org	Mon Apr 15 21:36:53 1996
-+++ ./man/cl.texi	Tue May 20 01:24:18 1997
-@@ -2,6 +2,12 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
-+@end direntry
-+
-+
- @iftex
- @finalout
- @end iftex
--- ./man/sc.texi.org	Thu Jan  4 12:55:23 1996
-+++ ./man/sc.texi	Tue May 20 01:25:13 1997
-@@ -3,6 +3,12 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename ../info/sc
- @settitle Supercite Version 3.1 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* SC: (sc).			Supercite lets you cite parts of messages
-+				you're replying to, in flexible ways.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
--- ./man/dired-x.texi.org	Thu Jan  4 12:54:19 1996
-+++ ./man/dired-x.texi	Tue May 20 01:25:55 1997
-@@ -18,6 +18,11 @@
- @setfilename ../info/dired-x
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Dired-X: (dired-x).		Dired Extra Features.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
--- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
-+++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,11 @@
- @synindex vr cp
- @synindex fn cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Ediff: (ediff).		A comprehensive visual interface to diff
-+				and patch.
-+@end direntry
- @iftex
- @finalout
- @end iftex
--- ./man/cc-mode.texi.org	Sun Aug  4 21:56:21 1996
-+++ ./man/cc-mode.texi	Tue May 20 01:27:18 1997
-@@ -9,6 +9,12 @@
- @settitle     CC-MODE Version 4 Documentation
- @footnotestyle end
- 
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
-+				Objective-C and Java code.
-+@end direntry
-+
- @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @comment @setchapternewpage odd !! we don't want blank pages !!
- @comment %**end of header (This is for running Texinfo on a region)
--- ./man/message.texi.org	Wed Jun 26 14:49:43 1996
-+++ ./man/message.texi	Sat Dec 13 17:46:31 1997
-@@ -5,6 +5,10 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message).		Editing mail and news messages.
-+@end direntry
- @iftex
- @finalout
- @end iftex
--- ./Makefile.in.org	Mon Aug 19 21:12:19 1996
-+++ ./Makefile.in	Tue Apr 15 00:15:28 1997
-@@ -184,7 +184,7 @@
- # Subdirectories to make recursively.  `lisp' is not included
- # because the compiled lisp files are part of the distribution
- # and you cannot remake them without installing Emacs first.
-SUBDIR = lib-src src
-+SUBDIR = lib-src src man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
-@@ -368,14 +368,8 @@
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
- 	then \
- 	  (cd ${infodir};  \
-	   if [ -f dir ]; then \
-	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
-	     else mv -f dir dir.bak; fi; \
-	   fi; \
- 	   cd ${srcdir}/info ; \
-	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
-	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
-	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
-+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip*; do \
- 	     (cd $${thisdir}; \
- 	      ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
- 	      chmod a+r ${infodir}/$$f); \
-@@ -426,7 +420,7 @@
- 	    esac ;					\
- 	  fi ;						\
- 	done
-	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
-+	(cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* mh-e* sc* vip*)
- 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1)
- 	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
- 
--- ./man/Makefile.in.org	Thu Jun 27 15:27:19 1996
-+++ ./man/Makefile.in	Tue Apr 15 00:29:52 1997
-@@ -13,7 +13,7 @@
- # The makeinfo program is part of the Texinfo distribution.
- MAKEINFO = makeinfo
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
-	       ../info/ediff ../info/forms ../info/gnus ../info/info \
-+	       ../info/ediff ../info/forms ../info/gnus \
- 	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
- 	       ../info/message
- DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
-@@ -66,6 +66,7 @@
- 	${srcdir}/gnu1.texi \
- 	${srcdir}/glossary.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
-@@ -74,12 +75,6 @@
- # in srcdir.  There is no provision for Info files
- # to exist in the build directory.
- # In a distribution of Emacs, the Info files should be up to date.
-
-../info/info: ${INFOSOURCES}
-	cd $(srcdir); $(MAKEINFO) --no-split info.texi
-
-info.dvi: ${INFOSOURCES}
-	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
- 
- ../info/emacs: ${EMACSSOURCES}
- 	cd $(srcdir); $(MAKEINFO) emacs.texi
--- a/editors/emacs19/files/patch-ab
+++ b/editors/emacs19/files/patch-ab
@ -1,11 +0,0 @@
--- ./src/xrdb.c.org	Sat Apr  8 21:54:08 1995
-+++ ./src/xrdb.c	Mon Sep 11 21:53:29 1995
-@@ -361,7 +361,7 @@
- 
- /* Producing databases for individual sources.  */
- 
-#define X_DEFAULT_SEARCH_PATH "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-+#define X_DEFAULT_SEARCH_PATH "/usr/X11R6/lib/X11/%L/%T/%N%C%S:/usr/X11R6/lib/X11/%l/%T/%N%C%S:/usr/X11R6/lib/X11/%T/%N%C%S:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S"
- 
- static XrmDatabase
- get_system_app (class)
--- a/editors/emacs19/files/patch-ac
+++ b/editors/emacs19/files/patch-ac
@ -1,82 +0,0 @@
--- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Tue Jul 11 16:44:14 2000
-@@ -1,5 +1,15 @@
- /* s/ file for freebsd system.  */
- 
-+/* Get the correct __FreeBSD_version, even if this is before that was
-+   defined. */
-+#ifndef __FreeBSD__
-+#define __FreeBSD_version 199401
-+#elif __FreeBSD__ == 1
-+#define __FreeBSD_version 199405
-+#else
-+#include <osreldate.h>
-+#endif
-+
- /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
-    Earlier versions do not have shared libraries, so inhibit them.
-    You can inhibit them on newer systems if you wish
-@@ -33,8 +43,9 @@
- 
- #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil
-+#if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
-#define LIB_GCC -lgcc
-+#endif
- 
- #define SYSV_SYSTEM_DIR
- 
-@@ -42,12 +53,33 @@
- #undef BSD_PGRPS
- #define GETPGRP_NO_ARG
- 
-+#ifdef __ELF__
-+
-+#define LD_SWITCH_SYSTEM
-+#ifdef i386
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#else
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#endif
-+#define UNEXEC unexelf.o
-+#undef LIB_GCC
-+#define LIB_GCC
-+
-+#else /* not __ELF__ */
-+
- #ifndef NO_SHARED_LIBS
- #define LD_SWITCH_SYSTEM -e start -dc -dp
- #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
-+#if __FreeBSD_version >= 300002
-+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
-+#else /* __FreeBSD_version < 300002 */
- #define START_FILES pre-crt0.o /usr/lib/crt0.o
-#define UNEXEC unexsunos4.o
-+#endif /* __FreeBSD_version < 300002 */
-+#define UNEXEC unexfreebsd.o
- #define RUN_TIME_REMAP
-+#define LIB_GCC -lgcc
- 
- #ifndef N_TRELOFF
- #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +95,8 @@
- #endif /* __FreeBSD__ */
- #endif /* NO_SHARED_LIBS */
- 
-+#endif /* not __ELF__ */
-+
- #define HAVE_WAIT_HEADER
- #define HAVE_GETLOADAVG
- /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +114,8 @@
- #define BSD 199103
- #elif __FreeBSD__ == 2
- #define BSD 199306
-+#elif __FreeBSD__ >= 3
-+#define BSD 199506
- #endif
- 
- #define WAITTYPE int
--- a/editors/emacs19/files/patch-ad
+++ b/editors/emacs19/files/patch-ad
@ -1,695 +0,0 @@
--- src/unexfreebsd.c.orig	Wed Dec  3 17:28:14 1997
-+++ src/unexfreebsd.c	Wed Dec  3 17:34:02 1997
-@@ -0,0 +1,692 @@
-+/* Code to do an unexec for FreeBSD for a temacs linked -Bdynamic.
-+   Derived from unexnetbsd.c, which was derived from unexsunos4.c
-+   Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-+
-+This file is part of XEmacs.
-+
-+XEmacs 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 2, or (at your option) any
-+later version.
-+
-+XEmacs 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 XEmacs; see the file COPYING.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+Boston, MA 02111-1307, USA.  */
-+
-+/* Synched up with: Not in FSF? */
-+
-+/*
-+Created 29-Oct-92 by Harlan Sexton
-+Tweaked 06-Aug-93 by Dean Michaels to work with sun3.
-+Converted 01-Dec-93 by Paul Mackerras to work with NetBSD shared libraries.
-+Tweaked 26-Feb-94 by Shawn Carey for use with FreeBSD-1.1 shared libraries.
-+*/
-+
-+/********************** Included .h Files **************************/
-+
-+#include <config.h>
-+
-+#include <stdarg.h>
-+#include <sys/param.h>
-+#include <sys/mman.h>
-+#include <sys/file.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <a.out.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <stab.h>
-+#include <dirent.h>
-+#include <link.h>
-+
-+/********************** Macros *************************************/
-+
-+#define SYS_ERR		strerror(errno)
-+
-+#define MASK_UP(x,p_of_two) \
-+ ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1)))
-+
-+#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1)))
-+
-+/********************** Typedefs and Structs ***********************/
-+
-+struct translation_struct
-+{
-+  long txtaddr;
-+  long txtoff;
-+  long dataddr;
-+  long datoff;
-+  long bssaddr;
-+  long endaddr;
-+};
-+
-+/********************** Function Prototypes/Declarations ***********/
-+
-+static void unexec_error (const char *m, int use_errno, ...);
-+static int unexec_open (char *filename, int flag, int mode);
-+static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags);
-+static long unexec_seek (int fd, long position);
-+static void unexec_read (int fd, long position, char *buf, int bytes);
-+static void unexec_write (int fd, long position, char *buf, int bytes);
-+static void unexec_pad (int fd, int bytes);
-+static void unexec_fstat (int fd, struct stat *statptr);
-+static void unexec_fchmod (int fd, int mode);
-+static long unexec_addr_to_offset (long addr, struct translation_struct *ts);
-+static void copy_relocation_site (struct relocation_info *ri, 
-+                                  caddr_t from_base_addr, 
-+                                  caddr_t to_base_addr, 
-+                                  struct translation_struct *ts);
-+static void reset_symtab (struct nlist *start, struct nlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end, 
-+                          char *strtab, long edata_value, long end_value,
-+                          int shlib_image);
-+int run_time_remap (char *dummy);
-+
-+/********************** Variables **********************************/
-+
-+/* for reporting error messages from system calls */
-+extern int errno;
-+extern int _DYNAMIC;
-+extern char **environ;             
-+
-+static unsigned long sbrk_of_0_at_unexec;
-+             
-+/*******************************************************************/
-+
-+static void
-+unexec_error (const char *fmt, int use_errno, ...)
-+{
-+  const char *err_msg = SYS_ERR;
-+  va_list args;
-+
-+  fprintf (stderr, "unexec - ");
-+  va_start (args, use_errno);
-+  vfprintf (stderr, fmt, args);
-+  va_end (args);
-+
-+  if (use_errno)
-+    fprintf (stderr, ": %s", err_msg);
-+  fprintf (stderr, "\n");
-+  exit (1);
-+  return;
-+}
-+
-+static int
-+unexec_open (char *filename, int flag, int mode)
-+{
-+  int fd;
-+
-+  errno = 0;
-+
-+  fd = open (filename, flag, mode);
-+
-+  if (fd < 0)
-+    unexec_error ("Failure opening file %s", 1, filename);
-+  return fd;
-+}
-+
-+static caddr_t
-+unexec_mmap (int fd, size_t len, int prot, int flags)
-+{
-+  caddr_t return_val;
-+
-+  unexec_seek (fd, 0);
-+  errno = 0;
-+  return_val = mmap (0, len, prot, flags, fd, 0);
-+
-+  if (return_val == (caddr_t) -1)
-+    unexec_error ("Failure mmap'ing file", 1);
-+  return return_val;
-+}
-+
-+
-+static long
-+unexec_seek (int fd, long position)
-+{
-+  long seek_value;
-+
-+  if (fd <= 0)
-+    unexec_error ("No file open in which to seek", 0);
-+
-+  errno = 0;
-+
-+  if (position < 0)
-+    seek_value = (long) lseek (fd, 0, L_INCR);
-+  else
-+    seek_value = (long) lseek (fd, position, L_SET);
-+
-+  if (seek_value < 0)
-+    unexec_error ("Failed to do a seek to 0x%x in %s", 1,
-+                  position, "unexec() output file");
-+
-+  return seek_value;
-+}
-+
-+static void
-+unexec_read (int fd, long position, char *buf, int bytes)
-+{
-+  int n_read;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted read of %d bytes", 0, bytes);
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_read = read (fd, buf, remains);
-+      if (n_read <= 0)
-+        unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_read;
-+      remains -= n_read;
-+    }
-+
-+  return;
-+}
-+
-+static void
-+unexec_write (int fd, long position, char *buf, int bytes)
-+{
-+  int n_written;
-+  int remains = bytes;
-+  position = unexec_seek (fd, position);
-+
-+  if (bytes < 0)
-+    unexec_error ("Attempted write of %d bytes in %s",
-+                  0, bytes, "unexec() output file");
-+
-+  errno = 0;
-+
-+  while (remains > 0)
-+    {
-+      n_written = write (fd, buf, remains);
-+      if (n_written <= 0)
-+        unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s",
-+                      1, bytes, position, "unexec() output file");
-+      buf += n_written;
-+      remains -= n_written;
-+    }
-+
-+  return;
-+}
-+
-+static void 
-+unexec_pad (int fd, int bytes)
-+{
-+  if (bytes > 0)
-+    {
-+      char buf[1024];
-+      int remaining = bytes;
-+
-+      memset (buf, 0, sizeof (buf));
-+
-+      while (remaining > 0)
-+        {
-+          int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining;
-+          unexec_write (fd, -1, buf, this_write);
-+          remaining -= this_write;
-+        }
-+    }
-+}
-+
-+static void
-+unexec_fstat (int fd, struct stat *statptr)
-+{
-+  errno = 0;
-+  if (-1 == fstat (fd, statptr))
-+    unexec_error ("fstat() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static void
-+unexec_fchmod (int fd, int mode)
-+{
-+  errno = 0;
-+  if (-1 == fchmod (fd, mode))
-+    unexec_error ("fchmod() failed for descriptor %d", 1, fd);
-+  return;
-+}
-+
-+static long
-+unexec_addr_to_offset (long addr, struct translation_struct *ts)
-+                             
-+{
-+  if ((addr < ts->txtaddr) || (addr >= ts->bssaddr))
-+    return -1;
-+  else if (addr >= ts->dataddr)
-+    return ((long) ((addr - ts->dataddr) + ts->datoff));
-+  else 
-+    return ((long) ((addr - ts->txtaddr) + ts->txtoff));
-+}
-+
-+
-+/*
-+ * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS 
-+ */
-+
-+static void
-+copy_relocation_site (struct relocation_info *ri, 
-+                      caddr_t from_base_addr,
-+                      caddr_t to_base_addr,
-+                      struct translation_struct *ts)
-+{
-+  long offset;
-+  caddr_t from, to;
-+
-+  /* We can get relocation sites in the bss region, for objects whose
-+     contents are copied from a shared library.  We don't need or want
-+     to restore these at present. */
-+#ifndef sparc
-+  if (ri->r_copy)
-+    return;
-+#else
-+  /* Struct relocation_info_sparc doesn't have member r_copy.
-+     Instead, we use the address to check if this is run-time-copied. */
-+  if (ri->r_address >= ts->bssaddr && ri->r_address < ts->endaddr)
-+    return;
-+#endif
-+
-+  offset = unexec_addr_to_offset (ri->r_address, ts);
-+  if (offset == -1)
-+    unexec_error ("bad relocation address 0x%x (0x%x)", 0, ri->r_address,
-+		  ((long *)ri)[1]);
-+
-+  from = from_base_addr + offset;
-+  to = to_base_addr + offset;
-+  /* This stuff should be in a md_ file somewhere... */
-+#ifndef sparc
-+  switch (ri->r_length)
-+    {
-+    case 0:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case 1:
-+      *((short *) to) = *((short *) from);
-+      break;
-+    case 2:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    default:
-+      unexec_error ("unknown reloc length %d seen during unexec()",
-+		    0, ri->r_length);
-+      break;
-+    }
-+#else /* sparc */
-+  switch (ri->r_type)
-+    {
-+    case RELOC_8:
-+    case RELOC_DISP8:
-+      *((char *) to) = *((char *) from);
-+      break;
-+    case RELOC_16:
-+    case RELOC_DISP16:
-+      *((short *) to) = *((short *) from);
-+      break;     
-+    case RELOC_LO10:
-+    case RELOC_13:     
-+    case RELOC_22:     
-+    case RELOC_HI22:
-+    case RELOC_WDISP22:
-+    case RELOC_WDISP30:
-+    case RELOC_32:
-+    case RELOC_DISP32:
-+    case RELOC_GLOB_DAT:
-+      *((long *) to) = *((long *) from);
-+      break;
-+    case RELOC_JMP_SLOT:
-+      {
-+        long *target = (long *) to;
-+        long *source = (long *) from;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+        target++;
-+        source++;
-+        *target = *source;
-+      }
-+      break;
-+    default:
-+      unexec_error ("unknown reloc type %d seen during unexec()",
-+		    0, ri->r_type);
-+      break;
-+    }
-+#endif /* sparc */
-+}
-+
-+static void
-+reset_symtab (struct nlist *start, struct nlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end)
-+    {
-+      int type = tmp->n_type;
-+
-+      if ((type == (N_UNDF | N_EXT)) &&
-+          (tmp->n_value != 0))
-+        unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!",
-+		      0);
-+     
-+      if (!(type & N_STAB))
-+        {
-+          if (!found_edata &&
-+              (type == (N_EXT | N_DATA)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_edata", strtab + tmp->n_un.n_strx))
-+            {
-+              tmp->n_value = edata_value;
-+              found_edata = 1;
-+            }
-+
-+
-+          if ((type & N_TYPE) == N_BSS)
-+            {
-+              if (!found_end &&
-+                  (type == (N_EXT | N_BSS)) &&
-+                  tmp->n_un.n_strx &&
-+                  !strcmp ("_end", strtab + tmp->n_un.n_strx))
-+                {
-+                  tmp->n_value = end_value;
-+                  found_end = 1;
-+                }
-+              else if (type & N_EXT)
-+                tmp->n_type = N_DATA | N_EXT;
-+              else
-+                tmp->n_type = N_DATA;
-+            }
-+
-+          /* the way things are being handled here, having sbrk() in the
-+             image is fatal for an image linked with shared lib's (although 
-+             the code could be modified to support it), but this should 
-+             never happen anyway */
-+          if (shlib_image &&
-+              (type == (N_EXT | N_TEXT)) &&
-+              tmp->n_un.n_strx &&
-+              !strcmp ("_sbrk", strtab + tmp->n_un.n_strx))
-+            unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!",
-+                          0);
-+        }
-+
-+      tmp++;
-+    }
-+} 
-+     
-+static void
-+reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab,
-+              long edata_value, long end_value, int shlib_image)
-+{
-+  struct nzlist *tmp = start;
-+  int found_edata = 0;
-+  int found_end = 0;
-+     
-+  while (tmp < end) {
-+    int type = tmp->nz_type;
-+/*
-+ * the following code breaks under FreeBSD-1.1-BETA, but everything
-+ * seems to work perfectly if it's commented out.  This did not break
-+ * anything until the changes to ld.so were made.
-+ */
-+/*
-+    if ((type == (N_UNDF | N_EXT)) && (tmp->nz_value != 0))
-+      unexec_error("unexec'ing image has COMMON symbols in rel -- we quit!",0);
-+*/
-+    if (!(type & N_STAB)) {
-+      if (!found_edata &&
-+	  (type == (N_EXT | N_DATA)) &&
-+	  !strcmp ("_edata", strtab + tmp->nz_strx)) {
-+	tmp->nz_value = edata_value;
-+	found_edata = 1;
-+      }
-+
-+      if ((type & N_TYPE) == N_BSS) {
-+	if (!found_end &&
-+	    (type == (N_EXT | N_BSS)) &&
-+	    !strcmp ("_end", strtab + tmp->nz_strx)) {
-+	  tmp->nz_value = end_value;
-+	  found_end = 1;
-+	} else if (type & N_EXT)
-+	  tmp->nz_type = N_DATA | N_EXT;
-+	else
-+	  tmp->nz_type = N_DATA;
-+      }
-+
-+      /* the way things are being handled here, having sbrk() in the
-+	 image is fatal for an image linked with shared lib's (although 
-+	 the code could be modified to support it), but this should 
-+	 never happen anyway */
-+      if (shlib_image &&
-+	  (type == (N_EXT | N_TEXT)) &&
-+	  !strcmp ("_sbrk", strtab + tmp->nz_strx))
-+	unexec_error("unexec'd shlib image has sbrk() ref -- we quit!", 0);
-+    }
-+    tmp++;
-+  }
-+} 
-+     
-+extern int getpagesize (void);
-+
-+/*
-+ * EXPORTED FUNCTIONS 
-+ */
-+
-+/* this has to be a global variable to prevent the optimizers from
-+ * assuming that it can not be 0.  
-+*/
-+static void *dynamic_addr = (void *) &_DYNAMIC;
-+
-+int
-+unexec (char *new_name, char *old_name,
-+        unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2)
-+{
-+  /* ld.so data */
-+  struct _dynamic *ld = 0;
-+  struct section_dispatch_table *ld2 = 0;
-+  /* old and new state */
-+  int old_fd;
-+  int new_fd;
-+  caddr_t old_base_addr;
-+  caddr_t new_base_addr;
-+  struct exec old_hdr;
-+  struct exec new_hdr;
-+  struct stat old_buf;
-+  struct stat new_buf;
-+  /* some process specific "constants" */
-+  unsigned long n_pagsiz, new_edata;
-+  long page_size = getpagesize ();
-+  caddr_t plt_end;
-+  caddr_t current_break = (caddr_t) sbrk (0);
-+
-+  if (!page_size)
-+    unexec_error ("unexec() failed because we can't get the size of a page!",
-+                  0);
-+
-+  /* see if this is a -Bdynamic image -- if so, find ld.so structures */
-+  if (dynamic_addr)
-+    {
-+      ld = (struct _dynamic *) dynamic_addr;
-+      ld2 = ld->d_un.d_sdt;
-+      if (ld->d_version < LD_VERSION_BSD)
-+        unexec_error ("%s linked with obsolete version of ld -- we quit!",
-+                      0, old_name);
-+    }
-+
-+  /* open the old and new files, figuring out how big the old one is
-+     so that we can map it in */
-+  old_fd = unexec_open (old_name, O_RDONLY, 0);
-+  new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-+
-+  /* setup the header and the statbuf for old_fd */
-+  unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr));
-+  unexec_fstat (old_fd, &old_buf);
-+
-+
-+  /* set up some important constants */
-+  n_pagsiz = __LDPGSZ;
-+  if (dynamic_addr)
-+    plt_end = (caddr_t) MASK_UP (ld2->sdt_plt + ld2->sdt_plt_sz, sizeof (double));
-+  else
-+    plt_end = (caddr_t) N_DATADDR (old_hdr);
-+
-+#if 0
-+  /* never write protect the variable "environ", defined in /lib/crt0.o, and
-+     set in process.c and callproc.c */
-+  mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **);
-+  /* never protect ABOVE the end of data emacs_edata specified */
-+  mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data);
-+#endif
-+
-+  /* Set up the image of the old file */
-+  old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ,
-+			       MAP_FILE | MAP_PRIVATE);
-+  close (old_fd);
-+
-+  /* set up the new exec */
-+  new_hdr = old_hdr;
-+  new_edata = (unsigned long) MASK_UP (current_break, n_pagsiz);
-+  new_hdr.a_data = new_edata - ((unsigned long) N_DATADDR (old_hdr));
-+  new_hdr.a_bss  = 0;
-+
-+  /* set up this variable, in case we want to reset "the break" 
-+     when restarting */
-+  sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz));
-+     
-+  /* Write out the first approximation to the new file. The sizes of
-+     each section will be correct, but there will be a number of 
-+     corrections that will need to be made. */
-+  {
-+    long old_datoff = N_DATOFF (old_hdr);
-+    long old_dataddr = N_DATADDR (old_hdr);
-+    long new_treloff = N_RELOFF (new_hdr);
-+    long old_treloff = N_RELOFF (old_hdr);
-+    long ld_so_size = ((unsigned long) plt_end) - old_dataddr;
-+    long real_data_size = current_break - plt_end;
-+    long pad_size = 
-+      MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break);
-+
-+
-+    /* First, write the text segment with new header -- copy everything until
-+       the start of the data segment from the old file, and then go back and 
-+       write the new header. */
-+    unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size);
-+    unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr));
-+
-+    /* Copy the rest of the data segment from the running image. */
-+    unexec_write (new_fd, old_datoff + ld_so_size, 
-+                  plt_end, real_data_size);
-+
-+    /* pad out the data segment */
-+    unexec_pad (new_fd, pad_size);
-+    
-+    /* Finally, copy the symbol table information from the old file. */
-+    unexec_write (new_fd, new_treloff,
-+                  old_base_addr + old_treloff,
-+                  old_buf.st_size - old_treloff);
-+  }
-+     
-+     
-+  /* Next, map in the output file so that we can jump around fixing it
-+     up. We retain the old file so that we can refer to it. */
-+  unexec_fstat (new_fd, &new_buf);
-+  new_base_addr = unexec_mmap (new_fd, 
-+                               MASK_UP (new_buf.st_size, page_size),
-+                               PROT_READ | PROT_WRITE,
-+			       MAP_FILE | MAP_SHARED);
-+
-+
-+
-+  /* We need to do 2 things. First, make sure that _edata and _end (and
-+     hence, curbrk) are set to the correct values. At the same time, for
-+     neatness and to help with debugging, mark all the types of all ld.so
-+     and nm BSS symbols in the new file to be DATA, and make sure that
-+     there are no COMMON symbols in the output file, as any references to
-+     these can lose really big. Second, reset all of the ld.so "relocation
-+     sites" in the new file to have the values that appear in the old file
-+     -- the failure to do this was the biggest loser in the old version of
-+     this code. */
-+
-+  /* STEP 1 */
-+  /* Reset the regular symbol table first. */
-+  reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)),
-+		(struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) +
-+				  new_hdr.a_syms),
-+		(char *) (new_base_addr + N_STROFF(new_hdr)),
-+		new_edata, new_edata,
-+		!!dynamic_addr);
-+
-+  /* Now reset the ld.so symbol table. */
-+  if (dynamic_addr)
-+    {
-+      struct translation_struct ts;
-+      struct relocation_info *tmp, *end;
-+      caddr_t syms, strings;
-+
-+      /* set up the structure that we use to translate addresses in the
-+	 old file into file offsets */
-+      ts.txtaddr = N_TXTADDR (old_hdr);
-+      ts.txtoff = N_TXTOFF (old_hdr);
-+      ts.dataddr = N_DATADDR (old_hdr);
-+      ts.datoff = N_DATOFF (old_hdr);
-+      ts.bssaddr = N_DATADDR (old_hdr) + old_hdr.a_data;
-+      ts.endaddr = ts.bssaddr + old_hdr.a_bss;
-+
-+      syms = new_base_addr + unexec_addr_to_offset(ld2->sdt_nzlist, &ts);
-+      strings = new_base_addr + unexec_addr_to_offset(ld2->sdt_strings, &ts);
-+      reset_ldso_symtab ((struct nzlist *) syms, (struct nzlist *) strings,
-+			 (char *) strings,
-+			 new_edata, new_edata,
-+			 !!dynamic_addr);
-+
-+      /* STEP 2 */
-+      tmp = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_rel, &ts));
-+      end = (struct relocation_info *)
-+	(old_base_addr + unexec_addr_to_offset(ld2->sdt_hash, &ts));
-+      while (tmp < end)
-+	{
-+	  copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts);
-+	  tmp++;
-+	}
-+    }
-+     
-+  /* get rid of the mmap-ed file space and make the output file 
-+     executable -- then quit */
-+  munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size));
-+  munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size));
-+  unexec_fchmod (new_fd, 0755);
-+  close (new_fd);
-+  return 0;
-+}
-+
-+
-+int
-+run_time_remap (char *dummy)
-+{
-+  unsigned long current_sbrk = (unsigned long) sbrk (0);
-+
-+  if (sbrk_of_0_at_unexec > current_sbrk)
-+    {
-+      errno = 0;
-+      if (brk ((caddr_t) sbrk_of_0_at_unexec))
-+	fprintf (stderr, "failed to change brk addr to 0x%lx: %s\n", 
-+		 sbrk_of_0_at_unexec, SYS_ERR);
-+    }
-+             
-+  return 0;
-+}
--- a/editors/emacs19/files/patch-ae
+++ b/editors/emacs19/files/patch-ae
@ -1,22 +0,0 @@
--- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
-+++ src/unexelf.c	Fri Oct  2 13:02:05 1998
-@@ -678,7 +678,8 @@
-   if (n < 0)
-     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
- 
-  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
-+/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
-+  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
-   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
- 
- #if 0 /* Maybe allow section after data2 - does this ever happen? */
-@@ -845,7 +846,9 @@
- 
-       for (; symp < symendp; symp ++)
- 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
-	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
-+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
- 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
-     }
--- a/editors/emacs19/files/patch-af
+++ b/editors/emacs19/files/patch-af
@ -1,13 +0,0 @@
--- configure.orig	Tue Aug 20 13:11:26 1996
-+++ configure	Sat Jan 16 23:18:54 1999
-@@ -756,6 +756,10 @@
-     machine=alpha opsys=gnu-linux
-   ;;
- 
-+  alpha-*-freebsd* )
-+    machine=alpha opsys=freebsd
-+  ;;
-+
-   ## Altos 3068
-   m68*-altos-sysv* )
-     machine=altos opsys=usg5-2
--- a/editors/emacs19/files/patch-ag
+++ b/editors/emacs19/files/patch-ag
@ -1,34 +0,0 @@
--- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
-+++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
-@@ -234,7 +234,11 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <alloca.h>
-+#else
-+#include <stdlib.h>
-+#endif
- 
- /* Hack alert!  For reasons unknown to mankind the string.h file insists
-    on defining bcopy etc. as taking char pointers as arguments.  With
-@@ -299,10 +303,18 @@
-    termio and struct termios are mutually incompatible.  */
- #define NO_TERMIO
- 
-#ifdef LINUX
-+#if defined(LINUX) || \
-+	defined(__FreeBSD__) || 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 (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
-+	&& defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+
--- a/editors/emacs19/files/patch-ah
+++ b/editors/emacs19/files/patch-ah
@ -1,54 +0,0 @@
--- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
-+++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
-@@ -423,12 +423,50 @@
- #include <elf.h>
- #include <sys/mman.h>
- 
-#ifdef __alpha__
-+#if defined(__alpha__) && defined(__osf__)
- # include <sym.h>	/* get COFF debugging symbol table declaration */
-+#else if defined(__alpha__)
-+typedef struct {
-+	short magic;
-+	short vstamp;
-+	int ilineMax;
-+	int idnMax;
-+	int ipdMax;
-+	int isymMax;
-+	int ioptMax;
-+	int iauxMax;
-+	int issMax;
-+	int issExtMax;
-+	int ifdMax;
-+	int crfd;
-+	int iextMax;
-+	long cbLine;
-+	long cbLineOffset;
-+	long cbDnOffset;
-+	long cbPdOffset;
-+	long cbSymOffset;
-+	long cbOptOffset;
-+	long cbAuxOffset;
-+	long cbSsOffset;
-+	long cbSsExtOffset;
-+	long cbFdOffset;
-+	long cbRfdOffset;
-+	long cbExtOffset;
-+} HDRR, *pHDRR; 
-+#define cbHDRR sizeof(HDRR)
-+#define hdrNil ((pHDRR)0)
- #endif
- 
- #if __GNU_LIBRARY__ - 0 >= 6
- # include <link.h>	/* get ElfW etc */
-+#endif
-+
-+#ifdef __FreeBSD__
-+# ifdef __STDC__
-+#  define ElfW(type)	Elf_##type
-+# else
-+#  define ElfW(type)	Elf_/**/type
-+# endif
- #endif
- 
- #ifndef ElfW
--- a/editors/emacs19/files/patch-ai
+++ b/editors/emacs19/files/patch-ai
@ -1,11 +0,0 @@
--- lib-src/Makefile.in.orig	Sun Apr  4 13:04:19 1999
-+++ lib-src/Makefile.in	Sun Apr  4 13:04:48 1999
-@@ -364,7 +364,7 @@
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/cvtmail.c $(LOADLIBES) -o cvtmail
- 
- fakemail: ${srcdir}/fakemail.c ../src/config.h
-	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
-+	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -lcompat -o fakemail
- 
- yow: ${srcdir}/yow.c ../src/paths.h
- 	$(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
--- a/editors/emacs19/files/patch-ba
+++ b/editors/emacs19/files/patch-ba
@ -1,22 +0,0 @@
--- lib-src/emacsclient.c.old	Tue Jul 23 23:18:33 1996
-+++ lib-src/emacsclient.c	Thu Oct  8 22:34:54 1998
-@@ -94,6 +94,8 @@
-     struct stat statbfr;
- 
-     gethostname (system_name, sizeof (system_name));
-+    system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-     sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-     if (stat (server.sun_path, &statbfr) == -1)
--- lib-src/emacsserver.c.old	Wed Jul 17 07:09:29 1996
-+++ lib-src/emacsserver.c	Thu Oct  8 22:35:08 1998
-@@ -115,6 +115,8 @@
-   server.sun_family = AF_UNIX;
- #ifndef SERVER_HOME_DIR
-   gethostname (system_name, sizeof (system_name));
-+  system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-   sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-   if (unlink (server.sun_path) == -1 && errno != ENOENT)
--- a/editors/emacs19/files/patch-bb
+++ b/editors/emacs19/files/patch-bb
@ -1,11 +0,0 @@
--- src/emacs.c.orig	Fri Sep  6 17:15:38 2002
-+++ src/emacs.c	Fri Sep  6 17:16:33 2002
-@@ -427,8 +427,6 @@
- {
-   char stack_bottom_variable;
-   int skip_args = 0;
-  extern int errno;
-  extern sys_nerr;
- 
- #ifdef LINUX_SBRK_BUG
-   __sbrk (1);
--- a/editors/emacs19/pkg-descr
+++ b/editors/emacs19/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/emacs19/pkg-plist
+++ b/editors/emacs19/pkg-plist
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@ -1,72 +0,0 @@
-# New ports collection makefile for:	GNU emacs
-# Date created:		29 October 1994
-# Whom:			jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME=	emacs
-PORTVERSION=	${EMACS_VER}
-PORTREVISION=	7
-CATEGORIES+=	editors ipv6
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	emacs
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	shige/emacs
-PATCHFILES=		emacs-20.7-linespace-patch.gz
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	GNU editing macros
-
-ONLY_FOR_ARCHS=	i386 alpha
-DEPRECATED=	"editors/emacs is recommended instead for new installations"
-EXPIRATION_DATE=	2007-08-19
-
-USE_AUTOTOOLS=	autoconf:213
-USE_GMAKE=	yes
-EMACS_VER=	20.7
-LATEST_LINK?=	${PKGNAMEPREFIX}emacs20
-CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS=	--with-x=no --with-pop
-.else
-CONFIGURE_ARGS=	--with-x-toolkit --with-pop
-USE_XLIB=	yes
-USE_XORG=	xbitmaps
-.endif
-CONFIGURE_ARGS+=	--with-line-space \
-	--bindir='$${archlibdir}'
-INFO_PATH=	${DATADIR_REL}/${EMACS_VER}/info
-MAKE_ARGS+=	manext=20.1
-
-MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-MAN1=		emacs20.1 etags20.1 ctags20.1
-PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
-
-RECOMPILE_ELS=	dired.el startup.el
-
-pre-build:
-	${RM} -rf ${WRKSRC}/info/*
-
-post-build:
-# to rebuild emacs because startup.elc should be updated
-	@(cd ${WRKSRC}/lisp; \
-		${WRKSRC}/src/emacs -batch -q -no-init-file \
-			-f batch-byte-compile ${RECOMPILE_ELS} ; \
-	)
-	@${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}*
-	@(cd ${BUILD_WRKSRC}; \
-		${SETENV} ${MAKE_ENV} \
-		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} ;\
-	)
-
-BINDIR=	${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
-post-install::
-	for f in b2m ctags emacs emacsclient etags rcs-checkin; do \
-		${LN} -sf ${BINDIR}/$${f} ${PREFIX}/bin/$${f}20; \
-	done
-	${LN} -sf ${BINDIR}/emacs-${EMACS_VER} ${PREFIX}/bin/emacs-${EMACS_VER}
-
-.include <bsd.port.mk>
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@ -1,6 +0,0 @@
-MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5
-SHA256 (emacs-20.7.tar.gz) = c73b753072ee3307787d597aaf5713a0652153a5a8037760f75cd8ffdcdcaea7
-SIZE (emacs-20.7.tar.gz) = 15043428
-MD5 (emacs-20.7-linespace-patch.gz) = 01b6e4480f5801dcfb202ca96f8ad886
-SHA256 (emacs-20.7-linespace-patch.gz) = f9b5b8700f747e5e14b94c8590dadd398229dc31a07e1b6b59a753cd5e23548b
-SIZE (emacs-20.7-linespace-patch.gz) = 2985
--- a/editors/emacs20/files/patch-aa
+++ b/editors/emacs20/files/patch-aa
@ -1,11 +0,0 @@
--- Makefile.in.orig	Sat Apr 10 04:16:24 1999
-+++ Makefile.in	Sat Jul 24 01:03:43 1999
-@@ -188,7 +188,7 @@
- # Subdirectories to make recursively.  `lisp' is not included
- # because the compiled lisp files are part of the distribution
- # and you cannot remake them without installing Emacs first.
-SUBDIR = lib-src src leim
-+SUBDIR = lib-src src leim man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
--- a/editors/emacs20/files/patch-ac
+++ b/editors/emacs20/files/patch-ac
@ -1,14 +0,0 @@
--- man/widget.texi.orig	Mon Oct 13 14:20:26 1997
-+++ man/widget.texi	Mon Oct 13 14:21:25 1997
-@@ -3,6 +3,11 @@
- @c %**start of header
- @setfilename ../info/widget
- @settitle The Emacs Widget Library
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Widget: (widget).		The Emacs Widget Library
-+@end direntry
-+
- @iftex
- @afourpaper
- @headings double
--- a/editors/emacs20/files/patch-ad
+++ b/editors/emacs20/files/patch-ad
@ -1,14 +0,0 @@
--- man/dired-x.texi.orig	Sun May 17 03:52:28 1998
-+++ man/dired-x.texi	Sat Jul 24 01:19:47 1999
-@@ -19,9 +19,9 @@
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
- 
-@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
-* Dired-X: (dired-x).   Dired Extra Features.
-+* Dired-X: (dired-x).		Dired Extra Features.
- @end direntry
- 
- @iftex
--- a/editors/emacs20/files/patch-ag
+++ b/editors/emacs20/files/patch-ag
@ -1,19 +0,0 @@
--- man/Makefile.in.orig	Sat Dec  5 08:33:16 1998
-+++ man/Makefile.in	Sat Jul 24 01:25:06 1999
-@@ -11,7 +11,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 \
-@@ -70,6 +70,7 @@
- 	${srcdir}/glossary.texi \
- 	${srcdir}/ack.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
--- a/editors/emacs20/files/patch-ah
+++ b/editors/emacs20/files/patch-ah
@ -1,29 +0,0 @@
--- lib-src/Makefile.in.orig	Sat Aug  1 20:22:55 1998
-+++ lib-src/Makefile.in	Sat Feb 13 17:30:37 1999
-@@ -218,7 +218,7 @@
- LIBMAIL=-lmail
- #endif
- 
-LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC
-+LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC -lcompat
- 
- /* We need to #define emacs to get the right versions of some files.
-    Some other files - those shared with other GNU utilities - need
-@@ -278,7 +278,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 +290,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/emacs20/files/patch-ai
+++ b/editors/emacs20/files/patch-ai
@ -1,17 +0,0 @@
--- src/unexelf.c.orig	Mon May 15 17:14:02 2000
-+++ src/unexelf.c	Sat Jul  1 18:17:15 2000
-@@ -506,6 +506,14 @@
- # include <link.h>	/* get ElfW etc */
- #endif
- 
-+#ifdef __FreeBSD__
-+# ifdef __STDC__
-+#  define ElfW(type)	Elf_##type
-+# else
-+#  define ElfW(type)	Elf_/**/type
-+# endif
-+#endif
-+
- #ifndef ElfW
- # ifdef __STDC__
- #  define ElfBitsW(bits, type) Elf##bits##_##type
--- a/editors/emacs20/files/patch-aj
+++ b/editors/emacs20/files/patch-aj
@ -1,31 +0,0 @@
--- src/m/alpha.h.orig	Wed Oct 29 16:47:37 1997
-+++ src/m/alpha.h	Sun Jan  3 20:05:49 1999
-@@ -239,7 +239,7 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <alloca.h>
- #else
- #include <stdlib.h>
-@@ -308,7 +308,8 @@
-    termio and struct termios are mutually incompatible.  */
- #define NO_TERMIO
- 
-#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
-+#if defined (LINUX) || \
-+	defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
- # define TEXT_END ({ extern int _etext; &_etext; })
- # ifndef __ELF__
- #  define COFF
-@@ -316,7 +317,8 @@
- # endif /* notdef __ELF__ */
- #endif
- 
-#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
-+#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
-+	&& defined (__ELF__)
- #define HAVE_TEXT_START
- #endif
- 
--- a/editors/emacs20/files/patch-al
+++ b/editors/emacs20/files/patch-al
@ -1,17 +0,0 @@
--- man/cc-mode.texi.orig	Sun May 17 03:55:23 1998
-+++ man/cc-mode.texi	Sat Jul 24 01:03:42 1999
-@@ -8,10 +8,10 @@
- @settitle     CC MODE Version 5 Documentation
- @footnotestyle end
- 
-@dircategory Editors
-@direntry
-* CC mode: (ccmode).	The GNU Emacs mode for editing C, C++, Objective-C
-			  and Java code.
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
-+				Objective-C and Java code.
- @end direntry
- 
- @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--- a/editors/emacs20/files/patch-am
+++ b/editors/emacs20/files/patch-am
@ -1,14 +0,0 @@
--- man/cl.texi.orig	Wed Apr  7 03:12:55 1999
-+++ man/cl.texi	Sat Jul 24 01:03:42 1999
-@@ -2,9 +2,9 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
-@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
-* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
-+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
- @end direntry
- 
- @iftex
--- a/editors/emacs20/files/patch-an
+++ b/editors/emacs20/files/patch-an
@ -1,23 +0,0 @@
--- man/emacs.texi.orig	Tue Jun 13 04:12:20 2000
-+++ man/emacs.texi	Tue Apr  9 22:47:39 2002
-@@ -11,9 +11,9 @@
- updated for Emacs version 20.7.
- @c Please REMEMBER to update edition number in *three* places in this file.
- 
-@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
-* Emacs: (emacs).	The extensible self-documenting text editor.
-+* Emacs: (emacs).		The extensible self-documenting text editor.
- @end direntry
- 
- Published by the Free Software Foundation
-@@ -119,7 +119,7 @@
- Emacs is the extensible, customizable, self-documenting real-time
- display editor.  This Info file describes how to edit with Emacs and
- some of how to customize it; it corresponds to GNU Emacs version 20.7.
-For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The
-+For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
- Emacs Lisp Reference Manual}.
- @end ifinfo
- 
--- a/editors/emacs20/files/patch-ao
+++ b/editors/emacs20/files/patch-ao
@ -1,26 +0,0 @@
--- man/forms.texi.orig	Mon Aug 24 18:43:18 1998
-+++ man/forms.texi	Sat Jul 24 01:03:41 1999
-@@ -8,18 +8,17 @@
- @syncodeindex vr cp
- @syncodeindex fn cp
- @syncodeindex ky cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Forms: (forms).		Emacs package for editing data bases
-+				by filling in forms.
-+@end direntry
- @iftex
- @finalout
- @setchapternewpage odd
- @end iftex
- @c      @smallbook
- @comment %**end of header (This is for running Texinfo on a region.)
-
-@dircategory Editors
-@direntry
-* Forms: (forms).	Emacs package for editing data bases
-			  by filling in forms.
-@end direntry
- 
- @ifinfo
- This file documents Forms mode, a form-editing major mode for GNU Emacs.
--- a/editors/emacs20/files/patch-ap
+++ b/editors/emacs20/files/patch-ap
@ -1,13 +0,0 @@
--- man/gnus.texi.orig	Wed Apr  7 07:46:41 1999
-+++ man/gnus.texi	Sat Jul 24 01:09:33 1999
-@@ -5,8 +5,9 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
- @direntry
-* Gnus: (gnus).         The newsreader Gnus.
-+* Gnus: (gnus).			The newsreader Gnus.
- @end direntry
- @iftex
- @finalout
--- a/editors/emacs20/files/patch-aq
+++ b/editors/emacs20/files/patch-aq
@ -1,20 +0,0 @@
--- man/mh-e.texi.orig	Sun May 17 03:51:15 1998
-+++ man/mh-e.texi	Sat Jul 24 01:03:41 1999
-@@ -4,13 +4,12 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
-
-@setchapternewpage odd
-
-@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
-* MH-E: (mh-e).		Emacs interface to the MH mail system.
-+* MH-E: (mh-e).			Emacs interface to the MH mail system.
- @end direntry
-+
-+@setchapternewpage odd
- 
- @c Version variables.
- @set EDITION 1.2
--- a/editors/emacs20/files/patch-ar
+++ b/editors/emacs20/files/patch-ar
@ -1,24 +0,0 @@
--- man/sc.texi.orig	Fri Jul  3 03:48:27 1998
-+++ man/sc.texi	Sat Jul 24 01:03:42 1999
-@@ -3,15 +3,15 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename ../info/sc
- @settitle Supercite Version 3.1 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* SC: (sc).			Supercite lets you cite parts of messages
-+				you're replying to, in flexible ways.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
-
-@dircategory Editors
-@direntry
-* SC: (sc).		Supercite lets you cite parts of messages you're 
-			  replying to, in flexible ways.
-@end direntry
- 
- @c @setchapternewpage odd		% For book style double sided manual.
- @comment %**end of header (This is for running Texinfo on a region.)
--- a/editors/emacs20/files/patch-as
+++ b/editors/emacs20/files/patch-as
@ -1,15 +0,0 @@
--- man/vip.texi.orig	Sun May 17 03:48:50 1998
-+++ man/vip.texi	Sat Jul 24 01:03:40 1999
-@@ -2,10 +2,9 @@
- 
- @setfilename ../info/vip
- @settitle VIP
-
-@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
-* VIP: (vip).		An older VI-emulation for Emacs.
-+* VIP: (vip).			A VI-emulation for Emacs.
- @end direntry
- 
- @iftex
--- a/editors/emacs20/files/patch-at
+++ b/editors/emacs20/files/patch-at
@ -1,17 +0,0 @@
--- man/viper.texi.orig	Mon Nov  9 02:13:07 1998
-+++ man/viper.texi	Sat Jul 24 01:03:41 1999
-@@ -5,12 +5,9 @@
- @comment @setfilename viper
- @comment @setfilename viper.info
- @setfilename ../info/viper
-
-@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
-* VIPER: (viper).       The newest Emacs VI-emulation mode.
-                          (also, A VI Plan for Emacs Rescue
-                           or the VI PERil.)
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
- @end direntry
- 
- @iftex
--- a/editors/emacs20/files/patch-au
+++ b/editors/emacs20/files/patch-au
@ -1,14 +0,0 @@
--- man/ediff.texi.orig	Tue Jun  9 12:29:49 1998
-+++ man/ediff.texi	Sat Jul 24 01:19:48 1999
-@@ -14,9 +14,9 @@
- @synindex fn cp
- @synindex pg cp
- 
-@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
-* Ediff: (ediff).       A visual interface for comparing and merging programs.
-+* Ediff: (ediff).		A visual interface for comparing and merging programs.
- @end direntry
- 
- @iftex
--- a/editors/emacs20/files/patch-av
+++ b/editors/emacs20/files/patch-av
@ -1,21 +0,0 @@
--- man/message.texi.orig	Wed Apr  7 07:48:28 1999
-+++ man/message.texi	Sat Jul 24 01:23:30 1999
-@@ -5,15 +5,15 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@ifinfo
-+@dircategory The Emacs editor and associated tools
- @direntry
-* Message: (message).   Mail and news composition mode that goes with Gnus.
-+* Message: (message).		Message, the Emacs message composition mode.
- @end direntry
- @iftex
- @finalout
- @end iftex
- @setchapternewpage odd
-
-@ifinfo
- 
- This file documents Message, the Emacs message composition mode.
- 
--- a/editors/emacs20/files/patch-aw
+++ b/editors/emacs20/files/patch-aw
@ -1,16 +0,0 @@
--- man/reftex.texi.orig	Sat Jul 24 02:31:43 1999
-+++ man/reftex.texi	Sat Jul 24 02:33:26 1999
-@@ -2,10 +2,10 @@
- @c %**start of header
- @setfilename ../info/reftex
- @settitle RefTeX User Manual
-@dircategory Editors
-+@dircategory The Emacs editor and associated tools
- @direntry
-* reftex: (reftex).	Support for LaTeX labels, references, and citations
-                          with Emacs.
-+* reftex: (reftex).		Support for LaTeX labels, references,
-+				 and citations with Emacs.
- @end direntry
- @synindex ky cp
- @syncodeindex vr cp
--- a/editors/emacs20/files/patch-bb
+++ b/editors/emacs20/files/patch-bb
@ -1,13 +0,0 @@
--- man/info.texi.orig	Fri Apr 17 10:12:19 1998
-+++ man/info.texi	Wed Feb 10 00:18:56 1999
-@@ -2,6 +2,10 @@
- @comment %**start of header 
- @setfilename ../info/info
- @settitle Info 1.0
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Info: (info).			GNU on-line hyper document system.
-+@end direntry
- @comment %**end of header 
- 
- @iftex
--- a/editors/emacs20/files/patch-cb
+++ b/editors/emacs20/files/patch-cb
@ -1,24 +0,0 @@
--- src/s/freebsd.h.orig	Tue May  2 21:29:10 2000
-+++ src/s/freebsd.h	Sun Jan 12 01:06:02 2003
-@@ -56,9 +56,20 @@
- #ifdef __ELF__
- 
- #define LD_SWITCH_SYSTEM
-+
-+#if __FreeBSD_version >= 500000
-+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
-+#endif
-+
-+#ifdef __alpha__
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#else
- #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define UNEXEC unexelf.o
- #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#endif
-+
-+#define UNEXEC unexelf.o
- #undef LIB_GCC
- #define LIB_GCC
- 
--- a/editors/emacs20/files/patch-cc
+++ b/editors/emacs20/files/patch-cc
@ -1,35 +0,0 @@
--- configure.in.orig	Tue Jun  6 00:42:49 2000
-+++ configure.in	Sun Sep 23 06:53:04 2001
-@@ -147,6 +147,15 @@
- machine='' opsys='' unported=no
- case "${canonical}" in
- 
-+  ## FreeBSD ports
-+  *-*-freebsd* )
-+    opsys=freebsd
-+    case "${canonical}" in
-+      alpha*-*-freebsd*)	machine=alpha ;;
-+      i[3456]86-*-freebsd*)	machine=intel386 ;;
-+    esac
-+  ;;
-+
-   ## NetBSD ports
-   *-*-netbsd* )
-     opsys=netbsd
-@@ -958,7 +967,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
-@@ -1639,7 +1647,7 @@
- rename closedir mkdir rmdir sysinfo \
- random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
- strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
-utimes setrlimit setpgid getcwd shutdown strftime)
-+utimes setrlimit setpgid getcwd shutdown strftime getaddrinfo)
- 
- # UNIX98 PTYs.
- AC_CHECK_FUNCS(grantpt)
--- a/editors/emacs20/files/patch-cd
+++ b/editors/emacs20/files/patch-cd
@ -1,10 +0,0 @@
--- src/config.in.orig	Sat May 20 23:58:21 2000
-+++ src/config.in	Sun Sep 23 05:33:27 2001
-@@ -236,6 +236,7 @@
- #undef HAVE_STRFTIME
- #undef HAVE_GRANTPT
- #undef HAVE_GETPT
-+#undef HAVE_GETADDRINFO
- 
- #undef LOCALTIME_CACHE
- #undef HAVE_INET_SOCKETS
--- a/editors/emacs20/files/patch-cg
+++ b/editors/emacs20/files/patch-cg
@ -1,161 +0,0 @@
--- src/process.c.orig	Wed May 24 04:10:16 2000
-+++ src/process.c	Mon Sep  4 14:15:19 2000
-@@ -1,7 +1,18 @@
-+/*
-+ * Locally hacked process.c to add ipv6 support. -wsr
-+ *
-+ * The configure.in file should define "HAVE_GETADDRINFO" if it is found 
-+ * in libc.
-+ * 
-+ */
-+
- /* Asynchronous subprocess control for GNU Emacs.
-    Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 1998
-       Free Software Foundation, Inc.
- 
-+   ipv6 changes are
-+   Copyright (C) 1999 Wolfgang S. Rupprecht
-+
- This file is part of GNU Emacs.
- 
- GNU Emacs is free software; you can redistribute it and/or modify
-@@ -1810,15 +1821,21 @@
- {
-   Lisp_Object proc;
-   register int i;
-+#ifdef HAVE_GETADDRINFO
-+  struct addrinfo hints, *res, *lres;
-+  int ret = 0;
-+  int xerrno = 0;
-+  char *portstring, portbuf [128];
-+#else /* HAVE_GETADDRINFO */
-   struct sockaddr_in address;
-   struct servent *svc_info;
-   struct hostent *host_info_ptr, host_info;
-   char *(addr_list[2]);
-   IN_ADDR numeric_addr;
-  int s, outch, inch;
-  char errstring[80];
-  int port;
-   struct hostent host_info_fixed;
-+  int port;
-+#endif /* HAVE_GETADDRINFO */
-+  int s = -1, outch, inch;
-   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
-   int retry = 0;
-   int count = specpdl_ptr - specpdl;
-@@ -1831,6 +1848,22 @@
-   GCPRO4 (name, buffer, host, service);
-   CHECK_STRING (name, 0);
-   CHECK_STRING (host, 0);
-+
-+#ifdef HAVE_GETADDRINFO
-+  /*
-+   * caution: service can either be a string or int.
-+   * Convert to a C string for later use by getaddrinfo.
-+   */
-+  if (INTEGERP (service)) {
-+      snprintf (portbuf, sizeof (portbuf), "%d", XINT (service));
-+      portstring = portbuf;
-+  }
-+  else
-+    {
-+      CHECK_STRING (service, 0);
-+      portstring = XSTRING (service)->data;
-+    }
-+#else /* HAVE_GETADDRINFO */
-   if (INTEGERP (service))
-     port = htons ((unsigned short) XINT (service));
-   else
-@@ -1841,6 +1874,7 @@
- 	error ("Unknown service \"%s\"", XSTRING (service)->data);
-       port = svc_info->s_port;
-     }
-+#endif /* HAVE_GETADDRINFO */
- 
-   /* Slow down polling to every ten seconds.
-      Some kernels have a bug which causes retrying connect to fail
-@@ -1850,6 +1884,75 @@
- #endif
- 
- #ifndef TERM
-+#ifdef HAVE_GETADDRINFO               /* We have a modern OS. -wsr */
-+  immediate_quit = 1;
-+  QUIT;
-+  memset(&hints, 0, sizeof(hints));
-+  hints.ai_flags = 0;
-+  hints.ai_family = AF_UNSPEC;
-+  hints.ai_socktype = SOCK_STREAM;
-+  hints.ai_protocol = 0;
-+  ret = getaddrinfo(XSTRING (host)->data, portstring, &hints, &res);
-+  if (ret)
-+    error("%s/%s %s", XSTRING (host)->data, portstring, gai_strerror(ret));
-+  immediate_quit = 0;
-+
-+  for (lres = res; lres ; lres = lres->ai_next)
-+    {
-+      s = socket(lres->ai_family, lres->ai_socktype, lres->ai_protocol);
-+      if (s < 0)
-+	{
-+	  xerrno = errno;
-+	  continue;
-+	}
-+
-+      /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
-+	 when connect is interrupted.  So let's not let it get interrupted.
-+	 Note we do not turn off polling, because polling is only used
-+	 when not interrupt_input, and thus not normally used on the systems
-+	 which have this bug.  On systems which use polling, there's no way
-+	 to quit if polling is turned off.  */
-+      if (interrupt_input)
-+        unrequest_sigio ();
-+
-+    loop:
-+      immediate_quit = 1;
-+      QUIT;
-+
-+      if (connect(s, lres->ai_addr, lres->ai_addrlen) == 0 ||
-+	  errno == EISCONN)
-+	break;
-+
-+      xerrno = errno;
-+      immediate_quit = 0;
-+
-+      if (errno == EINTR)
-+	goto loop;
-+      if (errno == EADDRINUSE && retry < 20)
-+	{
-+	  /* A delay here is needed on some FreeBSD systems,
-+	     and it is harmless, since this retrying takes time anyway
-+	     and should be infrequent.  */
-+	  Fsleep_for (make_number (1), Qnil);
-+	  retry++;
-+	  goto loop;
-+	}
-+      
-+      close(s);
-+      s = -1;
-+    }
-+
-+  freeaddrinfo(res);
-+  if (s < 0)
-+    {
-+      if (interrupt_input)
-+        request_sigio ();
-+      
-+      errno = xerrno;
-+      report_file_error ("connection failed",
-+			 Fcons (host, Fcons (name, Qnil)));
-+    }
-+#else /* HAVE_GETADDRINFO */
-   while (1)
-     {
- #ifdef TRY_AGAIN
-@@ -1940,6 +2043,7 @@
-       report_file_error ("connection failed",
- 			 Fcons (host, Fcons (name, Qnil)));
-     }
-+#endif /* HAVE_GETADDRINFO */
- 
-   immediate_quit = 0;
- 
--- a/editors/emacs20/files/patch-ch
+++ b/editors/emacs20/files/patch-ch
@ -1,51 +0,0 @@
--- src/process.c.original	Fri Sep 23 11:49:02 2005
-+++ src/process.c	Fri Sep 23 11:51:45 2005
-@@ -400,6 +400,14 @@
- 
- #ifdef HAVE_PTYS
- 
-+char to_tty_char(int i)
-+{
-+  if (i < 10)
-+    return '0' + i;
-+  else
-+    return 'a' + i - 10;
-+}
-+
- /* Open an available pty, returning a file descriptor.
-    Return -1 on failure.
-    The file name of the terminal corresponding to the pty
-@@ -423,13 +431,13 @@
-   PTY_ITERATION
- #else
-   for (c = FIRST_PTY_LETTER; c <= 'z'; c++)
-    for (i = 0; i < 16; i++)
-+    for (i = 0; i < 'z' - 'a' + 1 + 10; i++)
- #endif
-       {
- #ifdef PTY_NAME_SPRINTF
- 	PTY_NAME_SPRINTF
- #else
-	sprintf (pty_name, "/dev/pty%c%x", c, i);
-+	sprintf (pty_name, "/dev/pty%c%c", c, to_tty_char(i));
- #endif /* no PTY_NAME_SPRINTF */
- 
- #ifdef PTY_OPEN
-@@ -446,7 +454,7 @@
- 	if (stat (pty_name, &stb) < 0)
- 	  {
- 	    failed_count++;
-	    if (failed_count >= 3)
-+	    if (failed_count >= 30)
- 	      return -1;
- 	  }
- 	else
-@@ -466,7 +474,7 @@
- #ifdef PTY_TTY_NAME_SPRINTF
- 	    PTY_TTY_NAME_SPRINTF
- #else
-            sprintf (pty_name, "/dev/tty%c%x", c, i);
-+            sprintf (pty_name, "/dev/tty%c%c", c, to_tty_char(i));
- #endif /* no PTY_TTY_NAME_SPRINTF */
- #ifndef UNIPLUS
- 	    if (access (pty_name, 6) != 0)
--- a/editors/emacs20/files/patch-lib-src::movemail.c
+++ b/editors/emacs20/files/patch-lib-src::movemail.c
@ -1,19 +0,0 @@
-*** lib-src/movemail.c.orig	Sun May  2 18:25:15 1999
--- lib-src/movemail.c	Thu Feb 10 21:38:32 2005
-***************
-*** 765,771 ****
-        mbx_delimit_begin (mbf);
-        if (pop_retr (server, i, mbf) != OK)
-  	{
-! 	  error (Errmsg);
-  	  close (mbfi);
-  	  return (1);
-  	}
--- 765,771 ----
-        mbx_delimit_begin (mbf);
-        if (pop_retr (server, i, mbf) != OK)
-  	{
-! 	  error ("%s", Errmsg);
-  	  close (mbfi);
-  	  return (1);
-  	}
--- a/editors/emacs20/files/patch-lisp::dired.el
+++ b/editors/emacs20/files/patch-lisp::dired.el
@ -1,19 +0,0 @@
--- lisp/dired.el.orig	Tue Nov 30 00:04:12 1999
-+++ lisp/dired.el	Wed Dec  5 03:15:14 2001
-@@ -1375,6 +1375,7 @@
-          ;; weiand: changed: year potentially unaligned
- ;;old			  s "\\(" HH:MM "\\|" s yyyy "\\|" yyyy s "\\)"))
- 			  s "\\(" HH:MM "\\|" s "?" yyyy "\\|" yyyy s "\\)"))
-+	 (freebsd-ja (concat s "?" mm "\\(/\\|" s "\\)" dd s "\\(" HH:MM "\\|" s yyyy "\\)"))
- 	 (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)")))
- 	 ;; The "[0-9]" below requires the previous column to end in a digit.
- 	 ;; This avoids recognizing `1 may 1997' as a date in the line:
-@@ -1382,7 +1383,7 @@
- 	 ;; The ".*" below finds the last match if there are multiple matches.
- 	 ;; 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]" s "\\(" western "\\|" japanese "\\)" s))
-+    (concat ".*[0-9]" s "\\(" western "\\|" japanese "\\|" freebsd-ja "\\)" 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/emacs20/files/patch-src_emacs.c
+++ b/editors/emacs20/files/patch-src_emacs.c
@ -1,13 +0,0 @@
-
-$FreeBSD$
-
--- src/emacs.c.orig	Wed May 24 15:58:54 2000
-+++ src/emacs.c	Mon Jul 29 23:23:20 2002
-@@ -602,7 +602,6 @@
-   char stack_bottom_variable;
-   int skip_args = 0;
-   extern int errno;
-  extern int sys_nerr;
- #ifdef HAVE_SETRLIMIT
-   struct rlimit rlim;
- #endif
--- a/editors/emacs20/pkg-descr
+++ b/editors/emacs20/pkg-descr
@ -1,13 +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.
--- a/editors/emacs20/pkg-plist
+++ b/editors/emacs20/pkg-plist
--- a/editors/emacs20/scripts/configure
+++ b/editors/emacs20/scripts/configure
@ -1,9 +0,0 @@
-#! /bin/sh
-
-cd ${WRKSRC}
-
-if [ -f /usr/lib/aout/crt0.o -a ! -f /usr/lib/crt0.o ]; then
-    sed -e "s|/usr/lib/crt0\.o|/usr/lib/aout/crt0.o|g" \
-	src/s/freebsd.h > src/s/freebsd.h.new || exit
-    mv -f src/s/freebsd.h.new src/s/freebsd.h
-fi
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@ -1,23 +0,0 @@
-# New ports collection makefile for:	flim for emacs20
-# Date created:		23 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	FLIM, message representation or encoding elisp library for emacs20
-
-DEPRECATED=	emacs20 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-# This is a slave port.
-PORTCLASS=	slave
-
-MASTERDIR=	${.CURDIR}/../../editors/flim
-
-# emacs port setup
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@ -1,177 +0,0 @@
-# New ports collection makefile for:	files except executables for mule
-# Date created:		7 July 1997
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mule-common
-PORTVERSION=	${MULE_VERSION}
-PORTREVISION=	5
-CATEGORIES=	editors japanese
-MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/ \
-		ftp://ftp.jaist.ac.jp/pub/GNU/mule/ \
-		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/mule/
-DISTFILES=	mule-${MULE_VERSION}-${EMACS_VERSION}.tar.gz \
-		mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	For a multilingual emacs, emacs lisp files, info pages, etc (except executables)
-
-DEPRECATED=	emacs19 and related ports are obsolete; please use a more recent version
-EXPIRATION_DATE=	2007-08-19
-
-MULE_VERSION=	2.3
-EMACS_VERSION=	19.34
-
-USE_XORG=	xbitmaps
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-BROKEN=		Does not compile on !i386
-.endif
-
-.if ${OSVERSION} > 600000
-PLIST_SUB+=	NOTON6="@comment "
-.else
-PLIST_SUB+=	NOTON6=""
-.endif
-
-WRKDIRBASE=	${WRKDIRPREFIX}${.CURDIR:S,/editors/mule-common$,,}
-
-.for dir in 	chinese/mule-freewnn \
-		editors/mule \
-		japanese/mule-canna \
-		japanese/mule-canna+freewnn \
-		japanese/mule-canna+freewnn+sj3 \
-		japanese/mule-canna+sj3+wnn6 \
-		japanese/mule-canna+sj3+wnn7 \
-		japanese/mule-canna+sj3 \
-		japanese/mule-canna+wnn6 \
-		japanese/mule-canna+wnn7 \
-		japanese/mule-freewnn \
-		japanese/mule-freewnn+sj3 \
-		japanese/mule-sj3 \
-		japanese/mule-sj3+wnn6 \
-		japanese/mule-sj3+wnn7 \
-		japanese/mule-wnn6 \
-		japanese/mule-wnn7 \
-		korean/mule-freewnn
-.if exists(${WRKDIRBASE}/${dir}/work/.build_done.${dir:S,editors/,,:S,chinese/,zh-,:S,japanese/,ja-,:S,korean/,ko-,}-${PORTVERSION}${_SUF1}${_SUF2}.${PREFIX:S/\//_/g})
-WRKDIR?=	${WRKDIRBASE}/${dir}/work
-MULEPKG?=	${dir:S,editors/,,:S,chinese/,zh-,:S,japanese/,ja-,:S,korean/,ko-,}-${PORTVERSION}${_SUF1}${_SUF2}.${PREFIX:S/\//_/g}
-.endif
-.endfor
-WRKSRC=		${WRKDIR}/mule-${MULE_VERSION}-${EMACS_VERSION}
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/mule.sh
-
-EXTRACT_COOKIE=		${WRKDIR}/.extract_done.${MULEPKG}
-CONFIGURE_COOKIE=	${WRKDIR}/.configure_done.${MULEPKG}
-BUILD_COOKIE=		${WRKDIR}/.build_done.${MULEPKG}
-PATCH_COOKIE=		${WRKDIR}/.patch_done.${MULEPKG}
-TMPPLIST=	${WRKDIR}/.PLIST.mktmp-${PKGNAME}
-PLIST_SUB+=	EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET}
-
-USE_XLIB=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-EMACS_PREFIX=	mule
-EMACS_EXECUTABLE =	mule
-CONFIGURE_ARGS=	--with-executable=${EMACS_EXECUTABLE} \
-		--with-emacs-prefix=${EMACS_PREFIX} \
-		--with-terminal-face \
-		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
-STRIP=
-MAN1=		coco.1 ctags.1 etags.1 m2ps.1 emacs.1 mule.1
-
-INSTALL_TARGET=	install-arch-indep
-
-COMP_ELC=	egg.elc wnn-egg.elc sj3-client.elc sj3-egg.elc canna.elc
-ELC_DIR=	../lisp
-
-# ORIGINAL, MEW_ORG_PATCH and MEW_PATCH are used for debugging.
-#
-#   ORIGINAL: original mule 2.3 based on emacs 19.34
-#   MEW_ORG_PATCH: apply mew's patches to original mule (http://www.mew.org)
-#   MEW_PATCH: apply mew's patch after apply Mr. Katayama's patches
-post-extract:
-	${CP} ${FILESDIR}/unexfreebsd.c ${WRKSRC}/src
-.if !defined(ORIGINAL) && !defined(MEW_ORG_PATCH)
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/takana-${EMACS_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
-	${MKDIR} ${WRKSRC}/lisp/its
-	${CP} ${WRKDIR}/lisp/its/* ${WRKSRC}/lisp/its/
-.endif
-
-.if !defined(ORIGINAL)
-post-patch:
-.if !defined(MEW_ORG_PATCH)
-	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/patch-${EMACS_VERSION}
-	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/Mule-${MULE_VERSION}-${EMACS_VERSION}.patch
-	cd ${WRKSRC}; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/extra.patch
-.if defined(MEW_PATCH)
-	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-${EMACS_VERSION}.patch-for_katayama
-.endif
-.else
-	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/egg.el-${EMACS_VERSION}.patch
-.endif
-.if defined(MEW_PATCH) || defined(MEW_ORG_PATCH)
-	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/canna.el-${EMACS_VERSION}.patch
-	cd ${WRKSRC}/lisp; ${PATCH} --forward --quiet -E -p0 < ${WRKDIR}/mew/sj3-egg.el.patch
-.endif
-.endif
-
-.if !defined(WRKDIR)
-.if defined(PACKAGE_BUILDING)
-# XXX
-WRKDIR=	${WRKDIRBASE}/editors/mule/work
-pre-build::
-	@cd ${.CURDIR}/../mule; make
-.else
-IGNORE=		first you should build install a port for mule except mule-common
-.endif
-.endif
-
-pre-build::
-	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
-	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VERSION}.*
-
-post-build:
-# bytecompile elisps for Japanese input method
-	for file in ${COMP_ELC}; do \
-		target="$$target ${ELC_DIR}/$$file"; \
-	done; \
-	cd ${WRKSRC}/src; \
-	./temacs -batch -l mule-inst.el $$target
-
-post-install:
-# DOC* must be installed by a port for mule except mule-common
-	${RM} ${PREFIX}/share/mule/19.34/etc/DOC
-	${RM} ${PREFIX}/share/mule/19.34/etc/DOC-19.34.1
-# note that any2ps rcs-checkin are scripts
-.for file in b2m coco ctags emacsclient etags m2ps
-	${STRIP_CMD} ${PREFIX}/bin/${file}
-.endfor
-	if [ ! -f ${PREFIX}/share/mule/${EMACS_VERSION}/info/dir ]; then \
-	  ${MKDIR} ${PREFIX}/share/mule/${EMACS_VERSION}/info; \
-	fi
-.for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-# Our makeinfo can't handle files with Japanese characters. :<
-	install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp).	Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule).			Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp).		Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp).		Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir
-	install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).		Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
-	if [ ! -f ${STARTUP_SCRIPT} ]; then \
-		${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \
-		${INSTALL_SCRIPT} ${FILESDIR}/mule.sh ${STARTUP_SCRIPT}; \
-	fi
-
-post-package:
-	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
-
-.include <bsd.port.post.mk>
--- a/editors/mule-common/distinfo
+++ b/editors/mule-common/distinfo
@ -1,6 +0,0 @@
-MD5 (mule-2.3-19.34.tar.gz) = 2765407b4b202e29940867a3f5dfceae
-SHA256 (mule-2.3-19.34.tar.gz) = 03871f30ad3be1dc4bc54da4f7d8da78caac3223a9d0d1dd83ace587c2b96773
-SIZE (mule-2.3-19.34.tar.gz) = 12688557
-MD5 (mule-2.3-19.34.patch-981002.tar.gz) = cadf0c5e4ec4d74b921ffa96a7cca96e
-SHA256 (mule-2.3-19.34.patch-981002.tar.gz) = 8917ac43ee3b9258a618693210a94740465369bb1d88d827f517a26bb9da5b7a
-SIZE (mule-2.3-19.34.patch-981002.tar.gz) = 30823
--- a/editors/mule-common/files/cannainfo.el
+++ b/editors/mule-common/files/cannainfo.el
@ -1,4 +0,0 @@
-; reformat canna's info file
-(find-file "canna-jp.texi")
-(texinfo-format-buffer)
-(save-buffer)
--- a/editors/mule-common/files/dir
+++ b/editors/mule-common/files/dir
@ -1,39 +0,0 @@
-*- Text -*-
-This is the file .../info/dir, which contains the topmost node of the
-Info hierarchy.  The first time you invoke Info you start off
-looking at that node, which is (dir)Top.
-
-File: dir	Node: Top	This is the top of the INFO tree
-  This (the Directory node) gives a menu of major topics. 
-  Typing "d" returns here, "q" exits, "?" lists all INFO commands, "h" 
-  gives a primer for first-timers, "mTexinfo<Return>" visits Texinfo topic,
-  etc.
-  Or click mouse button 2 on a menu item or cross reference to select it.
-  --- PLEASE ADD DOCUMENTATION TO THIS TREE. (See INFO topic first.) ---
-
-* Menu: The list of major topics begins on the next line.
-
-* Info: (info).		Documentation browsing system.
-* Emacs: (emacs).	The extensible self-documenting text editor.
-* VIP: (vip).		A VI-emulation for Emacs.
-* Forms: (forms).	Emacs package for editing data bases
-			  by filling in forms.
-* GNUS: (gnus).		The news reader GNUS.
-* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
-* SC: (sc).		Supercite lets you cite parts of messages you're 
-			  replying to, in hairy ways.
-* Dired-X: (dired-x).   Dired Extra Features.
-
-	MULE
-
-* Antenews-jp: (antenews-jp).   (japanese).
-* Canna-jp: (canna-jp).         Kana to Kanji translation (japanese).
-* Egg: (egg).                   Japanese/Chinese inputting.
-* Egg-jp: (egg-jp).             Japanese/Chinese inputting (japanese).
-* Kbd-trans: (kbd-trans).       Redefining keyboard layout for languages.
-* Languages: (languages).       Using Asian and European languages under Mule.
-* M2PS: (m2ps).                 Translating Multi-language docs to postscript.
-* Mule: (mule).                 Mule (v2.1).
-* Mule-jp: (mule-jp).           Mule (v2.1) (japanese).
-* Quail: (quail).               Multilanguage inputting.
-* Terminology: (terminology).   Overview of multilanguage inputting methods.
--- a/editors/mule-common/files/mule.sh
+++ b/editors/mule-common/files/mule.sh
@ -1,21 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	if [ -d /var/run/emacs/lock ]
-	then
-	    rm -f /var/run/emacs/lock/*
-	else
-	    mkdir -p /var/run/emacs/lock
-	fi
-	chmod 1777 /var/run/emacs/lock
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
--- a/editors/mule-common/files/patch-aa
+++ b/editors/mule-common/files/patch-aa
@ -1,228 +0,0 @@
--- ./man/vip.texi.org	Fri Jun 16 15:31:11 1995
-+++ ./man/vip.texi	Tue May 20 01:28:33 1997
-@@ -2,6 +2,10 @@
- 
- @setfilename ../info/vip
- @settitle VIP
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIP: (vip).			A VI-emulation for Emacs.
-+@end direntry
- 
- @iftex
- @finalout
--- ./man/emacs.texi.org	Mon Aug 19 21:15:12 1996
-+++ ./man/emacs.texi	Tue May 20 01:20:11 1997
-@@ -49,6 +49,11 @@
- @settitle GNU Emacs Manual
- @setfilename ../info/emacs
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Emacs: (emacs).		The extensible self-documenting text editor.
-+@end direntry
-+
- @c
- @c in general, keep the following line commented out, unless doing a
- @c copy of this manual that will be published.  the manual should go
--- ./man/viper.texi.org	Wed Aug  7 10:59:45 1996
-+++ ./man/viper.texi	Tue May 20 01:29:17 1997
-@@ -4,6 +4,10 @@
- \input texinfo
- 
- @setfilename ../info/viper
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* VIPER: (viper).		The new VI-emulation mode in Emacs-19.29.
-+@end direntry
- 
- @iftex
- @finalout
--- ./man/forms.texi.org	Sat Mar 23 06:42:27 1996
-+++ ./man/forms.texi	Tue May 20 01:22:37 1997
-@@ -9,6 +9,11 @@
- @syncodeindex vr cp
- @syncodeindex fn cp
- @syncodeindex ky cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Forms: (forms).		Emacs package for editing data bases
-+				by filling in forms.
-+@end direntry
- @iftex
- @finalout
- @setchapternewpage odd
--- ./man/gnus.texi.org	Wed Jun 26 14:49:29 1996
-+++ ./man/gnus.texi	Tue May 20 01:23:15 1997
-@@ -5,6 +5,11 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* GNUS: (gnus).			The news reader GNUS.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
--- ./man/mh-e.texi.org	Sun Aug  4 00:00:29 1996
-+++ ./man/mh-e.texi	Tue May 20 01:23:49 1997
-@@ -4,6 +4,10 @@
- @setfilename ../info/mh-e
- @settitle mh-e
- @c %**end of header
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* MH-E: (mh-e).			Emacs interface to the MH mail system.
-+@end direntry
- 
- @setchapternewpage odd
- 
--- ./man/cl.texi.org	Mon Apr 15 21:36:53 1996
-+++ ./man/cl.texi	Tue May 20 01:24:18 1997
-@@ -2,6 +2,12 @@
- @setfilename ../info/cl
- @settitle Common Lisp Extensions
- 
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* CL: (cl).			Partial Common Lisp support for Emacs Lisp.
-+@end direntry
-+
-+
- @iftex
- @finalout
- @end iftex
--- ./man/sc.texi.org	Thu Jan  4 12:55:23 1996
-+++ ./man/sc.texi	Tue May 20 01:25:13 1997
-@@ -3,6 +3,12 @@
- @comment %**start of header (This is for running Texinfo on a region.)
- @setfilename ../info/sc
- @settitle Supercite Version 3.1 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* SC: (sc).			Supercite lets you cite parts of messages
-+				you're replying to, in flexible ways.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
--- ./man/dired-x.texi.org	Thu Jan  4 12:54:19 1996
-+++ ./man/dired-x.texi	Tue May 20 01:25:55 1997
-@@ -18,6 +18,11 @@
- @setfilename ../info/dired-x
- @c dired-x.el REVISION NUMBER
- @settitle Dired Extra Version 2 User's Manual
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Dired-X: (dired-x).		Dired Extra Features.
-+@end direntry
-+
- @iftex
- @finalout
- @end iftex
--- ./man/ediff.texi.org	Fri Jun 21 20:00:04 1996
-+++ ./man/ediff.texi	Tue May 20 01:26:29 1997
-@@ -10,6 +10,11 @@
- @synindex vr cp
- @synindex fn cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Ediff: (ediff).		A comprehensive visual interface to diff
-+				and patch.
-+@end direntry
- @iftex
- @finalout
- @end iftex
--- ./man/cc-mode.texi.org	Sun Aug  4 21:56:21 1996
-+++ ./man/cc-mode.texi	Tue May 20 01:27:18 1997
-@@ -9,6 +9,12 @@
- @settitle     CC-MODE Version 4 Documentation
- @footnotestyle end
- 
-+@dircategory The Emacs editor and associated tools 
-+@direntry 
-+* CC mode: (ccmode).		The GNU Emacs mode for editing C, C++,
-+				Objective-C and Java code.
-+@end direntry
-+
- @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- @comment @setchapternewpage odd !! we don't want blank pages !!
- @comment %**end of header (This is for running Texinfo on a region)
--- ./man/message.texi.org	Wed Jun 26 14:49:43 1996
-+++ ./man/message.texi	Sat Dec 13 17:46:31 1997
-@@ -5,6 +5,10 @@
- @synindex fn cp
- @synindex vr cp
- @synindex pg cp
-+@dircategory The Emacs editor and associated tools
-+@direntry
-+* Message: (message).		Editing mail and news messages.
-+@end direntry
- @iftex
- @finalout
- @end iftex
--- Makefile.in.~1~	Sat Jul 11 17:57:16 1998
-+++ Makefile.in	Sat Jul 11 17:58:45 1998
-@@ -191,7 +191,7 @@
- # Subdirectories to make recursively.  `lisp' is not included
- # because the compiled lisp files are part of the distribution
- # and you cannot remake them without installing Emacs first.
-SUBDIR = lib-src src
-+SUBDIR = lib-src src man
- 
- # The makefiles of the directories in $SUBDIR.
- SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile
--- Makefile.in.~1~	Fri Jul 10 00:00:50 1998
-+++ Makefile.in	Fri Jul 10 00:10:50 1998
-@@ -375,14 +375,9 @@
- 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
- 	then \
- 	  (cd ${infodir};  \
-	   if [ -f dir ]; then \
-	     if [ ! -f dir.old ]; then mv -f dir dir.old; \
-	     else mv -f dir dir.bak; fi; \
-	   fi; \
- 	   cd ${srcdir}/info ; \
-	   (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
- 	   (cd $${thisdir}; chmod a+r ${infodir}/dir); \
-	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip* \
-+	   for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* message* mh-e* sc* vip* \
- 		antenews* canna* egg* languages* m2ps* mule* kbd-trans* \
- 		quail* terminology* CCL* ISO2022* R2L* XFONT*; do \
- 	     (cd $${thisdir}; \
--- ./man/Makefile.in.org	Thu Jun 27 15:27:19 1996
-+++ ./man/Makefile.in	Tue Apr 15 00:29:52 1997
-@@ -13,7 +13,7 @@
- # The makeinfo program is part of the Texinfo distribution.
- MAKEINFO = makeinfo
- INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
-	       ../info/ediff ../info/forms ../info/gnus ../info/info \
-+	       ../info/ediff ../info/forms ../info/gnus \
- 	       ../info/mh-e ../info/sc ../info/vip ../info/viper \
- 	       ../info/message
- DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
-@@ -66,6 +66,7 @@
- 	${srcdir}/gnu1.texi \
- 	${srcdir}/glossary.texi
- 
-+all: info
- info: $(INFO_TARGETS)
- 
- dvi: $(DVI_TARGETS)
-@@ -74,12 +75,6 @@
- # in srcdir.  There is no provision for Info files
- # to exist in the build directory.
- # In a distribution of Emacs, the Info files should be up to date.
-
-../info/info: ${INFOSOURCES}
-	cd $(srcdir); $(MAKEINFO) --no-split info.texi
-
-info.dvi: ${INFOSOURCES}
-	TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/info.texi
- 
- ../info/emacs: ${EMACSSOURCES}
- 	cd $(srcdir); $(MAKEINFO) emacs.texi
--- a/editors/mule-common/files/patch-ac
+++ b/editors/mule-common/files/patch-ac
@ -1,79 +0,0 @@
--- src/s/freebsd.h.orig	Mon Jun 10 05:14:32 1996
-+++ src/s/freebsd.h	Sat Jan 16 22:17:58 1999
-@@ -1,5 +1,15 @@
- /* s/ file for freebsd system.  */
- 
-+/* Get the correct __FreeBSD_version, even if this is before that was
-+   defined. */
-+#ifndef __FreeBSD__
-+#define __FreeBSD_version 199401
-+#elif __FreeBSD__ == 1
-+#define __FreeBSD_version 199405
-+#else
-+#include <osreldate.h>
-+#endif
-+
- /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
-    Earlier versions do not have shared libraries, so inhibit them.
-    You can inhibit them on newer systems if you wish
-@@ -34,7 +44,6 @@
- #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil
- #define LIBS_TERMCAP -ltermcap
-#define LIB_GCC -lgcc
- 
- #define SYSV_SYSTEM_DIR
- 
-@@ -42,12 +51,33 @@
- #undef BSD_PGRPS
- #define GETPGRP_NO_ARG
- 
-+#ifdef __ELF__
-+
-+#define LD_SWITCH_SYSTEM
-+#ifdef i386
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-+#else
-+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crtbegin.o
-+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
-+#endif
-+#define UNEXEC unexelf.o
-+#undef LIB_GCC
-+#define LIB_GCC
-+
-+#else /* not __ELF__ */
-+
- #ifndef NO_SHARED_LIBS
- #define LD_SWITCH_SYSTEM -e start -dc -dp
- #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
-+#if __FreeBSD_version >= 300002
-+#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
-+#else /* __FreeBSD_version < 300002 */
- #define START_FILES pre-crt0.o /usr/lib/crt0.o
-#define UNEXEC unexsunos4.o
-+#endif /* __FreeBSD_version < 300002 */
-+#define UNEXEC unexfreebsd.o
- #define RUN_TIME_REMAP
-+#define LIB_GCC -lgcc
- 
- #ifndef N_TRELOFF
- #define N_PAGSIZ(x) __LDPGSZ
-@@ -63,6 +93,8 @@
- #endif /* __FreeBSD__ */
- #endif /* NO_SHARED_LIBS */
- 
-+#endif /* not __ELF__ */
-+
- #define HAVE_WAIT_HEADER
- #define HAVE_GETLOADAVG
- /*#define HAVE_GETPAGESIZE  /* configure now puts this in config.h */
-@@ -80,6 +112,8 @@
- #define BSD 199103
- #elif __FreeBSD__ == 2
- #define BSD 199306
-+#elif __FreeBSD__ >= 3
-+#define BSD 199506
- #endif
- 
- #define WAITTYPE int
--- a/editors/mule-common/files/patch-ae
+++ b/editors/mule-common/files/patch-ae
@ -1,23 +0,0 @@
--- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
-+++ src/unexelf.c	Fri Oct  2 13:02:05 1998
-@@ -678,7 +678,8 @@
-   if (n < 0)
-     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
- 
-  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
-+/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
-+  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
-   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
- 
- #if 0 /* Maybe allow section after data2 - does this ever happen? */
-@@ -845,7 +846,9 @@
- 
-       for (; symp < symendp; symp ++)
- 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
-	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
-+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
-+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
- 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
-     }
- 
--- a/editors/mule-common/files/patch-af
+++ b/editors/mule-common/files/patch-af
@ -1,13 +0,0 @@
--- configure.orig	Tue Aug 20 13:11:26 1996
-+++ configure	Sat Jan 16 23:18:54 1999
-@@ -756,6 +756,10 @@
-     machine=alpha opsys=gnu-linux
-   ;;
- 
-+  alpha-*-freebsd* )
-+    machine=alpha opsys=freebsd
-+  ;;
-+
-   ## Altos 3068
-   m68*-altos-sysv* )
-     machine=altos opsys=usg5-2
--- a/editors/mule-common/files/patch-ag
+++ b/editors/mule-common/files/patch-ag
@ -1,34 +0,0 @@
--- src/m/alpha.h.orig	Sat Aug 10 07:03:36 1996
-+++ src/m/alpha.h	Sat Jan 16 22:34:10 1999
-@@ -234,7 +234,11 @@
- 
- #ifndef NOT_C_CODE
- /* We need these because pointers are larger than the default ints.  */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <alloca.h>
-+#else
-+#include <stdlib.h>
-+#endif
- 
- /* Hack alert!  For reasons unknown to mankind the string.h file insists
-    on defining bcopy etc. as taking char pointers as arguments.  With
-@@ -299,10 +303,18 @@
-    termio and struct termios are mutually incompatible.  */
- #define NO_TERMIO
- 
-#ifdef LINUX
-+#if defined(LINUX) || \
-+	defined(__FreeBSD__) || 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 (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)) \
-+	&& defined (__ELF__)
-+#define HAVE_TEXT_START
-+#endif
-+
-+
--- a/editors/mule-common/files/patch-ah
+++ b/editors/mule-common/files/patch-ah
@ -1,54 +0,0 @@
--- src/unexelf1.c.orig	Sat Aug 10 06:56:52 1996
-+++ src/unexelf1.c	Sun Jan 17 00:28:21 1999
-@@ -423,12 +423,50 @@
- #include <elf.h>
- #include <sys/mman.h>
- 
-#ifdef __alpha__
-+#if defined(__alpha__) && defined(__osf__)
- # include <sym.h>	/* get COFF debugging symbol table declaration */
-+#else if defined(__alpha__)
-+typedef struct {
-+	short magic;
-+	short vstamp;
-+	int ilineMax;
-+	int idnMax;
-+	int ipdMax;
-+	int isymMax;
-+	int ioptMax;
-+	int iauxMax;
-+	int issMax;
-+	int issExtMax;
-+	int ifdMax;
-+	int crfd;
-+	int iextMax;
-+	long cbLine;
-+	long cbLineOffset;
-+	long cbDnOffset;
-+	long cbPdOffset;
-+	long cbSymOffset;
-+	long cbOptOffset;
-+	long cbAuxOffset;
-+	long cbSsOffset;
-+	long cbSsExtOffset;
-+	long cbFdOffset;
-+	long cbRfdOffset;
-+	long cbExtOffset;
-+} HDRR, *pHDRR; 
-+#define cbHDRR sizeof(HDRR)
-+#define hdrNil ((pHDRR)0)
- #endif
- 
- #if __GNU_LIBRARY__ - 0 >= 6
- # include <link.h>	/* get ElfW etc */
-+#endif
-+
-+#ifdef __FreeBSD__
-+# ifdef __STDC__
-+#  define ElfW(type)	Elf_##type
-+# else
-+#  define ElfW(type)	Elf_/**/type
-+# endif
- #endif
- 
- #ifndef ElfW
--- a/editors/mule-common/files/patch-ba
+++ b/editors/mule-common/files/patch-ba
@ -1,22 +0,0 @@
--- lib-src/emacsclient.c.old	Tue Jul 23 23:18:33 1996
-+++ lib-src/emacsclient.c	Thu Oct  8 22:34:54 1998
-@@ -94,6 +94,8 @@
-     struct stat statbfr;
- 
-     gethostname (system_name, sizeof (system_name));
-+    system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-     sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-     if (stat (server.sun_path, &statbfr) == -1)
--- lib-src/emacsserver.c.old	Wed Jul 17 07:09:29 1996
-+++ lib-src/emacsserver.c	Thu Oct  8 22:35:08 1998
-@@ -115,6 +115,8 @@
-   server.sun_family = AF_UNIX;
- #ifndef SERVER_HOME_DIR
-   gethostname (system_name, sizeof (system_name));
-+  system_name[sizeof (system_name) - 1] = '\0';
-+		/* system_name must be null-terminated string */
-   sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
- 
-   if (unlink (server.sun_path) == -1 && errno != ENOENT)
--- a/editors/mule-common/files/patch-ca
+++ b/editors/mule-common/files/patch-ca
@ -1,26 +0,0 @@
-Cannot view a gzpipped info file in mule Info-mode
-when the next line is in ~/.emacs:
-  (set-default-process-coding-system *autoconv*unix *junet*)
-
--- lisp/info.el.save	Thu Jan  6 17:26:03 2000
-+++ lisp/info.el	Wed Feb 19 15:17:14 2000
-@@ -204,12 +204,13 @@
- 	     (jka-compr-installed-p)
- 	     (jka-compr-get-compression-info fullname))
- 	(setq decoder nil))
-    (insert-file-contents fullname visit)
-    (if decoder
-	(let ((buffer-read-only nil)
-	      (default-directory (or (file-name-directory fullname)
-				     default-directory)))
-	  (call-process-region (point-min) (point-max) decoder t t)))))
-+    (cond (decoder
-+	   (let ((buffer-read-only nil)
-+		 (default-directory (or (file-name-directory fullname)
-+					default-directory)))
-+	     (call-process decoder fullname t) ))
-+	  (t
-+	   (insert-file-contents fullname visit) ))))
- 
- ;;;###autoload (add-hook 'same-window-buffer-names "*info*")
- 
--- a/editors/mule-common/files/patch-etl
+++ b/editors/mule-common/files/patch-etl
@ -1,73 +0,0 @@
-From ftp://ftp.etl.go.jp/pub/mule/BUG-INFO
-
-6) This fix a bug of displaying multilingual text in mode lines.
-
--- /usr/dist/mule/mule-2.3/src/xdisp.c	Fri Jun  9 17:37:14 1995
-+++ ./src/xdisp.c	Wed Mar  6 17:08:03 1996
-@@ -3973,8 +3973,9 @@
- 
-   /* 91.10.21 by K.Handa, 92.4.30 by Y.Niibe */
-   int mc_flag = !NILP(XBUFFER (w->buffer)->mc_flag);
-  /* 92.3.21, 92.9.7 by K.Handa */
-  register unsigned char *endp = string + strlen(string);
-+  /* 92.3.21, 92.9.7, 95.8.31 by K.Handa */
-+  register unsigned char *endp
-+    = string + (length < 0 ? strlen(string) : length);
-   char *hexa = "0123456789ABCDEF"; /* 92.4.9 by K.Handa */
-   /* 92.4.9 by K.Handa, 92.4.30 by Y.Niibe */
-   int ctl_hexa = !NILP (XBUFFER (w->buffer)->ctl_hexa);
-
-8) Another fix for a severe bug for writing *viscii* file.
-
--- mule/lisp/mule-init.el.old	Wed May  8 13:05:30 1996
-+++ ./lisp/mule-init.el	Wed May  8 13:04:06 1996
-@@ -638,7 +638,7 @@
- 		  (r0 -= 160)
- 		  (write-read-repeat
- 		   r0
-	       [  0 129 130 131 132 165 134 135 136 137 138 139 140 141 142 143
-+	       [  0 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
- 	        144 145 146   0   0 147 150 151 152   0   0   0   0 180 149   0
- 		  0   0   0   0   0   0   2   5   0   0   0   0   0   0   0 159
- 		  0 186   0   0   0 128  20 187 188   0   0  25  30   0 179 191
-
-
-11) This patch fixes Single Shift 3 handling.
-
--- /usr/dist/mule/mule-2.3/src/coding.c	Wed Nov 30 16:45:02 1994
-+++ ./src/coding.c	Sat Sep 28 09:41:51 1996
-@@ -1044,7 +1044,7 @@
- { \
-   if (lc != lcg) dp = designate(dp, lcg, lc, 3, form), lcg = lc; \
-   if (form & CODE_SEVEN) \
-    *dp++ = ESC, *dp++ = 'N'; \
-+    *dp++ = ESC, *dp++ = 'O'; \
-   else \
-     *dp++ = SS3; \
-   cntl = (cntl & ~CC_GRAPHIC_MASK) | CC_IN_G3; \
-
-12) This patch fixes wrong handling of *iso-2022-lock* by coco.
--- /usr/dist/mule/mule-2.3/lib-src/mulelib.c	Mon Jul 17 15:03:43 1995
-+++ ./lib-src/mulelib.c	Fri Oct  4 21:28:48 1996
-@@ -287,13 +287,18 @@
-   p0 = p1 + 1;
-   if (CODE_TYPE (cs) == ISO2022)  {
-     long flags[12];
-    for (i = 0; i < 11; i++) {
-      if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
-+    for (i = 0; i < 4; i++) {
-+      if ((flags[i] = atoi(p0)) == -1) flags[i] = LCASCII;
-       PROCEED_CHAR(',');
-       p0 = p1 + 1;
-     }
-    flags[i] = atoi(p0);
-     CODE_LC_SET(cs, flags[0], flags[1], flags[2], flags[3]);
-+    for (; i < 11; i++) {
-+      if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
-+      PROCEED_CHAR(',');
-+      p0 = p1 + 1;
-+    }
-+    if (!(flags[i] = atoi(p0))) flags[i] = Qnil;
-     CODE_FORM_SET(cs, (Lisp_Object)flags[4], (Lisp_Object)flags[5],
- 		  (Lisp_Object)flags[6], (Lisp_Object)flags[7],
- 		  (Lisp_Object)flags[8], (Lisp_Object)flags[9],
--- a/editors/mule-common/files/patch-mc
+++ b/editors/mule-common/files/patch-mc
@ -1,18 +0,0 @@
--- src/s/freebsd.h.orig	Mon Apr  5 18:00:36 1999
-+++ src/s/freebsd.h	Mon Apr  5 17:57:30 1999
-@@ -42,7 +42,7 @@
- #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
- 
- #define LIBS_DEBUG
-#define LIBS_SYSTEM -lutil
-+#define LIBS_SYSTEM -lutil -lcrypt
- #define LIBS_TERMCAP -ltermcap
- 
- #define SYSV_SYSTEM_DIR
-@@ -131,3 +131,6 @@
-    It is already a controlling terminal of subprocess, because we did
-    ioctl TIOCSCTTY.  */
- #define DONT_REOPEN_PTY
-+
-+/* XIM does not work very well, so the next is set (by taoka@FreeBSD.org) */
-+#define X_I18N_INHIBITED
--- a/editors/mule-common/files/patch-md
+++ b/editors/mule-common/files/patch-md
@ -1,89 +0,0 @@
-diff -arcN ../mule-2.3.org/etc/FAQ-Mule.jp ./etc/FAQ-Mule.jp
-*** ../mule-2.3.org/etc/FAQ-Mule.jp	Fri Jul 21 20:40:06 1995
--- ./etc/FAQ-Mule.jp	Wed Aug 21 11:33:22 1996
-***************
-*** 1867,1872 ****
--- 1867,1874 ----
-  
-     $B$H=q$/J}K!$b$"$j$^$9!#(B 
-  
-+    ($BCm5-(B : FreeBSD$B$G$O!"B>$H6%9g$9$k$?$a%]!<%HHV9f$O(B3086$B$K$7$F$"$j$^$9!#(B)
-+ 
-  Emacs lisp $B%W%m%0%i%_%s%0(B
-  =========================
-  
-diff -arcN ../mule-2.3.org/lisp/eggrc-sj3 ./lisp/eggrc-sj3
-*** ../mule-2.3.org/lisp/eggrc-sj3	Fri Oct 21 13:18:21 1994
--- ./lisp/eggrc-sj3	Wed Aug 21 13:05:24 1996
-***************
-*** 3,11 ****
-  ;;;	Version 1.0
-  ;;;	Copyright 1990 Kiyoji Ishii
-  ;;;
-  
-! (set-default-sys-dic-directory "/usr/sony/dict/sj3")
-! (set-default-usr-dic-directory "/usr/sony/dict/sj3/user/$USER")
-  
-  ;;;
-  ;;; System Dictionary
--- 3,17 ----
-  ;;;	Version 1.0
-  ;;;	Copyright 1990 Kiyoji Ishii
-  ;;;
-+ ;;;
-+ ;;; Change dictionary paths.
-+ ;;; Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ ;;; Remove $USER variable. Use (user-login-name).
-+ ;;; Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+ ;;;
-  
-! (set-default-sys-dic-directory "/usr/local/lib/sj3/dict")
-! (set-default-usr-dic-directory (concat "/usr/local/lib/sj3/dict/user/" (user-login-name)))
-  
-  ;;;
-  ;;; System Dictionary
-diff -arcN ../mule-2.3.org/lisp/sj3-egg.el ./lisp/sj3-egg.el
-*** ../mule-2.3.org/lisp/sj3-egg.el	Fri Feb 17 17:23:31 1995
--- ./lisp/sj3-egg.el	Wed Aug 21 13:32:36 1996
-***************
-*** 294,301 ****
-  ;;;
-  ;;; Entry functions for egg-startup-file
-  ;;;
-  
-! (defvar *default-sys-dic-directory* "/usr/sony/dict/sj3")
-  
-  (defun set-default-sys-dic-directory (pathname)
-    "$B%7%9%F%`<-=q$NI8=`(Bdirectory PATHNAME$B$r;XDj$9$k!#(B
--- 294,307 ----
-  ;;;
-  ;;; Entry functions for egg-startup-file
-  ;;;
-+ ;;;
-+ ;;; Change dictionary paths.
-+ ;;; Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/10
-+ ;;; Remove $USER variable. Use (user-login-name).
-+ ;;; Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)		1996/8/20
-+ ;;;
-  
-! (defvar *default-sys-dic-directory* "/usr/local/lib/sj3/dict")
-  
-  (defun set-default-sys-dic-directory (pathname)
-    "$B%7%9%F%`<-=q$NI8=`(Bdirectory PATHNAME$B$r;XDj$9$k!#(B
-***************
-*** 310,316 ****
-  	 (format "System Default directory(%s) $B$,$"$j$^$;$s!#(B" pathname))
-        (setq *default-sys-dic-directory* (file-name-as-directory pathname)))))
-  
-! (defvar *default-usr-dic-directory* "/usr/sony/dict/sj3/user/$USER")
-  
-  (defun set-default-usr-dic-directory (pathname)
-    "$BMxMQ<T<-=q$NI8=`(Bdirectory PATHNAME$B$r;XDj$9$k!#(B
--- 316,322 ----
-  	 (format "System Default directory(%s) $B$,$"$j$^$;$s!#(B" pathname))
-        (setq *default-sys-dic-directory* (file-name-as-directory pathname)))))
-  
-! (defvar *default-usr-dic-directory* (concat "/usr/local/lib/sj3/dict/user/" (user-login-name)))
-  
-  (defun set-default-usr-dic-directory (pathname)
-    "$BMxMQ<T<-=q$NI8=`(Bdirectory PATHNAME$B$r;XDj$9$k!#(B
--- a/editors/mule-common/files/patch-mf
+++ b/editors/mule-common/files/patch-mf
@ -1,60 +0,0 @@
--- ../mule.org/lisp/eggrc-wnn	Fri Jul 28 20:12:41 1995
-+++ ./lisp/eggrc-wnn	Wed Oct 29 12:13:50 1997
-@@ -24,7 +24,7 @@
- ;;;
- ;;;      modified for Wnn V4 - Use compatible library of Wnn v3
- ;;;	 Copyright 1989 OMRON Tateisi Electronics, Co.
-;;;	 1989 7/12 by H.Kuribayashi kuri@frf.oron.junet
-+;;;	 1989 7/12 by H.Kuribayashi kuri@frf.omron.junet
- 
- ;;; 92.5.19  modified for Wnn V4 by T.Shingu <shingu@cpr.canon.co.jp>
- ;;;	Use non compatible library.
-@@ -50,14 +50,16 @@
- 		     (concat wnn-usr-dic-dir "/symbol.h") 1 nil t)
-        (add-wnn-dict "iwanami/tankan.dic" "" 1 nil nil)
-        (add-wnn-dict "iwanami/tankan2.dic" "" 1 nil nil)
-       (add-wnn-dict "iwanami/tel.dic" "" 1 nil nil)
-       (add-wnn-dict "iwanami/zip.dic" "" 1 nil nil)
-+       (add-wnn-dict "iwanami/tel.dic"
-+		     (concat wnn-usr-dic-dir "/tel.h") 1 nil t)
-+       (add-wnn-dict "iwanami/zip.dic"
-+		     (concat wnn-usr-dic-dir "/zip.h") 1 nil t)
-        (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t)
- ;       (add-wnn-dict "wnncons/tankan2.dic" "" 1 nil nil)
- ;       (add-wnn-dict "wnncons/tankan3.dic" "" 1 nil nil)
-        (set-wnn-param  5 10 2 45 0  80 5 1 20  0 400 -100 400   80 200 2 200)
- 
-       (add-wnn-notrans-dict (concat wnn-usr-dic-dir "/katakana") 15 t)
-+       (add-wnn-notrans-dict (concat wnn-usr-dic-dir "/muhenkan") 15 t)
-        (add-wnn-bmodify-dict (concat wnn-usr-dic-dir "/bunsetsu") 15 t)
- 
-        (set-last-is-first-mode t)
-@@ -101,7 +103,9 @@
-        (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 5 t t)
- ;       (add-wnn-dict "wnncons/tankan2.dic" "" 1 nil nil)
- ;       (add-wnn-dict "wnncons/tankan3.dic" "" 1 nil nil)
-       (set-wnn-param  2 10 2 45 5  80 5 1 40  0 400 -100 400   80 200 2 200)
-+;       (set-wnn-param  2 10 2 45 5  80 5 1 40  0 400 -100 400   80 200 2 200)
-+; New Parameter
-+       (set-wnn-param  2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200)
-        (set-wnn-reverse t)
-        (set-wnn-fuzokugo "pubdic/full.fzk")
-        (add-wnn-dict "pubdic/kihon.dic" (concat wnn-usr-dic-dir "/kihon.h") 5 nil t)
-@@ -158,7 +162,7 @@
-       ((eq wnn-server-type 'kserver)
-        (set-wnn-reverse nil)
-        (set-wnn-fuzokugo "sys/full.fzk")
-					;       (add-wnn-dict "sys/hword.dic" (concat wnn-usr-dic-dir "/hword.h") 4 nil t)
-+       (add-wnn-dict "sys/hword.dic" (concat wnn-usr-dic-dir "/hword.h") 4 nil t)
-        (add-wnn-dict "sys/single.dic" (concat wnn-usr-dic-dir "/single.h") 1 nil t)
-        (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 5 t t)
- 					;       (add-wnn-dict (concat wnn-usr-dic-dir "/hangul") "" 5 t t)
-@@ -166,7 +170,7 @@
-        (set-wnn-param 1 5 2 750 10 80 10 5 1000 50  0 -200 0 0 0 16 0)
-        (set-wnn-reverse t)
-        (set-wnn-fuzokugo "sys/full.fzk")
-					;       (add-wnn-dict "sys/hword.dic" (concat wnn-usr-dic-dir "/hword.h") 4 nil t)
-+       (add-wnn-dict "sys/hword.dic" (concat wnn-usr-dic-dir "/hword.h") 4 nil t)
-        (add-wnn-dict "sys/single.dic" (concat wnn-usr-dic-dir "/single.h") 1 nil t)
-        (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 5 t t)
- 					;       (add-wnn-dict (concat wnn-usr-dic-dir "/hangul") "" 5 t t)
--- a/editors/mule-common/files/patch-mk
+++ b/editors/mule-common/files/patch-mk
@ -1,45 +0,0 @@
--- Makefile.in.orig	Fri Jul 10 11:22:07 1998
-+++ Makefile.in	Fri Jul 10 11:27:03 1998
-@@ -310,14 +310,14 @@
- ### It would be nice to do something for a parallel make
- ### to ensure that install-arch-indep finishes before this starts.
- install-arch-dep: mkdir
-	(cd lib-src; \
-	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
-	    exec_prefix=${exec_prefix} bindir=${bindir} \
-	    libexecdir=${libexecdir} archlibdir=${archlibdir})
- 	${INSTALL_PROGRAM} src/emacs ${bindir}/${executable}-${version}
- 	-chmod 1755  ${bindir}/${executable}-${version}
- 	rm -f ${bindir}/$(EMACS)
- 	-ln ${bindir}/${executable}-${version} ${bindir}/$(EMACS)
-+	echo "Copying etc/DOC-* to ${docdir} ..." ; \
-+	   (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
-+	   (cd $(docdir); chmod a+r DOC*; rm DOC) \
-+
- 
- ### Install the files that are machine-independent.
- ### Most of them come straight from the distribution;
-@@ -327,6 +327,10 @@
- ### Note that we copy DOC* and then delete DOC
- ### as a workaround for a bug in tar on Ultrix 4.2.
- install-arch-indep: mkdir
-+	(cd lib-src; \
-+	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
-+	    exec_prefix=${exec_prefix} bindir=${bindir} \
-+	    libexecdir=${libexecdir} archlibdir=${archlibdir})
- 	-set ${COPYDESTS} ; \
- 	for dir in ${COPYDIR} ; do \
- 	  if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
-@@ -360,9 +364,9 @@
- 	-chmod -R a+r ${COPYDESTS}
- 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
- 	then \
-	   echo "Copying etc/DOC-*, etc/CHARSETS, and etc/CODINGS to ${docdir} ..." ; \
-	   (cd ./etc; tar -cf - DOC* CHARSETS CODINGS)|(cd ${docdir}; umask 0; tar -xvf - ); \
-	   (cd $(docdir); chmod a+r DOC* CHARSETS CODINGS; rm DOC) \
-+	   echo "Copying etc/CHARSETS, and etc/CODINGS to ${docdir} ..." ; \
-+	   (cd ./etc; tar -cf - CHARSETS CODINGS)|(cd ${docdir}; umask 0; tar -xvf - ); \
-+	   (cd $(docdir); chmod a+r CHARSETS CODINGS) \
- 	else true; fi
- 	if [ -r ./lisp ] \
- 	   && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
--- a/editors/mule-common/files/patch-ml
+++ b/editors/mule-common/files/patch-ml
@ -1,5 +0,0 @@
--- lisp/its/han-kata.el~       Thu Aug  6 19:55:01 1998
-+++ lisp/its/han-kata.el        Mon Aug 10 13:24:50 1998
-@@ -45 +45 @@
-(defvar enable-double-n-syntax nil "*Enable ""nn"" input for ""(I](B"" ")
-+(defvar enable-double-n-syntax nil "*Enable \"nn\" input for \"(I](B\" ")
--- a/editors/mule-common/files/patch-mm
+++ b/editors/mule-common/files/patch-mm
@ -1,71 +0,0 @@
--- configure.orig	Wed Jul 18 16:03:57 2001
-+++ configure	Wed Jul 18 16:37:11 2001
-@@ -38,6 +38,10 @@
- ac_help="$ac_help
-   --with-wnn6             Use Wnn6 library to input Japanese or Chinese"
- ac_help="$ac_help
-+  --with-cwnn4            Use Wnn4 library to input Chinese"
-+ac_help="$ac_help
-+  --with-kwnn4            Use Wnn4 library to input Korean"
-+ac_help="$ac_help
-   --with-wnn-includes=DIR Search for WNN header files in DIR"
- ac_help="$ac_help
-   --with-wnn-libraries=DIR Search for WNN libraries in DIR"
-@@ -92,6 +96,7 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+wnnlib='-lwnn'
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -564,11 +569,11 @@
- emacs_prefix=emacs
- lispdir='${datadir}/${emacs_prefix}/${version}/lisp'
- locallisppath='${datadir}/${emacs_prefix}/${version}/site-lisp:'\
-'${datadir}/${emacs_prefix}/site-lisp'
-+'${datadir}/${emacs_prefix}/site-lisp:${datadir}/emacs/site-lisp'
- lisppath='${locallisppath}:${lispdir}'
- etcdir='${datadir}/${emacs_prefix}/${version}/etc'
- # share lockdir with emacs and mule.
-lockdir='${sharedstatedir}/emacs/lock'
-+lockdir='/var/run/emacs/lock'
- archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}'
- docdir='${datadir}/${emacs_prefix}/${version}/etc'
- 
-@@ -671,9 +676,20 @@
- 
- fi
- 
-+if test "${with_cwnn4+set}" = set; then
-+    wnnlib=-lcwnn
-+elif test "${with_kwnn4+set}" = set; then
-+    wnnlib=-lkwnn
-+fi
-+
- # Check whether --with-wnn6 or --without-wnn6 was given.
- if test "${with_wnn6+set}" = set; then
-   withval="$with_wnn6"
-+if test "${with_wnn6}" = yes; then
-+   wnnlib=-lwnn6
-+else
-+   wnnlib=$with_wnn6
-+fi
-   with_wnn=${withval}; cat >> confdefs.h <<\EOF
- #define WNN6 1
- EOF
-@@ -3104,12 +3120,12 @@
-   if test -n "${with_wnn_libraries}" ; then
-     if test -d ${with_wnn_libraries} ; then
-       LD_SWITCH_WNN="-L${with_wnn_libraries}"
-      LIBS_MULE="${LIBS_MULE} -lwnn"
-+      LIBS_MULE="${LIBS_MULE} ${wnnlib}"
-     else
-       LIBS_MULE="${LIBS_MULE} ${with_wnn_libraries}"
-     fi
-   else
-    LIBS_MULE="${LIBS_MULE} -lwnn"
-+    LIBS_MULE="${LIBS_MULE} ${wnnlib}"
-   fi
- fi
- 
--- a/editors/mule-common/files/patch-mn
+++ b/editors/mule-common/files/patch-mn
@ -1,11 +0,0 @@
--- src/coding.c.orig	Sun Jan 17 04:48:45 1999
-+++ src/coding.c	Sun Jan 17 04:49:02 1999
-@@ -154,7 +154,7 @@
- /* 92.4.3, 92.12.18 by K.Handa */
- Lisp_Object Qcoding_system, Qcoding_system_p, Qnon_nil_coding_system_p;
- Lisp_Object Qeol_type;
-Lisp_Object Qpriority;
-+extern Lisp_Object Qpriority;
- /* end of patch */
- #endif /* emacs */
- 
--- a/editors/mule-common/files/patch-na
+++ b/editors/mule-common/files/patch-na
@ -1,19 +0,0 @@
--- src/s/freebsd.h.~1~	Tue Jan 25 16:40:44 2000
-+++ src/s/freebsd.h	Tue Jan 25 16:45:23 2000
-@@ -43,7 +43,16 @@
- 
- #define LIBS_DEBUG
- #define LIBS_SYSTEM -lutil -lcrypt
-+#if __FreeBSD_version < 400000
- #define LIBS_TERMCAP -ltermcap
-+#else
-+#ifdef HAVE_LIBNCURSES
-+#define TERMINFO
-+#define LIBS_TERMCAP -lncurses
-+#else
-+#define LIBS_TERMCAP -ltermcap
-+#endif
-+#endif
- 
- #define SYSV_SYSTEM_DIR
- 
--- a/editors/mule-common/files/patch-oa
+++ b/editors/mule-common/files/patch-oa
@ -1,117 +0,0 @@
--- lisp/eggrc-wnn.orig	Mon Jul 16 04:31:14 2001
-+++ lisp/eggrc-wnn	Mon Jul 16 04:33:22 2001
-@@ -86,6 +86,99 @@
- 
-        )
- 
-+(defun wnn7-jserver-setup ()
-+  (set-wnn-reverse nil)
-+  (set-wnn-fuzokugo "system/kougo.fzk")
-+  (add-wnn-fisys-dict "system/fisd"
-+		       (concat wnn-usr-dic-dir "/fisd.h") t)
-+  (add-wnn-fiusr-dict (concat wnn-usr-dic-dir "/fiud") "" t nil)
-+  (add-wnn-dict "system/kihon.dic"
-+		 (concat wnn-usr-dic-dir "/kihon.h") 6 nil t)
-+  (add-wnn-dict "system/symbol.dic"
-+		 (concat wnn-usr-dic-dir "/symbol.h") 1 nil t)
-+;;  (add-wnn-dict "system/symbol_noat.dic"
-+;;		 (concat wnn-usr-dic-dir "/symbol_noat.h") 1 nil t)
-+  (add-wnn-dict "system/tel.dic"
-+		 (concat wnn-usr-dic-dir "/tel.h") 1 nil t)
-+  (add-wnn-dict "system/zip.dic"
-+		 (concat wnn-usr-dic-dir "/zip.h") 1 nil t)
-+  (add-wnn-dict "system/tankan.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/tankan2.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/ikeiji.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/rensou.dic" "" 1 nil nil)
-+  (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t)
-+
-+;  (add-wnn-dict "option/jinmei.dic"
-+;		  (concat wnn-usr-dic-dir "/jinmei.h") 1 nil t)
-+;  (add-wnn-dict "option/chimei.dic"
-+;		  (concat wnn-usr-dic-dir "/chimei.h") 1 nil t)
-+;  (add-wnn-dict "option/address.dic"
-+;		  (concat wnn-usr-dic-dir "/address.h") 1 nil t)
-+;  (add-wnn-dict "option/station.dic"
-+;		  (concat wnn-usr-dic-dir "/station.h") 1 nil t)
-+;  (add-wnn-dict "option/kana_english.dic"
-+;		  (concat wnn-usr-dic-dir "/kana_english.h") 1 nil t)
-+;  (add-wnn-dict "option/enterprise.dic"
-+;		  (concat wnn-usr-dic-dir "/enterprise.h") 1 nil t)
-+;  (add-wnn-dict "option/airport.dic"
-+;		  (concat wnn-usr-dic-dir "/airport.h") 1 nil t)
-+;  (add-wnn-dict "option/university.dic"
-+;		  (concat wnn-usr-dic-dir "/university.h") 1 nil t)
-+;  (add-wnn-dict "option/zoo.dic"
-+;		  (concat wnn-usr-dic-dir "/zoo.h") 1 nil t)
-+;  (add-wnn-dict "option/botanical_garden.dic"
-+;		  (concat wnn-usr-dic-dir "/botanical_garden.h") 1 nil t)
-+;  (add-wnn-dict "option/aquarium.dic"
-+;		  (concat wnn-usr-dic-dir "/aquarium.h") 1 nil t)
-+;  (add-wnn-dict "option/conveni.dic"
-+;		  (concat wnn-usr-dic-dir "/conveni.h") 1 nil t)
-+;  (add-wnn-dict "option/amusement.dic"
-+;		  (concat wnn-usr-dic-dir "/amusement.h") 1 nil t)
-+
-+  (set-wnn-param  5 10 2 45 0  80 5 1 20  0 400 -100 400   80 200 2 200)
-+  
-+  (add-wnn-notrans-dict (concat wnn-usr-dic-dir "/katakana") 15 t)
-+  (add-wnn-bmodify-dict (concat wnn-usr-dic-dir "/bunsetsu") 15 t)
-+
-+  (set-last-is-first-mode t)
-+  (set-complex-conv-mode nil)
-+;  (set-okuri-flag -1)
-+  (set-prefix-flag 0)
-+       
-+  (set-okuri-learn-mode t)
-+  (set-prefix-learn-mode t)
-+  (set-suffix-learn-mode t)
-+  (set-common-learn-mode t)
-+  (set-yuragi-mode nil)
-+
-+  (set-freq-func-mode 4)
-+
-+;  (set-numeric-mode -12)
-+;  (set-alphabet-mode -30)
-+;  (set-symbol-mode -40)
-+       
-+  (set-wnn-reverse t)
-+  (set-wnn-fuzokugo "system/kougo.fzk")
-+  (add-wnn-dict "system/kihonR.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/telR.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/zipR.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/tankanR.dic" "" 1 nil nil)
-+  (add-wnn-dict "system/tankan2R.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/stationR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/kana_englishR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/enterpriseR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/airportR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/universityR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/zooR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/botanical_gardenR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/aquariumR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/conveniR.dic" "" 1 nil nil)
-+  ;;(add-wnn-dict "option/amusementR.dic" "" 1 nil nil)
-+
-+  (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t)
-+  (set-wnn-param  2 10 2 45 1 80 5 1 50 -20 400 -10  100  -100 200 0 200)
-+  )
-+
- 
- (defun wnn4-jserver-setup ()
-        (set-wnn-reverse nil)
-@@ -126,9 +219,11 @@
- )
- 
- (cond ((eq wnn-server-type 'jserver)
-       (if (is-wnn6-server)
-	   (wnn6-jserver-setup)
-	 (wnn4-jserver-setup)))
-+       (if (is-wnn7-server)
-+	   (wnn7-jserver-setup)
-+	 (if (is-wnn6-server)
-+	     (wnn6-jserver-setup)
-+	   (wnn4-jserver-setup))))
-       ((eq wnn-server-type 'cserver)
-        (set-wnn-reverse nil)
-        (set-wnn-fuzokugo "sys/full.con")
--- a/editors/mule-common/files/patch-ob
+++ b/editors/mule-common/files/patch-ob
@ -1,12 +0,0 @@
--- lisp/wnn-egg.el.bak	Mon Jul 16 04:37:50 2001
-+++ lisp/wnn-egg.el	Mon Jul 16 04:42:05 2001
-@@ -606,6 +606,9 @@
- (defun is-wnn6-server ()
-   (= (wnn-server-version) 61697))
- 
-+(defun is-wnn7-server ()
-+  (= (wnn-server-version) 61698))
-+
- (defun add-wnn-dict (dfile hfile priority dmode hmode &optional dpaswd hpaswd)
- ;  (open-wnn-if-disconnected)
-   (if (null (wnn-server-dict-add
--- a/editors/mule-common/files/patch-src_emacs.c
+++ b/editors/mule-common/files/patch-src_emacs.c
@ -1,11 +0,0 @@
--- src/emacs.c.~1~	Tue Aug 18 14:48:38 1998
-+++ src/emacs.c	Fri Sep 20 23:04:16 2002
-@@ -510,8 +510,6 @@
- {
-   char stack_bottom_variable;
-   int skip_args = 0;
-  extern int errno;
-  extern sys_nerr;
- 
- #ifdef LINUX_SBRK_BUG
-   __sbrk (1);
--- a/Show More
+++ b/Show More