diff options
| author | wiz <wiz@pkgsrc.org> | 2009-05-18 10:01:37 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-05-18 10:01:37 +0000 |
| commit | c617a12fd940b6b0a1fae427c80a197adc8773d4 (patch) | |
| tree | 0ae96dbdc7c5ba5b2fb8033b905a3c3638267af6 /pkgtools | |
| parent | d3c5315f603c373c53b67d80cea3c333525d821f (diff) | |
| download | pkgsrc-c617a12fd940b6b0a1fae427c80a197adc8773d4.tar.gz | |
Sync default-accepted licenses with pkgsrc/mk/licenses.mk.
Bump version to 20090518.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/lib/license.c | 12 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c index 1516a85a1da..ac8e3f5ea63 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.1 2009/04/25 21:31:14 joerg Exp $ */ +/* $NetBSD: license.c,v 1.2 2009/05/18 10:01:37 wiz Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -47,13 +47,15 @@ const char *default_acceptable_licenses = "public-domain " - "gnu-gpl-v2 " - "gnu-lgpl-v2 gnu-lgpl-v2.1 " + "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 " + "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 " "gnu-gpl-v3 gnu-lgpl-v3 " - "original-bsd modified-bsd x11 " - "apache-2.0 " + "original-bsd modified-bsd " + "x11 " + "apache-1.1 apache-2.0 " "artistic artistic-2.0 " "cddl-1.0 " + "cpl-1.0 " "open-font-license "; #ifdef DEBUG diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 4d20ceeffb5..8bd27f7f671 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.127 2009/05/13 03:33:50 joerg Exp $ */ +/* $NetBSD: version.h,v 1.128 2009/05/18 10:01:37 wiz Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -27,6 +27,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION "20090513" +#define PKGTOOLS_VERSION "20090518" #endif /* _INST_LIB_VERSION_H_ */ |