Update "BSD" license in www category

48 files changed, 55 insertions, 54 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index d60afc9f30d0..8557cb57b9b6 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://adzapper.sourceforge.net/
 MAINTAINER=	horia@racoviceanu.com
 COMMENT=	Filter out animated ad banners from web pages
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/www/dfileserver/Makefile b/www/dfileserver/Makefile
index 492e91677d82..31c3326c968c 100644
--- a/www/dfileserver/Makefile
+++ b/www/dfileserver/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://rodrigo.osorio.free.fr/freebsd/distfiles/ \
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Compact webserver designed to make sharing files easy
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 PLIST_FILES=	bin/dfileserver
 
diff --git a/www/horde-trean/Makefile b/www/horde-trean/Makefile
index 327f71de4b1f..f4fa56e9c335 100644
--- a/www/horde-trean/Makefile
+++ b/www/horde-trean/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	horde-
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Bookmark Manager
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=	horde
diff --git a/www/hotcrp/Makefile b/www/hotcrp/Makefile
index 3dbd447d566e..314a3af60db2 100644
--- a/www/hotcrp/Makefile
+++ b/www/hotcrp/Makefile
@@ -18,7 +18,7 @@ USE_MYSQL=	server
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-LICENSE=	BSD
+LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 do-install:
diff --git a/www/httpsqs/Makefile b/www/httpsqs/Makefile
index d1417034b6bf..66bcd54e8746 100644
--- a/www/httpsqs/Makefile
+++ b/www/httpsqs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Simple Queue Service based on HTTP GET/POST protocol
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet \
 		libevent.so:${PORTSDIR}/devel/libevent2
diff --git a/www/imgsizer/Makefile b/www/imgsizer/Makefile
index 2cbddb862139..ae275be2e6a0 100644
--- a/www/imgsizer/Makefile
+++ b/www/imgsizer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.catb.org/~esr/imgsizer/ \
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Tool to autogenerate WIDTH and HEIGHT for IMG HTML tags
 
-LICENSE=	BSD
+LICENSE=	BSD4CLAUSE
 
 RUN_DEPENDS=	rdjpgcom:${PORTSDIR}/graphics/jpeg \
 		identify:${PORTSDIR}/graphics/ImageMagick
diff --git a/www/nostromo/Makefile b/www/nostromo/Makefile
index 2d96ee41b8ab..ea98411dfb04 100644
--- a/www/nostromo/Makefile
+++ b/www/nostromo/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.nazgul.ch/dev/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast, secure HTTP/1.1 CGI/1.1 SSL IPv4/IPv6 webserver
 
-LICENSE=	BSD
+LICENSE=	ISCL
 
 NOSTROMO_DIR?=		nostromo
 NOSTROMO_LOGDIR?=	${NOSTROMO_DIR}/logs
diff --git a/www/p5-CGI-Struct/Makefile b/www/p5-CGI-Struct/Makefile
index 2e044d134db1..327fdcb5e452 100644
--- a/www/p5-CGI-Struct/Makefile
+++ b/www/p5-CGI-Struct/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Build data structures from CGI request parameters
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
 
diff --git a/www/p5-Plack-Middleware-SocketIO/Makefile b/www/p5-Plack-Middleware-SocketIO/Makefile
index c479a590ae2a..69e445189dfe 100644
--- a/www/p5-Plack-Middleware-SocketIO/Makefile
+++ b/www/p5-Plack-Middleware-SocketIO/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Socket.IO Plack middleware
 
-LICENSE=	BSD
+LICENSE=	ART20
 
 RUN_DEPENDS=	\
 	p5-AnyEvent>0:${PORTSDIR}/devel/p5-AnyEvent \
diff --git a/www/pear-HTTP_Session2/Makefile b/www/pear-HTTP_Session2/Makefile
index 3d687bff7cc2..44a48e8eaa02 100644
--- a/www/pear-HTTP_Session2/Makefile
+++ b/www/pear-HTTP_Session2/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	www devel pear
 MAINTAINER=	joehorn@gmail.com
 COMMENT=	PHP5 Session Handler
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=		dos2unix pear
 
diff --git a/www/pear-Horde_Dav/Makefile b/www/pear-Horde_Dav/Makefile
index bda0fd73ffa5..df185977fc08 100644
--- a/www/pear-Horde_Dav/Makefile
+++ b/www/pear-Horde_Dav/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde library for WebDAV, CalDAV, CardDAV
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 USES=	horde
 USE_HORDE_RUN=	Horde_Auth \
