[Midnightbsd-cvs] mports [15869] trunk/Mk: move license-list target to external file.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Feb 20 08:37:52 EST 2014
Revision: 15869
http://svnweb.midnightbsd.org/mports/?rev=15869
Author: laffer1
Date: 2014-02-20 08:37:52 -0500 (Thu, 20 Feb 2014)
Log Message:
-----------
move license-list target to external file.
Modified Paths:
--------------
trunk/Mk/bsd.mport.mk
trunk/Mk/components/licenses.mk
Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk 2014-02-20 13:28:12 UTC (rev 15868)
+++ trunk/Mk/bsd.mport.mk 2014-02-20 13:37:52 UTC (rev 15869)
@@ -1711,20 +1711,6 @@
.MAIN: all
-#
-# LICENSE Setup
-#
-_LICENSES= agpl gpl gpl2 gpl3 lgpl lgpl2.1 lgpl3 bsd4 bsd3 bsd2 \
- apache2 apache1.1 apache1 apsl2 apsl1 artistic artistic2 \
- bdb bzip2 cddl epl fdl1.1 fdl1.2 fdl1.3 guile \
- ibm ilm infozip iscl \
- liberation mit modula3 mpl npl nvidia openldap2.8 opera owl \
- perl php python ruby sgi subversion x11 zlib \
- publicdom unknown other agg restricted
-
-
-
-
################################################################
# Many ways to disable a port.
#
@@ -1982,15 +1968,6 @@
.endif
-#
-# List of valid licenses
-#
-.if !target(license-list)
-license-list:
- @${ECHO_MSG} ${_LICENSES}
-.endif
-
-
# Warn user about deprecated packages. Advisory only.
.if !target(check-deprecated)
Modified: trunk/Mk/components/licenses.mk
===================================================================
--- trunk/Mk/components/licenses.mk 2014-02-20 13:28:12 UTC (rev 15868)
+++ trunk/Mk/components/licenses.mk 2014-02-20 13:37:52 UTC (rev 15869)
@@ -4,6 +4,12 @@
.if defined(_POSTMKINCLUDED) && !defined(BEFOREPORTMK)
+# List of valid licenses
+.if !target(license-list)
+license-list:
+ @${ECHO_MSG} ${_LICENSES}
+.endif
+
.if defined(LICENSE)
# Include known licenses from database
More information about the Midnightbsd-cvs
mailing list