From owner-freebsd-hackers@FreeBSD.ORG Sun Aug 21 21:31:14 2011 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1F78106564A for ; Sun, 21 Aug 2011 21:31:13 +0000 (UTC) (envelope-from lichray@gmail.com) Received: from mail-iy0-f172.google.com (mail-iy0-f172.google.com [209.85.210.172]) by mx1.freebsd.org (Postfix) with ESMTP id 69EAF8FC13 for ; Sun, 21 Aug 2011 21:31:13 +0000 (UTC) Received: by iye7 with SMTP id 7so17777709iye.17 for ; Sun, 21 Aug 2011 14:31:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=Sc5Vq/mXGnLJ1msbW4pWZ+q8Q6pmyHSqDniM7zKG+ho=; b=aW273dX+ZjmX6twhyxHBqbAWcVq9V4Clet+1A0xVOFF2+CLsT1XQetM5aDzX539jOE ybS5A1PMOqGFC7dHg9ntBoROw4AtgJPleAWw2vMlkGcIhmo+EbDIx05dnOVuKNZF+b8l lRnwsLdrbRKlzL39zrwpb32c+pWWvwMBVIQPE= MIME-Version: 1.0 Received: by 10.231.56.160 with SMTP id y32mr4098816ibg.68.1313962271576; Sun, 21 Aug 2011 14:31:11 -0700 (PDT) Received: by 10.231.15.205 with HTTP; Sun, 21 Aug 2011 14:31:11 -0700 (PDT) In-Reply-To: References: <868vqt0xuc.fsf@gmail.com> <1313663436600-4711635.post@n5.nabble.com> <86hb5euofp.fsf@gmail.com> Date: Sun, 21 Aug 2011 16:31:11 -0500 Message-ID: From: Zhihao Yuan To: Test Rat Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: freebsd-hackers@freebsd.org, timp Subject: Re: [nvi-iconv]Call for test X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Aug 2011 21:31:14 -0000 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 wrote: > On Thu, Aug 18, 2011 at 9:26 PM, Test Rat wrote: >> timp 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 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/