From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 29 14:40:01 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CF8B106566C for ; Thu, 29 Jul 2010 14:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 361098FC0A for ; Thu, 29 Jul 2010 14:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TEe1fe032542 for ; Thu, 29 Jul 2010 14:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6TEe1wb032541; Thu, 29 Jul 2010 14:40:01 GMT (envelope-from gnats) Resent-Date: Thu, 29 Jul 2010 14:40:01 GMT Resent-Message-Id: <201007291440.o6TEe1wb032541@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF7311065675 for ; Thu, 29 Jul 2010 14:36:29 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.116.15]) by mx1.freebsd.org (Postfix) with ESMTP id 7BA118FC1E for ; Thu, 29 Jul 2010 14:36:28 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.71) (envelope-from ) id 1OeUDj-0007ZX-66 for FreeBSD-gnats-submit@freebsd.org; Thu, 29 Jul 2010 18:36:27 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id E1CC0B865 for ; Thu, 29 Jul 2010 18:36:25 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 1000) id D437FB84E; Thu, 29 Jul 2010 18:36:25 +0400 (MSD) Message-Id: <20100729143625.D437FB84E@hades.panopticon> Date: Thu, 29 Jul 2010 18:36:25 +0400 (MSD) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/149070: [bsd.licenses.mk]: make license framework optional X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2010 14:40:01 -0000 >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@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: