summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/guide/files/fixes.xml16
1 files changed, 15 insertions, 1 deletions
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index f003a158abe..1c85746e4a1 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.122 2013/07/09 21:06:12 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.123 2013/08/24 16:55:21 bsiegert Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Making your package work</title>
@@ -444,6 +444,20 @@ DEPENDS+= ImageMagick>=6.0:../../graphics/ImageMagick
linkend="security-handling"/> for more
information.</para>
</listitem>
+ <listitem>
+ <para>If the package depends on either one of two (or more)
+ packages, specify the <quote>pre-req-package-name</quote> as a
+ comma-separated list between curly braces.</para>
+
+ <para>As an example, take a package that depends on the Perl
+ <quote>version</quote> module, which has been part of Perl
+ itself since version 5.10.0. This either/or dependency is
+ expressed as:</para>
+
+ <programlisting>
+DEPENDS+= {perl>=5.10.0,p5-version-[0-9]*}:../../devel/p5-version
+ </programlisting>
+ </listitem>
</orderedlist>
<para>If your package needs files from another package to build,