[Midnightbsd-cvs] mports: bsd.mport.mk: Fix check-license for empty LICENSE.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Mon Oct 8 12:52:02 EDT 2007


Log Message:
-----------
Fix check-license for empty LICENSE.
Add agg (agragate) license type.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.64 -> r1.65)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.64
retrieving revision 1.65
diff -LMk/bsd.mport.mk -LMk/bsd.mport.mk -u -r1.64 -r1.65
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -2934,7 +2934,7 @@
 #
 _LICENSES= 	gpl gpl2 gpl3 lgpl bsd4 bsd3 bsd2 python ruby x11 guile artistic artistic2 \
 			bdb mpl npl publicdom zlib apache2 apache1.1 apache1 apsl2 apsl1 php \
-			restricted perl modula3 unknown sgi
+			restricted perl modula3 unknown sgi agg
 
 
 
@@ -3419,7 +3419,10 @@
 	@${ECHO_MSG} "${PKGNAME}: Makefile error: LICENSE not set."
 	@sleep 5
 .else
-	@if ! ${ECHO_CMD} ${_LICENSES} | ${GREP} ${LICENSE} >/dev/null; then \
+	@if test -z '${LICENSE}'; then \
+		${ECHO_MSG} "${PKGNAME}: Makefile error: empty license."; \
+		sleep 5; \
+	elif ! ${ECHO_CMD} ${_LICENSES} | ${GREP} ${LICENSE} >/dev/null; then \
 		${ECHO_MSG} "${PKGNAME}: Makefile error: Invalid LICENSE: ${LICENSE}"; \
 		sleep 5; \
 	else \


More information about the Midnightbsd-cvs mailing list