diff options
| author | hubertf <hubertf> | 1999-12-16 03:20:35 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1999-12-16 03:20:35 +0000 |
| commit | 74ab091b45952f33d7bbda069bdbe5421433f108 (patch) | |
| tree | b98bbbc1e9f9517adf445424839ef78ed93b58a7 /mk | |
| parent | 122db7e7ab323628d057ee489edca6be1a91cd61 (diff) | |
| download | pkgsrc-74ab091b45952f33d7bbda069bdbe5421433f108.tar.gz | |
This patch cleans up our message for unacceptable licenses:
miyu% make
===> xephem-3.1 Unacceptable license: no-commercial-use.
To build this package, add this line to your /etc/mk.conf:
ACCEPTABLE_LICENSES+=no-commercial-use
To do this, we need to change the semantics of the IGNORE variable. It is
no longer taken as one variable, but rather as one variable with several
lines, seperated by whitespace. Each line will be printed on it's own.
In addition, the code for the IGNORE_FAIL has been slightly moved around
so IGNORE_SILENT can be used together with IGNORE_FAIL now. (does someone
use this?).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 984e64c672d..5323484076f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.375 1999/12/07 08:55:58 sakamoto Exp $ +# $NetBSD: bsd.pkg.mk,v 1.376 1999/12/16 03:20:35 hubertf Exp $ # # This file is in the public domain. # @@ -833,17 +833,24 @@ _ACCEPTABLE= yes .endfor # _lic .endif # ACCEPTABLE_LICENSES .ifndef _ACCEPTABLE -IGNORE= "Unacceptable license: ${LICENSE} - set ACCEPTABLE_LICENSES in /etc/mk.conf to include ${LICENSE} to make this package" +IGNORE= "Unacceptable license: ${LICENSE}." \ + " To build this package, add this line to your /etc/mk.conf:" \ + " ACCEPTABLE_LICENSES+=${LICENSE}" .endif .endif .if defined(IGNORE) -.if defined(IGNORE_FAIL) -IGNORECMD?= ${ECHO} "===> ${PKGNAME} ${IGNORE}." && ${FALSE} -.elif defined(IGNORE_SILENT) +.if defined(IGNORE_SILENT) IGNORECMD?= ${DO_NADA} .endif -IGNORECMD?= ${ECHO_MSG} "===> ${PKGNAME} ${IGNORE}." +IGNORECMD?= ${ECHO} -n "===> ${PKGNAME} " ; \ + for str in ${IGNORE} ; \ + do \ + ${ECHO} "$$str" ; \ + done +.if defined(IGNORE_FAIL) +IGNORECMD+= && ${FALSE} +.endif fetch checksum extract patch configure all build install deinstall package \ depends check-depends: @${IGNORECMD} |