Update "BSD" license in devel category

71 files changed, 90 insertions, 75 deletions

diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index c9d0fe1bed9c..65ee1dac5fd0 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	bmake-${PORTVERSION}.tar.gz mk-${PORTVERSION}.tar.gz
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Portable version of NetBSD 'make' utility
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 PORTSCOUT=	skipv:200910007
 
diff --git a/devel/bsdbuild/Makefile b/devel/bsdbuild/Makefile
index eec99b83344b..2d791976e31f 100644
--- a/devel/bsdbuild/Makefile
+++ b/devel/bsdbuild/Makefile
@@ -13,7 +13,7 @@ USES=		perl5 shebangfix
 SHEBANG_FILES=	*.pl mk/*.pl
 GNU_CONFIGURE=	yes
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 CONFIGURE_ARGS=	--with-catman=no
 
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index c4974ca6e819..59914b4cb8d5 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses Development Kit for speedy development of full screen programs
 
-LICENSE=	BSD
+LICENSE=	BSD4CLAUSE
 
 USES=		ncurses gmake tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/devel/horde-whups/Makefile b/devel/horde-whups/Makefile
index a7a089a901e4..887b69e7579f 100644
--- a/devel/horde-whups/Makefile
+++ b/devel/horde-whups/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	horde-
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde bug tracking/ticketing system
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=	horde
diff --git a/devel/javolution/Makefile b/devel/javolution/Makefile
index 42122b07bfd1..c51d16f5ee6a 100644
--- a/devel/javolution/Makefile
+++ b/devel/javolution/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	ale
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java solution for real time and embedded systems
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
diff --git a/devel/jline/Makefile b/devel/jline/Makefile
index 021c12517669..c57bb55018f8 100644
--- a/devel/jline/Makefile
+++ b/devel/jline/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	mkamm@gmx.net
 COMMENT=	Java library for handling console input
 
-LICENSE=	BSD
+LICENSE=	BSD4CLAUSE
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USES=		zip
diff --git a/devel/libdfui/Makefile b/devel/libdfui/Makefile
index 0dabee673691..68c826e47268 100644
--- a/devel/libdfui/Makefile
+++ b/devel/libdfui/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/philip
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Abstract user interface protocol library
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libaura3.so:${PORTSDIR}/devel/libaura
 
diff --git a/devel/libfortuna/Makefile b/devel/libfortuna/Makefile
index 16b730540b4a..412c71a42845 100644
--- a/devel/libfortuna/Makefile
+++ b/devel/libfortuna/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GH
 MAINTAINER=	waitman@waitman.net
 COMMENT=	Fortuna PRNG Library
 
-LICENSE=	BSD
+LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USE_GITHUB=	yes
diff --git a/devel/libgetline/Makefile b/devel/libgetline/Makefile
index dc48e447eef8..8392105b0c63 100644
--- a/devel/libgetline/Makefile
+++ b/devel/libgetline/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}-src
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Small, portable, and easy to use command line library
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
diff --git a/devel/libiqxmlrpc/Makefile b/devel/libiqxmlrpc/Makefile
index 23df3363d016..cb7c36eb5578 100644
--- a/devel/libiqxmlrpc/Makefile
+++ b/devel/libiqxmlrpc/Makefile
@@ -10,6 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Free, object-oriented XML-RPC implementation written in C++
 
+LICENSE=	BSD2CLAUSE
+
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
 OPTIONS_DEFINE=	DOCS
@@ -18,8 +20,6 @@ OPTIONS_DEFAULT=
 DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 DOCS_CMAKE_ARGS_OFF=	-Dbuild_docs=off
 
-LICENSE=	BSD
-
 USE_GNOME=	libxml2
 USES=		cmake tar:bzip2
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/libmtrie/Makefile b/devel/libmtrie/Makefile
index 147bf2ee51a9..824b7371ab3f 100644
--- a/devel/libmtrie/Makefile
+++ b/devel/libmtrie/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://rodrigo.osorio.free.fr/freebsd/distfiles/ \
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Library to build an IP-netmask based mtrie
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 USES=		tar:bzip2 uidfix
 USE_LDCONFIG=	yes
diff --git a/devel/libtpl/Makefile b/devel/libtpl/Makefile
index af4272406085..2ddfcf93268a 100644
--- a/devel/libtpl/Makefile
+++ b/devel/libtpl/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Tpl is a library for serializing C data
 
 OPTIONS_DEFINE=	DOCS
 
-LICENSE=	BSD
+LICENSE=	GPLv3 MIT
+LICENSE_COMB=	multi
 
 USES=		libtool tar:bzip2
 USE_GITHUB=	yes
diff --git a/devel/lm4tools/Makefile b/devel/lm4tools/Makefile
index 66a5c559ad6f..e40d5b9e5c5f 100644
--- a/devel/lm4tools/Makefile
+++ b/devel/lm4tools/Makefile
@@ -8,11 +8,8 @@ CATEGORIES=	devel
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	TI Tiva C ARM microcontroller tools
 
-LICENSE=		GPLv2 TIBSD
+LICENSE=		GPLv2 BSD3CLAUSE
 LICENSE_COMB=		multi
-LICENSE_NAME_TIBSD=	Texas Instruments Software License Agreement
-LICENSE_FILE_TIBSD=	${WRKSRC}/lmicdiusb/license.txt
-LICENSE_PERMS_TIBSD=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	utzig
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index a0d22a7cd578..52d4655ca4dd 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml library for working with S-expressions
 
-LICENSE=	BSD
+LICENSE=	APACHE20 BSD3CLAUSE
+LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	ocaml-type-conv>0:${PORTSDIR}/devel/ocaml-typeconv
 RUN_DEPENDS=	ocaml-type-conv>0:${PORTSDIR}/devel/ocaml-typeconv
diff --git a/devel/ocaml-typeconv/Makefile b/devel/ocaml-typeconv/Makefile
index a8f86e70e7bd..756325d1cf1b 100644
--- a/devel/ocaml-typeconv/Makefile
+++ b/devel/ocaml-typeconv/Makefile
@@ -12,7 +12,8 @@ DISTNAME=	${PORTNAME:S,-,_,}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Type conversion routines for OCaml
 
-LICENSE=	BSD
+LICENSE=	APACHE20 BSD3CLAUSE
+LICENSE_COMB=	multi
 
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index 190a58ef76c1..8a1eef30477f 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jase@FreeBSD.org
 COMMENT=	Peek into the internals of a running POE environment
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
diff --git a/devel/p5-Proc-SafeExec/Makefile b/devel/p5-Proc-SafeExec/Makefile
index 92c6d65294a7..eee058012b5e 100644
--- a/devel/p5-Proc-SafeExec/Makefile
+++ b/devel/p5-Proc-SafeExec/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	Convenient utility for executing external commands in various ways
 
-LICENSE=	BSD GPLv1
+LICENSE=	BSD2CLAUSE GPLv1
 LICENSE_COMB=	dual
 
 USES=		perl5
diff --git a/devel/papp/Makefile b/devel/papp/Makefile
index 079d29900c61..96b4f36afb15 100644
--- a/devel/papp/Makefile
+++ b/devel/papp/Makefile
@@ -10,6 +10,6 @@ MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Assembly Preprocessor
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 .include <bsd.port.mk>
diff --git a/devel/pasm/Makefile b/devel/pasm/Makefile
index e2a820d44a88..9d1ccb6025df 100644
--- a/devel/pasm/Makefile
+++ b/devel/pasm/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	https://github.com/rpaulo/am335x_pru_package/archive/
 MAINTAINER=	rpaulo@FreeBSD.org
 COMMENT=	TI PRU Assembler
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/pru_sw/utils/LICENCE.txt
 
 WRKSRC=		${WRKDIR}/am335x_pru_package-${PORTNAME}-${PORTVERSION}
diff --git a/devel/pear-PEAR_PackageFileManager2/Makefile b/devel/pear-PEAR_PackageFileManager2/Makefile
index 98e2a4247c26..4788a9634165 100644
--- a/devel/pear-PEAR_PackageFileManager2/Makefile
+++ b/devel/pear-PEAR_PackageFileManager2/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class to maintain PEAR packages
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
 RUN_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
diff --git a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
index 2ae91b644037..6fc9bcd42240 100644
--- a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
+++ b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
@@ -11,7 +11,7 @@ COMMENT=	The plugins for PEAR_PackageFileManager
 BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
 RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 USES=	pear
 
diff --git a/devel/pear-PHPUnit_MockObject/Makefile b/devel/pear-PHPUnit_MockObject/Makefile
index 4dfbc3c55ffa..8b167cd82749 100644
--- a/devel/pear-PHPUnit_MockObject/Makefile
+++ b/devel/pear-PHPUnit_MockObject/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Mock Object library for PHPUnit
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
 		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
diff --git a/devel/pear-PHP_CodeCoverage/Makefile b/devel/pear-PHP_CodeCoverage/Makefile
index a723e5fa0dd1..4631d3ad8d0e 100644
--- a/devel/pear-PHP_CodeCoverage/Makefile
+++ b/devel/pear-PHP_CodeCoverage/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Library that provides PHP code coverage information
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
 		pear-PHP_TokenStream>=1.1.3:${PORTSDIR}/devel/pear-PHP_TokenStream \
diff --git a/devel/pear-PHP_Depend/Makefile b/devel/pear-PHP_Depend/Makefile
index b49d638d5b7b..b5a2409f2559 100644
--- a/devel/pear-PHP_Depend/Makefile
+++ b/devel/pear-PHP_Depend/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PHP_Depend design quality metrics for PHP packages
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
 RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
diff --git a/devel/pear-PHP_PMD/Makefile b/devel/pear-PHP_PMD/Makefile
index a5bc99d81bd1..96dcc867cdc0 100644
--- a/devel/pear-PHP_PMD/Makefile
+++ b/devel/pear-PHP_PMD/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PHP Mess Detector
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
 RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
diff --git a/devel/pear-PHP_TokenStream/Makefile b/devel/pear-PHP_TokenStream/Makefile
index 7cbc296c9b70..0ea0b7e17ef2 100644
--- a/devel/pear-PHP_TokenStream/Makefile
+++ b/devel/pear-PHP_TokenStream/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Wrapper around PHP tokenizer extension
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
 RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
diff --git a/devel/pear-PPW/Makefile b/devel/pear-PPW/Makefile
index bdbf7c6e30d0..521b4eebc476 100644
--- a/devel/pear-PPW/Makefile
+++ b/devel/pear-PPW/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ppw-${DISTVERSION}
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PHP Project Wizard
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
 		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
diff --git a/devel/pear-SebastianBergmann_FinderFacade/Makefile b/devel/pear-SebastianBergmann_FinderFacade/Makefile
index 22c2fb93b4e2..f7a4f7924fb0 100644
--- a/devel/pear-SebastianBergmann_FinderFacade/Makefile
+++ b/devel/pear-SebastianBergmann_FinderFacade/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-SebastianBergmann_
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Convenience wrapper for Symfony's Finder component
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
 		pear-Symfony_Component_Finder>=2.2.0:${PORTSDIR}/devel/pear-Symfony_Component_Finder \
diff --git a/devel/pear-SebastianBergmann_Git/Makefile b/devel/pear-SebastianBergmann_Git/Makefile
index 2249d21a485e..0d0823e68a96 100644
--- a/devel/pear-SebastianBergmann_Git/Makefile
+++ b/devel/pear-SebastianBergmann_Git/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-SebastianBergmann_
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Simple wrapper for Git
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
 		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
diff --git a/devel/pear-SebastianBergmann_PHPCPD/Makefile b/devel/pear-SebastianBergmann_PHPCPD/Makefile
index 44bc5f35873d..658d213d76db 100644
--- a/devel/pear-SebastianBergmann_PHPCPD/Makefile
+++ b/devel/pear-SebastianBergmann_PHPCPD/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	phpcpd-${PORTVERSION}
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Copy/Paste Detector (CPD) for PHP code
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
 		pear-SebastianBergmann_FinderFacade>=1.0.4:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
diff --git a/devel/pear-SebastianBergmann_PHPLOC/Makefile b/devel/pear-SebastianBergmann_PHPLOC/Makefile
index d39539e5606e..fd6343b19316 100644
--- a/devel/pear-SebastianBergmann_PHPLOC/Makefile
+++ b/devel/pear-SebastianBergmann_PHPLOC/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	phploc-${PORTVERSION}
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Tool for quickly measuring the size of a PHP project
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	pear-Symfony_Component_Console>=1.1.0:${PORTSDIR}/devel/pear-Symfony_Component_Console \
 		pear-SebastianBergmann_FinderFacade>=1.1.0:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
diff --git a/devel/pear-SebastianBergmann_Version/Makefile b/devel/pear-SebastianBergmann_Version/Makefile
index 530bdbcb23a4..8870944eca3b 100644
--- a/devel/pear-SebastianBergmann_Version/Makefile
+++ b/devel/pear-SebastianBergmann_Version/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-SebastianBergmann_
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Managing the version number of Git-hosted PHP projects
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
 RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
diff --git a/devel/pear-TheSeer_phpDox/Makefile b/devel/pear-TheSeer_phpDox/Makefile
index 33fedbcdb118..4d08cafbd58e 100644
--- a/devel/pear-TheSeer_phpDox/Makefile
+++ b/devel/pear-TheSeer_phpDox/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-TheSeer_
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PHP Documentation generation framework and tool
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
 		pear-TheSeer_fDOMDocument>=1.2.3:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
diff --git a/devel/pear-ezc_Base/Makefile b/devel/pear-ezc_Base/Makefile
index ffc947b13ee6..a8cd5ffafa0c 100644
--- a/devel/pear-ezc_Base/Makefile
+++ b/devel/pear-ezc_Base/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-${PEAR_CHANNEL}_
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Base package that all ezc components packages rely on
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
 RUN_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
diff --git a/devel/pear-ezc_ConsoleTools/Makefile b/devel/pear-ezc_ConsoleTools/Makefile
index a3786f5522ca..06b27bd40a4a 100644
--- a/devel/pear-ezc_ConsoleTools/Makefile
+++ b/devel/pear-ezc_ConsoleTools/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-${PEAR_CHANNEL}_
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Set of classes to do different actions with the console
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
 		${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
diff --git a/devel/pear-pdepend-staticReflection/Makefile b/devel/pear-pdepend-staticReflection/Makefile
index 62dbdb369ef4..6046a6e2906f 100644
--- a/devel/pear-pdepend-staticReflection/Makefile
+++ b/devel/pear-pdepend-staticReflection/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	pear-${PEAR_CHANNEL}_
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	staticReflection package for PHP
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
 RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
diff --git a/devel/pecl-bbcode/Makefile b/devel/pecl-bbcode/Makefile
index a583ce50b3f9..070a9ed7ef5a 100644
--- a/devel/pecl-bbcode/Makefile
+++ b/devel/pecl-bbcode/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PECL extension which allows quick and efficient BBCode Parsing
 
-LICENSE=	PHP301 BSD
+LICENSE=	PHP301 BSD3CLAUSE
 LICENSE_COMB=	multi
 
 USE_PHP=	yes
diff --git a/devel/pecl-msgpack/Makefile b/devel/pecl-msgpack/Makefile
index d72b2a35c9a8..1d8a7ea4f4c8 100644
--- a/devel/pecl-msgpack/Makefile
+++ b/devel/pecl-msgpack/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	johnpupu@gmail.com
 COMMENT=	Provides API for communicating with MessagePack serialization
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USE_PHP=	session
 USE_PHPEXT=	yes
diff --git a/devel/php-xdebug/Makefile b/devel/php-xdebug/Makefile
index 8d150005eb10..790433f3cd2e 100644
--- a/devel/php-xdebug/Makefile
+++ b/devel/php-xdebug/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	php-
 MAINTAINER=	freebsd-ports-maintainers@intermedix.com
 COMMENT=	Xdebug extension for PHP
 
-LICENSE=	BSD
+LICENSE=	PHP30
 
 CONFIGURE_ARGS=	--enable-xdebug
 USE_PHP=	yes
diff --git a/devel/php5-dav/Makefile b/devel/php5-dav/Makefile
index 12dc2ae3f3c9..36a9c94e0f14 100644
--- a/devel/php5-dav/Makefile
+++ b/devel/php5-dav/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	php-webdav-${PORTVERSION}
 MAINTAINER=	komarov@valerka.net
 COMMENT=	The PHP WebDAV extension
 
-LICENSE=	BSD
+LICENSE=	ISCL
 
 LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon29
 
diff --git a/devel/pit/Makefile b/devel/pit/Makefile
index f999c22e1168..25fa258fc3c9 100644
--- a/devel/pit/Makefile
+++ b/devel/pit/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line project manager that integrates with Git
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
diff --git a/devel/pure-stllib/Makefile b/devel/pure-stllib/Makefile
index a11b277ead74..baf8cd5fb341 100644
--- a/devel/pure-stllib/Makefile
+++ b/devel/pure-stllib/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	pure
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Pure interface to C++ STL map and vectors
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		pure pkgconfig
 
diff --git a/devel/py-akismet/Makefile b/devel/py-akismet/Makefile
index ffa610e8b29f..5f53f97db44a 100644
--- a/devel/py-akismet/Makefile
+++ b/devel/py-akismet/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jacob@whotookspaz.org
 COMMENT=	Python interface to the Akismet API
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		python zip
 USE_PYTHON=	distutils
diff --git a/devel/py-anyjson/Makefile b/devel/py-anyjson/Makefile
index b7084aaef0ab..bcf03061f520 100644
--- a/devel/py-anyjson/Makefile
+++ b/devel/py-anyjson/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mail@derzinn.de
 COMMENT=	JSON library wrapper for Python
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-cld/Makefile b/devel/py-cld/Makefile
index e6d7098357f9..bfdb16f99a2a 100644
--- a/devel/py-cld/Makefile
+++ b/devel/py-cld/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	chromium_compact_language_detector-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Python bindings for chromium compact language detector library
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libcld.so:${PORTSDIR}/devel/cld
 
diff --git a/devel/py-collective.monkeypatcher/Makefile b/devel/py-collective.monkeypatcher/Makefile
index 863483e375bf..088814128615 100644
--- a/devel/py-collective.monkeypatcher/Makefile
+++ b/devel/py-collective.monkeypatcher/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	zope
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Applying monkey patches on startup using ZCML configuration
 
-LICENSE=	BSD
+LICENSE=	ZPL21
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-colorama/Makefile b/devel/py-colorama/Makefile
index 90639f659799..a47a6d3f674c 100644
--- a/devel/py-colorama/Makefile
+++ b/devel/py-colorama/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Cross-platform API to print colored terminal text from Python apps
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-coverage/Makefile b/devel/py-coverage/Makefile
index 651c63a830bd..d996306fa477 100644
--- a/devel/py-coverage/Makefile
+++ b/devel/py-coverage/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Code coverage measurement for Python
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-decorator/Makefile b/devel/py-decorator/Makefile
index 9013f656d2f5..76b839af88f0 100644
--- a/devel/py-decorator/Makefile
+++ b/devel/py-decorator/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	dsh@wizard.volgograd.ru
 COMMENT=	Better living through Python with decorators
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-dogpile.core/Makefile b/devel/py-dogpile.core/Makefile
index 414f834fecbb..3ab8ec11ae51 100644
--- a/devel/py-dogpile.core/Makefile
+++ b/devel/py-dogpile.core/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Component of a larger caching solution
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-flask-babel/Makefile b/devel/py-flask-babel/Makefile
index 0a355a46629f..0c8036cdcf33 100644
--- a/devel/py-flask-babel/Makefile
+++ b/devel/py-flask-babel/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Adds i18n/l10n support to Flask applications
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
 		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
diff --git a/devel/py-fs/Makefile b/devel/py-fs/Makefile
index d1e297e688d1..446e0c6d935b 100644
--- a/devel/py-fs/Makefile
+++ b/devel/py-fs/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Python filesystem abstraction
 
-LICENSE=	BSD
+LICENSE=	ISCL
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index c16205f1c5a9..65f3f8ef54a1 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Pure Python Implementation of a Finite State Machine
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>=1.0:${PORTSDIR}/graphics/py-graphviz
 
diff --git a/devel/py-gitdb/Makefile b/devel/py-gitdb/Makefile
index 336afe1672b8..b58bf689a0dc 100644
--- a/devel/py-gitdb/Makefile
+++ b/devel/py-gitdb/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Pure Python git object database
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}async>=0.6.1:${PORTSDIR}/devel/py-async \
 		${PYTHON_PKGNAMEPREFIX}smmap>=0.8.0:${PORTSDIR}/devel/py-smmap
diff --git a/devel/py-glob2/Makefile b/devel/py-glob2/Makefile
index a281bab42d1c..a679d372caa5 100644
--- a/devel/py-glob2/Makefile
+++ b/devel/py-glob2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	loader@freebsdmall.com
 COMMENT=	Glob that captures patterns and supports recursive wildcards
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile
index f2d113904cad..77d3554f776f 100644
--- a/devel/py-grab/Makefile
+++ b/devel/py-grab/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Site scraping framework
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
diff --git a/devel/py-repoze.who/Makefile b/devel/py-repoze.who/Makefile
index dfa8405e8c5a..dce54666f60f 100644
--- a/devel/py-repoze.who/Makefile
+++ b/devel/py-repoze.who/Makefile
@@ -11,7 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Identification and authentication framework for WSGI
 
-LICENSE=	BSD
+LICENSE=	REPOZE
+LICENSE_NAME=	Repoze License
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
diff --git a/devel/py-repoze.xmliter/Makefile b/devel/py-repoze.xmliter/Makefile
index a0d7acc48d1a..71447bd9dd15 100644
--- a/devel/py-repoze.xmliter/Makefile
+++ b/devel/py-repoze.xmliter/Makefile
@@ -10,7 +10,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Wrapper for lxml trees which serializes to string upon iteration
 
-LICENSE=	BSD
+LICENSE=	REPOZE
+LICENSE_NAME=	Repoze License
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:${PORTSDIR}/devel/py-lxml
 
diff --git a/devel/py-rose/Makefile b/devel/py-rose/Makefile
index db061369b11a..a309a44157d5 100644
--- a/devel/py-rose/Makefile
+++ b/devel/py-rose/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Small library for keeping your version up-to-date easily everywhere
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-simpletal/Makefile b/devel/py-simpletal/Makefile
index ec36c23fad84..427e8264de41 100644
--- a/devel/py-simpletal/Makefile
+++ b/devel/py-simpletal/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	SimpleTAL-${PORTVERSION}
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Stand alone TAL Python implementation to power HTML & XML templates
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		python
diff --git a/devel/py-smmap/Makefile b/devel/py-smmap/Makefile
index 8d468214c113..3bff127f2e8a 100644
--- a/devel/py-smmap/Makefile
+++ b/devel/py-smmap/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Pure python sliding memory map manager
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-speaklater/Makefile b/devel/py-speaklater/Makefile
index d35365b3f803..03807c1e0165 100644
--- a/devel/py-speaklater/Makefile
+++ b/devel/py-speaklater/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Lazy string Python module for translations
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-sqlcc/Makefile b/devel/py-sqlcc/Makefile
index ce9b61377eef..884ea84869da 100644
--- a/devel/py-sqlcc/Makefile
+++ b/devel/py-sqlcc/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Python SQL Command Composer
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pythk>=0:${PORTSDIR}/devel/pythk
 
diff --git a/devel/py-traits/Makefile b/devel/py-traits/Makefile
index a20fcbe43be7..d0848db0d0fa 100644
--- a/devel/py-traits/Makefile
+++ b/devel/py-traits/Makefile
@@ -12,7 +12,8 @@ DISTNAME=	Traits-${PORTVERSION}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Explicitly Typed Attributes for Python
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE PSFL
+LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}EnthoughtBase>=3.0.1:${PORTSDIR}/devel/py-EnthoughtBase \
 		${PYNUMPY}
diff --git a/devel/py-tvrage/Makefile b/devel/py-tvrage/Makefile
index 0059a29fea46..aa9d535c37f1 100644
--- a/devel/py-tvrage/Makefile
+++ b/devel/py-tvrage/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Python client for the tvrage.com XML API
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ckreutzer
diff --git a/devel/py-ujson/Makefile b/devel/py-ujson/Makefile
index 5e7ca59232bb..02de5a6312ce 100644
--- a/devel/py-ujson/Makefile
+++ b/devel/py-ujson/Makefile
@@ -10,7 +10,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Ultra fast JSON encoder and decoder for Python
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE TclTk
+LICENSE_COMB=	multi
+LICENSE_NAME_TclTk=	Tcl/Tk License
+LICENSE_TEXT_TclTk=	http://www.tcl.tk/software/tcltk/license.html
+LICENSE_PERMS_TclTk=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile
index 4d13b6f03aa1..fc4fcf92a348 100644
--- a/devel/pyside-tools/Makefile
+++ b/devel/pyside-tools/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for creating PySide applications
 
-LICENSE=	BSD GPLv2
+LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:${PORTSDIR}/devel/pyside
diff --git a/devel/rubygem-debugger/Makefile b/devel/rubygem-debugger/Makefile
index 79364c738b68..a661ac729ca1 100644
--- a/devel/rubygem-debugger/Makefile
+++ b/devel/rubygem-debugger/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	wulf@cicgroup.ru
 COMMENT=	Fast implementation of the standard Ruby debugger
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 FETCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch
 RUN_DEPENDS=	rubygem-columnize>=0.3.1:${PORTSDIR}/devel/rubygem-columnize \
diff --git a/devel/rubygem-wdm/Makefile b/devel/rubygem-wdm/Makefile
index a7d863f5d49a..e99fb8409450 100644
--- a/devel/rubygem-wdm/Makefile
+++ b/devel/rubygem-wdm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Library for monitoring directories for changes
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/uthash/Makefile b/devel/uthash/Makefile
index 8af70eafd303..832ec1988348 100644
--- a/devel/uthash/Makefile
+++ b/devel/uthash/Makefile
@@ -9,7 +9,10 @@ MASTER_SITES=	GH
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	hash table for C structures
 
-LICENSE=	BSD
+LICENSE=	BSD1CLAUSE
+LICENSE_NAME=	BSD 1-Clause License
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/yasm-devel/Makefile b/devel/yasm-devel/Makefile
index f633ec8f8297..5f8c01aa0954 100644
--- a/devel/yasm-devel/Makefile
+++ b/devel/yasm-devel/Makefile
@@ -12,7 +12,8 @@ PKGNAMESUFFIX=		-devel
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Complete rewrite of the NASM assembler (Development Snapshot)
 
-LICENSE=	BSD
+LICENSE=	ART10 BSD2CLAUSE BSD3CLAUSE
+LICENSE_COMB=	multi
 
 OPTIONS_DEFINE=	DEBUG NLS