diff options
| author | tron <tron@pkgsrc.org> | 2000-06-05 07:25:13 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2000-06-05 07:25:13 +0000 |
| commit | 355d5b6ef485a60caa34dd12353fbc7b090a77c1 (patch) | |
| tree | 2dabb1ec6f0a98fb5f7361e3b4751806e9b69c61 /mk | |
| parent | ea454ebc2ef3571fd277e0e9de83094d830db321 (diff) | |
| download | pkgsrc-355d5b6ef485a60caa34dd12353fbc7b090a77c1.tar.gz | |
Restructure test for "${LICENCE}" so that "${ONLY_FOR_PLATFORM}" will
not be ignored if a the licence is acceptable.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e4c4a6cb930..f30e2ce39db 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.476 2000/06/04 17:56:15 rh Exp $ +# $NetBSD: bsd.pkg.mk,v 1.477 2000/06/05 07:25:13 tron Exp $ # # This file is in the public domain. # @@ -914,7 +914,8 @@ IGNORE= "is restricted: ${RESTRICTED}" IGNORE= "uses X11, but ${X11BASE} not found" .elif defined(BROKEN) IGNORE= "is marked as broken: ${BROKEN}" -.elif defined(LICENSE) +.else +.if defined(LICENSE) .ifdef ACCEPTABLE_LICENSES .for _lic in ${ACCEPTABLE_LICENSES} .if ${LICENSE} == "${_lic}" @@ -927,26 +928,28 @@ IGNORE= "Unacceptable license: ${LICENSE}." \ " To build this package, add this line to your /etc/mk.conf:" \ " ACCEPTABLE_LICENSES+=${LICENSE}" .endif # _ACCEPTABLE -.else # This can't be in an "elif": +.endif # LICENSE # Define __PLATFORM_OK only if the OS matches the pkg's allowed list. -. if defined(ONLY_FOR_PLATFORM) && !empty(ONLY_FOR_PLATFORM) -. for __tmp__ in ${ONLY_FOR_PLATFORM} -. if ${MACHINE_PLATFORM:M${__tmp__}} != "" +.if !defined(IGNORE) +.if defined(ONLY_FOR_PLATFORM) && !empty(ONLY_FOR_PLATFORM) +.for __tmp__ in ${ONLY_FOR_PLATFORM} +.if ${MACHINE_PLATFORM:M${__tmp__}} != "" __PLATFORM_OK?= yes -. endif # MACHINE_PLATFORM -. endfor # __tmp__ -. else # !ONLY_FOR_PLATFORM +.endif # MACHINE_PLATFORM +.endfor # __tmp__ +.else # !ONLY_FOR_PLATFORM __PLATFORM_OK?= yes -. endif # ONLY_FOR_PLATFORM -. for __tmp__ in ${NOT_FOR_PLATFORM} -. if ${MACHINE_PLATFORM:M${__tmp__}} != "" -. undef __PLATFORM_OK -. endif # MACHINE_PLATFORM -. endfor # __tmp__ -. if !defined(__PLATFORM_OK) +.endif # ONLY_FOR_PLATFORM +.for __tmp__ in ${NOT_FOR_PLATFORM} +.if ${MACHINE_PLATFORM:M${__tmp__}} != "" +.undef __PLATFORM_OK +.endif # MACHINE_PLATFORM +.endfor # __tmp__ +.if !defined(__PLATFORM_OK) IGNORE= "is not available for ${MACHINE_PLATFORM}" -. endif # !__PLATFORM_OK -.endif # .elif row +.endif # !__PLATFORM_OK +.endif # IGNORE +.endif # IGNORE .if defined(IGNORE) .if defined(IGNORE_SILENT) |