PERFORCE change 167375 for review

[Alejandro Pulver]

http://perforce.freebsd.org/chv.cgi?CH=167375

Change 167375 by alepulver at 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