ports/149070: [bsd.licenses.mk]: make license framework optional

Dmitry Marakasov amdmi3 at FreeBSD.org
Thu Jul 29 14:40:01 UTC 2010


>Number:         149070
>Category:       ports
>Synopsis:       [bsd.licenses.mk]: make license framework optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 29 14:40:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 8.0-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #2: Wed Jun 2 02:28:21 MSD 2010 root at hades.panopticon:/async/obj/usr/src/sys/HADES i386


>Description:
FreeBSD ports are known to its vast customizability, but there are no means to disable newly added license framework. The patch fixes it.

>How-To-Repeat:
>Fix:

--- optional-licenses.patch begins here ---
Index: bsd.licenses.mk
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/Mk/bsd.licenses.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.licenses.mk
--- bsd.licenses.mk	26 May 2010 02:20:27 -0000	1.2
+++ bsd.licenses.mk	29 Jul 2010 14:35:08 -0000
@@ -42,6 +42,7 @@
 # Variables provided to the ports system and users in general, to modify the
 # behavior of the framework
 #
+# DISABLE_LICENSES			- Disable license auditing framework completely.
 # NO_LICENSES_INSTALL		- Do not install catalog, report and licenses.
 # NO_LICENSES_DIALOGS		- Disable interactive menus for asking licenses.
 
@@ -119,7 +120,7 @@
 
 .if defined(_POSTMKINCLUDED) && !defined(BEFOREPORTMK)
 
-.if defined(LICENSE)
+.if defined(LICENSE) && !defined(DISABLE_LICENSES)
 
 # Include known licenses from database
 
@@ -752,17 +753,11 @@
 
 .endif
 
-.else	# !LICENSE
+.elif !defined(DISABLE_LICENSES)	# !LICENSE
 
 check-license:
 	@${ECHO_MSG} "===>  License check disabled, port has not defined LICENSE"
 
-ask-license:
-	@${DO_NADA}
-
-install-license:
-	@${DO_NADA}
-
 .endif	# LICENSE
 
 .endif
Index: bsd.port.mk
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.643
diff -u -r1.643 bsd.port.mk
--- bsd.port.mk	15 Jul 2010 14:48:50 -0000	1.643
+++ bsd.port.mk	29 Jul 2010 14:26:36 -0000
@@ -6448,6 +6448,21 @@
 .endif
 .endif
 
+.if !target(check-license)
+check-license:
+	@${DO_NADA}
+.endif
+
+.if !target(ask-license)
+ask-license:
+	@${DO_NADA}
+.endif
+
+.if !target(install-license)
+install-license:
+	@${DO_NADA}
+.endif
+
 .endif
 # End of post-makefile section.
 
--- optional-licenses.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list