Index: head/multimedia/libtuner/Makefile
===================================================================
--- head/multimedia/libtuner/Makefile	(revision 374404)
+++ head/multimedia/libtuner/Makefile	(revision 374405)
@@ -1,17 +1,18 @@
 # Created by: Jason Harmening <jason.harmening@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	libtuner
 PORTVERSION=	1.1.2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://corona.homeunix.net/ports/libtuner/
 
 MAINTAINER=	jason.harmening@gmail.com
 COMMENT=	Userspace drivers for various TV/radio tuner ICs
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE MIT
+LICENSE_COMB=	multi
 
 MAKE_ARGS+=	INSTALLDIR=${STAGEDIR}${PREFIX}
 USE_LDCONFIG=	${PREFIX}/lib/libtuner
 
 .include <bsd.port.mk>
Index: head/multimedia/mkclean/Makefile
===================================================================
--- head/multimedia/mkclean/Makefile	(revision 374404)
+++ head/multimedia/mkclean/Makefile	(revision 374405)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	mkclean
 PORTVERSION=	0.8.7
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/matroska/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clean and optimize Matroska and WebM files
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 HAS_CONFIGURE=	yes
 
 USES=		iconv gmake tar:bzip2
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
 MAKE_ENV+=	"LFLAGS=${LDFLAGS}"
 MAKEFILE=	GNUmakefile
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 
 PLIST_FILES=	bin/mkclean \
 		bin/mkWDclean
 
 BROKEN_sparc64=	Does not install on sparc64: gmake: GNUmakefile: No such file or directory
 
 post-extract:
 	@${REINPLACE_CMD} -e 's,/usr/local,$$(DESTDIR)$$(PREFIX),g' ${WRKSRC}/corec/tools/coremake/gcc_mak.inc
 	@${RM} ${WRKSRC}/libmatroska2/test/test.proj
 
 .include <bsd.port.mk>
Index: head/multimedia/mkvalidator/Makefile
===================================================================
--- head/multimedia/mkvalidator/Makefile	(revision 374404)
+++ head/multimedia/mkvalidator/Makefile	(revision 374405)
@@ -1,32 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	mkvalidator
 PORTVERSION=	0.4.2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/matroska/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command line tool to verify Matroska and WebM files
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE BSD4CLAUSE GPLv2
+LICENSE_COMB=	multi
 
 HAS_CONFIGURE=	yes
 
 USES=		iconv gmake tar:bzip2
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
 MAKE_ENV+=	"LFLAGS=${LDFLAGS}"
 MAKEFILE=	GNUmakefile
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 
 PLIST_FILES=	bin/mkvalidator
 
 BROKEN_sparc64=	Does not install on sparc64: gmake: GNUmakefile: No such file or directory
 
 post-extract:
 	@${REINPLACE_CMD} -e 's,/usr/local,$$(DESTDIR)$$(PREFIX),g' ${WRKSRC}/corec/tools/coremake/gcc_mak.inc
 	@${RM} ${WRKSRC}/libmatroska2/test/test.proj
 
 .include <bsd.port.mk>
Index: head/multimedia/p5-Net-UPnP/Makefile
===================================================================
--- head/multimedia/p5-Net-UPnP/Makefile	(revision 374404)
+++ head/multimedia/p5-Net-UPnP/Makefile	(revision 374405)
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	Net-UPnP
 PORTVERSION=	1.4.2
 PORTREVISION=	1
 CATEGORIES=	multimedia devel
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SKONNO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for UPnP
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/README
 
 USES=		perl5
 USE_PERL5=	configure
 
 PORTSCOUT=	ignore:1.41
 
 .include <bsd.port.mk>
Index: head/multimedia/podcastdl/Makefile
===================================================================
--- head/multimedia/podcastdl/Makefile	(revision 374404)
+++ head/multimedia/podcastdl/Makefile	(revision 374405)
@@ -1,22 +1,22 @@
 # Created by: Rodrigo OSORIO <rodrigo@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	podcastdl
 PORTVERSION=	0.3.1
 PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://rodrigo.osorio.free.fr/freebsd/distfiles/ \
 		http://files.bebik.net/podcastdl/
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Simple command line podcast client written in plain C
 
-LICENSE=	BSD
+LICENSE=	ISCL
 
 LIB_DEPENDS=	libmrss.so:${PORTSDIR}/textproc/libmrss
 
 USES=		cmake
 
 PLIST_FILES=	bin/podcastdl
 
 .include <bsd.port.mk>