diff --git a/www/pecl-varnish/Makefile b/www/pecl-varnish/Makefile
index 602428095a2f..1414dbf1a8b4 100644
--- a/www/pecl-varnish/Makefile
+++ b/www/pecl-varnish/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	jim@ohlste.in
 COMMENT=	Varnish cache extension
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/varnishd:${PORTSDIR}/www/varnish
 
diff --git a/www/pelican/Makefile b/www/pelican/Makefile
index ec0e2570993d..0ad9292bbf0f 100644
--- a/www/pelican/Makefile
+++ b/www/pelican/Makefile
@@ -2,13 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	pelican
-PORTVERSION=	3.3.0
-PORTREVISION=	1
+PORTVERSION=	3.5.0
+PORTREVISION=	0
 CATEGORIES=	www textproc
+MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Static site generator written in Python
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils \
 		${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.6:${PORTSDIR}/devel/py-Jinja2 \
@@ -31,10 +34,6 @@ PYDISTUTILS_AUTOPLIST=	yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON=		yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	getpelican
-GH_COMMIT=	b35ce43
-
 .if ${PORT_OPTIONS:MTEST}
 BUILD_DEPENDS:=	${TEST_DEPENDS}
 .endif
diff --git a/www/pelican/distinfo b/www/pelican/distinfo
index 9b463a646b92..1d41ec87c918 100644
--- a/www/pelican/distinfo
+++ b/www/pelican/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pelican-3.3.0.tar.gz) = 3af90bddeecc8f710e1cfe03d51201580e3d1e564f7dfae7ebb4ef986417084c
-SIZE (pelican-3.3.0.tar.gz) = 590771
+SHA256 (pelican-3.5.0.tar.gz) = b7edaa88e458b99e4412e4a445c84e2d387387ed2ffdf1a88c1108a58d888836
+SIZE (pelican-3.5.0.tar.gz) = 268354
diff --git a/www/php-plurk-api/Makefile b/www/php-plurk-api/Makefile
index 875ac1c1e7db..f67d03887170 100644
--- a/www/php-plurk-api/Makefile
+++ b/www/php-plurk-api/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	appleboy.tw@gmail.com
 COMMENT=	Plurk API Implementation with PHP
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 NO_BUILD=	yes
 USE_PHP=	json curl
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index b21fe85fccbc..d2232cae39ad 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	xenophon+fbsdports@irtnog.org
 COMMENT=	Content management system built with the Django framework
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south \
 		${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django \
diff --git a/www/py-django-evolution/Makefile b/www/py-django-evolution/Makefile
index 1400cd2528cb..ae143f578940 100644
--- a/www/py-django-evolution/Makefile
+++ b/www/py-django-evolution/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	django_evolution-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database schema evolution tool for the Django web framework
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django14>=1.1.1:${PORTSDIR}/www/py-django14
 
diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile
index c0989b1699bd..71ee9675f434 100644
--- a/www/py-django-extensions/Makefile
+++ b/www/py-django-extensions/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Global custom management extensions for the Django Framework
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django \
 		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
diff --git a/www/py-django-haystack/Makefile b/www/py-django-haystack/Makefile
index b63900360e67..a28a3943d56c 100644
--- a/www/py-django-haystack/Makefile
+++ b/www/py-django-haystack/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	kristaps.kulis@gmail.com
 COMMENT=	Pluggable search for Django
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.3:${PORTSDIR}/www/py-django
 
diff --git a/www/py-django-keyedcache/Makefile b/www/py-django-keyedcache/Makefile
index 413bcdbf01d0..aab16e85cb24 100644
--- a/www/py-django-keyedcache/Makefile
+++ b/www/py-django-keyedcache/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Simplified, speedy way to manage caching in Django apps
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
 
diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index 82cf8ea552e6..f80b1b50aa24 100644
--- a/www/py-django-livesettings/Makefile
+++ b/www/py-django-livesettings/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Configure Django project settings via admin interface
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile
index cb32b951b7bf..0ab3f5f59749 100644
--- a/www/py-django-mezzanine/Makefile
+++ b/www/py-django-mezzanine/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	Mezzanine-${PORTVERSION}
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Content management platform built using the Django framework
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django \
 		${PYTHON_PKGNAMEPREFIX}south>=0.7.3:${PORTSDIR}/databases/py-south \
diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile
index de332c47a76e..98ef62853af2 100644
--- a/www/py-django-photologue/Makefile
+++ b/www/py-django-photologue/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Reusable gallery application for Django
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile
index 4f51c6b5334a..b5725b65a375 100644
--- a/www/py-django-registration/Makefile
+++ b/www/py-django-registration/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	User-registration application for Django
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.4:${PORTSDIR}/www/py-django
 
diff --git a/www/py-django-reversion/Makefile b/www/py-django-reversion/Makefile
index ecc823e45f3d..b34bb75c3329 100644
--- a/www/py-django-reversion/Makefile
+++ b/www/py-django-reversion/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	xenophon+fbsdports@irtnog.org
 COMMENT=	Provides comprehensive version control facilities to Django apps
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=0:${PORTSDIR}/www/py-django
 
diff --git a/www/py-django-tagging/Makefile b/www/py-django-tagging/Makefile
index 5e10c55ee3b4..5dcd2a7afaab 100644
--- a/www/py-django-tagging/Makefile
+++ b/www/py-django-tagging/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Generic tagging application for Django
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE MIT
+LICENSE_COMB=	multi
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
 
diff --git a/www/py-django-threaded-multihost/Makefile b/www/py-django-threaded-multihost/Makefile
index 128efb1623d7..070b8e048f5d 100644
--- a/www/py-django-threaded-multihost/Makefile
+++ b/www/py-django-threaded-multihost/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Multi-host utilities to Django
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PYTHON=	yes
diff --git a/www/py-fedex/Makefile b/www/py-fedex/Makefile
index 95cb34e6e11d..5eb8867ed53f 100644
--- a/www/py-fedex/Makefile
+++ b/www/py-fedex/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@caomhin.org
 COMMENT=	Light wrapper around Fedex's Web Services SOAP API using suds
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}suds>=0:${PORTSDIR}/net/py-suds
 
