Bug 182113 - [patch] editors/nvi-m17n: Cannot search multibyte characters on FreeBSD/amd64
Summary: [patch] editors/nvi-m17n: Cannot search multibyte characters on FreeBSD/amd64
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: John Marino
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-09-15 13:50 UTC by WATANABE Kazuhiro
Modified: 2014-01-15 18:00 UTC (History)
0 users

See Also:


Attachments
file.diff (757 bytes, patch)
2013-09-15 13:50 UTC, WATANABE Kazuhiro
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description WATANABE Kazuhiro 2013-09-15 13:50:01 UTC
On FreeBSD/amd64 nvi-m17n cannot search multibyte characters with {/,?}.
It always says "Pattern not found" for such characters.
ASCII characters are able to search well.

This problem is not occured on FreeBSD/i386.

The same problem has been reported and fixed in the NetBSD pkgsrc-bugs
mailing list in Feb 2010.

http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=42832

How-To-Repeat: On FreeBSD/amd64 open Japanese text, and search multibyte (kanji) characters.
Comment 1 John Marino freebsd_committer freebsd_triage 2014-01-15 14:51:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->marino

I'll take it.
Comment 2 John Marino freebsd_committer freebsd_triage 2014-01-15 17:55:00 UTC
State Changed
From-To: open->closed

Committed, although commit didn't show on PR.  Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-15 17:59:08 UTC
Author: marino
Date: Wed Jan 15 17:32:50 2014
New Revision: 339796
URL: http://svnweb.freebsd.org/changeset/ports/339796
QAT: https://qat.redports.org/buildarchive/r339796/

Log:
  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

Added:
  head/editors/nvi-m17n/files/patch-Makefile.in   (contents, props changed)
  head/editors/nvi-m17n/files/patch-configure   (contents, props changed)
  head/editors/nvi-m17n/files/patch-regex_regex2.h   (contents, props changed)
Deleted:
  head/editors/nvi-m17n/files/patch-aa
  head/editors/nvi-m17n/files/patch-ab
Modified:
  head/editors/nvi-m17n/Makefile
  head/editors/nvi-m17n/pkg-plist

Modified: head/editors/nvi-m17n/Makefile
==============================================================================
--- head/editors/nvi-m17n/Makefile	Wed Jan 15 17:28:00 2014	(r339795)
+++ head/editors/nvi-m17n/Makefile	Wed Jan 15 17:32:50 2014	(r339796)
@@ -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>

Added: head/editors/nvi-m17n/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/nvi-m17n/files/patch-Makefile.in	Wed Jan 15 17:32:50 2014	(r339796)
@@ -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)'`

Added: head/editors/nvi-m17n/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/nvi-m17n/files/patch-configure	Wed Jan 15 17:32:50 2014	(r339796)
@@ -0,0 +1,15 @@
+--- 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";;
+-		freebsd2.2*|freebsd3*)
+-			vi_cannapath="/usr/local";;
+-		freebsd2*)
+-			vi_cannapath="/usr/local/canna";;
++		freebsd*|dragonfly*)
++			vi_cannapath="${prefix}";;
+ 		*)
+ 			vi_cannapath="/usr/local/canna";;
+ 		esac

Added: head/editors/nvi-m17n/files/patch-regex_regex2.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/nvi-m17n/files/patch-regex_regex2.h	Wed Jan 15 17:32:50 2014	(r339796)
@@ -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)	*/

Modified: head/editors/nvi-m17n/pkg-plist
==============================================================================
--- head/editors/nvi-m17n/pkg-plist	Wed Jan 15 17:28:00 2014	(r339795)
+++ head/editors/nvi-m17n/pkg-plist	Wed Jan 15 17:32:50 2014	(r339796)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"