summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.mk
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2009-04-08 14:47:26 +0000
committerwiz <wiz@pkgsrc.org>2009-04-08 14:47:26 +0000
commitbd09635d6cbce22a64f1da2711fcc88a02acbf3b (patch)
tree0d488d8d76d43cf437865e25c910cb9cd4341426 /mk/bsd.pkg.mk
parent8696a7e4b305ac00bda4fab6a59a91ed1d289b07 (diff)
downloadpkgsrc-bd09635d6cbce22a64f1da2711fcc88a02acbf3b.tar.gz
Switch to the license handling in license.mk.
The following licenses are accepted by default: public-domain gnu-gpl-v2 gnu-lgpl-v2 gnu-gpl-v3 gnu-lgpl-v3 original-bsd modified-bsd x11 apache-2.0 cddl-1.0 open-font-license All packages should now be converted to define their LICENSE. Show a warning when PKG_DEVELOPER is set but LICENSE is not defined.
Diffstat (limited to 'mk/bsd.pkg.mk')
-rw-r--r--mk/bsd.pkg.mk31
1 files changed, 2 insertions, 29 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 8cff26eed8b..4cb300a8b21 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1954 2009/03/20 19:25:01 joerg Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1955 2009/04/08 14:47:26 wiz Exp $
#
# This file is in the public domain.
#
@@ -83,15 +83,6 @@ PKG_FAIL_REASON+= "Circular dependency detected"
MKCRYPTO?= YES # build crypto packages by default
-##### Variant spellings
-
-.if defined(LICENCE) && !defined(LICENSE)
-LICENSE= ${LICENCE}
-.endif
-.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES)
-ACCEPTABLE_LICENSES= ${ACCEPTABLE_LICENCES}
-.endif
-
##### Others
BUILD_DEPENDS?= # empty
@@ -529,25 +520,7 @@ PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found"
PKG_FAIL_REASON+= "${PKGNAME} is marked as broken:" ${BROKEN:Q}
. endif
-. if defined(LICENSE)
-. if defined(ACCEPTABLE_LICENSES) && !empty(ACCEPTABLE_LICENSES:M${LICENSE})
-_ACCEPTABLE= yes
-. endif # ACCEPTABLE_LICENSES
-. if !defined(_ACCEPTABLE)
-. if defined(MAKECONF)
-_MAKECONF?= ${MAKECONF}
-. elif ${OPSYS} == "NetBSD" && ${MAKE} != "${PREFIX}/bin/bmake"
-_MAKECONF?= /etc/mk.conf
-. else
-_MAKECONF?= ${PREFIX}/etc/mk.conf
-. endif
-
-PKG_FAIL_REASON+= "${PKGNAME} has an unacceptable license: ${LICENSE}." \
- " To view the license, enter \"${MAKE} show-license\"." \
- " To indicate acceptance, add this line to ${_MAKECONF}:" \
- " ACCEPTABLE_LICENSES+=${LICENSE}"
-. endif # _ACCEPTABLE
-. endif # LICENSE
+.include "license.mk"
# Define __PLATFORM_OK only if the OS matches the pkg's allowed list.
. if defined(ONLY_FOR_PLATFORM) && !empty(ONLY_FOR_PLATFORM)