diff --git a/www/py-feedgenerator/Makefile b/www/py-feedgenerator/Makefile
index 4eefe82601b6..7b7dc182a22d 100644
--- a/www/py-feedgenerator/Makefile
+++ b/www/py-feedgenerator/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Standalone version of django.utils.feedgenerator
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index 934b97baff75..2ea501bc457e 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Micro web framework
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}werkzeug>=0.9:${PORTSDIR}/www/py-werkzeug \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.6:${PORTSDIR}/devel/py-Jinja2 \
diff --git a/www/py-plone.behavior/Makefile b/www/py-plone.behavior/Makefile
index 0fe221336297..6ac5c6353e24 100644
--- a/www/py-plone.behavior/Makefile
+++ b/www/py-plone.behavior/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	zope
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Infrastructure for maintaining a registry of available behaviors
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
diff --git a/www/py-plone.transformchain/Makefile b/www/py-plone.transformchain/Makefile
index 251e066b9221..40ac1469507e 100644
--- a/www/py-plone.transformchain/Makefile
+++ b/www/py-plone.transformchain/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	zope
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Hook into repoze.zope2 for third party packages
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
 		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
diff --git a/www/py-requests-oauth-hook/Makefile b/www/py-requests-oauth-hook/Makefile
index a1af10969652..4fbfb6e5ba76 100644
--- a/www/py-requests-oauth-hook/Makefile
+++ b/www/py-requests-oauth-hook/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	This is an OAuth hook for py-requests
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests1>0:${PORTSDIR}/www/py-requests1 \
 		${PYTHON_PKGNAMEPREFIX}oauth2>0:${PORTSDIR}/net/py-oauth2
diff --git a/www/py-restclient/Makefile b/www/py-restclient/Makefile
index fe95ebc2abef..72ad0f29b98a 100644
--- a/www/py-restclient/Makefile
+++ b/www/py-restclient/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Convenient library for writing REST clients
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2
 
diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile
index 239e8a00d0bb..7fa3ed10f259 100644
--- a/www/py-webhelpers/Makefile
+++ b/www/py-webhelpers/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	WebHelpers-${PORTVERSION}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Python helper functions for writing templates in web applications
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}routes>=1.1:${PORTSDIR}/www/py-routes \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:${PORTSDIR}/textproc/py-MarkupSafe
diff --git a/www/rssroll/Makefile b/www/rssroll/Makefile
index 675a0e102bd1..42c07998a12b 100644
--- a/www/rssroll/Makefile
+++ b/www/rssroll/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://chaosophia.net/downloads/rssroll/ \
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	RSS collector in C
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libxml2.so:${PORTSDIR}/textproc/libxml2 \
diff --git a/www/rubygem-httpi/Makefile b/www/rubygem-httpi/Makefile
index 7f00983933f0..eaabe9239c27 100644
--- a/www/rubygem-httpi/Makefile
+++ b/www/rubygem-httpi/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Library for common HTTP client API
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-rack>=1.4.5:${PORTSDIR}/www/rubygem-rack
 
