diff options
| author | ryoon <ryoon@pkgsrc.org> | 2011-05-08 10:53:22 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2011-05-08 10:53:22 +0000 |
| commit | 470413bfa106a67e583ea8e8fda3c49dac2fd0af (patch) | |
| tree | a33448bcc48b10b5feef1e0887e9555d00ed2f75 | |
| parent | e21544c6d9f35bde271656841f637083eb544f00 (diff) | |
| download | pkgsrc-470413bfa106a67e583ea8e8fda3c49dac2fd0af.tar.gz | |
Add mplusfont and cc-by-sa-v3.0 to the default list.
| -rw-r--r-- | mk/license.mk | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/license.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mk/license.mk b/mk/license.mk index bbb4389d690..7771e36ac7f 100644 --- a/mk/license.mk +++ b/mk/license.mk @@ -1,4 +1,4 @@ -# $NetBSD: license.mk,v 1.41 2011/04/22 08:09:00 adam Exp $ +# $NetBSD: license.mk,v 1.42 2011/05/08 10:53:22 ryoon Exp $ # # This file handles everything about the LICENSE variable. It is # included automatically by bsd.pkg.mk. @@ -117,7 +117,9 @@ DEFAULT_ACCEPTABLE_LICENSES= \ python-software-foundation \ ipafont \ isc \ - boost-license + boost-license \ + mplusfont \ + cc-by-sa-v3.0 # not approved by OSI, derived from BSD DEFAULT_ACCEPTABLE_LICENSES+= info-zip diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c index c41019b581d..02e95354848 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.19 2011/04/22 08:16:42 adam Exp $ */ +/* $NetBSD: license.c,v 1.20 2011/05/08 10:53:22 ryoon Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -66,7 +66,9 @@ const char *default_acceptable_licenses = "ipafont " "isc " "info-zip " - "boost-license"; + "boost-license " + "mplusfont " + "cc-by-sa-v3.0"; #ifdef DEBUG static size_t hash_collisions; |