Resurrect editors/nvi-m17n. More updates will follow.

10 files changed, 281 insertions, 1 deletions

diff --git a/MOVED b/MOVED
index f070162da57e..dd9002a0ff98 100644
--- a/MOVED
+++ b/MOVED
@@ -2068,7 +2068,6 @@ emulators/tkhfs||2011-05-02|Has expired: Upstream disapear and distfile is no mo
 emulators/twin||2011-05-02|Has expired: Upstream disapear and distfile is no more available
 emulators/vgb||2011-05-02|Has expired: Distfile is no more available (lastest binaries provided by upstream are for 5.x)
 emulators/vpce||2011-05-02|Has expired: Upstream disapear and distfile is no more available
-editors/nvi-m17n||2011-05-02|Has expired: Distfile is no more available
 chinese/nvi-big5||2011-05-02|Has expired: Distfile is no more available
 chinese/nvi-euc-cn||2011-05-02|Has expired: Distfile is no more available
 chinese/nvi-euc-tw||2011-05-02|Has expired: Distfile is no more available
diff --git a/editors/Makefile b/editors/Makefile
index f55c4562a762..4a56bb0975b0 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -176,6 +176,7 @@
     SUBDIR += ne
     SUBDIR += nedit
     SUBDIR += nvi-devel
