From owner-svn-doc-all@FreeBSD.ORG Thu Feb 6 17:47:55 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36A728FC; Thu, 6 Feb 2014 17:47:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1380A118D; Thu, 6 Feb 2014 17:47:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16HlsN3047592; Thu, 6 Feb 2014 17:47:54 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16HlsmN047591; Thu, 6 Feb 2014 17:47:54 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201402061747.s16HlsmN047591@svn.freebsd.org> From: Warren Block Date: Thu, 6 Feb 2014 17:47:54 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43810 - head/en_US.ISO8859-1/books/porters-handbook X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Feb 2014 17:47:55 -0000 Author: wblock Date: Thu Feb 6 17:47:54 2014 New Revision: 43810 URL: http://svnweb.freebsd.org/changeset/doc/43810 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/book.xml Thu Feb 6 17:44:01 2014 (r43809) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Thu Feb 6 17:47:54 2014 (r43810) @@ -763,8 +763,7 @@ PLIST_DIRS= lib/X11/oneko&prompt.user; cp file file.orig - Patches are - saved into files named + Patches are saved into files named patch-* where * indicates the pathname of the file that is patched, such as @@ -785,18 +784,17 @@ PLIST_DIRS= lib/X11/oneko&prompt.user; diff -u -N newfile.orig newfile > patch-pathname-newfile - Patch files are - stored in PATCHDIR (usually - files/, from where they will be - automatically applied. All patches must be relative to - WRKSRC (generally the directory the port's - tarball unpacks itself into, that being where the build is - done). To make fixes and upgrades easier, avoid + Patch files are stored in PATCHDIR + (usually files/, from + where they will be automatically applied. All patches must be + relative to WRKSRC (generally the directory + the port's tarball unpacks itself into, that being where the + build is done). To make fixes and upgrades easier, avoid having more than one patch fix the same file (that is, patch-file and patch-file2 both changing - WRKSRC/foobar.c). - Note that if the path of a patched file contains an underscore + WRKSRC/foobar.c). Note that if the path + of a patched file contains an underscore (_) character, the patch needs to have two underscores instead in its name. For example, to patch a file named src/freeglut_joystick.c, the @@ -804,18 +802,19 @@ PLIST_DIRS= lib/X11/onekopatch-src-freeglut__joystick.c. Please only use characters - [-+._a-zA-Z0-9] for naming patches. - Do not use any other characters besides them. Do not name - patches like patch-aa or + [-+._a-zA-Z0-9] for naming patches. Do not + use any other characters besides them. Do not name patches + like patch-aa or patch-ab, always mention the path and file name in patch names. - There is an alternate, easier method for creating patches to existing files. - The first steps are the same, make a copy of the unmodified file with an - .orig extension, then make modifications. - Then use make makepatch - to write updated patch files to the - files directory of the port. + There is an alternate, easier method for creating patches + to existing files. The first steps are the same, make a copy + of the unmodified file with an .orig + extension, then make modifications. Then use + make makepatch to write updated patch files + to the files directory of the + port. Do not put RCS strings in patches. Subversion will mangle them when we @@ -838,21 +837,20 @@ PLIST_DIRS= lib/X11/onekoautoconf to regenerate configure, do not take the diffs of configure (it often grows to a few thousand - lines!). Instead, define USE_AUTOTOOLS=autoconf:261 - and take the diffs of - configure.in. - - Try to minimize the amount of non-functional - whitespace changes in patches. It is common in the Open - Source world for projects to share large amounts of a code - base, but obey different style and indenting rules. When - taking a working piece of functionality from one project to fix - similar areas in another, please be careful: the resulting - line patch may be full of non-functional changes. It not only - increases the size of the - Subversion repository but makes it - hard to find out what exactly caused the problem and what was - changed at all. + lines!). Instead, define + USE_AUTOTOOLS=autoconf:261 and take the + diffs of configure.in. + + Try to minimize the amount of non-functional whitespace + changes in patches. It is common in the Open Source world for + projects to share large amounts of a code base, but obey + different style and indenting rules. When taking a working + piece of functionality from one project to fix similar areas + in another, please be careful: the resulting line patch may be + full of non-functional changes. It not only increases the + size of the Subversion repository + but makes it hard to find out what exactly caused the problem + and what was changed at all. If a file must be deleted, do it in the post-extract target rather than as @@ -860,7 +858,8 @@ PLIST_DIRS= lib/X11/onekoSimple replacements can be performed directly from the port Makefile using the in-place mode of - &man.sed.1;. This is useful when changes use the value of a variable: + &man.sed.1;. This is useful when changes use the value of a + variable: post-patch: @${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README @@ -869,8 +868,7 @@ PLIST_DIRS= lib/X11/oneko/bin/sh^M not found.) To quickly convert - all files from CR/LF to just LF, add this entry - to the port + all files from CR/LF to just LF, add this entry to the port Makefile: USES= dos2unix @@ -882,12 +880,12 @@ PLIST_DIRS= lib/X11/oneko Use DOS2UNIX_REGEX to convert a group - of files across subdirectories. - Its argument is a &man.find.1;-compatible regular - expression. More on the format is in &man.re.format.7;. This - option is useful for converting all files of a given - extension. For example, convert all source code files, leaving binary - files intact: + of files across subdirectories. Its argument is a + &man.find.1;-compatible regular expression. More on the + format is in &man.re.format.7;. This option is useful for + converting all files of a given extension. For example, + convert all source code files, leaving binary files + intact: USES= dos2unix DOS2UNIX_REGEX= .*\.([ch]|cpp)