6 files changed, 105 insertions, 150 deletions

diff --git a/editors/nvi-perl/Makefile b/editors/nvi-perl/Makefile
index f8b22a4dc60c..7e26762adc29 100644
--- a/editors/nvi-perl/Makefile
+++ b/editors/nvi-perl/Makefile
@@ -1,35 +1,27 @@
-# New ports collection makefile for:	nvi-1.79 + multilingual patch(none)
+# New ports collection makefile for:	nvi-1.79 + perl
 # Version required:	1.79
-# Date created:		6 Mar 1997
+# Date created:		18 Feb 1998
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.7 1998/02/09 06:56:40 fenner Exp $
+# $Id$
 #
 
 DISTNAME=	nvi-1.79
-PKGNAME?=	nvi-m17n-1.79.19970820
+PKGNAME?=	nvi-perl-1.79
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.bostic.com/pub/\
+MASTER_SITES=	ftp://ftp.bostic.com/pub/ \
 		ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
-PATCH_SITES=	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
-PATCHFILES=	nvi-1.79.m17n-970820-1600.diff.gz
-
 MAINTAINER=	itojun@itojun.org
 
-#LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	yes
+USE_PERL5=	yes
 # can't say PATCH_DIST_STRIP=-p1 because contains files outside ${WRKSRC}
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p0
-CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
-CONFIGURE_ARGS=	--enable-multibyte --program-prefix=n
+PATCH_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p0
 
-post-install:
-	@${CP} ${WRKSRC}/../docs.m17n/README.english \
-		${PREFIX}/share/vi/
-	@${CP} ${WRKSRC}/../docs.m17n/README.japanese \
-		${PREFIX}/share/vi/
+CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"'
+CONFIGURE_ARGS=	--enable-perlinterp --program-prefix=pn
 
 .include <bsd.port.mk>
diff --git a/editors/nvi-perl/files/patch-aa b/editors/nvi-perl/files/patch-aa
index 9272867b1399..234fe85a1ae9 100644
--- a/editors/nvi-perl/files/patch-aa
+++ b/editors/nvi-perl/files/patch-aa
@@ -1,106 +1,76 @@
-*** 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)'`
+--- build/Makefile.in.orig	Wed Oct 23 22:43:38 1996
++++ build/Makefile.in	Fri Feb 20 00:27:03 1998
+@@ -85,25 +85,25 @@
+ 	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) \
++	cd $(bindir) && $(ln) -s \
+ 		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
+-	cd $(bindir) && $(ln) \
++	cd $(bindir) && $(ln) -s \
+ 		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
+ 	[ -d $(mandir) ] || \
+ 	    ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
+-	[ -d $(mandir)/cat1 ] || \
+-	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
++#	[ -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)'`
++#	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)'`
+@@ -112,9 +112,9 @@
+ 	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) \
++	cd $(mandir)/man1 && $(ln) -s \
+ 	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
+-	cd $(mandir)/man1 && $(ln) \
++	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
+@@ -139,7 +139,7 @@
+ 	    cd $(datadir)/vi/catalog && $(chmod) $(fmode) *)
+ 	@echo "Installing Perl scripts: $(datadir)/vi/perl ..."
+ 	$(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl
+-	[ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
++	[ ! -f VI.pm ] || ($(cp) VI.pm $(datadir)/vi/perl && \
+ 	    cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
+ 	(cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \
+ 	    cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl)
+@@ -156,9 +156,9 @@
+ 	cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
+ 	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
+ 	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+-	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)/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-perl/files/patch-ab b/editors/nvi-perl/files/patch-ab
new file mode 100644
index 000000000000..8df32b0abac5
--- /dev/null
+++ b/editors/nvi-perl/files/patch-ab
@@ -0,0 +1,11 @@
+--- perl_api/perl.xs.orig	Thu Feb 19 23:50:23 1998
++++ perl_api/perl.xs	Thu Feb 19 23:50:38 1998
+@@ -418,7 +418,7 @@
+ xs_init()
+ {
+ #ifdef HAVE_PERL_5_003_01
+-	dXSUB_SYS;
++	dXSUB_SYS
+ #endif
+ 	char *file = __FILE__;
+ 
diff --git a/editors/nvi-perl/pkg-comment b/editors/nvi-perl/pkg-comment
index 9b7989c596b4..c2dde9c6a655 100644
--- a/editors/nvi-perl/pkg-comment
+++ b/editors/nvi-perl/pkg-comment
@@ -1 +1 @@
-A clone of vi/ex, with multilingual patch, no default settings.
+A clone of vi/ex, with perl5 linked into.
diff --git a/editors/nvi-perl/pkg-descr b/editors/nvi-perl/pkg-descr
index c37c20cf106d..abd6e66b3cd9 100644
--- a/editors/nvi-perl/pkg-descr
+++ b/editors/nvi-perl/pkg-descr
@@ -1,24 +1,9 @@
-This ports contains multilingualized nex/nvi.
+This ports contains nex/nvi with perl5 interpreter linked into.
 
 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.
-
 original distribution site:
 	ftp://ftp.cs.berkeley.edu/ucb/4bsd/nvi-1.79.tar.gz
-	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
diff --git a/editors/nvi-perl/pkg-plist b/editors/nvi-perl/pkg-plist
index 19d97e4a0739..cca9011c9655 100644
--- a/editors/nvi-perl/pkg-plist
+++ b/editors/nvi-perl/pkg-plist
@@ -1,13 +1,9 @@
-bin/nvi
-bin/nex
-bin/nview
-bin/regular
-bin/qregular
-man/man1/nvi.1
-man/man1/nex.1
-man/man1/nview.1
-share/vi/README.english
-share/vi/README.japanese
+bin/pnvi
+bin/pnex
+bin/pnview
+man/man1/pnvi.1
+man/man1/pnex.1
+man/man1/pnview.1
 share/vi/recover
 share/vi/catalog/dutch
 share/vi/catalog/english
@@ -20,6 +16,7 @@ share/vi/perl/forall.pl
 share/vi/perl/make.pl
 share/vi/perl/tk.pl
 share/vi/perl/wc.pl
+share/vi/perl/VI.pm
 share/vi/tcl/errors.tcl
 share/vi/tcl/gnats.tcl
 share/vi/tcl/mailprocs.tcl