4 files changed, 6 insertions, 34 deletions
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index 492830e329c..f7016f0baf4 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	unicode-uhoai
 PORTVERSION=	2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	vietnamese x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
@@ -12,19 +12,15 @@ DISTNAME=	uhoaiw21
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	Unicode TrueType Font with UHoai Vietnamese encoding
 
-USES=		zip:infozip
+USES=		fonts zip:infozip
 NO_WRKSUBDIR=	yes
 NO_BUILD=	taken care of in do-install target
 
-BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir \
-		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-
+FONTNAME=	TrueType
 EXTRACT_BEFORE_ARGS=	-qoL
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/TrueType
-	${INSTALL_DATA} ${WRKSRC}/uhoaiw21.ttf \
-		${STAGEDIR}${PREFIX}/lib/X11/fonts/TrueType
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/uhoaiw21.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/vietnamese/unicode-uhoai/pkg-deinstall b/vietnamese/unicode-uhoai/pkg-deinstall
deleted file mode 100644
index a4eff462118..00000000000
--- a/vietnamese/unicode-uhoai/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-	exit 0
-fi
-
-cd ${PKG_PREFIX}/lib/X11/fonts/TrueType
-${PKG_PREFIX}/bin/ttmkfdir -o fonts.scale
-if [ `cat fonts.scale` = "0" ]; then
-	rm -f fonts.scale
-	rm -f fonts.dir
-fi
diff --git a/vietnamese/unicode-uhoai/pkg-install b/vietnamese/unicode-uhoai/pkg-install
deleted file mode 100644
index 3795ab95170..00000000000
--- a/vietnamese/unicode-uhoai/pkg-install
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-cd ${PKG_PREFIX}/lib/X11/fonts/TrueType
-${PKG_PREFIX}/bin/mkfontdir >/dev/null 2>&1
-${PKG_PREFIX}/bin/ttmkfdir -o fonts.scale
-chmod a+r fonts.scale
diff --git a/vietnamese/unicode-uhoai/pkg-plist b/vietnamese/unicode-uhoai/pkg-plist
index aa920ddbc9b..430fcfdf6c7 100644
--- a/vietnamese/unicode-uhoai/pkg-plist
+++ b/vietnamese/unicode-uhoai/pkg-plist
@@ -1 +1 @@
-lib/X11/fonts/TrueType/uhoaiw21.ttf
+%%FONTSDIR%%/uhoaiw21.ttf