Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Mar 2017 13:48:15 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r435394 - head/Mk
Message-ID:  <201703041348.v24DmFkL089838@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Mar  4 13:48:15 2017
New Revision: 435394
URL: https://svnweb.freebsd.org/changeset/ports/435394

Log:
  Remove superfluous space
  
  Differential Revision:	https://reviews.freebsd.org/D9162
  Submitted by:	sunpoet (myself)
  Reviewed by:	amdmi3
  Approved by:	portmgr (mat)

Modified:
  head/Mk/bsd.licenses.db.mk
  head/Mk/bsd.licenses.mk

Modified: head/Mk/bsd.licenses.db.mk
==============================================================================
--- head/Mk/bsd.licenses.db.mk	Sat Mar  4 13:33:25 2017	(r435393)
+++ head/Mk/bsd.licenses.db.mk	Sat Mar  4 13:48:15 2017	(r435394)
@@ -399,8 +399,6 @@ _LICENSE_GROUPS_ZPL21=	GPL OSI
 
 .for lic in ${_LICENSE_LIST}
 .	if !defined(_LICENSE_PERMS_${lic})
-# note that space before = is needed to correctly handle licenses
-# ending with a plus sign
-_LICENSE_PERMS_${lic} =	${_LICENSE_PERMS_DEFAULT}
+_LICENSE_PERMS_${lic}=	${_LICENSE_PERMS_DEFAULT}
 .	endif
 .endfor

Modified: head/Mk/bsd.licenses.mk
==============================================================================
--- head/Mk/bsd.licenses.mk	Sat Mar  4 13:33:25 2017	(r435393)
+++ head/Mk/bsd.licenses.mk	Sat Mar  4 13:48:15 2017	(r435394)
@@ -301,7 +301,7 @@ _LICENSE_DISTFILES=	${LICENSE_DISTFILES}
 _LICENSE_GROUPS_${lic}?=#
 .		if ${_LICENSE_LIST:M${lic}} != ""
 # Case 1: license defined in the framework.
-_LICENSE_TYPE_${lic} =	known
+_LICENSE_TYPE_${lic}=	known
 .			for var in ${_LICENSE_LIST_PORT_VARS}
 .				if defined(LICENSE_${var}_${lic})
 _LICENSE_ERROR?=	redefining LICENSE_${var}_${lic} is not allowed for known licenses, to define a custom license try another LICENSE name for ${lic} like ${lic}-variant
@@ -314,25 +314,25 @@ _LICENSE_ERROR?=	ERROR: missing _LICENSE
 .			if !defined(LICENSE_FILE_${lic})
 .				if !defined(LICENSE_TEXT_${lic})
 .					if exists(${_LICENSE_STORE}/${lic})
-_LICENSE_FILE_${lic} =		${_LICENSE_STORE}/${lic}
+_LICENSE_FILE_${lic}=		${_LICENSE_STORE}/${lic}
 .					else
 #  No license file in /usr/ports/Templates/Licenses
-_LICENSE_TEXT_${lic} =	The license: ${lic} (${_LICENSE_NAME_${lic}}) is standard, please read from the web.
-_LICENSE_FILE_${lic} =	${WRKDIR}/${lic}
+_LICENSE_TEXT_${lic}=	The license: ${lic} (${_LICENSE_NAME_${lic}}) is standard, please read from the web.
+_LICENSE_FILE_${lic}=	${WRKDIR}/${lic}
 .					endif
 .				else
 _LICENSE_ERROR?=	defining LICENSE_TEXT_${lic} is not allowed for known licenses
 .				endif
 .			else
-_LICENSE_FILE_${lic} =	${LICENSE_FILE_${lic}}
+_LICENSE_FILE_${lic}=	${LICENSE_FILE_${lic}}
 .			endif
 
 .		else
 # Case 2: license only known by the port.
-_LICENSE_TYPE_${lic} =	unknown
+_LICENSE_TYPE_${lic}=	unknown
 .			for var in ${_LICENSE_LIST_PORT_VARS}
 .				if defined(LICENSE_${var}_${lic})
-_LICENSE_${var}_${lic} =	${LICENSE_${var}_${lic}}
+_LICENSE_${var}_${lic}=	${LICENSE_${var}_${lic}}
 .				elif !defined(_LICENSE_${var}_${lic})
 _LICENSE_ERROR?=	for unknown licenses, defining LICENSE_${var}_${lic} is mandatory (otherwise use a known LICENSE)
 .				endif
@@ -354,11 +354,11 @@ _LICENSE_PERMS_${lic}:=	${__LICENSE_PERM
 .				if !defined(LICENSE_TEXT_${lic})
 _LICENSE_ERROR?=		either LICENSE_FILE_${lic} or LICENSE_TEXT_${lic} must be defined
 .				else
-_LICENSE_TEXT_${lic} =	${LICENSE_TEXT_${lic}}
-_LICENSE_FILE_${lic} =	${WRKDIR}/${lic}
+_LICENSE_TEXT_${lic}=	${LICENSE_TEXT_${lic}}
+_LICENSE_FILE_${lic}=	${WRKDIR}/${lic}
 .				endif
 .			else
-_LICENSE_FILE_${lic} =	${LICENSE_FILE_${lic}}
+_LICENSE_FILE_${lic}=	${LICENSE_FILE_${lic}}
 .			endif
 .		endif
 
@@ -368,9 +368,9 @@ _LICENSE_ERROR?=		defining both LICENSE_
 .		endif
 # Distfiles
 .		if !defined(LICENSE_DISTFILES_${lic})
-_LICENSE_DISTFILES_${lic} =	${_DISTFILES}
+_LICENSE_DISTFILES_${lic}=	${_DISTFILES}
 .		else
-_LICENSE_DISTFILES_${lic} =	${LICENSE_DISTFILES_${lic}}
+_LICENSE_DISTFILES_${lic}=	${LICENSE_DISTFILES_${lic}}
 .		endif
 .	endfor
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703041348.v24DmFkL089838>