Index: head/x11-fonts/ubuntu-font/Makefile
===================================================================
--- head/x11-fonts/ubuntu-font/Makefile	(revision 381762)
+++ head/x11-fonts/ubuntu-font/Makefile	(revision 381763)
@@ -1,40 +1,33 @@
 # Created by: Kevin Lo <kevlo@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ubuntu-font
 PORTVERSION=	0.80
 PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://font.ubuntu.com/download/
 
 DISTNAME=	${PORTNAME}-family-${PORTVERSION}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Ubuntu font family
 
 LICENSE=	UFL
 LICENSE_FILE=	${WRKSRC}/LICENCE.txt
 LICENSE_NAME=	Ubuntu Font License (UFL)
-LICENSE_PERMS=	auto-accept
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-USES=		zip
+USES=		fonts zip
 NO_BUILD=	yes
 
-PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
-FONTSDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
 SUB_FILES=	pkg-message
-SUB_LIST=	FONTSDIR=${FONTSDIR}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} *.txt ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
Index: head/x11-fonts/ubuntu-font/pkg-plist
===================================================================
--- head/x11-fonts/ubuntu-font/pkg-plist	(revision 381762)
+++ head/x11-fonts/ubuntu-font/pkg-plist	(revision 381763)
@@ -1,21 +1,20 @@
 %%FONTSDIR%%/Ubuntu-B.ttf
 %%FONTSDIR%%/Ubuntu-BI.ttf
 %%FONTSDIR%%/Ubuntu-C.ttf
 %%FONTSDIR%%/Ubuntu-L.ttf
 %%FONTSDIR%%/Ubuntu-LI.ttf
 %%FONTSDIR%%/Ubuntu-M.ttf
 %%FONTSDIR%%/Ubuntu-MI.ttf
 %%FONTSDIR%%/Ubuntu-R.ttf
 %%FONTSDIR%%/Ubuntu-RI.ttf
 %%FONTSDIR%%/UbuntuMono-B.ttf
 %%FONTSDIR%%/UbuntuMono-BI.ttf
 %%FONTSDIR%%/UbuntuMono-R.ttf
 %%FONTSDIR%%/UbuntuMono-RI.ttf
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.txt
 %%PORTDOCS%%%%DOCSDIR%%/FONTLOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENCE-FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/TRADEMARKS.txt
 %%PORTDOCS%%%%DOCSDIR%%/copyright.txt
-@fc %%FONTSDIR%%