CVS commit: pkgsrc/doc/guide/files

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar 20 14:41:07 UTC 2025

Modified Files:
        pkgsrc/doc/guide/files: fixes.xml

Log Message:
doc: describe AND and OR keywords for LICENSE


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 pkgsrc/doc/guide/files/fixes.xml

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

Modified files:

Index: pkgsrc/doc/guide/files/fixes.xml
diff -u pkgsrc/doc/guide/files/fixes.xml:1.201 pkgsrc/doc/guide/files/fixes.xml:1.202
--- pkgsrc/doc/guide/files/fixes.xml:1.201      Sat Feb 22 17:17:25 2025
+++ pkgsrc/doc/guide/files/fixes.xml    Thu Mar 20 14:41:07 2025
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.201 2025/02/22 17:17:25 rillig Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.202 2025/03/20 14:41:07 wiz Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
@@ -142,6 +142,17 @@ LICENSE=        xv-license
 *** Error code 1
 </programlisting>
 
+    <para>In case a package requires multiple licenses, you can add all of
+    them to the LICENSE variable, connected with the upper-case keyword
+    <varname>AND</varname>. If the user has a choice between multiple
+    licenses, you can add them connected with the upper-case keyword
+    <varname>OR</varname>, for example:</para>
+
+<programlisting>
+LICENSE=        isc AND apache-2.0
+LICENSE=        2-clause-bsd OR ruby-license
+</programlisting>
+
     <para>The license can be viewed with <command>make
     show-license</command>, and if the user so chooses, the line
     printed above can be added to &mk.conf; to