Date: Fri, 22 Nov 2013 13:31:31 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43214 - head/en_US.ISO8859-1/books/porters-handbook Message-ID: <201311221331.rAMDVVYj098686@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Fri Nov 22 13:31:30 2013 New Revision: 43214 URL: http://svnweb.freebsd.org/changeset/doc/43214 Log: Replace USE_DOS2UNIX by USES=dos2unix in the running text of the Porters Handbook and add it to the list in uses.xml Approved by: gjb (mentor) Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml head/en_US.ISO8859-1/books/porters-handbook/uses.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/book.xml Fri Nov 22 13:29:29 2013 (r43213) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Fri Nov 22 13:31:30 2013 (r43214) @@ -11,7 +11,6 @@ --> <book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en"> <info><title>FreeBSD Porter's Handbook</title> - <authorgroup> <author><orgname>The FreeBSD Documentation Project</orgname></author> @@ -827,11 +826,11 @@ PLIST_DIRS= lib/X11/oneko</programlistin further patching, compiler warnings, scripts execution (e.g., <command>/bin/sh^M</command> not found.) To quickly convert all files from CR/LF to just LF, add - <literal>USE_DOS2UNIX=yes</literal> to the port + <literal>USES=dos2unix</literal> to the port <filename>Makefile</filename>. A list of files to convert can be specified:</para> - <programlisting>USE_DOS2UNIX= util.c util.h</programlisting> + <programlisting>DOS2UNIX_FILES= util.c util.h</programlisting> <para>If you want to convert a group of files across subdirectories, <varname>DOS2UNIX_REGEX</varname> can be used. @@ -841,8 +840,15 @@ PLIST_DIRS= lib/X11/oneko</programlistin extension, for example all source code files leaving binary files intact:</para> - <programlisting>USE_DOS2UNIX= yes -DOS2UNIX_REGEX= .*\.(c|cpp|h)</programlisting> + <programlisting>USES= dos2unix +DOS2UNIX_REGEX= .*\.([ch]|cpp)</programlisting> + + <para>A similar option is <varname>DOS2UNIX_GLOB</varname>, which + invokes <command>find</command> for each element listed in + it.</para> + + <programlisting>USES= dos2unix +DOS2UNIX_GLOB= *.c *.cpp *.h</programlisting> <para>If you want to create a patch file based off of an existing file, you can copy it with an Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/uses.xml Fri Nov 22 13:29:29 2013 (r43213) +++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml Fri Nov 22 13:31:30 2013 (r43214) @@ -74,6 +74,24 @@ </row> <row> + <entry><literal>dos2unix</literal></entry> + <entry>(none)</entry> + + <entry>The port has files with line endings in DOS format which need + to be converted. Three variables can be set to control which files + will be converted. The default is to convert + <emphasis>all</emphasis> files, including binaries. + <itemizedlist> + <listitem><para><varname>DOS2UNIX_REGEX</varname>: match file + names based on a regular expression.</para></listitem> + <listitem><para><varname>DOS2UNIX_FILES</varname>: match literal + file names.</para></listitem> + <listitem><para><varname>DOS2UNIX_GLOB</varname>: match file + names based on a glob pattern.</para></listitem> + </itemizedlist></entry> +</row> + +<row> <entry><literal>fuse</literal></entry> <entry>(none)</entry>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311221331.rAMDVVYj098686>