Re: Generating port changes easily
On 02/27/15 23:34, Kubilay Kocak wrote: On 28/02/2015 3:35 AM, Patrick Powell wrote: I have made some modifications to a port - couple of lines in the Makefile, and an updated pkg-plist. Once upon a time I was shown a script (run_this_script?) to help with updating a port. 1. Copy the original files in the port to XXX.orig (or something) For example cp Makefile Makefile.orig 2. Make your changes For example: vi Makefile 3. Now run this script which will generate a DIFF file which can be posted: run_this_script ... /tmp/changes.shar ? run_this_script ... /tmp/diffs ? 4. Post the generated file to bugzilla with an update request. Ummm... is there such a 'run_this_script' or am I indulging in wishful thinking? If the changes you make are in the ports files, porttools has a `port diff` command (which uses a reference ports tree to create diffs against. You can use /usr/ports as that reference, and in fact I believe that is the default. You can then just port diff path-to-patch-file.diff, ready for attachment into a new bugzilla issue. If the patch is against WRKSRC source code, you can a) cp WRKSRC/file WRKSRC/file.orig b) edit file c) make makepatch (from the port dir) makepatch recursively searches WRKSRC for *.orig files, and automatically creates correctly named patch-foo patch files in /files for you. Hope that helps -- koobs Excellent suggestions, both. I tried port diff AND make makepatch - both seemed to work as advertised. Thanks for the help! -- Patrick Powell Astart Technologies papow...@astart.com1530 Jamacha Rd, Suite X Network and System San Diego, CA 92019 Consulting 858-874-6543 FAX 858-751-2435 Web: www.astart.com ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org
Re: Generating port changes easily
On Sat, 28 Feb 2015 18:34:40 +1100 Kubilay Kocak ko...@freebsd.org wrote On 28/02/2015 3:35 AM, Patrick Powell wrote: I have made some modifications to a port - couple of lines in the Makefile, and an updated pkg-plist. Once upon a time I was shown a script (run_this_script?) to help with updating a port. 1. Copy the original files in the port to XXX.orig (or something) For example cp Makefile Makefile.orig 2. Make your changes For example: vi Makefile 3. Now run this script which will generate a DIFF file which can be posted: run_this_script ... /tmp/changes.shar ? run_this_script ... /tmp/diffs ? 4. Post the generated file to bugzilla with an update request. Ummm... is there such a 'run_this_script' or am I indulging in wishful thinking? If the changes you make are in the ports files, porttools has a 'port diff' command (which uses a reference ports tree to create diffs against. You can use /usr/ports as that reference, and in fact I believe that is the default. You can then just port diff path-to-patch-file.diff, ready for attachment into a new bugzilla issue. If the patch is against WRKSRC source code, you can a) cp WRKSRC/file WRKSRC/file.orig b) edit file c) make makepatch (from the port dir) makepatch recursively searches WRKSRC for *.orig files, and automatically creates correctly named patch-foo patch files in /files for you. Hope that helps koobs' reply got me to thinking. So I did a little searching around in ports/Tools/scripts and found, I think, exactly what you were referring/hoping for; update-patches Give it a look. It's intended to work almost exactly as you described. HTH --Chris -- koobs ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org
Re: Generating port changes easily
On 28/02/2015 3:35 AM, Patrick Powell wrote: I have made some modifications to a port - couple of lines in the Makefile, and an updated pkg-plist. Once upon a time I was shown a script (run_this_script?) to help with updating a port. 1. Copy the original files in the port to XXX.orig (or something) For example cp Makefile Makefile.orig 2. Make your changes For example: vi Makefile 3. Now run this script which will generate a DIFF file which can be posted: run_this_script ... /tmp/changes.shar ? run_this_script ... /tmp/diffs ? 4. Post the generated file to bugzilla with an update request. Ummm... is there such a 'run_this_script' or am I indulging in wishful thinking? If the changes you make are in the ports files, porttools has a `port diff` command (which uses a reference ports tree to create diffs against. You can use /usr/ports as that reference, and in fact I believe that is the default. You can then just port diff path-to-patch-file.diff, ready for attachment into a new bugzilla issue. If the patch is against WRKSRC source code, you can a) cp WRKSRC/file WRKSRC/file.orig b) edit file c) make makepatch (from the port dir) makepatch recursively searches WRKSRC for *.orig files, and automatically creates correctly named patch-foo patch files in /files for you. Hope that helps -- koobs ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org
Re: Generating port changes easily
Hi, In previous we used porttools. You can try it out ports-mgmt/porttools. port diff will give you the required stuff provided it is configured properly. BR, Muhammad On Fri, Feb 27, 2015 at 10:35 PM, Patrick Powell papow...@astart.com wrote: I have made some modifications to a port - couple of lines in the Makefile, and an updated pkg-plist. Once upon a time I was shown a script (run_this_script?) to help with updating a port. 1. Copy the original files in the port to XXX.orig (or something) For example cp Makefile Makefile.orig 2. Make your changes For example: vi Makefile 3. Now run this script which will generate a DIFF file which can be posted: run_this_script ... /tmp/changes.shar ? run_this_script ... /tmp/diffs ? 4. Post the generated file to bugzilla with an update request. Ummm... is there such a 'run_this_script' or am I indulging in wishful thinking? -- Patrick Powell Astart Technologies papow...@astart.com1530 Jamacha Rd, Suite X Network and System San Diego, CA 92019 Consulting 858-874-6543 FAX 858-751-2435 Web: www.astart.com ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org
Re: Generating port changes easily
On Fri, 27 Feb 2015 08:35:19 -0800 Patrick Powell papow...@astart.com wrote I have made some modifications to a port - couple of lines in the Makefile, and an updated pkg-plist. Once upon a time I was shown a script (run_this_script?) to help with updating a port. 1. Copy the original files in the port to XXX.orig (or something) For example cp Makefile Makefile.orig 2. Make your changes For example: vi Makefile 3. Now run this script which will generate a DIFF file which can be posted: run_this_script ... /tmp/changes.shar ? run_this_script ... /tmp/diffs ? 4. Post the generated file to bugzilla with an update request. Ummm... is there such a 'run_this_script' or am I indulging in wishful thinking? svn(1) is your friend; #check out the currently kisted version of your port: $ svn co --depth empty svn://svn.freebsd.org/ports/head 2015-02-27 $ svn up --set-depth empty 2015-02-27/port-category $ svn up 2015-02-27/port-category/your-port-name # make your modifications to your port, then... $ cd 2015-02-27/you-port-name $ svn diff 2015-02-27.diff NOTE: if you add, or delete files in the port, you will also need to issue the appropriate command to svn(1) (delete/add) prior to creating the diff. But the real answers lie within the svn man pages. :) Also have a look at diff(1), and patch (1), diff -u -N newfile.orig newfile patch-pathname-newfile and https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/ for even greater depth to these topics. :) HTH --Chris -- Patrick Powell Astart Technologies papow...@astart.com1530 Jamacha Rd, Suite X Network and System San Diego, CA 92019 Consulting 858-874-6543 FAX 858-751-2435 Web: www.astart.com ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org ___ freebsd-ports@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org
