Index: head/www/tdom/Makefile
===================================================================
--- head/www/tdom/Makefile	(revision 429816)
+++ head/www/tdom/Makefile	(revision 429817)
@@ -1,47 +1,50 @@
 # Created by: Aldert Nooitgedagt
 # $FreeBSD$
 
 PORTNAME=	tDOM
 PORTVERSION=	0.8.3
 CATEGORIES=	www
 MASTER_SITES=	GHC http://mirrors.rit.edu/zi/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	High performance XML data processing with Tcl (ARGS for OpenACS)
 
+LICENSE=	MPL MIT
+LICENSE_COMB=	multi
+LICENSE_FILE_MIT=	${WRKSRC}/expat/COPYING
+
 TDOMBASE=	${PREFIX}/lib/tdom${PORTVERSION}
 
-OPTIONS_DEFINE=	DOCS
-
 USES=		gmake tar:tgz tcl:tea
 USE_GITHUB=	yes
+CONFIGURE_ARGS=	--enable-threads --disable-tdomalloc
 
-pre-configure:
-	${RM} ${WRKSRC}/generic/domalloc.?
+TEST_TARGET=	test
+TEST_ENV=	LANG=C
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-DOCS=		CHANGES LICENSE README README.AOL
+DOCS=		CHANGES README README.AOL
 HTMLDOCS=	category-index.html dom.html domDoc.html domNode.html \
 		expat.html expatapi.html index.html keyword-index.html \
 		tdomcmd.html tnc.html
 
-post-build test:
-	${SETENV} LANG=C ${MAKE} -C ${WRKSRC} test
+OPTIONS_DEFINE=	DOCS
 
-CONFIGURE_ARGS+=--enable-threads --disable-tdomalloc
+pre-configure:
+	@${RM} ${WRKSRC}/generic/domalloc.?
 
 post-install:
 	${CHMOD} 755 ${STAGEDIR}${TDOMBASE}
 	${CHMOD} 644 ${STAGEDIR}${TDOMBASE}/*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for FILE in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
 .endfor
 .for FILE in ${HTMLDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}/html/${FILE}
 .endfor
 
 .include <bsd.port.mk>
Index: head/www/tdom/pkg-plist
===================================================================
--- head/www/tdom/pkg-plist	(revision 429816)
+++ head/www/tdom/pkg-plist	(revision 429817)
@@ -1,27 +1,26 @@
 include/tdom.h
 lib/tdom%%PORTVERSION%%/libtdom%%PORTVERSION%%.so
 lib/tdom%%PORTVERSION%%/libtdomstub%%PORTVERSION%%.a
 lib/tdom%%PORTVERSION%%/pkgIndex.tcl
 lib/tdom%%PORTVERSION%%/tdom.tcl
 lib/tdomConfig.sh
 man/mann/dom.n.gz
 man/mann/domDoc.n.gz
 man/mann/domNode.n.gz
 man/mann/expat.n.gz
 man/mann/expatapi.n.gz
 man/mann/tdomcmd.n.gz
 man/mann/tnc.n.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/category-index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dom.html
 %%PORTDOCS%%%%DOCSDIR%%/html/domDoc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/domNode.html
 %%PORTDOCS%%%%DOCSDIR%%/html/expat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/expatapi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/keyword-index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tdomcmd.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tnc.html
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.AOL