From e7b199c42cfffc6025e27fb1c804d8176bacb636 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 1 Apr 2011 13:11:07 +0000 Subject: Allow GNU GPL v1 by default. --- mk/license.mk | 3 ++- pkgtools/pkg_install/files/lib/license.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mk/license.mk b/mk/license.mk index 3693ffdc56c..dd0f6834677 100644 --- a/mk/license.mk +++ b/mk/license.mk @@ -1,4 +1,4 @@ -# $NetBSD: license.mk,v 1.39 2011/03/17 22:58:10 bad Exp $ +# $NetBSD: license.mk,v 1.40 2011/04/01 13:11:07 wiz Exp $ # # This file handles everything about the LICENSE variable. It is # included automatically by bsd.pkg.mk. @@ -100,6 +100,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \ public-domain unlicense \ 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 \ gnu-gpl-v3 gnu-lgpl-v3 \ original-bsd modified-bsd 2-clause-bsd \ diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c index c5ce6118887..68aacdc1bf8 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.17 2011/03/17 23:07:52 bad Exp $ */ +/* $NetBSD: license.c,v 1.18 2011/04/01 13:11:08 wiz Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger . @@ -48,6 +48,7 @@ const char *default_acceptable_licenses = "public-domain unlicense" "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 " "gnu-gpl-v3 gnu-lgpl-v3 " "original-bsd modified-bsd 2-clause-bsd " -- cgit v1.2.3