From nobody@FreeBSD.org  Tue Jun  1 04:34:45 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7FF01065673
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 Jun 2010 04:34:45 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id B6C728FC14
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 Jun 2010 04:34:45 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o514YjuP073667
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 1 Jun 2010 04:34:45 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o514YjYs073666;
	Tue, 1 Jun 2010 04:34:45 GMT
	(envelope-from nobody)
Message-Id: <201006010434.o514YjYs073666@www.freebsd.org>
Date: Tue, 1 Jun 2010 04:34:45 GMT
From: Aldis Berjoza <aldis@bsdroot.lv>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Imporve Porters Handbook section 4.4 - Patching
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: Jason Helfman <jhelfman@e-e.com>

>Number:         147268
>Category:       docs
>Synopsis:       Imporve Porters Handbook section 4.4 - Patching
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pgj
>State:          closed
>Quarter:        
>Keywords:       porthandbook
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 01 04:40:03 UTC 2010
>Closed-Date:    Sun Sep 05 17:32:39 UTC 2010
>Last-Modified:  Sun Sep 05 17:34:04 UTC 2010
>Originator:     Aldis Berjoza
>Release:        
>Organization:
>Environment:
>Description:
While original Porters Handbooks is good, I faced 1 problem yesterday, when I was creating patch (4.4 Patching) for freeglut 2.6 and couldn't solve this for few hours.

The problem is that if file name that I want to patch contains underscore (_) patch needs to have two underscores instead.

For example I want to patch src/freeglut_joystick.c patch should be named patch-src-freeglut__joustick.c

I'm sure that if such info was available on porters handbook, it would help many other porters :)


Also It would be very nice if Section 4.4 would contain info about make makepatch :)

porter can copy original files, that he wants to patch to same filename with .orig file extension, modify original file and then in ports directory run make make patch. This will create patch files for all *.orig files :)


I think such information would be super helpful.
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:

From: Jason Helfman <jhelfman@e-e.com>
To: bug-followup@FreeBSD.org, aldis@bsdroot.lv
Cc:  
Subject: Re: docs/147268: Imporve Porters Handbook section 4.4 - Patching
Date: Thu, 02 Sep 2010 13:28:35 -0700

 This is a multi-part message in MIME format.
 --------------010806020605050709080300
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 
 
 --------------010806020605050709080300
 Content-Type: text/plain;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 --- book.sgml	2010-08-25 02:55:41.000000000 -0700
 +++ book.sgml	2010-09-02 13:18:58.000000000 -0700
 @@ -735,6 +735,16 @@
  
  	<programlisting>USE_DOS2UNIX=    yes
  DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programlisting>
 +
 +	<para>If you want to create a patch file based off of an original 
 +	 file, you can copy the original file to a <emphasis>.orig</emphasis>
 +	 extension and then modify the original file. Run <maketarget>makepatch
 +	 </maketarget>, and this will write out an appropriate patch file 
 +	 to the files directory of the port. If you feel the &os; community 
 +	 would benefit from your patch, you
 +	 may <ulink
 +	 url="&url.base;/send-pr.html">submit a problem report</ulink> for 
 +	 consideration.</para>
        </sect1>
  
        <sect1 id="slow-configure">
 
 --------------010806020605050709080300--

From: "Jason" <jhelfman@experts-exchange.com>
To: bug-followup@freebsd.org
Cc: aldis@bsdroot.lv
Subject: Re: docs/147268: Imporve Porters Handbook section 4.4 - Patching
Date: Thu, 02 Sep 2010 13:21:14 -0700

 --- book.sgml	2010-08-25 02:55:41.000000000 -0700
 +++ book.sgml	2010-09-02 13:18:58.000000000 -0700
 @@ -735,6 +735,16 @@
  
  	<programlisting>USE_DOS2UNIX=    yes
  DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programlisting>
 +
 +	<para>If you want to create a patch file based off of an original 
 +	 file, you can copy the original file to a <emphasis>.orig</emphasis>
 +	 extension and then modify the original file. Run <maketarget>makepatch
 +	 </maketarget>, and this will write out an appropriate patch file 
 +	 to the files directory of the port. If you feel the &os; community 
 +	 would benefit from your patch, you
 +	 may <ulink
 +	 url="&url.base;/send-pr.html">submit a problem report</ulink> for 
 +	 consideration.</para>
        </sect1>
  
        <sect1 id="slow-configure">
