diff --git a/en_US.ISO8859-1/books/porters-handbook/book.xml b/en_US.ISO8859-1/books/porters-handbook/book.xml index 5f42fea067..fc7063aca8 100644 --- a/en_US.ISO8859-1/books/porters-handbook/book.xml +++ b/en_US.ISO8859-1/books/porters-handbook/book.xml @@ -804,10 +804,10 @@ PLIST_DIRS= lib/X11/oneko patch-src-freeglut__joystick.c. Please only use characters - [-+._a-zA-Z0-9] for naming your patches. + [-+._a-zA-Z0-9] for naming patches. Do not use any other characters besides them. Do not name - your patches like patch-aa or - patch-ab etc, always mention the path and + 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. @@ -845,8 +845,8 @@ PLIST_DIRS= lib/X11/oneko 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. If you - take a working piece of functionality from one project to fix + 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 @@ -854,35 +854,39 @@ PLIST_DIRS= lib/X11/oneko hard to find out what exactly caused the problem and what was changed at all. - If you had to delete a file, then you can do it in the + If a file must be deleted, do it in the post-extract target rather than as part of the patch. Simple replacements can be performed directly from the port Makefile using the in-place mode of - &man.sed.1;. This is very useful when you need to patch in a - variable value. Example: + &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 Quite often, software being ported uses the CR/LF - convention for its source files. This may cause problems with - further patching, compiler warnings, scripts execution (e.g., - /bin/sh^M not found.) To quickly convert - all files from CR/LF to just LF, add - USES=dos2unix to the port - Makefile. A list of files to convert can - be specified: + convention in source files. This may cause problems with + further patching, compiler warnings, or script execution (like + /bin/sh^M not found.) To quickly convert + all files from CR/LF to just LF, add this entry + to the port + Makefile: - DOS2UNIX_FILES= util.c util.h + USES= dos2unix - If you want to convert a group of files across - subdirectories, DOS2UNIX_REGEX can be used. - Its argument is a find compatible regular + A list of specific files to convert can + be given: + + USES= dos2unix +DOS2UNIX_FILES= util.c util.h + + 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 all source code files leaving binary + extension. For example, convert all source code files, leaving binary files intact: USES= dos2unix