ports/149837: bsd.licenses.mk: a bit better way of optional license framework

[Dmitry Marakasov]

>Number:         149837
>Category:       ports
>Synopsis:       bsd.licenses.mk: a bit better way of optional license framework
>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:   Fri Aug 20 15:40:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Fri Jul 30 02:50:28 MSD 2010 root at hades.panopticon:/async/obj/usr/src/sys/HADES i386


>Description:
>How-To-Repeat:
>Fix:

Minor improvement over original way of making license framework optional - now it doesn't include bsd.licenses.mk on DISABLE_LICENSES, which should save time on parsing.

--- 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.3
diff -u -r1.3 bsd.licenses.mk
--- bsd.licenses.mk	20 Aug 2010 12:15:02 -0000	1.3
+++ bsd.licenses.mk	20 Aug 2010 15:22:23 -0000
@@ -120,7 +120,7 @@
 
 .if defined(_POSTMKINCLUDED) && !defined(BEFOREPORTMK)
 
-.if defined(LICENSE) && !defined(DISABLE_LICENSES)
+.if defined(LICENSE)
 
 # Include known licenses from database
 
@@ -754,7 +754,7 @@
 
 .endif
 
-.elif !defined(DISABLE_LICENSES)	# !LICENSE
+.else	# !LICENSE
 
 check-license:
 	@${ECHO_MSG} "===>  License check disabled, port has not defined LICENSE"
Index: bsd.port.mk
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.644
diff -u -r1.644 bsd.port.mk
--- bsd.port.mk	20 Aug 2010 12:15:02 -0000	1.644
+++ bsd.port.mk	20 Aug 2010 15:21:50 -0000
@@ -2487,7 +2487,9 @@
 INSTALL_TARGET?=	install
 
 # Integrate with the license auditing framework
+.if !defined (DISABLE_LICENSES)
 .include "${PORTSDIR}/Mk/bsd.licenses.mk"
+.endif
 
 # Popular master sites
 .include "${PORTSDIR}/Mk/bsd.sites.mk"
--- licenses.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: