summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2015-07-12 18:56:06 +0000
committerwiz <wiz@pkgsrc.org>2015-07-12 18:56:06 +0000
commite3691e1ff29866f244016d7915f143710367a946 (patch)
treee627a638f10e8eb4f65a201079f6391431c359a8 /doc
parent9c2b259aee0e099eb7dbde08430e9cf2a09258a5 (diff)
downloadpkgsrc-e3691e1ff29866f244016d7915f143710367a946.tar.gz
Comment out dependencies of the style
{perl>=5.16.6,p5-ExtUtils-ParseXS>=3.15}:../../devel/p5-ExtUtils-ParseXS since pkgsrc enforces the newest perl version anyway, so they should always pick perl, but sometimes (pkg_add) don't due to the design of the {,} syntax. No effective change for the above reason. Ok joerg
Diffstat (limited to 'doc')
-rw-r--r--doc/guide/files/fixes.xml16
1 files changed, 1 insertions, 15 deletions
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 264809d648c..57ad3946dbd 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.131 2015/04/25 11:31:01 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.132 2015/07/12 18:56:21 wiz Exp $ -->
<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
<title>Making your package work</title>
@@ -444,20 +444,6 @@ 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,