diff --git a/www/rubygem-rqrcode/Makefile b/www/rubygem-rqrcode/Makefile
index 491d9ca0ea25..1b3d77f8aa1b 100644
--- a/www/rubygem-rqrcode/Makefile
+++ b/www/rubygem-rqrcode/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	RG
 MAINTAINER=	rpaulo@FreeBSD.org
 COMMENT=	Library for encoding QR Codes
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/trac-TracGoogleAnalytics/Makefile b/www/trac-TracGoogleAnalytics/Makefile
index fafc500be410..ba769edd78e6 100644
--- a/www/trac-TracGoogleAnalytics/Makefile
+++ b/www/trac-TracGoogleAnalytics/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Trac plugin to enable logging by Google Analytics
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	tracd:${PORTSDIR}/www/trac \
 		${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi
diff --git a/www/trac-attachmentpolicy/Makefile b/www/trac-attachmentpolicy/Makefile
index eedb84bb87b4..13aeb29ff4c8 100644
--- a/www/trac-attachmentpolicy/Makefile
+++ b/www/trac-attachmentpolicy/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}plugin-r${SVN_REV}
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Provides delete permission to Trac normal user
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 SVN_REV=	12775
 
diff --git a/www/trac-childtickets/Makefile b/www/trac-childtickets/Makefile
index 4f63fd98863c..0917f2cde1a0 100644
--- a/www/trac-childtickets/Makefile
+++ b/www/trac-childtickets/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	hsn@sendmail.cz
 COMMENT=	Support for having child-tickets in Trac
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS+=	trac>=0.12:${PORTSDIR}/www/trac
 
diff --git a/www/trac-subtickets/Makefile b/www/trac-subtickets/Makefile
index 11ad95a12b64..0d94c0dd13f7 100644
--- a/www/trac-subtickets/Makefile
+++ b/www/trac-subtickets/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	itota-trac-subtickets-plugin-a0fc153
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Offers sub-ticket feature for managing tickets
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
 
diff --git a/www/trac-tracdragdrop/Makefile b/www/trac-tracdragdrop/Makefile
index 9c2bb80c53a3..7977732956c6 100644
--- a/www/trac-tracdragdrop/Makefile
+++ b/www/trac-tracdragdrop/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}plugin-r${SVN_REV}
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Provides extends attachments list of Trac
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 SVN_REV=	12822
 
diff --git a/www/trac-watchlist/Makefile b/www/trac-watchlist/Makefile
index 8cc96f602c15..da3cf9d4ab60 100644
--- a/www/trac-watchlist/Makefile
+++ b/www/trac-watchlist/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}plugin-r${SVN_REV}
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Watchlist feature for wikis and tickets of Trac
 
-LICENSE=	BSD
+LICENSE=	GPLv3
 
 SVN_REV=	11526
 
diff --git a/www/trac-xmlrpc/Makefile b/www/trac-xmlrpc/Makefile
index 0237ca180f49..c83c63e1a6e6 100644
--- a/www/trac-xmlrpc/Makefile
+++ b/www/trac-xmlrpc/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}plugin-r${SVN_REV}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides an XML-RPC interface to Trac
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 SVN_REV=	13203
 
diff --git a/www/varnish-libvmod-header/Makefile b/www/varnish-libvmod-header/Makefile
index d3ce11b2d4bd..c8bc25e50ac4 100644
--- a/www/varnish-libvmod-header/Makefile
+++ b/www/varnish-libvmod-header/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	varnish-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Varnish Module (vmod) for manipulation of duplicated headers
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/varnish/varnishapi.h:${PORTSDIR}/www/varnish \
 		rst2man:${PORTSDIR}/textproc/py-docutils
diff --git a/www/webbrowser/Makefile b/www/webbrowser/Makefile
index 7097a416fb2e..a186ed91fbb6 100644
--- a/www/webbrowser/Makefile
+++ b/www/webbrowser/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Wrapper for running the "best" available WEB browser
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 NO_BUILD=	yes
 USES=		tar:xz
diff --git a/www/yahoo-ui/Makefile b/www/yahoo-ui/Makefile
index 677e7b936f0b..f7d1a83083df 100644
--- a/www/yahoo-ui/Makefile
+++ b/www/yahoo-ui/Makefile
@@ -15,7 +15,8 @@ DISTFILES=	yui_${DISTVERSION}r1.zip:main \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Yahoo! User Interface (YUI) Library
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE MIT
+LICENSE_COMB=	multi
 
 USES=		zip