From owner-p4-projects@FreeBSD.ORG Sat Aug 15 18:10:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96F171065691; Sat, 15 Aug 2009 18:10:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43509106568F for ; Sat, 15 Aug 2009 18:10:42 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3214F8FC43 for ; Sat, 15 Aug 2009 18:10:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7FIAfN0006805 for ; Sat, 15 Aug 2009 18:10:41 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7FIAf87006803 for perforce@freebsd.org; Sat, 15 Aug 2009 18:10:41 GMT (envelope-from alepulver@freebsd.org) Date: Sat, 15 Aug 2009 18:10:41 GMT Message-Id: <200908151810.n7FIAf87006803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver To: Perforce Change Reviews Cc: Subject: PERFORCE change 167375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Aug 2009 18:10:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=167375 Change 167375 by alepulver@alepulver_deimos on 2009/08/15 18:10:10 - Fix name in GPLv2 definition (was set to groups). - Make LICENSE_GROUPS and LICENSE_GROUPS_xxx optional as documented. - Minor adjustments in bsd.licenses.mk. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.db.mk#5 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#10 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/Makefile#5 edit Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.db.mk#5 (text+ko) ==== @@ -72,7 +72,7 @@ _LICENSE_GROUPS_CDDL= FSF OSI _LICENSE_NAME_GPLv2= GNU General Public License version 2 -_LICENSE_NAME_GPLv2= FSF GPL OSI +_LICENSE_GROUPS_GPLv2= FSF GPL OSI _LICENSE_NAME_GPLv3= GNU General Public License version 3 _LICENSE_GROUPS_GPLv3= FSF GPL OSI ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#10 (text+ko) ==== @@ -240,8 +240,8 @@ . for var in ${_LICENSE_LIST_PORT_VARS} . if defined(LICENSE_${var}) _LICENSE_${var}= ${LICENSE_${var}} -. else -_LICENSE_ERROR?= for a new/unknown license, defining LICENSE_${var} is mandatory (otherwise use a known LICENSE) +. elif !defined(_LICENSE_${var}) +_LICENSE_ERROR?= for unknown licenses, defining LICENSE_${var} is mandatory (otherwise use a known LICENSE) . endif . endfor # Check LICENSE_PERMS for invalid, ambiguous and duplicate components @@ -315,8 +315,8 @@ . for var in ${_LICENSE_LIST_PORT_VARS} . if defined(LICENSE_${var}_${lic}) _LICENSE_${var}_${lic}= ${LICENSE_${var}_${lic}} -. else -_LICENSE_ERROR?= for a new/unknown license, defining LICENSE_${var}_${lic} is mandatory (otherwise use a known LICENSE) +. elif !defined(_LICENSE_${var}_${lic}) +_LICENSE_ERROR?= for unknown licenses, defining LICENSE_${var}_${lic} is mandatory (otherwise use a known LICENSE) . endif . endfor # Check LICENSE_PERMS for invalid, ambiguous and duplicate components @@ -552,7 +552,7 @@ . if ${_LICENSE_STATUS} == "rejected" @${ECHO_MSG} "===> 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} "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" @@ -657,7 +657,8 @@ @${ECHO_MSG} . if ${_LICENSE_COMB} == "single" @${ECHO_MSG} "To install the port you must agree to the license: ${_LICENSE} (${_LICENSE_NAME})." | ${FMT} - @${ECHO_MSG} "You can view the license at ${_LICENSE_FILE}." + @${ECHO_MSG} + @${ECHO_MSG} "You can view the license at ${_LICENSE_FILE:S/${WRKDIR}\//${WRKDIR:T}\//}." . elif ${_LICENSE_COMB} == "dual" @${ECHO_MSG} "To install the port you must agree to any of the following licenses:" . elif ${_LICENSE_COMB} == "multi" @@ -668,9 +669,9 @@ . for lic in ${_LICENSE_TO_ASK} @${ECHO_MSG} "- ${lic} (${_LICENSE_NAME_${lic}}), available at ${_LICENSE_FILE_${lic}:S/${WRKDIR}\//${WRKDIR:T}\//}" . endfor + @${ECHO_MSG} . endif - @${ECHO_MSG} - @${ECHO_MSG} "If you agree with the corresponding license/s, add them to LICENSES_ACCEPTED either in make arguments or /etc/make.conf." | ${FMT} + @${ECHO_MSG} "If you agree with the corresponding license(s), add them to LICENSES_ACCEPTED either in make arguments or /etc/make.conf." | ${FMT} @${ECHO_MSG} @exit 1 . endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/Makefile#5 (text+ko) ==== @@ -17,8 +17,11 @@ NO_BUILD= yes NO_WRKSUBDIR= yes -LICENSE= GPLv2 BSD CDDL +LICENSE= GPLv2 EULA LICENSE_COMB= multi +LICENSE_NAME_EULA= End User License Agreement for copyrighted data +LICENSE_PERMS_EULA= pkg-mirror dist-mirror +LICENSE_TEXT_EULA= Commercial redistribution is not allowed, either in source or binary form #LICENSE= MyLic #LICENSE= Test1 MyLic Test2 #LICENSE_COMB= dual