editors/nvi-m17: Fix multibyte search on amd64, support stage

This commit enables multibyte search support on AMD64.  Previous search
attempts result in "Pattern not found".  The origin for this fix is pkgsrc
handled by a committer I know and trust.  While here, support stage.

PR: ports/182113

6 files changed, 124 insertions, 117 deletions

diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index c2beee238017..9a4b1764fb83 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nvi
 PORTVERSION=	1.79.20040608
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	editors
 MASTER_SITES=	ftp://ftp.mk.bsdclub.org/pub/FreeBSD/distfiles/	\
@@ -14,7 +15,7 @@ PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	nvi-m17n-1.79-20040608.diff.gz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A clone of vi/ex, with multilingual patch, no default settings
+COMMENT=	Clone of vi/ex, with multilingual patch, no default settings
 
 PATCH_DIST_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p0 -f
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
@@ -23,10 +24,6 @@ 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
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -34,8 +31,8 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/../docs.m17n/README.english \
-		${PREFIX}/share/vi/
+		${STAGEDIR}${PREFIX}/share/vi/
 	${INSTALL_DATA} ${WRKSRC}/../docs.m17n/README.japanese \
-		 ${PREFIX}/share/vi/
+		${STAGEDIR}${PREFIX}/share/vi/
 
 .include <bsd.port.post.mk>
diff --git a/editors/nvi-m17n/files/patch-Makefile.in b/editors/nvi-m17n/files/patch-Makefile.in
new file mode 100644
index 000000000000..b2a641d1277d
--- /dev/null
+++ b/editors/nvi-m17n/files/patch-Makefile.in
@@ -0,0 +1,100 @@
+--- Makefile.in.orig	2014-01-15 15:12:44.000000000 +0000
++++ Makefile.in
+@@ -61,14 +61,14 @@ tknvi: $(TKALL)
+ chmod=	@vi_cv_path_chmod@
+ cp=	@vi_cv_path_cp@
+ ln=	@vi_cv_path_ln@
+-mkdir=	@vi_cv_path_mkdir@
++mkdir=	@vi_cv_path_mkdir@ -p
+ rm=	@vi_cv_path_rm@
+ strip=	@vi_cv_path_strip@
+ 
+ prefix=	@prefix@
+-bindir=	@bindir@
+-datadir=@datadir@
+-mandir=	@mandir@
++bindir=	$(DESTDIR)@bindir@
++datadir=$(DESTDIR)@datadir@
++mandir=	$(DESTDIR)@mandir@
+ exec_prefix=@exec_prefix@
+ 
+ dmode=	755
+@@ -79,8 +79,6 @@ transform=@program_transform_name@
+ 
+ install: all install_common
+ 	@echo "Installing vi, ex, view: $(bindir) ..."
+-	[ -d $(bindir) ] || \
+-	    ($(mkdir) $(bindir) && $(chmod) $(dmode) $(bindir))
+ 	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
+ 	$(cp) nvi $(bindir)/`echo vi | sed '$(transform)'`
+ 	cd $(bindir) && [ -f $(strip) ] && \
+@@ -88,55 +86,28 @@ install: all install_common
+ 	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)'`
+ 	cd $(bindir) && $(rm) -f regular qregular
+ 	$(cp) regular $(bindir)/regular
+ 	$(cp) qregular $(bindir)/qregular
+ 	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)'`
+ 	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.1 \
+ 	    $(mandir)/man1/`echo vi.1 | sed '$(transform)'`
+ 	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
+ install_common:
+-	[ -f $(chmod) ]
+-	[ -f $(cp) ]
+-	[ -f $(ln) ]
+-	[ -f $(mkdir) ]
+-	[ -f $(rm) ]
+-	[ -d $(prefix) ] || \
+-	    ($(mkdir) $(prefix) && $(chmod) $(dmode) $(prefix))
+-	[ -d $(exec_prefix) ] || \
+-	    ($(mkdir) $(exec_prefix) && $(chmod) $(dmode) $(exec_prefix))
+-	[ -d $(datadir) ] || \
+-	    ($(mkdir) $(datadir) && $(chmod) $(dmode) $(datadir))
+ 	$(rm) -rf $(datadir)/vi
+ 	$(mkdir) $(datadir)/vi && $(chmod) $(dmode) $(datadir)/vi
+ 	@echo "Installing message catalogs: $(datadir)/vi/catalog ..."
+@@ -164,9 +135,6 @@ uninstall:
+ 	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-aa b/editors/nvi-m17n/files/patch-aa
deleted file mode 100644
index 9272867b1399..000000000000
--- a/editors/nvi-m17n/files/patch-aa
+++ /dev/null
@@ -1,106 +0,0 @@
-*** 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-configure
index d590fd0019a9..060e2974e86d 100644
--- a/editors/nvi-m17n/files/patch-ab
+++ b/editors/nvi-m17n/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.bad	Fri Jun 26 02:22:51 1998
-+++ configure	Fri Jun 26 02:23:39 1998
-@@ -1686,10 +1686,8 @@
+--- configure.orig	2014-01-15 15:12:44.000000000 +0000
++++ configure
+@@ -1805,10 +1805,8 @@ if test "$vi_cv_canna" = "yes"; then
  		case "$host_os" in
  		bsdi2.1)
  			vi_cannapath="/usr/contrib/canna";;
@@ -8,7 +8,7 @@
 -			vi_cannapath="/usr/local";;
 -		freebsd2*)
 -			vi_cannapath="/usr/local/canna";;
-+		freebsd*)
++		freebsd*|dragonfly*)
 +			vi_cannapath="${prefix}";;
  		*)
  			vi_cannapath="/usr/local/canna";;
diff --git a/editors/nvi-m17n/files/patch-regex_regex2.h b/editors/nvi-m17n/files/patch-regex_regex2.h
new file mode 100644
index 000000000000..14a5bf17f7db
--- /dev/null
+++ b/editors/nvi-m17n/files/patch-regex_regex2.h
@@ -0,0 +1,13 @@
+--- ../regex/regex2.h.orig	2014-01-15 15:00:45.000000000 +0000
++++ ../regex/regex2.h
+@@ -80,8 +80,8 @@ typedef int sopno;
+ #define	OPRMASK	0xf8000000
+ #define	OPDMASK	0x07ffffff
+ #define	OPSHIFT	((unsigned)27)
+-#define	OP(n)	((n)&OPRMASK)
+-#define	OPND(n)	((n)&OPDMASK)
++#define	OP(n)	((unsigned)((n)&OPRMASK))
++#define	OPND(n)	((unsigned)((n)&OPDMASK))
+ #define	SOP(op, opnd)	((op)|(opnd))
+ /* operators			   meaning	operand			*/
+ /*						(back, fwd are offsets)	*/
diff --git a/editors/nvi-m17n/pkg-plist b/editors/nvi-m17n/pkg-plist
index 197f17873740..c233ff99bb84 100644
--- a/editors/nvi-m17n/pkg-plist
+++ b/editors/nvi-m17n/pkg-plist
@@ -3,6 +3,9 @@ bin/nvi
 bin/nview
 bin/qregular
 bin/regular
+man/man1/nex.1.gz
+man/man1/nvi.1.gz
+man/man1/nview.1.gz
 share/vi/README.english
 share/vi/README.japanese
 share/vi/catalog/dutch