+    SUBDIR += nvi-m17n
     SUBDIR += nxml
     SUBDIR += nxml-emacs21
     SUBDIR += omegaT
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
new file mode 100644
index 000000000000..a82c88b78742
--- /dev/null
+++ b/editors/nvi-m17n/Makefile
@@ -0,0 +1,43 @@
+# New ports collection makefile for:	nvi-1.79 + multilingual patch(none)
+# Date created:		6 Mar 1997
+# Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	nvi
+PORTVERSION=	1.79.20040401
+PORTEPOCH=	1
+CATEGORIES?=	editors
+MASTER_SITES=	http://people.allbsd.org/~hrs/FreeBSD/
+PKGNAMESUFFIX?=	-m17n
+DISTNAME=	nvi-1.79
+
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	nvi-1.79.m17n-20040401.diff.gz
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A clone of vi/ex, with multilingual patch, no default settings
+
+PATCH_DIST_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p0 -f
+WRKSRC=		${WRKDIR}/${DISTNAME}/build
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
+CONFIGURE_ARGS=	--enable-multibyte --program-prefix=n
+
+MAN1=		nvi.1
+MLINKS=		nvi.1 nex.1  nvi.1 nview.1
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	${LN} -s /usr/include/sys/queue.h ${WRKSRC}/../include/sys/queue_dist.h
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/../docs.m17n/README.english \
+		${PREFIX}/share/vi/
+	${INSTALL_DATA} ${WRKSRC}/../docs.m17n/README.japanese \
+		 ${PREFIX}/share/vi/
+
+.include <bsd.port.post.mk>
diff --git a/editors/nvi-m17n/distinfo b/editors/nvi-m17n/distinfo
new file mode 100644
index 000000000000..352b4fe4b057
--- /dev/null
+++ b/editors/nvi-m17n/distinfo
@@ -0,0 +1,4 @@
+SHA256 (nvi-1.79.tar.gz) = 755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33
+SIZE (nvi-1.79.tar.gz) = 1295401
+SHA256 (nvi-1.79.m17n-20040401.diff.gz) = 5907f09910c70189f5806ca5f4d814924ecd021b29e5b26d211a4a6ebe017df1
+SIZE (nvi-1.79.m17n-20040401.diff.gz) = 160411
diff --git a/editors/nvi-m17n/files/patch-aa b/editors/nvi-m17n/files/patch-aa
new file mode 100644
index 000000000000..9272867b1399
--- /dev/null
+++ b/editors/nvi-m17n/files/patch-aa
@@ -0,0 +1,106 @@
+*** Makefile.in.orig	Thu Mar  6 13:19:46 1997
+--- Makefile.in	Thu Mar  6 13:23:40 1997
+***************
+*** 87,95 ****
+  	cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+! 	cd $(bindir) && $(ln) \
+  		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
+! 	cd $(bindir) && $(ln) \
+  		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f regular qregular
+  	$(cp) regular $(bindir)/regular
+--- 87,95 ----
+  	cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+! 	cd $(bindir) && $(ln) -s \
+  		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
+! 	cd $(bindir) && $(ln) -s \
+  		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f regular qregular
+  	$(cp) regular $(bindir)/regular
+***************
+*** 97,115 ****
+  	cd $(bindir) && $(chmod) $(emode) regular qregular
+  	[ -d $(mandir) ] || \
+  	    ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
+! 	[ -d $(mandir)/cat1 ] || \
+! 	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
+  	@echo "Installing man pages: $(mandir) ..."
+! 	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+! 	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
+! 	    $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
+! 	cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
+! 	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+! 	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+! 	cd $(mandir)/cat1 && $(ln) \
+! 	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
+! 	cd $(mandir)/cat1 && $(ln) \
+! 	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
+  	[ -d $(mandir)/man1 ] || \
+  	    ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
+  	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+--- 97,115 ----
+  	cd $(bindir) && $(chmod) $(emode) regular qregular
+  	[ -d $(mandir) ] || \
+  	    ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
+! #	[ -d $(mandir)/cat1 ] || \
+! #	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
+  	@echo "Installing man pages: $(mandir) ..."
+! #	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+! #	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
+! #	    $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
+! #	cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
+! #	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+! #	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+! #	cd $(mandir)/cat1 && $(ln) -s \
+! #	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
+! #	cd $(mandir)/cat1 && $(ln) -s \
+! #	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
+  	[ -d $(mandir)/man1 ] || \
+  	    ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
+  	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+***************
+*** 118,126 ****
+  	cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
+! 	cd $(mandir)/man1 && $(ln) \
+  	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
+! 	cd $(mandir)/man1 && $(ln) \
+  	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
+  
+  cat=	dutch english french german ru_SU.KOI8-R spanish swedish
+--- 118,126 ----
+  	cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
+! 	cd $(mandir)/man1 && $(ln) -s \
+  	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
+! 	cd $(mandir)/man1 && $(ln) -s \
+  	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
+  
+  cat=	dutch english french german ru_SU.KOI8-R spanish swedish
+***************
+*** 163,171 ****
+  	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f regular qregular
+! 	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+! 	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+! 	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
+--- 163,171 ----
+  	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+  	cd $(bindir) && $(rm) -f regular qregular
+! #	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+! #	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+! #	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+  	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
diff --git a/editors/nvi-m17n/files/patch-ab b/editors/nvi-m17n/files/patch-ab
new file mode 100644
index 000000000000..d590fd0019a9
--- /dev/null
+++ b/editors/nvi-m17n/files/patch-ab
@@ -0,0 +1,15 @@
+--- configure.bad	Fri Jun 26 02:22:51 1998
++++ configure	Fri Jun 26 02:23:39 1998
+@@ -1686,10 +1686,8 @@
+ 		case "$host_os" in
+ 		bsdi2.1)
+ 			vi_cannapath="/usr/contrib/canna";;
+-		freebsd2.2*|freebsd3*)
+-			vi_cannapath="/usr/local";;
+-		freebsd2*)
+-			vi_cannapath="/usr/local/canna";;
++		freebsd*)
++			vi_cannapath="${prefix}";;
+ 		*)
+ 			vi_cannapath="/usr/local/canna";;
+ 		esac
diff --git a/editors/nvi-m17n/files/patch-ac b/editors/nvi-m17n/files/patch-ac
new file mode 100644
index 000000000000..283366a97955
--- /dev/null
+++ b/editors/nvi-m17n/files/patch-ac
@@ -0,0 +1,51 @@
+--- ../include/sys/queue.h.old	Wed Jan 10 07:16:01 2001
++++ ../include/sys/queue.h	Wed Jan 10 07:17:02 2001
+@@ -33,8 +33,10 @@
+  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+  */
+ 
+-#ifndef	_SYS_QUEUE_H_
+-#define	_SYS_QUEUE_H_
++#ifndef	_SYS_QUEUE_HACK_H_
++#define	_SYS_QUEUE_HACK_H_
++
++#include <sys/queue_dist.h>
+ 
+ /*
+  * This file defines three types of data structures: lists, tail queues,
+@@ -65,6 +67,7 @@
+  * For details on the use of these macros, see the queue(3) manual page.
+  */
+ 
++#ifndef LIST_HEAD
+ /*
+  * List definitions.
+  */
+@@ -114,7 +117,9 @@
+ 		    (elm)->field.le_prev;				\
+ 	*(elm)->field.le_prev = (elm)->field.le_next;			\
+ }
++#endif /* LIST_HEAD */
+ 
++#ifndef TAILQ_HEAD
+ /*
+  * Tail queue definitions.
+  */
+@@ -180,7 +185,9 @@
+ 		(head)->tqh_last = (elm)->field.tqe_prev;		\
+ 	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
+ }
++#endif /* TAILQ_HEAD */
+ 
++#ifndef CIRCLEQ_HEAD
+ /*
+  * Circular queue definitions.
+  */
+@@ -256,4 +263,6 @@
+ 		(elm)->field.cqe_prev->field.cqe_next =			\
+ 		    (elm)->field.cqe_next;				\
+ }
+-#endif	/* !_SYS_QUEUE_H_ */
++#endif /* CIRCLEQ_HEAD */
++
++#endif	/* !_SYS_QUEUE_HACK_H_ */
diff --git a/editors/nvi-m17n/files/patch-config.h.in b/editors/nvi-m17n/files/patch-config.h.in
new file mode 100644
index 000000000000..6ebc3a67148b
--- /dev/null
+++ b/editors/nvi-m17n/files/patch-config.h.in
@@ -0,0 +1,12 @@
+--- config.h.in-	Fri May  9 12:50:29 2003
++++ config.h.in	Fri May  9 12:50:56 2003
+@@ -103,9 +103,6 @@
+ /* Define if you have <sys/select.h> */
+ #undef HAVE_SYS_SELECT_H
+ 
+-/* Define if you have the System V style pty calls. */
+-#undef HAVE_SYS5_PTY
+-
+ /* Define if you want to compile in the Tcl interpreter. */
+ #undef HAVE_TCL_INTERP
+ 
diff --git a/editors/nvi-m17n/pkg-descr b/editors/nvi-m17n/pkg-descr
new file mode 100644
index 000000000000..9ddbe01dd714
--- /dev/null
+++ b/editors/nvi-m17n/pkg-descr
@@ -0,0 +1,22 @@
+This ports contains multilingualized nex/nvi.
+
+nex/nvi is a freely redistributable implementation of ex/vi text
+editors originally distributed as part of the Fourth Berkeley
+Software Distribution (4BSD), by the University of California,
+Berkeley.
+
+Multilingual patch enables you to use the following multilingual
+encoding methods, such as:
+	none iso-8859-[1234789] latin1 latin2
+	euc-jp-1978 euc-jp euc-jp-1983 euc-jp-1990 euc-cn euc-kr
+	iso-2022-cn iso-2022-jp iso-2022-kr
+	iso-2022-7-1 iso-2022-7-2 iso-2022-8-2
+	sjis big5 hz euc-tw
+Multilingual support has been set up to use some of the above (guess from
+the name of the ports/packages) as default value.
+You can change encoding style on the fly, or by setting up ~/.exrc.
+With configurations, for Japanese encodings, you can also enjoy the
+embedded canna support.
+See /usr/local/share/vi/README.* for details of multilingual patch.
+
+WWW: http://www.bostic.com/vi/
diff --git a/editors/nvi-m17n/pkg-plist b/editors/nvi-m17n/pkg-plist
new file mode 100644
index 000000000000..197f17873740
--- /dev/null
+++ b/editors/nvi-m17n/pkg-plist
@@ -0,0 +1,27 @@
+bin/nex
+bin/nvi
+bin/nview
+bin/qregular
+bin/regular
+share/vi/README.english
+share/vi/README.japanese
+share/vi/catalog/dutch
+share/vi/catalog/english
+share/vi/catalog/french
+share/vi/catalog/german
+share/vi/catalog/ru_SU.KOI8-R
+share/vi/catalog/spanish
+share/vi/catalog/swedish
+share/vi/perl/forall.pl
+share/vi/perl/make.pl
+share/vi/perl/tk.pl
+share/vi/perl/wc.pl
+share/vi/recover
+share/vi/tcl/errors.tcl
+share/vi/tcl/gnats.tcl
+share/vi/tcl/mailprocs.tcl
+share/vi/tcl/wc.tcl
+@dirrm share/vi/tcl
+@dirrm share/vi/perl
+@dirrm share/vi/catalog
+@dirrm share/vi