diff options
| author | mycroft <mycroft> | 1998-07-13 13:08:06 +0000 |
|---|---|---|
| committer | mycroft <mycroft> | 1998-07-13 13:08:06 +0000 |
| commit | 588a6575915910b59df20a62280e7ad20b1ab0a7 (patch) | |
| tree | d3ddc97627feea0c9e64e17f900c0a975481b545 /mk | |
| parent | 490275e521d3c48a480f8d8767f7044208131001 (diff) | |
| download | pkgsrc-588a6575915910b59df20a62280e7ad20b1ab0a7.tar.gz | |
We use American English.
licence -> license
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 14 | ||||
| -rw-r--r-- | mk/mk.conf.example | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a231b6e3516..9308ed973fb 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.114 1998/07/12 09:41:25 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.115 1998/07/13 13:08:06 mycroft Exp $ # # This file is in the public domain. # @@ -569,16 +569,16 @@ IGNORE= "is restricted: ${RESTRICTED}" IGNORE= "uses X11, but ${X11BASE} not found" .elif defined(BROKEN) IGNORE= "is marked as broken: ${BROKEN}" -.elif defined(LICENCE) -.ifdef ACCEPTABLE_LICENCES -.for _lic in ${ACCEPTABLE_LICENCES} -.if ${LICENCE} == "${_lic}" +.elif defined(LICENSE) +.ifdef ACCEPTABLE_LICENSES +.for _lic in ${ACCEPTABLE_LICENSES} +.if ${LICENSE} == "${_lic}" _ACCEPTABLE= yes .endif .endfor # _lic -.endif # ACCEPTABLE_LICENCES +.endif # ACCEPTABLE_LICENSES .ifndef _ACCEPTABLE -IGNORE= "Unacceptable licence: ${LICENCE}" +IGNORE= "Unacceptable license: ${LICENSE}" .endif .endif diff --git a/mk/mk.conf.example b/mk/mk.conf.example index cc4a62c2176..16d2081ac88 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.18 1998/07/06 15:10:48 agc Exp $ +# $NetBSD: mk.conf.example,v 1.19 1998/07/13 13:08:06 mycroft Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values # for building either NetBSD or some of the NetBSD packages collection @@ -45,10 +45,10 @@ MANZ= 1 # gzip manual pages at installation time # Possible: defined, not defined # Default: not defined -#ACCEPTABLE_LICENCES= shareware non-commercial-use +#ACCEPTABLE_LICENSES= shareware non-commercial-use # Whitespace-delimited list of the types of - # licence which are acceptable for installation. - # (apart from standard "free" licences such as + # license which are acceptable for installation. + # (apart from standard "free" licenses such as # Berkeley/CMU and GPL). # Possible: shareware, non-commercial-use # |