From root@server.t-hosting.hu  Fri Dec 16 20:29:40 2005
Return-Path: <root@server.t-hosting.hu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F3D9E16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Dec 2005 20:29:39 +0000 (GMT)
	(envelope-from root@server.t-hosting.hu)
Received: from server.t-hosting.hu (server.t-hosting.hu [217.20.133.7])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1745443D77
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Dec 2005 20:29:39 +0000 (GMT)
	(envelope-from root@server.t-hosting.hu)
Received: from localhost (localhost [127.0.0.1])
	by server.t-hosting.hu (Postfix) with ESMTP id 1A43C998351;
	Fri, 16 Dec 2005 21:29:37 +0100 (CET)
Received: from server.t-hosting.hu ([127.0.0.1])
 by localhost (server.t-hosting.hu [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 46289-04; Fri, 16 Dec 2005 21:29:33 +0100 (CET)
Received: by server.t-hosting.hu (Postfix, from userid 0)
	id A784D99834D; Fri, 16 Dec 2005 21:29:33 +0100 (CET)
Message-Id: <20051216202933.A784D99834D@server.t-hosting.hu>
Date: Fri, 16 Dec 2005 21:29:33 +0100 (CET)
From: Gabor Kovesdan <gabor.kovesdan@t-hosting.hu>
Reply-To: Gabor Kovesdan <gabor.kovesdan@t-hosting.hu>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Gabor Kovesdan <gabor.kovesdan@t-hosting.hu>
Subject: Use new patch naming convention in Porter's Handbook
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         90515
>Category:       docs
>Synopsis:       Use new patch naming convention in Porter's Handbook
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 16 20:30:03 GMT 2005
>Closed-Date:    Sat Dec 17 01:11:52 GMT 2005
>Last-Modified:  Sat Dec 17 01:11:52 GMT 2005
>Originator:     Gabor Kovesdan
>Release:        FreeBSD 5.3-RELEASE-p17 amd64
>Organization:
n/a
>Environment:
System: FreeBSD server.t-hosting.hu 5.3-RELEASE-p17 FreeBSD 5.3-RELEASE-p17 #0: Mon Jul 4 20:23:15 CEST 2005 root@server.t-hosting.hu:/usr/src/sys/amd64/compile/FREEBSD amd64

>Description:

According to http://wikitest.freebsd.org/moin.cgi/PortsLongtermTargets the new
patch naming convention requires to use :: signs for specifying paths in the
patch filenames, e.g. patch-src::config.c, but Porter's Handbook describes the
old naming convention, e.g. patch-src-config.c.
This patch updates Porter's Handbook to explain the new rule.


>How-To-Repeat:
>Fix:

--- book.sgml.diff begins here ---
--- /usr/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml	Thu Dec 15 09:49:06 2005
+++ ./book.sgml	Fri Dec 16 21:21:09 2005
@@ -635,11 +635,14 @@
 	  <replaceable>*</replaceable> indicates
 	  the pathnames of the files that are patched,
 	  such as <filename>patch-Imakefile</filename> or
-	  <filename>patch-src-config.h</filename>.  These files should
+	  <filename>patch-src::config.h</filename>. All patches must be
+	  relative to <makevar>WRKSRC</makevar> (generally the directory your
+	  port's tarball unpacks itself into, that being where the build is
+	  done), and the / signs must be substituted with :: in this relative
+	  path when constructing patch filenames, as the example represents
+	  above. The patch files should
 	  be stored in <makevar>PATCHDIR</makevar>, from where they will be
-	  automatically applied.  All patches must be relative to
-	  <makevar>WRKSRC</makevar> (generally the directory your port's
-	  tarball unpacks itself into, that being where the build is done).
+	  automatically applied.
 	  To make fixes and upgrades easier, you should avoid having more than
 	  one patch fix the same file (e.g., <filename>patch-file</filename> and
 	  <filename>patch-file2</filename> both changing
--- book.sgml.diff ends here ---


>Release-Note:
>Audit-Trail:

From: linimon@lonesome.com (Mark Linimon)
To: Gabor Kovesdan <gabor.kovesdan@t-hosting.hu>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: docs/90515: Use new patch naming convention in Porter's Handbook
Date: Fri, 16 Dec 2005 15:10:19 -0600

 On Fri, Dec 16, 2005 at 09:29:33PM +0100, Gabor Kovesdan wrote:
 > According to http://wikitest.freebsd.org/moin.cgi/PortsLongtermTargets the new
 > patch naming convention requires to use :: signs for specifying paths in the
 > patch filenames, e.g. patch-src::config.c, but Porter's Handbook describes the
 > old naming convention, e.g. patch-src-config.c.
 
 Then the wiki is wrong.  The Porter's Handbook is correct.
 
 Is the other part of your change still relevant even with this being the case?

From: =?ISO-8859-1?Q?K=F6vesd=E1n_G=E1bor?= <gabor.kovesdan@t-hosting.hu>
To: Mark Linimon <linimon@lonesome.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: docs/90515: Use new patch naming convention in Porter's Handbook
Date: Fri, 16 Dec 2005 22:12:48 +0100

 Mark Linimon wrote:
 
 >On Fri, Dec 16, 2005 at 09:29:33PM +0100, Gabor Kovesdan wrote:
 >  
 >
 >>According to http://wikitest.freebsd.org/moin.cgi/PortsLongtermTargets the new
 >>patch naming convention requires to use :: signs for specifying paths in the
 >>patch filenames, e.g. patch-src::config.c, but Porter's Handbook describes the
 >>old naming convention, e.g. patch-src-config.c.
 >>    
 >>
 >
 >Then the wiki is wrong.  The Porter's Handbook is correct.
 >
 >Is the other part of your change still relevant even with this being the case?
 >  
 >
 No. So, if I make a port, I should use the patch-src-config.c form 
 instead of patch-src::config.c?

From: linimon@lonesome.com (Mark Linimon)
To: =?iso-8859-1?Q?K=F6vesd=E1n_G=E1bor?= <gabor.kovesdan@t-hosting.hu>
Cc: Mark Linimon <linimon@lonesome.com>,
	FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: docs/90515: Use new patch naming convention in Porter's Handbook
Date: Fri, 16 Dec 2005 15:19:23 -0600

 On Fri, Dec 16, 2005 at 10:12:48PM +0100, Kvesdn Gbor wrote:
 > No. So, if I make a port, I should use the patch-src-config.c form 
 > instead of patch-src::config.c?
 
 Correct.
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sat Dec 17 01:11:00 UTC 2005 
State-Changed-Why:  
Oh you got it backwards. :: is old way and should not be used for new work. 
The wiki page is merely tracking a progress of getting rid of ::'s. 
The text in the header is a longterm target of "not using :: in patchfile name". 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90515 
>Unformatted:
