Date: Sun, 21 Aug 2011 16:31:11 -0500 From: Zhihao Yuan <lichray@gmail.com> To: Test Rat <ttsestt@gmail.com> Cc: freebsd-hackers@freebsd.org, timp <timp87@gmail.com> Subject: Re: [nvi-iconv]Call for test Message-ID: <CAGsORuCXe2TU9E6urV4d48zSKy2u9GrkL88sHf_4h8wcKGShpw@mail.gmail.com> In-Reply-To: <CAGsORuBJsP6AuB_biHJ9wv55=qhkb%2BWRQLpMUBkgA_OXuXKCbA@mail.gmail.com> References: <CAGsORuBr=b-cJEAJO7cJ=j5dn04kJfR%2BHzz58Rjc29uTDZv4Xg@mail.gmail.com> <CAGsORuCsz_XzWntZ_y40SuAS%2B7saT7GzMUoTzpGgdCN5aTYuNg@mail.gmail.com> <868vqt0xuc.fsf@gmail.com> <CAGsORuDiq%2BgsGyV1Da0mUKj0JBnam584S2z5VFVcKyKM1qsVdw@mail.gmail.com> <1313663436600-4711635.post@n5.nabble.com> <86hb5euofp.fsf@gmail.com> <CAGsORuBJsP6AuB_biHJ9wv55=qhkb%2BWRQLpMUBkgA_OXuXKCbA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
A new patch is uploaded. https://github.com/downloads/lichray/nvi2/nvi2-freebsd-2011-08-21.diff.gz There is no functional change in this patch. I just wrote a cmake script and regenerated config.h and pathnames.h; I also removed usr.bin/vi/port.h, so please make sure you applied the patch with patch -p0 -E < /path/to/nvi2-freebsd-2011-08-21.diff If usr.bin/vi/port.h still exists, just rm it; and if you see a usr.bin/vi/config.h.rej, you can get a clean copy with wget --no-check-certificate 'https://socsvn.freebsd.org/socsvn/soc2011/zy/nvi-iconv/head/usr.bin/vi/con= fig.h' And replace usr.bin/vi/config.h with the one you downloaded. After the src tree is patched, please issue a make WITH_ICONV=3D1 depend first under usr.bin/vi/ if you just want to test nvi instead of to rebuild the world. For the new config.h, the FreeBSD-only SYSV_CURSES macro is removed, since we only have ncurses in -stable and -current. And the SYS5_TTY is enabled, since we support it in -stable and -current. On Thu, Aug 18, 2011 at 10:15 PM, Zhihao Yuan <lichray@gmail.com> wrote: > On Thu, Aug 18, 2011 at 9:26 PM, Test Rat <ttsestt@gmail.com> wrote: >> timp <timp87@gmail.com> writes: >> >>> Hi! >>> I just tried you patch on latest current with clang. >>> >>> [root@current64 /usr/src]# uname -a >>> FreeBSD current64 9.0-BETA1 FreeBSD 9.0-BETA1 #0: Thu Aug 18 03:56:45 M= SK >>> 2011 =C2=A0 =C2=A0 mox@current64:/usr/obj/usr/src/sys/GENERIC =C2=A0amd= 64 >>> >>> [root@current64 /usr/src]# patch < ~/nvi2-freebsd-2011-08-17.diff >> [...] >>> =3D=3D=3D> usr.bin/vi (depend) >>> make: don't know how to make cl_bsd.c. Stop >>> *** Error code 2 >> >> Use `-p0' otherwise new directories won't be created. This is documented >> in patch(1). And cl_bsd.c ended up in current directory (/usr/src) >> >> =C2=A0$ diffstat ~/nvi2-freebsd-2011-08-17.diff.gz | fgrep cl_bsd.c >> =C2=A0 contrib/nvi2/cl/cl_bsd.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| =C2=A0346 +++ > > zzz... I always use -p0 but I did not know what it does... > >> >> Zhihao Yuan <lichray@gmail.com> writes: >>> The patch will create contrib/nvi2, and it will not remove the unused >>> contrib/nvi (patch(1) can not really remove files anyway). >> >> patch(1) can remove *empty* files with `-E', e.g. >> >> =C2=A0$ svn rm UPDATING >> =C2=A0$ svn di UPDATING | patch -E -d /usr/src > > Got it. But removing contrib/nvi with patch will just double the patch > size anyway. A svn rm will do it if some day the patch got committed. > >> _______________________________________________ >> freebsd-hackers@freebsd.org mailing list >> http://lists.freebsd.org/mailman/listinfo/freebsd-hackers >> To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.or= g" >> > > > > -- > Zhihao Yuan, nickname lichray > The best way to predict the future is to invent it. > ___________________________________________________ > 4BSD -- http://4bsd.biz/ > --=20 Zhihao Yuan, nickname lichray The best way to predict the future is to invent it. ___________________________________________________ 4BSD -- http://4bsd.biz/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGsORuCXe2TU9E6urV4d48zSKy2u9GrkL88sHf_4h8wcKGShpw>