Attachment 136032 Details for Bug 181080 – porters-handbook.diff

[patch] porters-handbook.diff

porters-handbook.diff (text/x-diff; charset=us-ascii), 3.28 KB, created by Frederic Culot on 2013-09-01 08:22:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Culot

Created: 2013-09-01 08:22:08 UTC

Size: 3.28 KB

patch

obsolete

>Index: book.xml
>===================================================================
>--- book.xml	(revision 42606)
>+++ book.xml	(working copy)
>@@ -278,6 +278,20 @@
> 	<para>Of course, <makevar>PLIST_DIRS</makevar> should be left
> 	  unset if a port installs no directories of its own.</para>
> 
>+	<note>
>+	  <para>It is possible that several ports share a common
>+	    directory. In that case
>+	    <makevar>PLIST_DIRS</makevar> should be replaced by
>+	    <makevar>PLIST_DIRSTRY</makevar> so that the directory
>+	    is removed only if empty, otherwise it is silently
>+	    ignored. <makevar>PLIST_DIRS</makevar> and
>+	    <makevar>PLIST_DIRSTRY</makevar> are equivalent to
>+	    using <literal>@dirrm</literal> and
>+	    <literal>@dirrmtry</literal> in
>+	    <filename>pkg-plist</filename>, which are described in
>+	    <xref linkend="plist-dir-cleaning"/>.</para>
>+	</note>
>+
> 	<para>The price for this way of listing port's files and
> 	  directories is that you cannot use command sequences
> 	  described in &man.pkg.create.1;.  Therefore, it is suitable
>@@ -9918,20 +9932,25 @@
> 	<filename><makevar>TMPPLIST</makevar></filename>.</para>
> 
>       <para>Another possibility to modify port's packing list is based
>-	on setting the variables <makevar>PLIST_FILES</makevar> and
>-	<makevar>PLIST_DIRS</makevar>.  The value of each variable is
>+	on setting the variables <makevar>PLIST_FILES</makevar>,
>+	<makevar>PLIST_DIRS</makevar>, and
>+	<makevar>PLIST_DIRSTRY</makevar>.  The value of each variable is
> 	regarded as a list of pathnames to write to
> 	<filename><makevar>TMPPLIST</makevar></filename> along with
> 	<filename><makevar>PLIST</makevar></filename> contents.  Names
>-	listed in <makevar>PLIST_FILES</makevar> and
>-	<makevar>PLIST_DIRS</makevar> are subject to
>+	listed in <makevar>PLIST_FILES</makevar>,
>+	<makevar>PLIST_DIRS</makevar>, and
>+	<makevar>PLIST_DIRSTRY</makevar> are subject to
> 	<literal>%%<replaceable>VAR</replaceable>%%</literal>
> 	substitution, as described above.  Except for that, names from
> 	<makevar>PLIST_FILES</makevar> will appear in the final
>-	packing list unchanged, while <literal>@dirrm</literal> will
>-	be prepended to names from <makevar>PLIST_DIRS</makevar>.  To
>-	take effect, <makevar>PLIST_FILES</makevar> and
>-	<makevar>PLIST_DIRS</makevar> must be set before
>+	packing list unchanged, while <literal>@dirrm</literal> and
>+	<literal>@dirrmtry</literal> will
>+	be prepended to names from <makevar>PLIST_DIRS</makevar>
>+	and <makevar>PLIST_DIRSTRY</makevar>, respectively.  To
>+	take effect, <makevar>PLIST_FILES</makevar>,
>+	<makevar>PLIST_DIRS</makevar>, and
>+	<makevar>PLIST_DIRSTRY</makevar> must be set before
> 	<filename><makevar>TMPPLIST</makevar></filename> is written,
> 	i.e., in <maketarget>pre-install</maketarget> or
> 	earlier.</para>
>@@ -10059,8 +10078,9 @@
> 	<filename>pkg-plist</filename> file (with or without variable
> 	substitution), or embedded into the
> 	<filename>Makefile</filename> via
>-	<makevar>PLIST_FILES</makevar> and
>-	<makevar>PLIST_DIRS</makevar>.  Even if the contents are
>+	<makevar>PLIST_FILES</makevar>,
>+	<makevar>PLIST_DIRS</makevar>, and
>+	<makevar>PLIST_DIRSTRY</makevar>.  Even if the contents are
> 	auto-generated by a tool or a target in the Makefile
> 	<emphasis>before</emphasis> the inclusion into the Ports
> 	Collection by a committer, this is still considered a static

Actions: View | Diff

Attachments on bug 181080: 136031 | 136032