From owner-p4-projects@FreeBSD.ORG Sat Jun 13 20:51:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA4A01065672; Sat, 13 Jun 2009 20:51:29 +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 6A767106566C for ; Sat, 13 Jun 2009 20:51:29 +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 588928FC14 for ; Sat, 13 Jun 2009 20:51:29 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5DKpQLm074809 for ; Sat, 13 Jun 2009 20:51:26 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5DKpIfa074802 for perforce@freebsd.org; Sat, 13 Jun 2009 20:51:18 GMT (envelope-from alepulver@freebsd.org) Date: Sat, 13 Jun 2009 20:51:18 GMT Message-Id: <200906132051.n5DKpIfa074802@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 164292 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, 13 Jun 2009 20:51:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=164292 Change 164292 by alepulver@alepulver_deimos on 2009/06/13 20:51:13 - Add packaging restriction for GPLv3. - Allow not defining license groups for particular cases. - Avoid (non-fatal) error if license checksum is was not present. - Add "@dirrmtry share/licenses" to avoid leftovers in the test build, as all ports save license information (and licenses themselves, if nonstandard) to "share/licenses/${UNIQUENAME}"). Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.db.mk#3 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#7 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#6 edit Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.db.mk#3 (text+ko) ==== @@ -49,6 +49,7 @@ _LICENSE_NAME_GPLv2= GNU General Public License version 2 _LICENSE_NAME_GPLv3= GNU General Public License version 3 +_LICENSE_PERMS_GPLv3= no-pkg _LICENSE_NAME_LGPL= GNU Lesser General Public License ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#7 (text+ko) ==== @@ -205,9 +205,10 @@ . endif . endfor . endif -# XXX here it does not affect _LICENSE_TYPE +# XXX Some defaults (here they do not affect _LICENSE_TYPE). _LICENSE_COMPAT?= # _LICENSE_INCOMPAT?= # +_LICENSE_GROUPS?= # # Check everything needed is defined. . for var in ${_LICENSE_LIST_PORT_VARS} . if !defined(_LICENSE_${var}) @@ -411,7 +412,8 @@ status=done; \ fi; \ if [ ${_LICENSE_STATUS} = "accepted" -a ${_LICENSE_TYPE} != "known" ]; then \ - if [ ${_LICENSE_${_LICENSE}_CHK} != `${SHA256} -q ${_LICENSE_FILE}` ]; then \ + if [ -n "${_LICENSE_${_LICENSE}_CHK}" -a \ + "${_LICENSE_${_LICENSE}_CHK}" != `${SHA256} -q ${_LICENSE_FILE}` ]; then \ ${ECHO_MSG} "===> License has changed, agreement will be presented"; \ status=ask; \ fi; \ @@ -498,6 +500,8 @@ @${ECHO_CMD} ${var}=${${var}:C/^[[:blank:]]*//} >> ${_LICENSE_REPORT} . endif . endfor +# XXX @dirrmtry entry must be here (no way to do with PLIST_* vars) + @${ECHO_CMD} "@unexec rmdir %D/share/licenses 2>/dev/null || true" >> ${TMPPLIST} .if make(clean-user-license-config) . for lic in ${LICENSES_APPROVED:N\@*} ${LICENSES_REJECTED:N\@*} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#6 (text+ko) ====