33 files changed, 0 insertions, 2132 deletions

diff --git a/vietnamese/Makefile b/vietnamese/Makefile
index 0e8ff015de75..8b88653c0ed5 100644
--- a/vietnamese/Makefile
+++ b/vietnamese/Makefile
@@ -19,12 +19,10 @@
     SUBDIR += vis2u
     SUBDIR += vn7to8
     SUBDIR += vnconvert
-    SUBDIR += vnelvis
     SUBDIR += vnless
     SUBDIR += vnlpr
     SUBDIR += vnpstext
     SUBDIR += vnroff
-    SUBDIR += vnterm
     SUBDIR += vntex
     SUBDIR += vnxfonts
     SUBDIR += x-unikey
diff --git a/vietnamese/vnelvis/Makefile b/vietnamese/vnelvis/Makefile
deleted file mode 100644
index a0302da5c9f4..000000000000
--- a/vietnamese/vnelvis/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: David O'Brien (obrien@cs.ucdavis.edu)
-# $FreeBSD$
-
-PORTNAME=	vnelvis
-PORTVERSION=	1.4
-CATEGORIES=	vietnamese editors
-MASTER_SITES=	ftp://ftp.monash.edu.au/pub/vietnam/unix/
-DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=	obrien@FreeBSD.org
-COMMENT=	A vi clone that speaks Vietnamese
-
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2013-03-05
-
-BUILD_DEPENDS=  ${LOCALBASE}/lib/libviqr.a:${PORTSDIR}/vietnamese/libviet
-
-CFLAGS+=	-I${PREFIX}/include/viet
-MAN1=		vnelvis.1 vnvi.1
-
-post-extract:
-	@ cd ${WRKSRC} ; make clean
-	@ ${MV} ${WRKDIR}/lib ${WRKDIR}/DONT.lib
-	@ ${MV} ${WRKDIR}/include ${WRKDIR}/DONT.include
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/vnelvis.1V ${PREFIX}/man/man1/vnelvis.1
-	${INSTALL_MAN} ${WRKSRC}/vnelvis.1V ${PREFIX}/man/man1/vnvi.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800039
-BROKEN=		does not build
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/vietnamese/vnelvis/distinfo b/vietnamese/vnelvis/distinfo
deleted file mode 100644
index b759ccc3c25d..000000000000
--- a/vietnamese/vnelvis/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (vnelvis.tar.Z) = e6d051f73c3c9f1f9db9dda6a0f50f897cd43526b3c73fca853c88aadb0650c2
-SIZE (vnelvis.tar.Z) = 295861
diff --git a/vietnamese/vnelvis/files/patch-01 b/vietnamese/vnelvis/files/patch-01
deleted file mode 100644
index a19b0dedb33d..000000000000
--- a/vietnamese/vnelvis/files/patch-01
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.orig	Tue May 19 11:57:57 1992
-+++ Makefile	Sat Feb 10 19:55:12 2001
-@@ -1,8 +1,8 @@
- #
- # TriChlor VN libraries and includes
- #
--VNLIBDIR = ../lib
--VNINCDIR = ../include
-+VNLIBDIR = $(PREFIX)/lib
-+VNINCDIR = $(PREFIX)/include/viet
- 
- # combined Makefile for ELVIS - a clone of `vi`
- #
-@@ -115,7 +115,7 @@
- EXTRA=
- EXTRA2=
- LIBS=  $(VNLIBDIR)/libviqr.a $(VNLIBDIR)/libvntype.a -ltermcap
--BIN=	/usr/local/bin
-+BIN=	${PREFIX}/bin
- CFLAGS=	-Dbsd -I$(VNINCDIR)
- OF=	-s -o 
- RF=	-c
-@@ -357,10 +357,10 @@
- 	cp $(PROGS) $(BIN)
- 	(cd $(BIN); chmod 755 $(PROGS))
- 	(cd $(BIN); chown bin $(PROGS))
--	-ln $(BIN)/vnelvis $(BIN)/vi
--	-ln $(BIN)/vnelvis $(BIN)/ex
--	-ln $(BIN)/vnelvis $(BIN)/view
--	-ln $(BIN)/vnelvis $(BIN)/input
-+	-ln -sf $(BIN)/vnelvis $(BIN)/vnvi
-+	-ln -sf $(BIN)/vnelvis $(BIN)/vnex
-+	-ln -sf $(BIN)/vnelvis $(BIN)/vnview
-+	-ln -sf $(BIN)/vnelvis $(BIN)/vninput
- 
- inst.dos: $(DUMMY)
- 	copy $(PROGS) $(BIN)
diff --git a/vietnamese/vnelvis/files/patch-03 b/vietnamese/vnelvis/files/patch-03
deleted file mode 100644
index 29763dd04471..000000000000
--- a/vietnamese/vnelvis/files/patch-03
+++ /dev/null
@@ -1,44 +0,0 @@
---- config.h.orig	Wed Dec  5 08:50:51 1990
-+++ config.h	Thu Apr  5 03:06:15 2001
-@@ -18,7 +18,9 @@
- 
- /* BSD UNIX? */
- #ifdef bsd
--# define BSD		1
-+/* # define BSD		1 */
-+/* BSD is defined in <sys/param.h> so just get it from there */
-+# include <sys/param.h>
- #endif
- 
- /* Microsoft C: sorry, Watcom does the same thing */
-@@ -129,6 +131,12 @@
- # define CREDIT	"Ported to Coherent by Esa Ahola"
- #endif
- 
-+#if BSD 
-+# if (BSD >= 199306)
-+#  define CREDIT	"Ported to 4.4BSD by David O'Brien"
-+# endif
-+#endif
-+
- /*************************** functions depending on OS *********************/
- 
- /* Only MSDOS, TOS, and OS9 need a special function for reading from the
-@@ -203,7 +211,7 @@
- # define TMPNAME	"%s/elv%x%04x%03x" /* temp file */
- # define CUTNAME	"%s/elv_%04x%03x" /* cut buffer's temp file */
- # ifndef EXRC
--#  define EXRC		".exrc"		/* init file in current directory */
-+#  define EXRC		".vnelvisrc"		/* init file in current directory */
- # endif
- # define SCRATCHOUT	"%s/soXXXXXX"	/* temp file used as input to filter */
- # ifndef EXINIT
-@@ -263,7 +271,7 @@
- #  define CC_COMMAND	"cc -r"		   /* name of the compiler */
- # endif
- # ifndef EXRC
--#  define EXRC		".exrc"		   /* init file in current directory */
-+#  define EXRC		".vnelvisrc"		   /* init file in current directory */
- # endif
- # define SCRATCHOUT	"%s/soXXXXXX"	   /* temp file used as input to filter */
- # ifndef SHELL
diff --git a/vietnamese/vnelvis/files/patch-04 b/vietnamese/vnelvis/files/patch-04
deleted file mode 100644
index 872dcb848ad0..000000000000
--- a/vietnamese/vnelvis/files/patch-04
+++ /dev/null
@@ -1,36 +0,0 @@
---- vi.h.orig	Sat Jul 27 11:00:24 1991
-+++ vi.h	Thu Dec  5 00:37:44 1996
-@@ -16,6 +16,7 @@
- 
- #define VERSION "ELVIS 1.4, by Steve Kirkendall"
- #define COPYING	"This version of ELVIS is freely redistributable."
-+#define VNVERSION "Adapted for Vietnamese text by Nguye^~n T. Cu+o+`ng"
- 
- #include <errno.h>
- extern int errno;
-@@ -92,7 +93,9 @@
- #define READONLY	0x0002	/* the file is read-only */
- #define HADNUL		0x0004	/* the file contained NUL characters */
- #define MODIFIED	0x0008	/* the file has been modified */
--#define NOFILE		0x0010	/* no name is known for the current text */
-+/*#define NOFILE		0x0010	/* no name is known for the current text */
-+/* NOFILE conflicts with 4.4BSD's <sys/param.h> */
-+#define NONAME		0x0010	/* no name is known for the current text */
- #define ADDEDNL		0x0020	/* newlines were added to the file */
- 
- /* macros used to set/clear/test flags */
-@@ -235,7 +238,13 @@
- #ifndef NO_RECYCLE
- extern long	allocate();	/* allocate a free block of the tmp file */
- #endif
--extern int	trapint();	/* trap handler for SIGINT */
-+extern 
-+#if BSD && (BSD >= 199306)
-+ void
-+#else
-+ int	
-+#endif
-+trapint();	/* trap handler for SIGINT */
- extern void	blkdirty();	/* marks a block as being "dirty" */
- extern void	blkflush();	/* writes a single dirty block to the disk */
- extern void	blksync();	/* forces all "dirty" blocks to disk */
diff --git a/vietnamese/vnelvis/files/patch-05 b/vietnamese/vnelvis/files/patch-05
deleted file mode 100644
index d88f47be11ae..000000000000
--- a/vietnamese/vnelvis/files/patch-05
+++ /dev/null
@@ -1,12 +0,0 @@
---- tmp.c.orig	Wed Dec  5 08:51:19 1990
-+++ tmp.c	Wed Dec  4 23:31:22 1996
-@@ -161,7 +161,8 @@
- 	}
- 	else
- 	{
--		setflag(file, NOFILE);
-+		/* setflag(file, NOFILE); */ /* NOFILE conflicts w/4.4BSD's param.h */
-+		setflag(file, NONAME);
- 		origfd = -1;
- 		origtime = 0L;
- 		stat(".", &statb);
diff --git a/vietnamese/vnelvis/files/patch-06 b/vietnamese/vnelvis/files/patch-06
deleted file mode 100644
index a06cd1d77183..000000000000
--- a/vietnamese/vnelvis/files/patch-06
+++ /dev/null
@@ -1,14 +0,0 @@
---- blk.c.orig	Wed Dec  5 08:50:47 1990
-+++ blk.c	Wed Dec  4 23:35:36 1996
-@@ -19,7 +19,11 @@
- # define NBUFS	5		/* must be at least 3 -- more is better */
- #endif
- 
-+#if BSD && (BSD >= 199306)
-+# include <unistd.h>
-+#else
- extern long lseek();
-+#endif
- 
- /*------------------------------------------------------------------------*/
- 
diff --git a/vietnamese/vnelvis/files/patch-07 b/vietnamese/vnelvis/files/patch-07
deleted file mode 100644
index 4ded4ac18158..000000000000
--- a/vietnamese/vnelvis/files/patch-07
+++ /dev/null
@@ -1,51 +0,0 @@
---- curses.c.orig	Thu May 14 22:55:48 1992
-+++ curses.c	Wed Dec  4 23:55:33 1996
-@@ -40,6 +40,13 @@
- 
- #include <signal.h>
- 
-+#if TURBOC || (BSD >= 199306)
-+void 
-+#else
-+int 
-+#endif
-+getsize();
-+
- extern char	*getenv();
- static void	 starttcap();
- 
-@@ -338,7 +345,7 @@
- 	}	
- 	exwrote = FALSE;
- 
--#if TURBOC
-+#if TURBOC || (BSD >= 199306)
- 	signal(SIGINT, (void(*)()) trapint);
- #else
- 	signal(SIGINT, trapint);
-@@ -482,7 +489,12 @@
-  * This function is called once during initialization, and thereafter it is
-  * called whenever the SIGWINCH signal is sent to this process.
-  */
--int getsize(signo)
-+#if TURBOC || (BSD >= 199306)
-+void 
-+#else
-+int 
-+#endif
-+getsize(signo)
- 	int	signo;
- {
- 	int	lines;
-@@ -535,7 +547,11 @@
- 		*o_lines = LINES;
- 	}
- 
-+#if TURBOC || (BSD >= 199306)
-+	return;
-+#else
- 	return 0;
-+#endif
- }
- 
- 
diff --git a/vietnamese/vnelvis/files/patch-08 b/vietnamese/vnelvis/files/patch-08
deleted file mode 100644
index 0b86e2243d6c..000000000000
--- a/vietnamese/vnelvis/files/patch-08
+++ /dev/null
@@ -1,15 +0,0 @@
---- recycle.c.orig	Wed Dec  5 08:51:08 1990
-+++ recycle.c	Wed Dec  4 23:42:53 1996
-@@ -18,7 +18,11 @@
- #ifndef NO_RECYCLE
- /* this whole file would have be skipped if NO_RECYCLE is defined */
- 
--extern long	lseek();
-+#if BSD && (BSD >= 199306)
-+# include <unistd.h>
-+#else
-+ extern long	lseek();
-+#endif
- 
- #define BTST(bitno, byte)	((byte) & (1 << (bitno)))
- #define BSET(bitno, byte)	((byte) |= (1 << (bitno)))
diff --git a/vietnamese/vnelvis/files/patch-09 b/vietnamese/vnelvis/files/patch-09
deleted file mode 100644
index bb20524098fb..000000000000
--- a/vietnamese/vnelvis/files/patch-09
+++ /dev/null
@@ -1,24 +0,0 @@
---- tio.c.orig	Mon Apr  6 15:30:53 1992
-+++ tio.c	Wed Dec  4 23:59:12 1996
-@@ -369,10 +369,20 @@
- #if !MSDOS && !TOS
- # if BSD || COHERENT
- static jmp_buf env_timeout;
--static int dummy()
-+static 
-+#  if (BSD >= 199306)
-+void
-+#  else
-+int 
-+#  endif
-+dummy()
- {
- 	longjmp(env_timeout, 1);
-+#  if (BSD >= 199306)
-+	return;
-+#  else
- 	return 0;
-+#  endif
- }
- # else 
- static int dummy()
diff --git a/vietnamese/vnelvis/files/patch-10 b/vietnamese/vnelvis/files/patch-10
deleted file mode 100644
index 497cf899add9..000000000000
--- a/vietnamese/vnelvis/files/patch-10
+++ /dev/null
@@ -1,54 +0,0 @@
---- main.c.orig	Mon Apr  6 15:30:43 1992
-+++ main.c	Wed Dec  4 23:58:14 1996
-@@ -25,7 +25,7 @@
- int		Debug = 0;
- #endif
- 
--extern		trapint(); /* defined below */
-+/* extern		trapint(); /* defined below */
- extern char	*getenv();
- jmp_buf		jmpenv;
- 
-@@ -307,7 +307,7 @@
- 			/* Maybe we just aborted a change? */
- 			abortdo();
- 		}
--#if TURBOC
-+#if TURBOC || (BSD >= 199306)
- 		signal(SIGINT, (void(*)()) trapint);
- #else
- 		signal(SIGINT, trapint);
-@@ -350,7 +350,12 @@
- 
- 
- /*ARGSUSED*/
--int trapint(signo)
-+#if TURBO_C || (BSD >= 199306)
-+void
-+#else
-+int 
-+#endif
-+trapint(signo)
- 	int	signo;
- {
- 	resume_curses(FALSE);
-@@ -358,14 +363,18 @@
- #if OSK
- 	sigmask(-1);
- #endif
--#if TURBO_C
-+#if TURBO_C || (BSD >= 199306)
- 	signal(signo, (void (*)())trapint);
- #else
- 	signal(signo, trapint);
- #endif
- 	longjmp(jmpenv, 1);
- 
-+#if TURBO_C || (BSD >= 199306)
-+	return;
-+#else
- 	return 0;
-+#endif
- }
- 
- 
diff --git a/vietnamese/vnelvis/files/patch-11 b/vietnamese/vnelvis/files/patch-11
deleted file mode 100644
index 9752fb5670ab..000000000000
--- a/vietnamese/vnelvis/files/patch-11
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmd1.c.orig	Wed Dec  5 08:50:48 1990
-+++ cmd1.c	Thu Dec  5 00:21:11 1996
-@@ -908,6 +908,9 @@
- #else
- 	msg("%s  (%s)", VERSION, DATE);
- #endif
-+#ifdef VNVERSION
-+	msg("%s", VNVERSION);
-+#endif
- #ifdef COMPILED_BY
- 	msg("Compiled by %s", COMPILED_BY);
- #endif
diff --git a/vietnamese/vnelvis/files/patch-opts.c b/vietnamese/vnelvis/files/patch-opts.c
deleted file mode 100644
index cc0a25a8031e..000000000000
--- a/vietnamese/vnelvis/files/patch-opts.c
+++ /dev/null
@@ -1,5 +0,0 @@
---- opts.c.orig	Mon Apr  6 15:30:53 1992
-+++ opts.c	Thu Apr  5 02:59:24 2001
-@@ -103 +103 @@
--char	o_vnkeys[1] =		{FALSE};
-+char	o_vnkeys[1] =		{TRUE};
diff --git a/vietnamese/vnelvis/files/patch-vnelvis.1V b/vietnamese/vnelvis/files/patch-vnelvis.1V
deleted file mode 100644
index 0064c94589ed..000000000000
--- a/vietnamese/vnelvis/files/patch-vnelvis.1V
+++ /dev/null
@@ -1,185 +0,0 @@
---- vnelvis.1V.orig	Mon Apr 12 14:48:10 1993
-+++ vnelvis.1V	Tue Nov 27 17:08:43 2001
-@@ -10,32 +10,32 @@
- .SH DESCRIPTION
- .NXR "vnelvis command"
- .PP
--.PN Vnelvis
-+.B Vnelvis
- is an adaptation of Steve Kirkendall's
- public domain
--.PN vi
-+.B vi
- clone,
--.PN elvis
-+.B elvis
- command.  It is preferable to
--.PN vi
-+.B vi
- because most current
--.PN vi
-+.B vi
- implementations allow only 7-bit text editing
- which is inappropriate for the  8-bit
- Vietnamese character set.
- This manual page describes only
- those features specific to
--.PN vnelvis ;
-+.B vnelvis ;
- please consult the documentation for
--.PN elvis
-+.B elvis
- and
--.PN vi
-+.B vi
- for the rest of the story.  If you are already
- familiar with
--.PN vi ,
-+.B vi ,
- no special training is necessary.
- .PP
--.PN Vnelvis
-+.B Vnelvis
- allows user to edit 
- Vietnamese text with the keyboard input
- style according the 7-bit VIQR standard,
-@@ -46,19 +46,19 @@
- text (according to the VISCII standard).
- .PP
- In order to use
--.PN vnelvis,
-+.B vnelvis,
- you must have a terminal capable of
- displaying Vietnamese, e.g.,
--.MS vnterm 1V
-+.B vnterm 1V
- or
--.MS vietterm 1V
-+.B vietterm 1V
- .PP
- There is one user-definable setting
- with
--.PN vnelvis:
-+.B vnelvis:
- .I vnkeys .
- It is handled as regular
--.PN vi
-+.B vi
- variables and can be set with your .exrc or
- your EXINIT environment variable, e.g.,:
- .EX
-@@ -78,11 +78,11 @@
- .I vnkeys
- specifies whether Vietnamese input processing is to
- be performed; when it is off,
--.PN vnelvis
-+.B vnelvis
- behaves as a regular
--.PN elvis
-+.B elvis
- or
--.PN vi ,
-+.B vi ,
- except that 8-bit data is supported.
- Note that keyboard filtering is only done in input
- mode and not in vi-command mode, which is most
-@@ -92,11 +92,11 @@
- .I vnkeys
- off.  The reason for this is because users will typically
- start
--.PN vnelvis
-+.B vnelvis
- from within a
--.PN vnterm
-+.B vnterm
- or
--.PN vietterm
-+.B vietterm
- window, which is already doing its Vietnamese keyboard filtering.
- .SH STATUS DISPLAY
- When the vi-variable
-@@ -113,59 +113,68 @@
- .SH USAGE NOTES
- .IP o
- When using
--.PN vnelvis
-+.B vnelvis
- in conjunction with
--.MS vnterm 1V ,
-+.B vnterm 1V ,
- remember to turn off keyboard processing by
- either
--.PN vnelvis
-+.B vnelvis
- or
--.PN vnterm ,
-+.B vnterm ,
- otherwise the results of your keypresses going
- through two Vietnamese filters may be somewhat
- confusing.
- .IP o
--.PN vnelvis
-+.B vnelvis
- is currently the only alternative that
- would correctly handle the six Vietnamese characters
- "A(? A(~ A^~ Y? Y~ Y." as they are coded in
- the C0 control area.  For best results when
- using
--.PN vnelvis
-+.B vnelvis
- and
--.PN vnterm ,
-+.B vnterm ,
- it is recommended that you turn on
--.PN vnelvis 's
-+.B vnelvis 's
- keyboard filter (:set vnkeys)
- and turn off
--.PN vnterm 's
-+.B vnterm 's
- keyboard filtering.  This will ensure that
- Vietnamese characters are generated only in
- input mode when you typically really want them.
- .IP o
- On the other hand,
- if you prefer leaving
--.PN vnterm 's
-+.B vnterm 's
- or
--.PN vietterm 's
-+.B vietterm 's
- keyboard filtering on and turn off
--.PN vnelvis 's
-+.B vnelvis 's
- keyboard filter, you may find commands such as
- "dd" (delete line) awkward, because
- the "dd" is converted first to the Vietnamese
- character "d-bar" before it is sent to
--.PN vnelvis.
-+.B vnelvis.
- Therefore you must either type "d\\d"
- to prevent the composition action, or
- use the "qq" sequence which has been
- implemented in
--.PN vnelvis
-+.B vnelvis
- as a substitute for "dd".
- .SH AUTHOR
- Adapted from Steve Kirkendall's elvis.1.4
- by Cuong T. Nguyen, the TriChlor Group, TriChlor@haydn.Stanford.EDU
- .SH "SEE ALSO"
--The Viet-Std Standardization Specification (Viet-Std@Haydn.Stanford.EDU)
--.br
- viqr(3V), vntype(3V),
- vi(1), elvis(1l)
-+.SH STANDARDS
-+Viet-Std Standardization Specification (Viet-Std@Haydn.Stanford.EDU)
-+.PP
-+RFC 1456 Vietnamese Standardization Working Group,
-+"Conventions for Encoding the Vietnamese Language
-+.br
-+VISCII: VIetnamese Standard Code for Information Interchange
-+.br
-+VIQR: VIetnamese Quoted-Readable Specification Revision 1.1",
-+.br
-+May 1993.
diff --git a/vietnamese/vnelvis/pkg-descr b/vietnamese/vnelvis/pkg-descr
deleted file mode 100644
index af5b0e58b83a..000000000000
--- a/vietnamese/vnelvis/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Tha^n cha`o ca'c ba.n,
-
-VNElvis is a clone of vi/ex (the standard UNIX editor) that allows the
-displaying and editing of documents in the Vietnamese 8-bit VISCII (VIetnamese
-Standard Code for Information Interchange) (RFC 1456) data format using the
-7-bit VIQR (VIetnamese Quoted Readable) input method.
-
-It is expected that you will run vnelvis w/in a vnterm.  Because of the way
-vi utilizes various key strokes, it may be better to turn off vnterm's VIQR
-processing and allow vnelvis to handle the VIQR input itself.  You do this
-by "set vnkeys".
-Because "dd" --> "-d" in VIQR, "qq" has been added as a means of
-deleting a line.  Otherwise vnelvis behaives as expected.
-
-David O'Brien
-obrien@cs.ucdavis.edu
diff --git a/vietnamese/vnelvis/pkg-plist b/vietnamese/vnelvis/pkg-plist
deleted file mode 100644
index 0241c7dcc759..000000000000
--- a/vietnamese/vnelvis/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $FreeBSD$
-bin/vnelvis
-bin/vnvi
-bin/vnex
-bin/vnview
-bin/vninput
-bin/virec
diff --git a/vietnamese/vnterm/Makefile b/vietnamese/vnterm/Makefile
deleted file mode 100644
index 49ff3c34467e..000000000000
--- a/vietnamese/vnterm/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Created by: David O'Brien (obrien@cs.ucdavis.edu)
-# $FreeBSD$
-
-PORTNAME=	vnterm
-PORTVERSION=	3.4	#11.6.6[.0]
-PORTREVISION?=	4
-CATEGORIES=	vietnamese x11
-MASTER_SITES=	ftp://ftp.x.org/pub/R6.6/tars/
-DISTNAME=	xorg-1
-
-MAINTAINER=	obrien@FreeBSD.org
-COMMENT=	An xterm that speaks Vietnamese
-
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2013-03-05
-
-USE_IMAKE=	yes
-USE_XORG=	ice sm x11 xaw xext xmu xt xpm
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800039
-BROKEN=		does not build
-.endif
-
-BUILD_DEPENDS=  ${LOCALBASE}/lib/libviqr.a:${PORTSDIR}/vietnamese/libviet \
-		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-RUN_DEPENDS=	${PREFIX}/lib/X11/fonts/vietnamese/fonts.dir:${PORTSDIR}/vietnamese/vnxfonts
-
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/programs/xterm
-WRKSRC=		${WRKDIR}/xc/programs/xterm
-XMKMF=		xmkmf
-MAN1=		vnterm.1
-
-post-patch:
-	@${CP} -p ${FILESDIR}/vnvars.* ${WRKSRC}
-
-pre-build:
-	${LN} -f ${WRKSRC}/XTerm.ad ${WRKSRC}/VNTerm.ad
-	${CP} -p ${FILESDIR}/vnterm.1V ${WRKSRC}/vnterm.man
-
-post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/VNterm.sh ${PREFIX}/bin/VNterm
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/vnterm \
-		&& ${CHMOD} a+rx ${PREFIX}/share/doc/vnterm
-	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/vnterm
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/vietnamese/vnterm/distinfo b/vietnamese/vnterm/distinfo
deleted file mode 100644
index 0b1b822a6fc0..000000000000
--- a/vietnamese/vnterm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg-1.tar.gz) = 0cae081bf3aa1be27c0616c243e8d48ce44a2e781c1b03fe81de6ed11c6e0189
-SIZE (xorg-1.tar.gz) = 15879579
diff --git a/vietnamese/vnterm/files/README.vnterm b/vietnamese/vnterm/files/README.vnterm
deleted file mode 100644
index bab821384574..000000000000
--- a/vietnamese/vnterm/files/README.vnterm
+++ /dev/null
@@ -1,271 +0,0 @@
-7/15/93
-vnterm has been "ported" to be base on the latest X11R5 xterm source
-that I have.  It has only been tested on SGI IRIX 5.0 alpha.
-
-Theoretically, it should compile on other SVR4 derived OS.
-
-Any problem, contact me as I am responsible for this particular
-version of vnterm.  Email to tin@saigon.com
-
-Tin Le
-
---------------------------
-
-If you received this program in source form and must compile it,
-please follow the compile instructions below.  If you received
-the program in executable format, please skip directly to the
-XDEFAULTS section below.
-
-The files VIQR.7 and VISCII.8 contain samples of Vietnamese
-text that conform to the Viet-Std encoding specifications,
-with which Vnterm complies.
-
---------
-COMPILE INSTRUCTIONS:
-
-To compile this program, first try
-	
-	% xmkmf
-	% /bin/make
-
-If your system is properly set up for X and imake, that should be
-sufficient.  However, some systems are not correctly set up,
-and for that we have provided the script "make" that summarizes
-the important parameters you need to set for your system.
-Edit "Doimake" and "make" as appropriate, and run
-
-	% Doimake
-	% ./Make Makefile
-	% ./Make
-
-Sparc users note: your system libraries may require the -ldl
-option added at the final linking step.  A simple fix for this
-is to edit your Imakefile/Makefile, and change the definition
-
-	VNLIBS = $(VNLIBDIR)/libviqr.a $(VNLIBDIR)/libvntype.a
-
-to
-
-	VNLIBS = -ldl $(VNLIBDIR)/libviqr.a $(VNLIBDIR)/libvntype.a
-
-If you still have trouble, make a transcript of your compile
-attempt,
-
-	% script
-	% ....
-	% exit
-
-and mail it to trichlor@haydn.Stanford.EDU, along with your questions.
---------
-XDEFAULTS:
-
-Sample settings to be placed in your .Xdefaults file for vnterm
-is provided in the file "Xdefaults."
-
-  > vnterm*font:                    vn-r14
-    This sets the font for "vnterm" to "vn-r14" whenever you
-    run it.
-
-  > vnterm*vnFilterKeyboard:        on
-    This enables the Vietnamese keyboard.
-
-  > vnterm*vnFilterScreen:          off
-    This disables the screen-filter mode.   When this mode is enabled,
-    instead of displaying the true characters, vnterm will display them
-    as Vietnamese characters according to the VIQR standard (Viet-Net
-    like, see below under KEYBOARD INSTRUCTIONS).  This is useful if
-    you're reading Vietnamese mail or Soc.Culture.Vietnamese messages
-    where people type things like:
-
-    DDa^y la` tie^'ng Vie^.t.
-
-    By having the screen filter ON, you will see this as true Vietnamese
-    characters.  Of course, you won't need the filter on if the characters
-    are already true Vietnamese data (according to the Viet-Std 8-bit
-    VISCII standard).
-
-    One hitch: occasionally, some magic strings will cause the
-    Vietnamese screen filter to switch language modes (see below,
-    under KEYBOARD INSTRUCTIONS) and it will no longer combine
-    characters to form Vietnamese.  "This is not a bug, it is a feature."
-    If you want to get back to Vietnamese mode for screen filtering,
-    the simplest way is to go to the pop-up menu (CTRL-MIDDLE MOUSE)
-    and turn the screen filter off, then on again.
-
---------
-FONT INSTRUCTIONS:
-
-Vnterm.3.0 requires the availability of Vietnamese X fonts.
-Such fonts can be found under the "fonts/X" directory of the
-TriChlor distribution.  Installation of the fonts is a 4-step
-process, which is partially taken care of by the Makefile
-in the fonts/X directory:
-
-    1. Convert the BDF format to SNF (server normal format),
-       with "bdftosnf <fontfile>.bdf > <fontfile>.snf".
-       The Makefile under fonts/X takes care of this automatically.
-       This is also automatically taken care of if you run
-       a compilation of vnterm.  However, if you retrieved
-       vnterm in its executable form, you must go to the
-       fonts/X directory and run "make all".
-
-    2. Make a listing of your fonts in the directory so the
-       X server can read it, with "mkfontdir".  The Makefile
-       takes care of this automatically.
-
-    3. Tell the X server where to find your font directory,
-       with "xset +fp <your_font_directory>".  The Makefile
-       does NOT do this, as you may wish to place your fonts
-       somewhere other than in the directory where they were compiled.
-
-       Remember that <your_font_directory> refers to
-       where the X server is running, which is NOT necessarily
-       the machine you are logged into.  If this doesn't make
-       much sense, don't worry, just plow ahead with the installation.
-       If it doesn't work, you'll know this is one possible
-       reason why.  In case of doubt, ask your local X guru.
-    
-    4. Set the font for the "vnterm" program to that font.
-       For example, if you have the font "vn-r14",
-       either issue the command
-
-	 % vnterm -fn vn-r14
-    
-       of place the following line in your .Xdefaults:
-
-
-	 vnterm*font: vn-r14
-
-If you have trouble with the font installation, try seeking help
-from a local X guru who knows the particulars of your environment.
-We can be reached for further consultation at the mail alias
-TriChlor@haydn.Stanford.EDU.
-
-Particulars:
-
-X11/NeWS: the server has its own font format that can be generated
-	  with the command "convertfont".
-
-NFS users:make sure your font files are accessible by everyone.  This
-	  means a minimum of:
-
-	  (a) all directories in the path to your font files must
-	      be executable by everyone.  This means a minimum of:
-
-	      % chmod go+x <dir>
-
-	      for all directory components.
-
-	  (b) all font files readable by everyone:
-
-	      % chmod go+r *
-
-	      in the font directory.
-
-X-terminals: recently X-terminals have become increasingly available.
-	X-terminals typically boot up getting files from a file server,
-	in particular its font files.  This poses a thorny problem:
-	how do you install a new font for these displays?  The user
-	typically does not have access to the file system where the
-	X-terminal looks for its fonts.
-
-	If you know where your X terminal looks for its fonts
-	(at least which file system), and have write access to
-	it, you're okay, because you can place your fonts there
-	and tell the X terminal server proram to look there.
-
-	If you do know where it looks for fonts, but don't have
-	access to it, OR, if you don't know where it looks for fonts,
-	there is nothing you can do short of contacting the
-	guru who manages your X terminal.  He or she will be
-	able to put the Vietnames font file in the right places
---------
-KEYBOARD INSTRUCTIONS:
-
-    Vnterm starts up in Vietnamese typing mode.  There are two other
-    modes, English and Literal, (according to the Viet-Std VIQR standard)
-    each of which is initiated as described below:
-
-    Typing instructions:
-
-	\v: Start Vietnamese mode, where Viet-Net style input is supported,
-	    for example:
-
-	    Ca' kho^ng a(n muo^'i ca' u+o+ng
-	    Con ca~i cha me. tra(m ddu+o+`ng con hu+\.
-
-	    To prevent composition, use "\".  The example above shows
-	    "hu+\." which tells Vnterm that the ending period is
-	    a period and not a Vietnamese dot-below (da^'u na(.ng).
-
-	    The diacritics (da^'u) are:
-
-	    (	breve		da^'u tra(ng, a('
-	    ^	circumflex	da^'u mu~, a^'
-	    +	horn		da^'u mo'c, o+
-
-	    '	acute		da^'u sa('c
-	    `	grave		da^'u huye^`n
-	    ?	hook above	da^'u ho?i
-	    ~	tilde		da^'u nga~
-	    .	dot below	da^'u na(.ng
-	
-	\m: Start English mode, where Viet-Net style input is supported,
-	    but must be explicitly announced with a "\", for example:
-
-	    C\a' kh\o^ng \a(n mu\o^'i c\a' \u+\o+ng
-	    Con c\a~i cha m\e. tr\a(m \dd\u+\o+`ng con h\u+\.
-
-	    This mode is useful if you type mostly English and don't
-	    want the trouble of having to type "\" to escape composition
-	    all the time.
-
-	\l: starts Literal mode, almost all keys are passed literally.
-
-	For complete details, please see the Viet-Std documents
-	published elsewhere.  Contact "viet-std@haydn.Stanford.EDU"
-	if you would like a copy.
-
-    To turn off keyboard filtering completely, use the pop-up menu
-    using CTRL-middle (hold down Control key while pressing the middle
-    mouse button), and highlight the option "Enable Vietnamese keys."
-    If there is a check mark next to it, the Vietnamese keyboard filtering
-    is in effect. Otherwise, it has been turned off.
---------
-DISPLAY INSTRUCTIONS:
-
-    Vnterm also supports a Screen-Filter mode which will convert
-    the displayed text to Vietnamese as appropriate.  This is useful
-    if you are reading Soc.Culture.Vietnamese or something similar.
-    To use this, bring up the pop-up menu, also using CTRL-middle,
-    and highlight the "Use Vietnamese screen" option so that there
-    is a check mark next to it.  From then on if you read a message
-    with Vietnamese mnemonics in it, it will display as true Vietnamese
-    characters.  NOTE: the screen filter also switches modes like
-    the keyboard filter, so that if you happen to read a message
-    with the string "\l" or "\m" in it, it will put the filter in
-    Literal or English mode, respectively.  Subsequently, the
-    Vietnamese mnemonics will no longer display as Vietnamese.
-    A simple way to get the screen filter back to Vietnamese mode
-    is to turn it off, then on again, using the pop-up menu.
-
---------
-TTY settings:
-	
-    Some of the newer shells try to be "smart" and will actually
-    reset your terminal characteristics, even though vnterm attempts
-    to set them correctly on start-up.  This requires you to manually
-    set:
-
-	% stty pass8 cs8 -istrip
-
-    You may find it convenient to place the line above in your
-    .cshrc, which is read every time the C-shell starts up.
-
-    In addition, the one of the newest shells we've tested will
-    actually insist on not passing 8-bit characters, regardless
-    of the tty settings.  Your best bet in this case is to run
-    an older shell, which may be available on your system as
-    /bin/csh.
-
-Cu+o+`ng Nguye^~n
diff --git a/vietnamese/vnterm/files/VNterm.sh.in b/vietnamese/vnterm/files/VNterm.sh.in
deleted file mode 100644
index 176aa74d3cb6..000000000000
--- a/vietnamese/vnterm/files/VNterm.sh.in
+++ /dev/null
@@ -1,63 +0,0 @@
-# ex:ts=4
-#	Modified from CXterm.sh included with the cxterm Chinese lang xterm pkg
-
-# ENCODE_FONTS:		automaticially search for a font from the list
-
-#Files:  "vn-r14 vn10x20 vn9x15 vnlutRS18"
-VN_FONTS="vn-r14 vn10x20 viet   vn-lucidasanstypewriter-18"
-
-if [ "$BINDIR" != "" ]; then
-	VNTERM="$BINDIR/vnterm"
-else
-	VNTERM=vnterm
-fi
-
-check_use_font ()
-{
-	for f in "$@" ; do
-	if [ "`xlsfonts $f 2>/dev/null`" = "$f" ]; then
-		echo $f
-		return 0
-	fi
-	done
-	xset fp+ "$XFONTDIR"
-	for f in "$@" ; do
-	if [ "`xlsfonts $f 2>/dev/null`" = "$f" ]; then
-		echo $f
-		return 0
-	fi
-	done
-	return 1
-}
-
-
-VF=""
-FN=0
-for i in "$@" ; do 
-	if [ "$i" = "-fn" ]; then
-		FN=1;  continue;
-	fi
-	if [ "$FN" -eq 1 ]; then
-		VF=`check_use_font $i`
-		if [ "$VF" = "" ]; then
-			echo "Specified font doesn't exist in the X Window system."
-			exit 1
-		fi
-		break
-    fi
-	FN=0
-done
-
-
-if [ "$VF" = "" ]; then
-	VF=`check_use_font $VN_FONTS`
-	if [ "$VF" = "" ]; then
-		echo "Cannot identify a Vietnamese font in the X Window system."
-		exit 1
-	fi
-	FN_OPT="-fn $VF"
-fi
-
-XENVIRONMENT=$VNTERM_AD
-export XENVIRONMENT
-exec $VNTERM $FN_OPT $*
diff --git a/vietnamese/vnterm/files/patch-Imakefile b/vietnamese/vnterm/files/patch-Imakefile
deleted file mode 100644
index bd2123ff7ae9..000000000000
--- a/vietnamese/vnterm/files/patch-Imakefile
+++ /dev/null
@@ -1,114 +0,0 @@
---- Imakefile.orig	Mon Aug 21 08:47:46 2000
-+++ Imakefile	Sun Sep  8 19:26:19 2002
-@@ -1,6 +1,6 @@
- XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:07 cpqbld Exp $
- XCOMM
--XCOMM                         Attention xterm porters
-+XCOMM                         Attention vnterm porters
- XCOMM
- XCOMM
- XCOMM Xterm assumes that bcopy can handle overlapping arguments.  If your
-@@ -23,26 +23,35 @@
-  OSMAJORVERSION = OSMajorVersion
-  OSMINORVERSION = OSMinorVersion
- 
-+  VNLIBDIR      = ../lib
-+  VNINCDIR      = $(LOCALBASE)/include/viet
-+  VNFONTXDIR    = ../fonts/X
-+
-    MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \
- 		  -DOSMAJORVERSION=$(OSMAJORVERSION) \
- 		  -DOSMINORVERSION=$(OSMINORVERSION)
-    MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ 
-     XKB_DEFINES = XkbClientDefines
-         DEFINES = $(XKB_DEFINES)
-+    CDEBUGFLAGS = -I$(VNINCDIR) #-O #-g
-+         LDLIBS = $(VNLIBS)
-           SRCS1 = button.c charproc.c cursor.c data.c input.c \
- 		  main.c menu.c misc.c screen.c scrollbar.c tabs.c \
--		  TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c
-+		  TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c vnvars.c
-           OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \
- 		  screen.o scrollbar.o button.o Tekproc.o misc.o \
--		  VTPrsTbl.o TekPrsTbl.o data.o menu.o
-+		  VTPrsTbl.o TekPrsTbl.o data.o menu.o vnvars.o
-           SRCS2 = resize.c
-           OBJS2 = resize.o
-            SRCS = $(SRCS1) $(SRCS2)
-            OBJS = $(OBJS1) $(OBJS2)
--       PROGRAMS = resize xterm
--       DEPLIBS1 = XkbClientDepLibs XawClientDepLibs
-+       PROGRAMS = vnterm
-+         VNLIBS = $(LOCALBASE)/lib/libviqr.a $(LOCALBASE)/lib/libvntype.a
-+        /*VNFONTX = $(VNFONTXDIR)/fontsmade */
-+        VNFONTX =
-+       DEPLIBS1 = XkbClientDepLibs XawClientDepLibs $(VNFONTX)
-        DEPLIBS2 = 
--       PROGRAMS = xterm resize
-+       PROGRAMS = vnterm
- 
- #ifndef TermcapLibrary
- #if SystemV && !defined(MacIIArchitecture)
-@@ -65,9 +74,9 @@
- SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
- 
- #if InstallXtermSetUID
--SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
-+SetUIDProgramTarget(vnterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
- #else
--NormalProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
-+NormalProgramTarget(vnterm,$(OBJS1),$(DEPLIBS1),XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
- #endif
- 
- #if InstallXtermSetUID && defined(SunArchitecture) && HasSharedLibraries && OSMajorVersion < 5
-@@ -83,24 +92,37 @@
- #endif
- #endif
- #endif
--install:: xterm
-+
-+/*	XTERM_LINK_FLAGS = -Wl,-T,10000000,-D,10400000	*/
-+
-+install:: vnterm
- 	MakeDir($(DESTDIR)$(BINDIR))
--	RemoveFile(xterm.inst)
--	LinkRule(xterm.inst,$(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS),$(OBJS1),$(LDOVERRIDE) XawClientLibs $(LDRESUME) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB))
--	$(INSTALL) -c $(INSTPGMFLAGS) $(INSTUIDFLAGS) xterm.inst $(DESTDIR)$(BINDIR)/xterm
--	RemoveFile(xterm.inst)
-+	RemoveFile(vnterm.inst)
-+	LinkRule(vnterm.inst,$(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS),$(OBJS1),$(LDOVERRIDE) XawClientLibs $(LDRESUME) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB) $(XTERM_LINK_FLAGS))
-+	$(INSTALL) -c $(INSTPGMFLAGS) $(INSTUIDFLAGS) vnterm.inst $(DESTDIR)$(BINDIR)/vnterm
-+	RemoveFile(vnterm.inst)
- #else
- #if InstallXtermSetUID
--InstallProgramWithFlags(xterm,$(BINDIR),$(INSTUIDFLAGS))
-+InstallProgramWithFlags(vnterm,$(BINDIR),$(INSTUIDFLAGS))
- #else
--InstallProgramWithFlags(xterm,$(BINDIR),NullParameter)
-+InstallProgramWithFlags(vnterm,$(BINDIR),NullParameter)
- #endif
- #endif
- 
--NormalProgramTarget(resize,$(OBJS2),$(DEPLIBS2),NullParameter,$(TERMCAPLIB))
--InstallProgramWithFlags(resize,$(BINDIR),NullParameter)
--
--InstallAppDefaults(XTerm)
--InstallManPage(xterm,$(MANDIR))
--InstallManPage(resize,$(MANDIR))
-+InstallAppDefaults(VNTerm)
-+InstallManPage(vnterm,$(MANDIR))
- DependTarget()
-+
-+$(VNLIBS):
-+	@echo ""
-+	@echo "Making library routines in $(VNLIBDIR).  Please wait..."
-+	@(cd $(VNLIBDIR) ; make VNLIBDIR=.. VNINCDIR=../../include)
-+	@echo "Done making library routines."
-+	@echo ""
-+
-+$(VNFONTX):
-+	@echo ""
-+	@echo "Making X fonts in $(VNFONTXDIR).  Please wait..."
-+	@(cd $(VNFONTXDIR) ; make)
-+	@echo "Done making X fonts."
-+	@echo ""
diff --git a/vietnamese/vnterm/files/patch-charproc.c b/vietnamese/vnterm/files/patch-charproc.c
deleted file mode 100644
index 5f35739110df..000000000000
--- a/vietnamese/vnterm/files/patch-charproc.c
+++ /dev/null
@@ -1,306 +0,0 @@
---- charproc.c.orig	Mon Aug 21 08:47:46 2000
-+++ charproc.c	Sun Sep  8 16:41:40 2002
-@@ -72,6 +72,10 @@
- #include <X11/Shell.h>
- #endif /* NO_ACTIVE_ICON */
- 
-+#ifndef NO_VIETNAMESE
-+#include <vnkeys.h>
-+#endif /* NO_VIETNAMESE */
-+
- /*
-  * Check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
-  * systems are broken and return EWOULDBLOCK when they should return EAGAIN.
-@@ -91,9 +95,11 @@
- 
- extern XtAppContext app_con;
- extern Widget toplevel;
-+#if 0	/* get these from std headers... */
- extern void exit();
- extern char *malloc();
- extern char *realloc();
-+#endif
- extern fd_set Select_mask;
- extern fd_set X_mask;
- extern fd_set pty_mask;
-@@ -619,6 +625,10 @@
- 	for( ; ; ) {
- 	        switch (parsestate[c = doinput()]) {
- 		 case CASE_PRINT:
-+#ifndef NO_VIETNAMESE
-+label_CASE_PRINT:     /* for escaping from the CASE_IGNORE
-+			state with Vietnamese characters */
-+#endif /* NO_VIETNAMESE */
- 			/* printable characters */
- 			top = bcnt > TEXT_BUF_SIZE ? TEXT_BUF_SIZE : bcnt;
- 			cp = bptr;
-@@ -656,6 +666,9 @@
- 			break;
- 
- 		 case CASE_IGNORE:
-+#ifndef NO_VIETNAMESE
-+			if (isgraph(c)) goto label_CASE_PRINT;
-+#endif /* NO_VIETNAMESE */
- 			/* Ignore character */
- 			break;
- 
-@@ -666,17 +679,32 @@
- 
- 		 case CASE_BS:
- 			/* backspace */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			CursorBack(screen, 1);
- 			break;
- 
- 		 case CASE_CR:
- 			/* carriage return */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			CarriageReturn(screen);
- 			parsestate = groundtable;
- 			break;
- 
- 		 case CASE_ESC:
- 			/* escape */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			parsestate = esctable;
- 			break;
- 
-@@ -684,6 +712,11 @@
- 			/*
- 			 * form feed, line feed, vertical tab
- 			 */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			Index(screen, 1);
- 			if (term->flags & LINEFEED)
- 				CarriageReturn(screen);
-@@ -695,6 +728,11 @@
- 
- 		 case CASE_TAB:
- 			/* tab */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			screen->cur_col = TabNext(term->tabs, screen->cur_col);
- 			if (screen->cur_col > screen->max_col)
- 				screen->cur_col = screen->max_col;
-@@ -762,6 +800,11 @@
- 
- 		 case CASE_ICH:
- 			/* ICH */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			InsertChar(screen, row);
-@@ -770,6 +813,11 @@
- 
- 		 case CASE_CUU:
- 			/* CUU */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			CursorUp(screen, row);
-@@ -778,6 +826,11 @@
- 
- 		 case CASE_CUD:
- 			/* CUD */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			CursorDown(screen, row);
-@@ -786,6 +839,11 @@
- 
- 		 case CASE_CUF:
- 			/* CUF */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			CursorForward(screen, row);
-@@ -794,6 +852,11 @@
- 
- 		 case CASE_CUB:
- 			/* CUB */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			CursorBack(screen, row);
-@@ -802,6 +865,11 @@
- 
- 		 case CASE_CUP:
- 			/* CUP | HVP */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			if(nparam < 2 || (col = param[1]) < 1)
-@@ -821,6 +889,11 @@
- 
- 		 case CASE_ED:
- 			/* ED */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			switch (param[0]) {
- 			 case DEFAULT:
- 			 case 0:
-@@ -840,6 +913,11 @@
- 
- 		 case CASE_EL:
- 			/* EL */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			switch (param[0]) {
- 			 case DEFAULT:
- 			 case 0:
-@@ -857,6 +935,11 @@
- 
- 		 case CASE_IL:
- 			/* IL */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			InsertLine(screen, row);
-@@ -865,6 +948,11 @@
- 
- 		 case CASE_DL:
- 			/* DL */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			DeleteLine(screen, row);
-@@ -873,6 +961,11 @@
- 
- 		 case CASE_DCH:
- 			/* DCH */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			if((row = param[0]) < 1)
- 				row = 1;
- 			DeleteChar(screen, row);
-@@ -1092,6 +1185,11 @@
- 
- 		 case CASE_NEL:
- 			/* NEL */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			Index(screen, 1);
- 			CarriageReturn(screen);
- 			
-@@ -1109,6 +1207,11 @@
- 
- 		 case CASE_RI:
- 			/* RI */
-+#ifndef NO_VIETNAMESE
-+			/* flush the Vietnamese FSM */
-+			dotext(screen, term->flags,
-+				screen->gsets[screen->curgl], 0, 0);
-+#endif /* NO_VIETNAMESE */
- 			RevIndex(screen, 1);
- 			parsestate = groundtable;
- 			break;
-@@ -1460,6 +1563,13 @@
- 	register int	len;
- 	register int	n;
- 	register int	next_col;
-+#ifndef NO_VIETNAMESE
-+	extern Boolean        vn_filter_screen;
-+	extern Vk_Fsm vn_screen_id;
-+	unsigned char buf2[TEXT_BUF_SIZE+3]; /* at most three pending
-+						chars from previous
-+						call */
-+#endif /* NO_VIETNAMESE */
- 
- 	switch (charset) {
- 	case 'A':	/* United Kingdom set			*/
-@@ -1480,6 +1590,32 @@
- 	default:	/* any character sets we don't recognize*/
- 		return;
- 	}
-+
-+#ifndef NO_VIETNAMESE
-+	if (buf == 0 && ptr == 0) { /* flush the FSM */
-+
-+		int                 count;
-+
-+		vk_flush(vn_screen_id, buf2, &count);
-+		buf = (char *)buf2;
-+		ptr = (char *)buf + count;
-+	} else if (vn_filter_screen) {
-+		/* translate output into 8-bit Vietnamese */
-+		register unsigned char      *s1, *s2;
-+		register int        i;
-+		unsigned char       outchars[5];
-+		int                 count;
-+
-+		for (s1 = (unsigned char*)buf, s2 = buf2;
-+			s1 < (unsigned char*)ptr; s1++) {
-+			vk_step(vn_screen_id, *s1, outchars, &count);
-+			for (i = 0; i < count; i++) *s2++ = outchars[i];
-+		}
-+
-+		buf = (char *)buf2;
-+		ptr = (char *)s2;
-+	}
-+#endif /* NO_VIETNAMESE */
- 
- 	len = ptr - buf; 
- 	ptr = buf;
diff --git a/vietnamese/vnterm/files/patch-input.c b/vietnamese/vnterm/files/patch-input.c
deleted file mode 100644
index ad6a731c662d..000000000000
--- a/vietnamese/vnterm/files/patch-input.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- input.c.orig	Mon Aug 21 08:47:47 2000
-+++ input.c	Sat Feb 10 05:32:41 2001
-@@ -155,7 +155,40 @@
- 		      unparseputc (033, pty);  /* escape */
- 		}
- 		while (nbytes-- > 0)
-+#ifndef NO_VIETNAMESE
-+		{
-+#include <vnkeys.h>
-+			unsigned char       outchars[5];
-+			register int        i;
-+			int                 nchars;
-+			extern Vk_Fsm       vn_keyboard_id;
-+			extern Boolean      vn_filter_keyboard;
-+
-+			if (!vn_filter_keyboard) { /* don't filter */
-+				unparseputc(*string++, pty);
-+			} else {
-+
-+				Vk_State        state;
-+				static Vk_State lastState;
-+
-+				/* feed in the keypresses */
-+				state = vk_step(vn_keyboard_id, *string++, outchars, &nchars);
-+				if (lastState != state) {
-+					lastState = state;
-+					_Set_Vn_Title(state);
-+				}
-+
-+				/* send out the Vietnamese translation */
-+				for (i = 0; i < nchars; i++) {
-+					unparseputc(outchars[i], pty);
-+				}
-+			}
-+		}
-+#else /* NO_VIETNAMESE */
-+		{
- 			unparseputc(*string++, pty);
-+		}
-+#endif /* NO_VIETNAMESE */
- 		key = TRUE;
- 	}
- 	if(key && !screen->TekEmu)
-@@ -165,6 +198,47 @@
- #endif
- 	return;
- }
-+
-+#ifndef NO_VIETNAMESE
-+_Set_Vn_Title(state)
-+    int               state;
-+{
-+    int               nochange = 0;
-+    char      title[80], icon[80];
-+    extern Boolean    vn_filter_keyboard;
-+
-+    strcpy(title, "vnterm-");
-+    strcpy(icon, title);
-+    if (!vn_filter_keyboard){
-+      strcat(title, "No Filtering");
-+      strcat(icon, "off");
-+    } else {
-+      switch(state) {
-+      case VK_ST_VIETNAMESE:
-+          strcat(title, "Vietnamese");
-+          strcat(icon, "V");
-+          break;
-+      case VK_ST_ENGLISH:
-+          strcat(title, "English");
-+          strcat(icon, "E");
-+          break;
-+      case VK_ST_LITERAL:
-+          strcat(title, "Literal");
-+          strcat(icon, "L");
-+          break;
-+      default:
-+          nochange = 1;
-+          break;
-+      }
-+    }
-+
-+    if (!nochange) {
-+      Changetitle(title);
-+      Changename(icon);
-+    }
-+}
-+#endif /* NO_VIETNAMESE */
-+
- 
- StringInput (screen, string, nbytes)
-     register TScreen	*screen;
diff --git a/vietnamese/vnterm/files/patch-main.c b/vietnamese/vnterm/files/patch-main.c
deleted file mode 100644
index a7dac2240a84..000000000000
--- a/vietnamese/vnterm/files/patch-main.c
+++ /dev/null
@@ -1,196 +0,0 @@
---- main.c.orig	Mon Aug 21 08:47:47 2000
-+++ main.c	Sun Sep  8 19:35:54 2002
-@@ -76,6 +76,9 @@
- #include "data.h"
- #include "error.h"
- #include "menu.h"
-+#ifndef NO_VIETNAMESE
-+#include "vnvars.h"
-+#endif /* NO_VIETNAMESE */
- 
- #ifdef att
- #define ATT
-@@ -279,6 +282,10 @@
- #endif
- #include <sys/param.h>	/* for NOFILE */
- 
-+#if (defined(BSD) && (BSD >= 199103))
-+#define USE_POSIX_WAIT
-+#endif
-+
- #ifdef  PUCC_PTYD
- #include <local/openpty.h>
- int	Ptyfd;
-@@ -421,7 +428,11 @@
-         CFLUSH, CWERASE, CLNEXT
- };
- static int d_disipline = NTTYDISC;
-+#ifndef NO_VIETNAMESE
-+static long int d_lmode = LCRTBS|LCRTERA|LCRTKIL|LPASS8;
-+#else /* NO_VIETNAMESE */
- static long int d_lmode = LCRTBS|LCRTERA|LCRTKIL|LCTLECH;
-+#endif /* NO_VIETNAMESE */
- #ifdef sony
- static long int d_jmode = KM_SYSSJIS|KM_ASCII;
- static struct jtchars d_jtc = {
-@@ -586,6 +597,11 @@
-     Boolean sunFunctionKeys;	/* %%% should be widget resource? */
-     Boolean wait_for_map;
-     Boolean useInsertMode;
-+#ifndef NO_VIETNAMESE
-+    Boolean vn_filter_keyboard;
-+    Boolean vn_filter_screen;
-+    unsigned int vn_erase_character;
-+#endif /* NO_VIETNAMESE */
- } resource;
- 
- /* used by VT (charproc.c) */
-@@ -613,6 +629,14 @@
-         offset(wait_for_map), XtRString, "false"},
-     {"useInsertMode", "UseInsertMode", XtRBoolean, sizeof (Boolean),
-         offset(useInsertMode), XtRString, "false"},
-+#ifndef NO_VIETNAMESE
-+    {"vnFilterKeyboard", "VnFilterKeyboard", XtRBoolean, sizeof (Boolean),
-+        offset(vn_filter_keyboard), XtRString, "true"},
-+    {"vnFilterScreen", "VnFilterScreen", XtRBoolean, sizeof (Boolean),
-+        offset(vn_filter_screen), XtRString, "false"},
-+    {"vnEraseCharacter", "VnEraseCharacter", XtRInt, sizeof (unsigned int),
-+        offset(vn_erase_character), XtRString, "0"},
-+#endif /* NO_VIETNAMESE */
- };
- #undef offset
- 
-@@ -621,7 +645,7 @@
-     "XTerm*SimpleMenu*HorizontalMargins: 16",
-     "XTerm*SimpleMenu*Sme.height: 16",
-     "XTerm*SimpleMenu*Cursor: left_ptr",
--    "XTerm*mainMenu.Label:  Main Options (no app-defaults)",
-+    "XTerm*mainMenu.Label:  VNTERM v2.1.1 (SGI version by Tin Le)",
-     "XTerm*vtMenu.Label:  VT Options (no app-defaults)",
-     "XTerm*fontMenu.Label:  VT Fonts (no app-defaults)",
-     "XTerm*tekMenu.Label:  Tek Options (no app-defaults)",
-@@ -693,6 +717,13 @@
- {"+im",		"*useInsertMode", XrmoptionNoArg,	(caddr_t) "off"},
- {"-vb",		"*visualBell",	XrmoptionNoArg,		(caddr_t) "on"},
- {"+vb",		"*visualBell",	XrmoptionNoArg,		(caddr_t) "off"},
-+#ifndef NO_VIETNAMESE
-+{"-vnk",      "*vnFilterKeyboard",    XrmoptionNoArg, (caddr_t) "on"},
-+{"+vnk",      "*vnFilterKeyboard",    XrmoptionNoArg, (caddr_t) "off"},
-+{"-vns",      "*vnFilterScreen",      XrmoptionNoArg, (caddr_t) "on"},
-+{"+vns",      "*vnFilterScreen",      XrmoptionNoArg, (caddr_t) "off"},
-+{"-vne",      "*vnEraseCharacter",    XrmoptionSepArg, (caddr_t) "0"},
-+#endif /* NO_VIETNAMESE */
- {"-wf",		"*waitForMap",	XrmoptionNoArg,		(caddr_t) "on"},
- {"+wf",		"*waitForMap",	XrmoptionNoArg,		(caddr_t) "off"},
- /* bogus old compatibility stuff for which there are
-@@ -770,6 +801,11 @@
- #endif
- { "-/+vb",                 "turn on/off visual bell" },
- { "-/+wf",                 "turn on/off wait for map before command exec" },
-+#ifndef NO_VIETNAMESE
-+{ "-/+vnk",                 "turn on/off Vietnamese keyboard filter" },
-+{ "-/+vns",                 "turn on/off Vietnamese screen filter" },
-+{ "-vne ASCII_code",        "specify erase character for Vietnamese typing" },
-+#endif /* NO_VIETNAMESE */
- { "-e command args ...",   "command to execute" },
- { "%geom",                 "Tek window geometry" },
- { "#geom",                 "icon window geometry" },
-@@ -815,6 +851,11 @@
- 
-     fprintf (stderr, "\r\n\nType %s -help for a full description.\r\n\n",
- 	     ProgramName);
-+fprintf(stderr, "\n");
-+fprintf(stderr, "Version:   VISCII & VIQR 1.1\n");
-+fprintf(stderr, "Ported by: Cuong T. Nguyen (cuong@haydn.Stanford.EDU\n");
-+fprintf(stderr, "           TriChlor Software Group\n");
-+fprintf(stderr, "Ported to 4.4BSD and X11R6.5.1 by: David E. O'Brien <obrien@NUXI.com>\n");
-     exit (1);
- }
- 
-@@ -836,6 +877,11 @@
- 	putc ('\n', stderr);
-     }
-     putc ('\n', stderr);
-+fprintf(stderr, "\n");
-+fprintf(stderr, "Version:   VISCII & VIQR 1.1\n");
-+fprintf(stderr, "Ported by: Cuong T. Nguyen (cuong@haydn.Stanford.EDU\n");
-+fprintf(stderr, "           TriChlor Software Group\n");
-+fprintf(stderr, "Ported to 4.4BSD and X11R6.5.1 by: David E. O'Brien <obrien@NUXI.com>\n");
- 
-     exit (0);
- }
-@@ -926,6 +972,11 @@
- 	int mode;
- 	char *base_name();
- 	int xerror(), xioerror();
-+#ifndef NO_VIETNAMESE
-+#ifdef USE_SYSV_TERMIO
-+	struct termio deftio;
-+#endif /* USE_SYSV_TERMIO */
-+#endif /* NO_VIETNAMESE */
- 
- 	XtSetLanguageProc (NULL, NULL, NULL);
- 
-@@ -1150,6 +1201,39 @@
- 				  XtNumber(application_resources), NULL, 0);
- 
- 	waiting_for_initial_map = resource.wait_for_map;
-+#ifndef NO_VIETNAMESE
-+{
-+	vn_filter_keyboard = resource.vn_filter_keyboard;
-+	vn_filter_screen = resource.vn_filter_screen;
-+	vn_erase_character = resource.vn_erase_character;
-+
-+	vn_keyboard_id = vk_init(VK_ST_VIETNAMESE, VK_DEFAULT_ESC, VK_DEFAULT_BS);
-+	_Set_Vn_Title(VK_ST_VIETNAMESE);
-+
-+#ifdef USE_SYSV_TERMIO /* deftio has been initialized above */
-+	vn_erase_char = deftio.c_cc[VERASE];
-+#else /* USE_SYSV_TERMIO */
-+	{
-+		struct sgttyb       attr;
-+
-+		if (ioctl (0, TIOCGETP, (char *)&attr) >= 0) {
-+			vn_erase_char = attr.sg_erase;
-+		} else {
-+			vn_erase_char = VK_DEFAULT_BS;
-+		}
-+	}
-+#endif /* USE_SYSV_TERMIO */
-+	if (vn_erase_character != 0) { /* not specified by user, take from tty characteristics */
-+		vn_erase_char = (unsigned int) vn_erase_character;
-+	}
-+	vk_set(vn_keyboard_id,  (unsigned int) vn_erase_char, (int)VK_SET_BS);
-+
-+	vn_screen_id = vk_init(VK_ST_VIETNAMESE, VK_DEFAULT_ESC, VK_DEFAULT_BS);
-+	/* screen filter is batch mode, as we don't want to spew backspaces
-+	   all over the true drawing screen */
-+	vk_set(vn_screen_id, 1, VK_SET_BATCH);
-+}
-+#endif /* NO_VIETNAMESE */
- 
- 	/*
- 	 * ICCCM delete_window.
-@@ -1255,6 +1339,11 @@
- 
- 	if (screen->savelines < 0) screen->savelines = 0;
- 
-+#ifndef NO_VIETNAMESE
-+	update_vnfilterkeyboard();
-+	update_vnfilterscreen();
-+#endif /* NO_VIETNAMESE */
-+
- 	term->flags = 0;
- 	if (!screen->jumpscroll) {
- 	    term->flags |= SMOOTHSCROLL;
-@@ -2417,6 +2506,10 @@
- 			    HsSysError(cp_pipe[1], ERROR_TIOCSETC);
- #endif	/* TIOCSLTC */
- #ifdef TIOCLSET
-+#ifndef NO_VIETNAMESE
-+		lmode |= LPASS8;
-+		lmode &= ~LCTLECH;
-+#endif /* NO_VIETNAMESE */
- 		    if (ioctl (tty, TIOCLSET, (char *)&lmode) == -1)
- 			    HsSysError(cp_pipe[1], ERROR_TIOCLSET);
- #endif	/* TIOCLSET */
diff --git a/vietnamese/vnterm/files/patch-menu.c b/vietnamese/vnterm/files/patch-menu.c
deleted file mode 100644
index f4cb2a2da457..000000000000
--- a/vietnamese/vnterm/files/patch-menu.c
+++ /dev/null
@@ -1,111 +0,0 @@
---- menu.c.orig	Mon Aug 21 08:47:47 2000
-+++ menu.c	Sat Feb 10 05:32:41 2001
-@@ -33,6 +33,10 @@
- #include <stdio.h>
- #include <signal.h>
- 
-+#ifndef NO_VIETNAMESE
-+#include "vnvars.h"
-+#endif /* NO_VIETNAMESE */
-+
- extern void FindFontSelection();
- 
- Arg menuArgs[2] = {{ XtNleftBitmap, (XtArgVal) 0 },
-@@ -57,12 +61,20 @@
-     do_tektextlarge(), do_tektext2(), do_tektext3(), do_tektextsmall(), 
-     do_tekpage(), do_tekreset(), do_tekcopy(), do_vtshow(), do_vtmode(), 
-     do_tekhide(), do_vtfont();
-+#ifndef NO_VIETNAMESE
-+static void do_vnfilterkeyboard(), do_vnfilterscreen();
-+#endif /* NO_VIETNAMESE */
- 
- 
- /*
-  * The order entries MUST match the values given in menu.h
-  */
- MenuEntry mainMenuEntries[] = {
-+#ifndef NO_VIETNAMESE
-+    { "Enable Vietnamese keys",do_vnfilterkeyboard, NULL },   /*  0 */
-+    { "Use Vietnamese screen",        do_vnfilterscreen, NULL },      /*  1 */
-+    { "line3",                NULL, NULL },                   /*  2 */
-+#endif /* NO_VIETNAMESE */
-     { "securekbd",	do_securekbd, NULL },		/*  0 */
-     { "allowsends",	do_allowsends, NULL },		/*  1 */
- #ifdef ALLOWLOGGING
-@@ -80,6 +92,11 @@
-     { "quit",		do_quit, NULL }};		/* 12 */
- 
- MenuEntry vtMenuEntries[] = {
-+#ifndef NO_VIETNAMESE
-+    { "Enable Vietnamese keys",do_vnfilterkeyboard, NULL },     /*  0 */
-+    { "Use Vietnamese screen",  do_vnfilterscreen, NULL },      /*  1 */
-+    { "line3",          NULL, NULL },                   /*  2 */
-+#endif /* NO_VIETNAMESE */
-     { "scrollbar",	do_scrollbar, NULL },		/*  0 */
-     { "jumpscroll",	do_jumpscroll, NULL },		/*  1 */
-     { "reversevideo",	do_reversevideo, NULL },	/*  2 */
-@@ -160,6 +177,10 @@
-     Cardinal *param_count;      /* 0 or 1 */
- {
-     TScreen *screen = &term->screen;
-+#ifndef NO_VIETNAMESE
-+	extern Boolean    vn_filter_keyboard;
-+	extern Boolean    vn_filter_screen;
-+#endif
- 
-     if (*param_count != 1) {
- 	Bell(XkbBI_MinorError,0);
-@@ -209,6 +230,10 @@
- 	    update_cursesemul();
- 	    update_visualbell();
- 	    update_marginbell();
-+#ifndef NO_VIETNAMESE
-+	update_vnfilterkeyboard();
-+	update_vnfilterscreen();
-+#endif
- #ifndef NO_ACTIVE_ICON
- 	    if (!screen->fnt_icon || !screen->iconVwin.window) {
- 		set_sensitivity (screen->vtmenu,
-@@ -1277,3 +1302,42 @@
- }
- 
- 
-+#ifndef NO_VIETNAMESE
-+
-+static void do_vnfilterkeyboard (gw, closure, data)
-+    Widget gw;
-+    caddr_t closure, data;
-+{
-+    unsigned char     buf[5];
-+    int                       count;
-+
-+    vn_filter_keyboard = !vn_filter_keyboard;
-+    if (vn_filter_keyboard) {
-+        vn_keyboard_id = vk_init(VK_ST_VIETNAMESE, VK_DEFAULT_ESC, vn_erase_char);
-+    } else {
-+      vk_end(vn_keyboard_id, buf, &count);
-+    }
-+    _Set_Vn_Title(VK_ST_VIETNAMESE);
-+    update_vnfilterkeyboard();
-+}
-+
-+
-+static void do_vnfilterscreen (gw, closure, data)
-+    Widget gw;
-+    caddr_t closure, data;
-+{
-+    unsigned char     buf[5];
-+    int                       count;
-+
-+    vn_filter_screen = !vn_filter_screen;
-+    if (vn_filter_screen) {
-+        vn_screen_id = vk_init(VK_ST_VIETNAMESE, VK_DEFAULT_ESC, vn_erase_char);
-+      /* set it in batch mode so we don't get backspaces in immediate mode */
-+      vk_set(vn_screen_id, 1, VK_SET_BATCH);
-+    } else {
-+      vk_end(vn_screen_id, buf, &count);
-+    }
-+    update_vnfilterscreen();
-+}
-+
-+#endif /* NO_VIETNAMESE */
diff --git a/vietnamese/vnterm/files/patch-menu.h b/vietnamese/vnterm/files/patch-menu.h
deleted file mode 100644
index 14bab7fdd5de..000000000000
--- a/vietnamese/vnterm/files/patch-menu.h
+++ /dev/null
@@ -1,73 +0,0 @@
---- menu.h.orig	Mon Aug 21 08:47:47 2000
-+++ menu.h	Sat Feb 10 05:32:41 2001
-@@ -94,6 +94,37 @@
- /*
-  * items in vt100 mode menu
-  */
-+#ifndef NO_VIETNAMESE
-+#define vtMenu_vnfilterkeyboard 0
-+#define vtMenu_vnfilterscreen 1
-+#define vtMenu_line3 2
-+#define vtMenu_scrollbar 3
-+#define vtMenu_jumpscroll 4
-+#define vtMenu_reversevideo 5
-+#define vtMenu_autowrap 6
-+#define vtMenu_reversewrap 7
-+#define vtMenu_autolinefeed 8
-+#define vtMenu_appcursor 9
-+#define vtMenu_appkeypad 10
-+#define vtMenu_scrollkey 11
-+#define vtMenu_scrollttyoutput 12
-+#define vtMenu_allow132 13
-+#define vtMenu_cursesemul 14
-+#define vtMenu_visualbell 15
-+#define vtMenu_marginbell 16
-+#define vtMenu_altscreen 17
-+#ifndef NO_ACTIVE_ICON
-+#define vtMenu_activeicon 18
-+#endif /* NO_ACTIVE_ICON */
-+#define vtMenu_line1 19
-+#define vtMenu_softreset 20
-+#define vtMenu_hardreset 21
-+#define vtMenu_clearsavedlines 22
-+#define vtMenu_line2 23
-+#define vtMenu_tekshow 24
-+#define vtMenu_tekmode 25
-+#define vtMenu_vthide 26
-+#else /* NO_VIETNAMESE */
- #define vtMenu_scrollbar 0
- #define vtMenu_jumpscroll 1
- #define vtMenu_reversevideo 2
-@@ -120,6 +151,7 @@
- #define vtMenu_tekshow 21
- #define vtMenu_tekmode 22
- #define vtMenu_vthide 23
-+#endif /* NO_VIETNAMESE */
- 
- /*
-  * items in vt100 font menu
-@@ -278,6 +310,24 @@
-   update_menu_item (term->screen.vtMenu, \
- 		    vtMenuEntries[vtMenu_tekshow].widget, \
- 		    term->screen.Tshow)
-+
-+#ifndef NO_VIETNAMESE
-+#define update_vnfilterkeyboard() \
-+  update_menu_item (term->screen.vtMenu, \
-+                    vtMenuEntries[vtMenu_vnfilterkeyboard].widget, \
-+                    vn_filter_keyboard)
-+
-+/* Keep this around just for future reference */
-+#define set_vnfilterimmediate_sensitivity(val) \
-+  set_sensitivity (term->screen.vtMenu,\
-+                   vtMenuEntries[vtMenu_vnfilterimmediate].widget, (val))
-+
-+#define update_vnfilterscreen() \
-+  update_menu_item (term->screen.vtMenu, \
-+                    vtMenuEntries[vtMenu_vnfilterscreen].widget, \
-+                    vn_filter_screen)
-+
-+#endif /* NO_VIETNAMESE */
- 
- #define update_vttekmode() { \
-     update_menu_item (term->screen.vtMenu, \
diff --git a/vietnamese/vnterm/files/vnterm.1V b/vietnamese/vnterm/files/vnterm.1V
deleted file mode 100644
index a9fea63d4fc6..000000000000
--- a/vietnamese/vnterm/files/vnterm.1V
+++ /dev/null
@@ -1,233 +0,0 @@
-.\" $FreeBSD$
-.\" to view this file, use: nroff -man %M% | more
-.\"     %W%     (TriChlor) %G% %U%
-.\"
-.TH vnterm 1V 
-.SH NAME
-vnterm \- X-terminal with Vietnamese
-.SH SYNTAX
-.B vnterm
-[\fB-/+vnk\fP]
-[\fB-/+vns\fP]
-[\fB-vne <erase_ASCII_code>\fP]
-[\fIregular_xterm_options\fP]
-.SH DESCRIPTION
-.NXR "vnterm command"
-Version 3.4 of
-.B vnterm
-is an adaptation of the X11R6.5.1
-.B xterm 1X
-command.  This manual page describes only
-those features specific to
-.B vnterm ;
-please consult the manual page for
-.B xterm 1X
-for the rest of the story.
-.PP
-.B Vnterm
-allows the X-environment user to type and
-display Vietnamese text.  The keyboard input
-scheme follows the
-7-bit VIQR (VIetnamese Quoted-Readable) standard,
-which is based on the prevalent
-Vietnamese networking convention of placing Vietnamese
-diacritical marks after the vowel, for example: "Vie^.t Nam".
-.PP
-With the appropriate font setting,
-.B vnterm
-can display both 7-bit and 8-bit
-Vietnamese text.  The 7-bit text is assumed
-to follow the
-.I VIQR
-standard,
-and the 8-bit text is according to
-.I VISCII
-(VIetnamese Standard Code for Information Interchange),
-both published by the Viet-Std working group
-(Viet-Std@Haydn.Stanford.EDU).
-.PP
-On start-up,
-.B vnterm
-attempts to set the tty line to 8-bit mode,
-with canonical echoing of control characters turned off
-(because the Vietnamese characters "A(? A(~ A^~ Y? Y~ Y."
-are encoded in the C0 control-character area).
-.SH OPTIONS
-.nf
-	-/+vnk          turn on/off Vietnamese keyboard filter (default on)
-	-/+vns          turn on/off Vietnamese screen output (default off)
-	-vne ASCII_code explicitly specify erase character
-.fi
-.PP
-The keyboard and screen options above
-can also be found and set
-in the
-"VT\ Options"
-menu of
-.B vnterm ,
-which you may access by clicking the CTRL-middle-mouse-button
-combination.
-The corresponding X resources are:
-.EX
-	vnterm*font:				vn-r14
-	vnterm*vnFilterKeyboard:    on
-	vnterm*vnFilterScreen:      off
-	vnterm*vnEraseCharacter:    127
-.EE
-.PP
-If 
-.I vnFilterKeyboard
-is turned off, no keyboard processing is done and characters
-are reported to the underlying application as they are typed.
-With
-.I vnFilterKeyboard
-turned on,
-Vietnamese composition takes place.
-.PP
-The erase character (which is needed to backspace
-over the Vietnamese letter being composed)
-is figured from the terminal settings at the time
-.B vnterm
-is invoked.  In those cases where it is necessary
-to specify another erase character,
-.I vnEraseCharacter
-may be used.  The argument to this option is
-the decimal ASCII code for the desired erase
-character.  Use 8 for backspace, and 127 for
-delete.
-.PP
-The
-.I vnFilterScreen
-setting is provided as a convenience to the user
-who wants to read 7-bit Vietnamese without
-having first to convert it to 8-bit format.
-When turned on,
-.I vnFilterScreen
-causes the displayed characters to be interpreted
-with exactly the same rules as those applied to
-keyboard input.  This option is provided
-with Soc.Culture.Vietnamese readers
-explicitly in mind.
-.SH "KEYBOARD INSTRUCTIONS"
-Vnterm starts up in Vietnamese typing mode.  There are two other
-modes, English and Literal,
-each of which is initiated as described below.
-
-.PP
-.SH "Vietnamese Mode:"
-Type "\\V" or "\\v" to start Vietnamese mode,
-where Viet-Net style input is supported, for example:
-.EX
-	Ca' kho^ng a(n muo^'i ca' u+o+ng
-	Con ca~i cha me. tra(m ddu+o+`ng con hu+\\.
-.EE
-.PP
-To prevent composition, use "\\".  The example above shows
-"hu+\." which tells Vnterm that the ending period is
-a period and not a Vietnamese dot-below (da^'u na(.ng).
-.PP
-The diacritics (da^'u) are:
-.EX
-	MARK      	CHAR	EXAMPLE
-
-	breve     	 (  	a(n na(n
-	circumflex	 ^  	nha^n co^ng
-	horn      	 +  	tu+o+ng tu+
-
-	acute     	 '  	choa'ng va'ng
-	grave     	 `  	lu` khu`
-	hook above 	 ?  	ho?i tha(m
-	tilde      	 ~  	ky~ ca`ng
-	dot below  	 .  	Tra.ng Nguye^n
-
-	dd        	 dd 	dda ti`nh
-	DD        	 DD 	DDo^ng So+n
-.EE
-.SH "English Mode:"
-Type "\\M" or "\\m" to start English mode,
-where Viet-Net style input is supported,
-but must be explicitly announced with a "\\", for example:
-.EX
-	C\\a' kh\\o^ng \\a(n mu\\o^'i c\\a' \\u+\\o+ng
-	Con c\\a~i cha m\\e. tr\\a(m \\dd\\u+\\o+`ng con h\\u+\\.
-.EE
-.PP
-This mode is useful if you type mostly English and don't
-want the trouble of having to type "\\" to escape composition
-all the time.
-.SH "Literal Mode:"
-Typing "\\L" or "\\l" starts the Literal mode,
-in which almost all keys are passed literally.
-.SH RESTRICTIONS
-.NXR "vnterm command" "restricted"
-.PP
-.IP o 
-If your shell is tcsh, you may find that it's unfriendly
-to 8-bit data; this means Vietnamese characters cannot
-be used.  Use
-.I sh
-in the
-.B vnterm
-window instead.
-.PP
-.IP o
-In some cases
-.B vnterm
-may fail to set the terminal mode correctly for 8-bits.
-This will happen when your shell is "smart" and undoes the
-settings performed by
-.B vnterm
-on start-up.
-In this case issue the command:
-.EX
-	% stty -istrip cs8 pass8
-.EE
-to set the terminal line for 8-bits.
-.PP
-.IP o
-Remember that the screen output filter only works strictly
-with 7-bit Vietnamese that is conformant to the VIQR
-standard.
-With the Viet-Net style text alone, there are potential
-ambiguities which
-.B vnterm
-will not interpret correctly, e.g., in displaying
-the question "La`m chi?", where the question mark
-will be taken to be a hook-above (da^'u ho?i),
-and the word displayed as "ch<i?>" (Vietnamese "thread")
-rather than as "chi<?>" (Vietnamese "what").
-Note that "chi\\?" will be correctly interpreted.
-.PP
-Occasionally, magic sequences such as "\\V",
-"\\M", and "\\L" may appear in non-VIQR-conformant text
-which will change the state of the screen filter
-causing it not to display Vietnamese properly afterwards.
-When this happens, simply turn the screen filter
-off and on again, by using the CTRL-middle-mouse-button
-menu of
-.B vnterm.
-.SH AUTHOR
-4.4BSD porting and X11R6 updating by David O'Brien <obrien@cs.ucdavis.edu>
-.PP
-Adapted from X11R5's xterm by
-Tin Le <tin@saigon.com>
-.PP
-Adapted from X11R4's xterm by
-the TriChlor Group, TriChlor@haydn.Stanford.EDU.
-.PP
-Thanks to Tuan P. Do (tuan@compass-da.com) for illustrating
-the need for the vnEraseCharacter specifier.
-.SH "SEE ALSO"
-.PP
-vietterm(1V), vnelvis(1V)
-.SH STANDARDS
-Viet-Std Standardization Specification (Viet-Std@Haydn.Stanford.EDU)
-.PP
-RFC 1456 Vietnamese Standardization Working Group,
-"Conventions for Encoding the Vietnamese Language
-.br
-VISCII: VIetnamese Standard Code for Information Interchange
-.br
-VIQR: VIetnamese Quoted-Readable Specification Revision 1.1",
-.br
-May 1993.
diff --git a/vietnamese/vnterm/files/vnvars.c b/vietnamese/vnterm/files/vnvars.c
deleted file mode 100644
index 9de0c28175f8..000000000000
--- a/vietnamese/vnterm/files/vnvars.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *      @(#)vnvars.c	2.1 TriChlor: 92/03/17 06:36:00
- */
-
-
-#include "vnvars.h"
-
-Boolean		vn_filter_keyboard;
-Boolean		vn_filter_screen;
-Vk_Fsm		vn_keyboard_id;
-Vk_Fsm		vn_screen_id;
-u_char		vn_erase_char;	/* character copied from tty characteristics */
-unsigned int	vn_erase_character; /* character given by .Xdefaults */
diff --git a/vietnamese/vnterm/files/vnvars.h b/vietnamese/vnterm/files/vnvars.h
deleted file mode 100644
index 7106c683a481..000000000000
--- a/vietnamese/vnterm/files/vnvars.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *      @(#)vnvars.h	2.1 TriChlor: 92/03/17 06:36:41
- */
-
-#ifndef _VNVARS_H_
-#define _VNVARS_H_
-
-#include <sys/types.h>
-#include <X11/Intrinsic.h>
-#include <vnkeys.h>
-
-extern Boolean	vn_filter_keyboard;
-extern Boolean	vn_filter_screen;
-extern Vk_Fsm	vn_keyboard_id;
-extern Vk_Fsm	vn_screen_id;
-extern u_char	vn_erase_char; /* see vnvars.c */
-extern unsigned int vn_erase_character; /* see vnvars.c */
-
-#endif /* _VNVARS_H_ */
diff --git a/vietnamese/vnterm/pkg-descr b/vietnamese/vnterm/pkg-descr
deleted file mode 100644
index 33f0fd818780..000000000000
--- a/vietnamese/vnterm/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Tha^n cha`o ca'c ba.n,
-
-vnxterm is a xterm replacement with Vietnamese VIQR 1.1 (7-bit VIetnamese
-Quoted Readable/Viet-Net, RFC 1456) support.  This version of vnterm is
-derived from the X11R6.5.1 xterm, and thus has simular capabilities.
-
-Please see the README file in the share/doc/vnterm directory.
-
-	Note, if you are a new user, or not quite understand X resources or
-	X font paths, etc., simply use the command "VNterm".
-
-David O'Brien
-obrien@cs.ucdavis.edu
diff --git a/vietnamese/vnterm/pkg-plist b/vietnamese/vnterm/pkg-plist
deleted file mode 100644
index 062f67969479..000000000000
--- a/vietnamese/vnterm/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $FreeBSD$
-bin/vnterm
-bin/VNterm
-share/doc/vnterm/README
-lib/X11/app-defaults/VNTerm
-@dirrm share/doc/vnterm
diff --git a/vietnamese/vnterm/scripts/pre-install b/vietnamese/vnterm/scripts/pre-install
deleted file mode 100644
index e3fd9fddc3da..000000000000
--- a/vietnamese/vnterm/scripts/pre-install
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-# set up the resource file
-#	nothing yet...
-
-# setup helper script
-echo "creating VNterm script for inexperienced users"
-VNTERM_SH=${WRKDIR}/VNterm.sh
-
-echo "#!/bin/sh"                                            > $VNTERM_SH
-echo ""                                                    >> $VNTERM_SH
-echo "XFONTDIR=${PREFIX}/lib/X11/fonts/vietnamese"         >> $VNTERM_SH
-echo ""                                                    >> $VNTERM_SH
-/bin/cat ${FILESDIR}/VNterm.sh.in                          >> $VNTERM_SH