Index: head/misc/figlet/Makefile
===================================================================
--- head/misc/figlet/Makefile	(revision 374395)
+++ head/misc/figlet/Makefile	(revision 374396)
@@ -1,40 +1,40 @@
 # Created by: David O'Brien (obrien@cs.ucdavis.edu)
 # $FreeBSD$
 
 PORTNAME=	figlet
 PORTVERSION=	2.2.5
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.figlet.org/pub/figlet/program/unix/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
 
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	SysV banner-like program prints strings in large fancy ASCII art
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MAKE_ENV=	datadir=${DATADIR} prefix=${PREFIX}
 MAKE_ARGS=	LD=${CC}
 
 OPTIONS_DEFINE=	DOCS
 
 regression-test:
 	@ cd ${WRKSRC} && ${MAKE} check
 
 post-build tests test: regression-test
 
 do-install:
 	@ ${MKDIR} ${STAGEDIR}${DATADIR}
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/figlet ${STAGEDIR}${PREFIX}/bin
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/chkfont ${STAGEDIR}${PREFIX}/bin
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/figlist ${STAGEDIR}${PREFIX}/bin
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/showfigfonts ${STAGEDIR}${PREFIX}/bin
 	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flf ${STAGEDIR}${DATADIR}
 	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flc ${STAGEDIR}${DATADIR}
 	@ cd ${WRKSRC} && ${INSTALL_MAN} *.6 ${STAGEDIR}${PREFIX}/man/man6
 
 	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@ ${INSTALL_DATA} ${WRKSRC}/figfont.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/misc/libutf/Makefile
===================================================================
--- head/misc/libutf/Makefile	(revision 374395)
+++ head/misc/libutf/Makefile	(revision 374396)
@@ -1,33 +1,33 @@
 # Created by: Serge Gagnon <gagnon__s@videotron.ca>
 # $FreeBSD$
 
 PORTNAME=	libutf
 PORTVERSION=	2.10
 PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.yorku.ca/pub/wily/misc/ \
 		http://www.westley.demon.co.uk/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UTF-8 character set support library, including regular expressions
 
-LICENSE=	BSD
+LICENSE=	BSD4CLAUSE
 
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	ETCDIR="${DATADIR}"
 ALL_TARGET=	tst
 
 PLIST_FILES=	include/ure.h include/utf.h lib/libutf.a \
 		man/man3/ure.3.gz man/man3/utf.3.gz %%DATADIR%%/langcoll.utf
 PLIST_DIRS=	%%DATADIR%%
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/ure.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/utf.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/libutf.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_MAN} ${WRKSRC}/utf.3 ${STAGEDIR}${MAN3PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/ure.3 ${STAGEDIR}${MAN3PREFIX}/man/man3
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/langcoll.utf ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/misc/logsurfer/Makefile
===================================================================
--- head/misc/logsurfer/Makefile	(revision 374395)
+++ head/misc/logsurfer/Makefile	(revision 374396)
@@ -1,32 +1,34 @@
 # Created by: shanee@augusta.de
 # $FreeBSD$
 
 PORTNAME=	logsurfer
 PORTVERSION=	1.8
 CATEGORIES=	misc
 MASTER_SITES=	http://www.crypt.gen.nz/logsurfer/ \
 		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Process logfiles and conditionally perform certain actions
 
-LICENSE=	BSD
+LICENSE=	GPLv2 ISCL
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/DISCLAIMER
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-etcdir=${ETCDIR}
 USES=		desthack
 USE_RC_SUBR=	logsurfer
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ChangeLog README
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
Index: head/misc/tkinfo/Makefile
===================================================================
--- head/misc/tkinfo/Makefile	(revision 374395)
+++ head/misc/tkinfo/Makefile	(revision 374396)
@@ -1,30 +1,30 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tkinfo
 PORTVERSION=	2.8
 PORTREVISION=	2
 CATEGORIES=	misc tk
 MASTER_SITES=	http://math-www.uni-paderborn.de/~axel/tkinfo/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tk script to read GNU "info" files and display them
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 NO_BUILD=	yes
 USES+=		tk
 
 PLIST_FILES=	bin/tkinfo \
 		man/man1/tkinfo.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local/info|${LOCALBASE}/info|; \
 		 s|exec wish|exec ${WISH}|' ${WRKSRC}/tkinfo
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tkinfo ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/tkinfo.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>