From owner-cvs-ports@FreeBSD.ORG Wed Apr 21 03:45:34 2004 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A9DC16A4CE; Wed, 21 Apr 2004 03:45:34 -0700 (PDT) Received: from srv01.sparkit.no (srv01.sparkit.no [193.69.116.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5054743D39; Wed, 21 Apr 2004 03:45:33 -0700 (PDT) (envelope-from eivind@FreeBSD.org) Received: from ws ([193.69.114.88]) by srv01.sparkit.no (8.12.10/8.12.10) with ESMTP id i3LAjUcZ089744; Wed, 21 Apr 2004 12:45:30 +0200 (CEST) (envelope-from eivind@FreeBSD.org) Received: from ws (localhost [127.0.0.1]) by ws (8.12.9/8.12.10) with ESMTP id i3LAi6TH005932; Wed, 21 Apr 2004 10:44:06 GMT (envelope-from eivind@ws) Received: (from eivind@localhost) by ws (8.12.9/8.12.10/Submit) id i3LAi6C5005917; Wed, 21 Apr 2004 10:44:06 GMT (envelope-from eivind) Date: Wed, 21 Apr 2004 10:43:05 +0000 From: Eivind Eklund To: Alexey Dokuchaev Message-ID: <20040421104305.GB5052@FreeBSD.org> References: <200404181922.i3IJMkTf044706@repoman.freebsd.org> <20040419032304.GA61048@regency.nsu.ru> <20040419103101.GB26102@dragon.nuxi.com> <20040419110810.GA24385@regency.nsu.ru> <20040420200903.GA6174@dragon.nuxi.com> <20040421094050.GA5052@FreeBSD.org> <20040421095427.GA82398@regency.nsu.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040421095427.GA82398@regency.nsu.ru> User-Agent: Mutt/1.5.4i cc: Clement Laforet cc: cvs-ports@FreeBSD.org cc: cvs-all@FreeBSD.org cc: David O'Brien cc: ports-committers@FreeBSD.org Subject: Re: files/patch-* pathname separators (was Re: cvs commit: ports/games Makefile ...) X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2004 10:45:34 -0000 On Wed, Apr 21, 2004 at 04:54:27PM +0700, Alexey Dokuchaev wrote: > On Wed, Apr 21, 2004 at 09:40:50AM +0000, Eivind Eklund wrote: > > On Tue, Apr 20, 2004 at 01:09:03PM -0700, David O'Brien wrote: > > > On Mon, Apr 19, 2004 at 06:08:10PM +0700, Alexey Dokuchaev wrote: > > > > While particular choice for a separator is arguable, the general scheme > > > > for patch-files is not, right? FWIW, that was my point, not `::' vs. > > > > whatever. > > > > > > > > As a side note, I don't really see any problem with `::' or `-'. > > > > > > 1. Bash escapes it so it actually becomes 4 characters. > > > This should not be takeing lightly -- people bitched about '%' in > > > patch names and they were all changed because its a magic charter for > > > Perforce and Perforce users could be bothered to escape it. > > > > > > 2. With the file name lenths of some of our patches (greater than 80 > > > chars) two characters, when one will do, is annoying. > > > > If nobody objects, I'll add the following patch to the porters handbook > > to avoid profileration. > > Good idea. Please suggest some evil-less chars (like `+') for > separators, and (*begging*) discourage porters from using ``patch-xx'' > scheme, and commit your patch! New patch suggestion: Index: book.sgml =================================================================== RCS file: /home/dcvs/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v retrieving revision 1.400 diff -u -r1.400 book.sgml --- book.sgml 16 Apr 2004 15:05:32 -0000 1.400 +++ book.sgml 21 Apr 2004 10:31:08 -0000 @@ -614,10 +614,15 @@ * denotes the sequence in which the patches will be applied — these are done in alphabetical order, thus aa - first, ab second and so on. If you wish, - you can use names that indicate the pathnames of the files that + first, ab second and so on. If you do not need + this explicit ordering, you can use names that indicate the + pathnames of the files that are patched, such as patch-Imakefile or - patch-src-config.h. These files should + patch-src+config.h. These filenames are + preferred when possible. Due to issues with escaping in + bash and Perforce, you should + avoid using :: or % as separator in the patch filename. The + preferred separator is +. The files should be stored in PATCHDIR, from where they will be automatically applied. All patches should be relative to WRKSRC (generally the directory your port's Eivind.