Fix: -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--5LGI4kqMUEGc7xEgUt049m1SpoWa9BtOc6hYeUroWsf6hl6k Content-Type: text/plain; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" ? patch.txt Index: bsd.licenses.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.licenses.mk,v retrieving revision 1.9 diff -u -r1.9 bsd.licenses.mk --- bsd.licenses.mk 9 Jan 2012 15:31:27 -0000 1.9 +++ bsd.licenses.mk 7 Feb 2012 18:50:12 -0000 @@ -548,27 +548,26 @@ # Check variables are correctly defined and print status up to here +.if ${_LICENSE_STATUS} == "ask" && defined(BATCH) +IGNORE= License ${_LICENSE} needs confirmation, but BATCH is defined +.endif + check-license: .if defined(_LICENSE_ERROR) @${ECHO_MSG} "===> License not correctly defined: ${_LICENSE_ERROR}" @exit 1 .endif -. if ${_LICENSE_STATUS} == "rejected" +.if ${_LICENSE_STATUS} == "rejected" @${ECHO_MSG} "===> License ${_LICENSE} rejected by the user" @${ECHO_MSG} @${ECHO_MSG} "If you want to install this port make sure the following license(s) are not present in LICENSES_REJECTED, either in make arguments or /etc/make.conf: ${_LICENSE}. Also check LICENSES_GROUPS_REJECTED in case they contain a group this license(s) belong to." | ${FMT} @${ECHO_MSG} @exit 1 -. elif ${_LICENSE_STATUS} == "accepted" +.elif ${_LICENSE_STATUS} == "accepted" @${ECHO_MSG} "===> License ${_LICENSE} accepted by the user" -. elif ${_LICENSE_STATUS} == "ask" -. if defined(BATCH) - @${ECHO_MSG} "===> License ${_LICENSE} needs confirmation, but BATCH is defined" - @exit 1 -. else +.elif ${_LICENSE_STATUS} == "ask" @${ECHO_MSG} "===> License ${_LICENSE} needs confirmation, will ask later" -. endif -. endif +.endif # Display, ask and save preference if requested
Responsible Changed From-To: freebsd-ports-bugs->portmgr bsd.licenses.mk is portmgr territory
Responsible Changed From-To: portmgr->tabthorpe I'll take it.
tabthorpe 2012-06-26 15:27:54 UTC FreeBSD ports repository Modified files: Mk bsd.licenses.db.mk bsd.licenses.mk Log: - Set IGNORE if BATCH is set [1] - Silence some output, set LICENCE_VERBOSE to enable [2] - Add AGPLv3 as a license PR: ports/164870 [1] ports/165270 [2] ports/166066 [3] Submitted by: many Exp-run by: linimon Revision Changes Path 1.19 +5 -1 ports/Mk/bsd.licenses.db.mk 1.13 +11 -10 ports/Mk/bsd.licenses.mk _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!