[Midnightbsd-cvs] mports [17923] U trunk/Mk/components: allow magus to build packages with ask license type
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Dec 23 08:18:54 EST 2014
Revision: 17923
http://svnweb.midnightbsd.org/mports/?rev=17923
Author: laffer1
Date: 2014-12-23 08:18:53 -0500 (Tue, 23 Dec 2014)
Log Message:
-----------
allow magus to build packages with ask license type
Modified Paths:
--------------
trunk/Mk/components/licenses.mk
Property Changed:
----------------
trunk/Mk/components/default-versions.mk
trunk/Mk/components/licenses.db.mk
trunk/Mk/components/licenses.mk
trunk/Mk/components/ssp.mk
Index: trunk/Mk/components/default-versions.mk
===================================================================
--- trunk/Mk/components/default-versions.mk 2014-12-23 13:13:45 UTC (rev 17922)
+++ trunk/Mk/components/default-versions.mk 2014-12-23 13:18:53 UTC (rev 17923)
Property changes on: trunk/Mk/components/default-versions.mk
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/Mk/components/licenses.db.mk
===================================================================
--- trunk/Mk/components/licenses.db.mk 2014-12-23 13:13:45 UTC (rev 17922)
+++ trunk/Mk/components/licenses.db.mk 2014-12-23 13:18:53 UTC (rev 17923)
Property changes on: trunk/Mk/components/licenses.db.mk
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/Mk/components/licenses.mk
===================================================================
--- trunk/Mk/components/licenses.mk 2014-12-23 13:13:45 UTC (rev 17922)
+++ trunk/Mk/components/licenses.mk 2014-12-23 13:18:53 UTC (rev 17923)
@@ -446,8 +446,13 @@
# Check variables are correctly defined and print status up to here
.if ${_LICENSE_STATUS} == "ask" && defined(BATCH)
+# Allow magus to build packages anyway
+.if defined(PACKAGE_BUILDING)
+_LICENSE_STATUS= "accepted"
+.else
IGNORE= License ${_LICENSE} needs confirmation, but BATCH is defined
.endif
+.endif
check-license:
.if defined(_LICENSE_ERROR)
Property changes on: trunk/Mk/components/licenses.mk
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/Mk/components/ssp.mk
===================================================================
--- trunk/Mk/components/ssp.mk 2014-12-23 13:13:45 UTC (rev 17922)
+++ trunk/Mk/components/ssp.mk 2014-12-23 13:18:53 UTC (rev 17923)
Property changes on: trunk/Mk/components/ssp.mk
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list