pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/doc



Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Sep 10 12:12:34 UTC 2018

Modified Files:
        pkgsrc/doc: pkgsrc.html pkgsrc.txt

Log Message:
doc/pkgsrc.*: regen


To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 pkgsrc/doc/pkgsrc.html
cvs rdiff -u -r1.250 -r1.251 pkgsrc/doc/pkgsrc.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.254 pkgsrc/doc/pkgsrc.html:1.255
--- pkgsrc/doc/pkgsrc.html:1.254        Tue Jul 24 23:44:22 2018
+++ pkgsrc/doc/pkgsrc.html      Mon Sep 10 12:12:34 2018
@@ -7109,25 +7109,31 @@ DEPENDS+=       ImageMagick>=6.0:../.
     already have installed on his system, e.g. if your package
     installs the same set of files as another package in the pkgsrc
     tree or has the same <code class="varname">PKGNAME</code>.</p>
-<p>These cases are handled automatically by the packaging tools
-    at package installation time and do not need to be handled
-    manually.</p>
-<p>In case the conflicts can not be recognized automatically
-    (e.g., packages using the same config file location but no other
-    shared files), you can set <code class="varname">CONFLICTS</code> to a
-    space-separated list of packages (including version string) your
-    package conflicts with.</p>
-<p>For example, if both <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/foo/bar/README.html"; target="_top"><code class="filename">foo/bar</code></a>
-    and <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/foo/baz/README.html"; target="_top"><code class="filename">foo/baz</code></a>
-    use the same config file, you would set in
-    <code class="filename">foo/bar/Makefile</code>:</p>
-<pre class="programlisting">
-CONFLICTS=      baz-[0-9]*
-</pre>
-<p>and in <code class="filename">pkgsrc/foo/baz/Makefile</code>:</p>
-<pre class="programlisting">
-CONFLICTS=      bar-[0-9]*
-</pre>
+<p>For example, <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/libXaw3d/README.html"; target="_top"><code class="filename">x11/libXaw3d</code></a>
+    and <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/Xaw-Xpm/README.html"; target="_top"><code class="filename">x11/Xaw-Xpm</code></a>
+    install the same shared library, thus you set in
+    <code class="filename">pkgsrc/x11/libXaw3d/Makefile</code>:</p>
+<pre class="programlisting">
+CONFLICTS=      Xaw-Xpm-[0-9]*
+    </pre>
+<p>and in <code class="filename">pkgsrc/x11/Xaw-Xpm/Makefile</code>:</p>
+<pre class="programlisting">
+CONFLICTS=      libXaw3d-[0-9]*
+    </pre>
+<p><a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?pkg_add+1.i386+NetBSD-7.1.2";><span class="citerefentry"><span class="refentrytitle">pkg_add</span>(1)</span></a> is able to 
detect attempts to install packages
+    that conflict with existing packages and abort. However, in many
+    situations this is too late in the process. Binary package managers
+    will not know about the conflict until they attempt to install the
+    package after already downloading it and all its dependencies.
+    Users may also waste time building a package and its dependencies
+    only to find out at the end that it conflicts with another package
+    they have installed.</p>
+<p>To avoid these issues <code class="varname">CONFLICTS</code> entries
+    should be added in all cases where it is known that packages conflict
+    with each other.  These <code class="varname">CONFLICTS</code> entries are
+    exported in <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?pkg_summary+5.i386+NetBSD-7.1.2";><span class="citerefentry"><span 
class="refentrytitle">pkg_summary</span>(5)</span></a> files and consumed by binary package
+    managers to inform users that packages cannot be installed onto
+    the target system.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
@@ -8833,7 +8839,7 @@ place.</p></li>
        and if you still don't have the answer, ask on the
        <code class="literal">pkgsrc-users</code> mailing list.</p>
 <div class="qandaset">
-<a name="idm79114832"></a><dl>
+<a name="idm79174480"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
        MAKEFLAGS, .MAKEFLAGS and
        MAKE_FLAGS?</a>
@@ -8878,7 +8884,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm79114448"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm79174096"></a><p><b>22.1.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
        <code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
@@ -8894,7 +8900,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm79102160"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm79161808"></a><p><b>22.2.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
        <code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
@@ -8912,7 +8918,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm79097808"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm79157456"></a><p><b>22.3.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
        <code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
@@ -8930,7 +8936,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm79093584"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm79145040"></a><p><b>22.4.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
        <code class="varname">BUILDLINK_LDFLAGS</code>,
@@ -8943,7 +8949,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm79091408"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm79142864"></a><p><b>22.5.</b></p>
 </td>
 <td align="left" valign="top"><p>Why does <span class="command"><strong>make show-var
        VARNAME=BUILDLINK_PREFIX.<em class="replaceable"><code>foo</code></em></strong></span>
@@ -8959,7 +8965,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm79088336"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm79139664"></a><p><b>22.6.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
        <code class="code">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -8983,7 +8989,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm79081424"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm79132880"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
        developers?</p></td>
@@ -9008,7 +9014,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm79077584"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm79129040"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
        documentation?</p></td>
@@ -9056,7 +9062,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm79071184"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm79122512"></a><p><b>22.9.</b></p>
 </td>
 <td align="left" valign="top"><p>I have a little time to kill.  What shall I
 do?</p></td>

Index: pkgsrc/doc/pkgsrc.txt
diff -u pkgsrc/doc/pkgsrc.txt:1.250 pkgsrc/doc/pkgsrc.txt:1.251
--- pkgsrc/doc/pkgsrc.txt:1.250 Tue Jul 24 23:44:22 2018
+++ pkgsrc/doc/pkgsrc.txt       Mon Sep 10 12:12:34 2018
@@ -5932,22 +5932,29 @@ Your package may conflict with other pac
 installed on his system, e.g. if your package installs the same set of files as
 another package in the pkgsrc tree or has the same PKGNAME.
 
-These cases are handled automatically by the packaging tools at package
-installation time and do not need to be handled manually.
+For example, x11/libXaw3d and x11/Xaw-Xpm install the same shared library, thus
+you set in pkgsrc/x11/libXaw3d/Makefile:
 
-In case the conflicts can not be recognized automatically (e.g., packages using
-the same config file location but no other shared files), you can set CONFLICTS
-to a space-separated list of packages (including version string) your package
-conflicts with.
+CONFLICTS=      Xaw-Xpm-[0-9]*
 
-For example, if both foo/bar and foo/baz use the same config file, you would
-set in foo/bar/Makefile:
 
-CONFLICTS=      baz-[0-9]*
+and in pkgsrc/x11/Xaw-Xpm/Makefile:
 
-and in pkgsrc/foo/baz/Makefile:
+CONFLICTS=      libXaw3d-[0-9]*
 
-CONFLICTS=      bar-[0-9]*
+
+pkg_add(1) is able to detect attempts to install packages that conflict with
+existing packages and abort. However, in many situations this is too late in
+the process. Binary package managers will not know about the conflict until
+they attempt to install the package after already downloading it and all its
+dependencies. Users may also waste time building a package and its dependencies
+only to find out at the end that it conflicts with another package they have
+installed.
+
+To avoid these issues CONFLICTS entries should be added in all cases where it
+is known that packages conflict with each other. These CONFLICTS entries are
+exported in pkg_summary(5) files and consumed by binary package managers to
+inform users that packages cannot be installed onto the target system.
 
 19.1.7. Packages that cannot or should not be built
 



Home | Main Index | Thread Index | Old Index