Index: Mk/bsd.licenses.db.mk =================================================================== --- Mk/bsd.licenses.db.mk +++ Mk/bsd.licenses.db.mk @@ -39,12 +39,29 @@ # _LICENSE_LIST_GROUPS - List of defined license groups # -_LICENSE_LIST= AGPLv3 APACHE10 APACHE11 APACHE20 ART10 ARTPERL10 ART20 \ - BSD BSD2CLAUSE BSD3CLAUSE BSD4CLAUSE BSL CC0-1.0 CDDL ClArtistic CPAL-1.0 EPL GFDL \ - GMGPL GPLv1 GPLv2 GPLv3 GPLv3RLE ISCL LGPL20 LGPL21 LGPL3 \ - LPPL10 LPPL11 LPPL12 LPPL13 LPPL13a LPPL13b LPPL13c MIT \ - MPL OpenSSL OFL10 OFL11 OWL PostgreSQL PHP202 PHP30 PHP301 PSFL RUBY \ - ZLIB ZPL21 +_LICENSE_LIST= BSL CC0-1.0 CDDL CPAL-1.0 ClArtistic EPL GFDL GMGPL \ + ISCL MIT MPL OFL10 OFL11 OWL OpenSSL PD PSFL PostgreSQL \ + RUBY ZLIB ZPL21 + +# GNU family +_LICENSE_LIST+= AGPLv3 GPLv1 GPLv2 GPLv3 GPLv3RLE LGPL20 LGPL21 LGPL3 +_LICENSE_LIST+= AGPLv3+ GPLv1+ GPLv2+ GPLv3+ GPLv3RLE+ LGPL20+ LGPL21+ \ + LGPL3+ + +# BSD family +_LICENSE_LIST+= BSD BSD2CLAUSE BSD3CLAUSE BSD4CLAUSE + +# LaTeX family +_LICENSE_LIST+= LPPL10 LPPL11 LPPL12 LPPL13 LPPL13a LPPL13b LPPL13c + +# Apache family +_LICENSE_LIST+= APACHE10 APACHE11 APACHE20 + +# Artistic family +_LICENSE_LIST+= ART10 ARTPERL10 ART20 + +# PHP family +_LICENSE_LIST+= PHP202 PHP30 PHP301 # List of groups (only names must be present) @@ -54,7 +71,7 @@ _LICENSE_NAME_OSI= OSI Approved -_LICENSE_NAME_COPYFREE= Comply with Copyfree Standard Definition. +_LICENSE_NAME_COPYFREE= Comply with Copyfree Standard Definition _LICENSE_NAME_FONTS= Font licenses @@ -73,10 +90,12 @@ # - General permissions from groups are added to each license, if not defined. # - _LICENSE_NAME_AGPLv3= GNU Affero General Public License version 3 _LICENSE_GROUPS_AGPLv3= FSF GPL OSI +_LICENSE_NAME_AGPLv3+ = ${_LICENSE_NAME_AGPLv3} (or later) +_LICENSE_GROUPS_AGPLv3+ = ${_LICENSE_GROUPS_AGPLv3} + _LICENSE_NAME_APACHE10= Apache License 1.0 _LICENSE_GROUPS_APACHE10= FSF @@ -94,7 +113,7 @@ _LICENSE_NAME_ART20= Artistic License version 2.0 _LICENSE_GROUPS_ART20= FSF GPL OSI - + _LICENSE_NAME_BSD= BSD license Generic Version (deprecated) _LICENSE_GROUPS_BSD= FSF OSI COPYFREE @@ -103,7 +122,7 @@ _LICENSE_NAME_BSD3CLAUSE= BSD 3-clause "New" or "Revised" License _LICENSE_GROUPS_BSD3CLAUSE= FSF OSI COPYFREE - + _LICENSE_NAME_BSD4CLAUSE= BSD 4-clause "Original" or "Old" License _LICENSE_GROUPS_BSD4CLAUSE= FSF @@ -134,27 +153,48 @@ _LICENSE_NAME_GPLv1= GNU General Public License version 1 _LICENSE_GROUPS_GPLv1= FSF GPL OSI +_LICENSE_NAME_GPLv1+ = ${_LICENSE_NAME_GPLv1} (or later) +_LICENSE_GROUPS_GPLv1+ = ${_LICENSE_GROUPS_GPLv1} + _LICENSE_NAME_GPLv2= GNU General Public License version 2 _LICENSE_GROUPS_GPLv2= FSF GPL OSI +_LICENSE_NAME_GPLv2+ = ${_LICENSE_NAME_GPLv2} (or later) +_LICENSE_GROUPS_GPLv2+ = ${_LICENSE_GROUPS_GPLv2} + _LICENSE_NAME_GPLv3= GNU General Public License version 3 _LICENSE_GROUPS_GPLv3= FSF GPL OSI +_LICENSE_NAME_GPLv3+ = ${_LICENSE_NAME_GPLv3} (or later) +_LICENSE_GROUPS_GPLv3+ = ${_LICENSE_GROUPS_GPLv3} + _LICENSE_NAME_GPLv3RLE= GNU GPL version 3 Runtime Library Exception _LICENSE_GROUPS_GPLv3RLE= FSF GPL OSI +_LICENSE_NAME_GPLv3RLE+ = ${_LICENSE_NAME_GPLv3RLE} (or later) +_LICENSE_GROUPS_GPLv3RLE+ = ${_LICENSE_GROUPS_GPLv3RLE} + _LICENSE_NAME_ISCL= Internet Systems Consortium License _LICENSE_GROUPS_ISCL= FSF GPL OSI COPYFREE _LICENSE_NAME_LGPL20= GNU Library General Public License version 2.0 _LICENSE_GROUPS_LGPL20= FSF GPL OSI +_LICENSE_NAME_LGPL20+ = ${_LICENSE_NAME_LGPL20} (or later) +_LICENSE_GROUPS_LGPL20+ = ${_LICENSE_GROUPS_LGPL20} + _LICENSE_NAME_LGPL21= GNU Lesser General Public License version 2.1 _LICENSE_GROUPS_LGPL21= FSF GPL OSI +_LICENSE_NAME_LGPL21+ = ${_LICENSE_NAME_LGPL21} (or later) +_LICENSE_GROUPS_LGPL21+ = ${_LICENSE_GROUPS_LGPL21} + _LICENSE_NAME_LGPL3= GNU Lesser General Public License version 3 _LICENSE_GROUPS_LGPL3= FSF GPL OSI +_LICENSE_NAME_LGPL3+ = ${_LICENSE_NAME_LGPL3} (or later) +_LICENSE_GROUPS_LGPL3+ = ${_LICENSE_GROUPS_LGPL3} + _LICENSE_NAME_LPPL10= LaTeX Project Public License version 1.0 _LICENSE_GROUPS_LPPL10= FSF OSI _LICENSE_PERMS_LPPL10= dist-mirror dist-sell @@ -198,6 +238,9 @@ _LICENSE_NAME_OpenSSL= OpenSSL License _LICENSE_GROUPS_OpenSSL= FSF +_LICENSE_NAME_PD= Public Domain +_LICENSE_GROUPS_PD= GPL COPYFREE + _LICENSE_NAME_OWL= Open Works License (owl.apotheon.org) _LICENSE_GROUPS_OWL= COPYFREE @@ -229,6 +272,6 @@ .for lic in ${_LICENSE_LIST} . if !defined(_LICENSE_PERMS_${lic}) -_LICENSE_PERMS_${lic}= ${_LICENSE_PERMS_DEFAULT} +_LICENSE_PERMS_${lic} = ${_LICENSE_PERMS_DEFAULT} . endif .endfor Index: archivers/xdms/Makefile =================================================================== --- archivers/xdms/Makefile +++ archivers/xdms/Makefile @@ -10,9 +10,7 @@ COMMENT= Tool for decompressing Amiga DMS files LICENSE= PD -LICENSE_NAME= Public Domain LICENSE_FILE= ${WRKSRC}/COPYING -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= tar:bzip2 HAS_CONFIGURE= yes Index: games/magicor/Makefile =================================================================== --- games/magicor/Makefile +++ games/magicor/Makefile @@ -13,8 +13,6 @@ COMMENT= Old-school, puzzle game similar to Solomon's Key LICENSE= PD -LICENSE_NAME= Public Domain -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game Index: games/naev-data/Makefile =================================================================== --- games/naev-data/Makefile +++ games/naev-data/Makefile @@ -18,16 +18,12 @@ LICENSE_COMB= multi LICENSE_NAME_CCBYv3= Creative Commons Attribution 3.0 Unported license LICENSE_NAME_CCBYSAv3= Creative Commons Attribution-ShareAlike 3.0 Unported license -LICENSE_NAME_PD= Public Domain license LICENSE_TEXT_CCBYv3= The license: CCBYv3 (${LICENSE_NAME_CCBYv3}) is standard,\ please read from the web: http://creativecommons.org/licenses/by/3.0/ LICENSE_TEXT_CCBYSAv3= The license: CCBYSAv3 (${LICENSE_NAME_CCBYSAv3}) is standard,\ please read from the web: http://creativecommons.org/licenses/by-sa/3.0/ -LICENSE_TEXT_PD= The license: PD (${LICENSE_NAME_PD}), please read possible explanation on the web:\ - http://www.teachingcopyright.org/handout/public-domain-faq LICENSE_PERMS_CCBYv3= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_CCBYSAv3= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_PERMS_PD= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept PROJECTHOST= ${PKGNAMEPREFIX:S/-//} NO_ARCH= yes Index: security/libtomcrypt/Makefile =================================================================== --- security/libtomcrypt/Makefile +++ security/libtomcrypt/Makefile @@ -12,9 +12,7 @@ COMMENT= Comprehensive, modular, and portable cryptographic toolkit LICENSE= PD -LICENSE_NAME= Public Domain LICENSE_FILE= ${WRKSRC}/LICENSE -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CFLAGS+= -I${LOCALBASE}/include EXTRALIBS= -L${LOCALBASE}/lib Index: sysutils/daemontools/Makefile =================================================================== --- sysutils/daemontools/Makefile +++ sysutils/daemontools/Makefile @@ -14,9 +14,6 @@ COMMENT= Service monitoring and logging utilities by djb LICENSE= PD -LICENSE_NAME= public domain -LICENSE_TEXT= The daemontools-0.76.tar.gz archive is in the public domain as of 2007.12.28. -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CONFLICTS= freedt-[0-9]* serialmail-[0-9]* Index: textproc/html-pretty/Makefile =================================================================== --- textproc/html-pretty/Makefile +++ textproc/html-pretty/Makefile @@ -12,9 +12,7 @@ COMMENT= HTML and SGML prettyprinter and text-to-HTML/SGML converter LICENSE= PD -LICENSE_NAME= Public Domain LICENSE_FILE= ${WRKSRC}/COPYING -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes