summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--licenses/gfsl31
-rw-r--r--mk/license.mk3
-rw-r--r--pkgtools/pkg_install/files/lib/license.c3
3 files changed, 35 insertions, 2 deletions
diff --git a/licenses/gfsl b/licenses/gfsl
new file mode 100644
index 00000000000..5111e9971ec
--- /dev/null
+++ b/licenses/gfsl
@@ -0,0 +1,31 @@
+The GUST Font Source License (GFSL)
+
+This is a preliminary version, barring acceptance from the LaTeX
+Project Team and other feedback, of the GUST Font Source License.
+This license is for use with free fonts distributed with source
+code.
+
+For the most recent version of this license see
+http://www.gust.org.pl/fonts/licenses/GUST-FONT-SOURCE-LICENSE.txt
+or http://tug.org/fonts/licenses/GUST-FONT-SOURCE-LICENSE.txt
+
+This work may be distributed and/or modified under the conditions
+of the LaTeX Project Public License, either version 1.3a of this
+license or (at your option) any later version, provided that the
+following additional clauses are observed:
+
+1. Due to the nature of fonts, clause 6a of the LaTeX Project Public
+ License, version 1.3a, does not apply. A later version of the
+ LaTeX Project Public License may number or word this clause
+ differently; it is the substance that is important.
+
+2. It is requested, but not legally required, that derived works
+ be distributed only after changing the names of the fonts comprising
+ this work and given in the accompanying file MANIFEST.txt, and
+ that the files comprising the Work, as listed in MANIFEST.txt
+ also be given new names. Any exceptions to this request are also
+ given in MANIFEST.txt.
+
+The latest version of the LaTeX Project Public License is in
+http://www.latex-project.org/lppl.txt and version 1.3a or later is
+part of all distributions of LaTeX version 2004/10/01 or later.
diff --git a/mk/license.mk b/mk/license.mk
index b537d64a5ab..ed1235b362b 100644
--- a/mk/license.mk
+++ b/mk/license.mk
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.69 2015/04/25 10:18:42 reinoud Exp $
+# $NetBSD: license.mk,v 1.70 2015/05/02 13:21:37 wiz Exp $
#
# This file handles everything about the LICENSE variable. It is
# included automatically by bsd.pkg.mk.
@@ -113,6 +113,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
cpl-1.0 \
epl-v1.0 \
eupl-v1.1 \
+ gfsl \
gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
gnu-gpl-v1 \
gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c
index 40636f9616d..57587782910 100644
--- a/pkgtools/pkg_install/files/lib/license.c
+++ b/pkgtools/pkg_install/files/lib/license.c
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.39 2015/04/19 22:19:15 rodent Exp $ */
+/* $NetBSD: license.c,v 1.40 2015/05/02 13:21:37 wiz Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -57,6 +57,7 @@ const char *default_acceptable_licenses =
"cpl-1.0 "
"epl-v1.0 "
"eupl-v1.1 "
+ "gfsl "
"gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
"gnu-gpl-v1 "
"gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "