Tue Jul 19 01:58:05 2022 UTC ()
fixes.xml: add a comment about conflicting PKGNAME entries

While here, fix some style.


(gutteridge)
diff -r1.179 -r1.180 pkgsrc/doc/guide/files/fixes.xml
cvs diff -r1.179 -r1.180 pkgsrc/doc/guide/files/fixes.xml (expand / switch to unified diff)

--- pkgsrc/doc/guide/files/fixes.xml 2022/06/02 21:20:32 1.179
+++ pkgsrc/doc/guide/files/fixes.xml 2022/07/19 01:58:04 1.180
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1<!-- $NetBSD: fixes.xml,v 1.179 2022/06/02 21:20:32 gutteridge Exp $ --> 1<!-- $NetBSD: fixes.xml,v 1.180 2022/07/19 01:58:04 gutteridge Exp $ -->
2 2
3<chapter id="fixes"> <?dbhtml filename="fixes.html"?> 3<chapter id="fixes"> <?dbhtml filename="fixes.html"?>
4<title>Making your package work</title> 4<title>Making your package work</title>
5 5
6<sect1 id="general-operation"> 6<sect1 id="general-operation">
7 <title>General operation</title> 7 <title>General operation</title>
8 8
9 <para>One appealing feature of pkgsrc is that it runs on many 9 <para>One appealing feature of pkgsrc is that it runs on many
10 different platforms. As a result, it is important to ensure, 10 different platforms. As a result, it is important to ensure,
11 where possible, that packages in pkgsrc are portable. This 11 where possible, that packages in pkgsrc are portable. This
12 chapter mentions some particular details you should pay 12 chapter mentions some particular details you should pay
13 attention to while working on pkgsrc.</para> 13 attention to while working on pkgsrc.</para>
14 14
@@ -460,30 +460,31 @@ BUILDLINK_API_DEPENDS.jpeg+= jpeg>=9. @@ -460,30 +460,31 @@ BUILDLINK_API_DEPENDS.jpeg+= jpeg>=9.
460 <para>If your package needs files from another package to build, 460 <para>If your package needs files from another package to build,
461 add the relevant distribution files to 461 add the relevant distribution files to
462 <varname>DISTFILES</varname>, so they will be extracted 462 <varname>DISTFILES</varname>, so they will be extracted
463 automatically. See the <filename 463 automatically. See the <filename
464 role="pkg">print/ghostscript</filename> package for an example. 464 role="pkg">print/ghostscript</filename> package for an example.
465 (It relies on the jpeg sources being present in source form 465 (It relies on the jpeg sources being present in source form
466 during the build.)</para> 466 during the build.)</para>
467 </sect2> 467 </sect2>
468 468
469 469
470 <sect2 id="conflicts"> 470 <sect2 id="conflicts">
471 <title>Handling conflicts with other packages</title> 471 <title>Handling conflicts with other packages</title>
472 472
473 <para>Your package may conflict with other packages a user might 473 <para>Your package may conflict with other packages users might
474 already have installed on his system, e.g. if your package 474 already have installed on their system, e.g., if your package
475 installs the same set of files as another package in the pkgsrc 475 installs the same set of files as another package in the pkgsrc
476 tree or has the same <varname>PKGNAME</varname>.</para> 476 tree or has the same <varname>PKGNAME</varname> (though, the latter
 477 would arguably be a bug in itself).</para>
477 478
478 <para>For example, <filename role="pkg">x11/libXaw3d</filename> 479 <para>For example, <filename role="pkg">x11/libXaw3d</filename>
479 and <filename role="pkg">x11/Xaw-Xpm</filename> 480 and <filename role="pkg">x11/Xaw-Xpm</filename>
480 install the same shared library, thus you set in 481 install the same shared library, thus you set in
481 <filename>pkgsrc/x11/libXaw3d/Makefile</filename>:</para> 482 <filename>pkgsrc/x11/libXaw3d/Makefile</filename>:</para>
482 483
483 <programlisting> 484 <programlisting>
484CONFLICTS= Xaw-Xpm-[0-9]* 485CONFLICTS= Xaw-Xpm-[0-9]*
485 </programlisting> 486 </programlisting>
486 487
487 <para>and in <filename>pkgsrc/x11/Xaw-Xpm/Makefile</filename>:</para> 488 <para>and in <filename>pkgsrc/x11/Xaw-Xpm/Makefile</filename>:</para>
488 489
489 <programlisting> 490 <programlisting>