Responsible-Changed-From-To: freebsd-doc->pgj 
Responsible-Changed-By: pgj 
Responsible-Changed-When: Thu Sep 2 22:13:36 UTC 2010 
Responsible-Changed-Why:  
I take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147268 

From: Gabor PALI <pgj@FreeBSD.org>
To: bug-followup@FreeBSD.org, aldis@bsdroot.lv
Cc:  
Subject: Re: docs/147268: Imporve Porters Handbook section 4.4 - Patching
Date: Fri, 3 Sep 2010 17:08:25 +0200

 --001517477f7c65b96d048f5c4dbc
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hey Jason,
 
 I have reviewed and refined your patch.  Please take a look at it.
 
 
 :g
 
 --001517477f7c65b96d048f5c4dbc
 Content-Type: text/x-diff; charset=US-ASCII; name="147268_1.diff"
 Content-Disposition: attachment; filename="147268_1.diff"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_gdn6ivl90
 
 SW5kZXg6IGJvb2suc2dtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9kY3ZzL2RvYy9lbl9V
 Uy5JU084ODU5LTEvYm9va3MvcG9ydGVycy1oYW5kYm9vay9ib29rLnNnbWwsdgpyZXRyaWV2aW5n
 IHJldmlzaW9uIDEuMTA3MwpkaWZmIC11IC1yMS4xMDczIGJvb2suc2dtbAotLS0gYm9vay5zZ21s
 CTI1IEF1ZyAyMDEwIDA5OjU1OjQxIC0wMDAwCTEuMTA3MworKysgYm9vay5zZ21sCTMgU2VwIDIw
 MTAgMTU6MDM6NTIgLTAwMDAKQEAgLTY2Miw3ICs2NjIsMTMgQEAKIAkgIFRvIG1ha2UgZml4ZXMg
 YW5kIHVwZ3JhZGVzIGVhc2llciwgeW91IHNob3VsZCBhdm9pZCBoYXZpbmcgbW9yZSB0aGFuCiAJ
 ICBvbmUgcGF0Y2ggZml4IHRoZSBzYW1lIGZpbGUgKGUuZy4sIDxmaWxlbmFtZT5wYXRjaC1maWxl
 PC9maWxlbmFtZT4gYW5kCiAJICA8ZmlsZW5hbWU+cGF0Y2gtZmlsZTI8L2ZpbGVuYW1lPiBib3Ro
 IGNoYW5naW5nCi0JICA8ZmlsZW5hbWU+PG1ha2V2YXI+V1JLU1JDPC9tYWtldmFyPi9mb29iYXIu
 YzwvZmlsZW5hbWU+KS48L3BhcmE+CisJICA8ZmlsZW5hbWU+PG1ha2V2YXI+V1JLU1JDPC9tYWtl
 dmFyPi9mb29iYXIuYzwvZmlsZW5hbWU+KS4KKwkgIE5vdGUgdGhhdCBpZiB0aGUgcGF0aCBvZiBh
 IHBhdGNoZWQgZmlsZSBjb250YWlucyBhbiB1bmRlcnNjb3JlCisJICAoPGxpdGVyYWw+XzwvbGl0
 ZXJhbD4pIGNoYXJhY3RlciwgdGhlIHBhdGNoIG5lZWRzIHRvIGhhdmUgdHdvCisJICB1bmRlcnNj
 b3JlcyBpbnN0ZWFkIGluIGl0cyBuYW1lLiAgRm9yIGV4YW1wbGUsIHRvIHBhdGNoIGEgZmlsZQor
 CSAgbmFtZWQgPGZpbGVuYW1lPnNyYy9mcmVlZ2x1dF9qb3lzdGljay5jPC9maWxlbmFtZT4sIHRo
 ZQorCSAgY29ycmVzcG9uZGluZyBwYXRjaCBzaG91bGQgYmUgbmFtZWQKKwkgIDxmaWxlbmFtZT5w
 YXRjaC1zcmMtZnJlZWdsdXRfX2pveXN0aWNrLmM8L2ZpbGVuYW1lPi48L3BhcmE+CiAKIAk8cGFy
 YT5QbGVhc2Ugb25seSB1c2UgY2hhcmFjdGVycyA8bGl0ZXJhbD5bLSsuX2EtekEtWjAtOV08L2xp
 dGVyYWw+IGZvcgogCSAgbmFtaW5nIHlvdXIgcGF0Y2hlcy4gIERvIG5vdCB1c2UgYW55IG90aGVy
 IGNoYXJhY3RlcnMgYmVzaWRlcyB0aGVtLgpAQCAtNzM1LDYgKzc0MSwxNCBAQAogCiAJPHByb2dy
 YW1saXN0aW5nPlVTRV9ET1MyVU5JWD0gICAgeWVzCiBET1MyVU5JWF9SRUdFWD0gIC4qXC4oY3xj
 cHB8aCk8L3Byb2dyYW1saXN0aW5nPgorCisJPHBhcmE+SWYgeW91IHdhbnQgdG8gY3JlYXRlIGEg
 cGF0Y2ggZmlsZSBiYXNlZCBvZmYgb2YgYW4KKwkgIGV4aXN0aW5nIGZpbGUsIHlvdSBjYW4gY29w
 eSBpdCB3aXRoIGFuCisJICA8ZmlsZW5hbWU+Lm9yaWc8L2ZpbGVuYW1lPiBleHRlbnNpb24sIGFu
 ZCB0aGVuIG1vZGlmeSB0aGUKKwkgIG9yaWdpbmFsIG9uZS4gIFJ1biA8bWFrZXRhcmdldD5tYWtl
 cGF0Y2g8L21ha2V0YXJnZXQ+LCBhbmQKKwkgIHRoaXMgd2lsbCB3cml0ZSBvdXQgYW4gYXBwcm9w
 cmlhdGUgcGF0Y2ggZmlsZSB0byB0aGUgPGZpbGVuYW1lCisJICAgIGNsYXNzPSJkaXJlY3Rvcnki
 PmZpbGVzPC9maWxlbmFtZT4gZGlyZWN0b3J5IG9mIHRoZQorCSAgcG9ydC48L3BhcmE+CiAgICAg
 ICA8L3NlY3QxPgogCiAgICAgICA8c2VjdDEgaWQ9InNsb3ctY29uZmlndXJlIj4K
 --001517477f7c65b96d048f5c4dbc--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/147268: commit references a PR
Date: Sun,  5 Sep 2010 17:26:39 +0000 (UTC)

 pgj         2010-09-05 17:26:26 UTC
 
   FreeBSD doc repository
 
   Modified files:
     en_US.ISO8859-1/books/porters-handbook book.sgml 
   Log:
   - Add more information on patching, i.e. how to:
     - Escape underscores in patch file names
     - Create patches by using the "makepatch" make(1) target
   
   PR:             docs/147268
   Submitted by:   Aldis Berjoza <aldis@bsdroot.lv>
   Patch by:       Jason Helfman <jhelfman@e-e.com>
   
   Revision  Changes    Path
   1.1074    +15 -1     doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: pgj 
State-Changed-When: Sun Sep 5 17:32:12 UTC 2010 
State-Changed-Why:  
Some text has been added to address these issues.  Thank you for your
submission!

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