3 files changed, 21 insertions, 29 deletions

diff --git a/x11-fonts/lohit/Makefile b/x11-fonts/lohit/Makefile
index 393206e33973..54ad951fccfc 100644
--- a/x11-fonts/lohit/Makefile
+++ b/x11-fonts/lohit/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Lohit
 PORTVERSION=	20130612
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://fedorahosted.org/releases/l/o/lohit/
 DISTNAME=	lohit-ttf-${PORTVERSION}
@@ -11,37 +12,28 @@ COMMENT=	Lohit fonts
 
 LICENSE=	OFL11
 
-EXTRACT_SUFX=	.tar.gz
-XORG_CAT=	font
-
-FONTLIBPATH=	lib/X11/fonts
-FONTROOTDIR=	${PREFIX}/${FONTLIBPATH}
-INSTALLS_TTF=	yes
+USES=		fonts
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S,.orig,,:S,_,-,}
 
-PLIST_FILES=	${FONTLIBPATH}/${FONTDIR}/Lohit-Assamese.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Bengali.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Devanagari.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Gujarati.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Kannada.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Malayalam.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Marathi.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Nepali.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Oriya.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Punjabi.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Tamil-Classical.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Tamil.ttf \
-		${FONTLIBPATH}/${FONTDIR}/Lohit-Telugu.ttf
-
-SUB_LIST=	"FONTPATH=${FONTROOTDIR}/${FONTDIR}"
-SUB_FILES=	pkg-message
+PLIST_FILES=	${FONTSDIR}/Lohit-Assamese.ttf \
+		${FONTSDIR}/Lohit-Bengali.ttf \
+		${FONTSDIR}/Lohit-Devanagari.ttf \
+		${FONTSDIR}/Lohit-Gujarati.ttf \
+		${FONTSDIR}/Lohit-Kannada.ttf \
+		${FONTSDIR}/Lohit-Malayalam.ttf \
+		${FONTSDIR}/Lohit-Marathi.ttf \
+		${FONTSDIR}/Lohit-Nepali.ttf \
+		${FONTSDIR}/Lohit-Oriya.ttf \
+		${FONTSDIR}/Lohit-Punjabi.ttf \
+		${FONTSDIR}/Lohit-Tamil-Classical.ttf \
+		${FONTSDIR}/Lohit-Tamil.ttf \
+		${FONTSDIR}/Lohit-Telugu.ttf
 
-do-configure:
-	${DO_NADA}
+SUB_FILES=	pkg-message
 
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/lohit/distinfo b/x11-fonts/lohit/distinfo
index 4dd9fc0665de..7fa1b822cd6e 100644
--- a/x11-fonts/lohit/distinfo
+++ b/x11-fonts/lohit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/font/lohit-ttf-20130612.tar.gz) = c68525b695e8492b29e19596f41670eb7c4fd4de991fa932454dfada793265db
-SIZE (xorg/font/lohit-ttf-20130612.tar.gz) = 538621
+SHA256 (lohit-ttf-20130612.tar.gz) = c68525b695e8492b29e19596f41670eb7c4fd4de991fa932454dfada793265db
+SIZE (lohit-ttf-20130612.tar.gz) = 538621
diff --git a/x11-fonts/lohit/files/pkg-message.in b/x11-fonts/lohit/files/pkg-message.in
index 9858a99fac4a..6c989372b5f8 100644
--- a/x11-fonts/lohit/files/pkg-message.in
+++ b/x11-fonts/lohit/files/pkg-message.in
@@ -1,7 +1,7 @@
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
-	FontPath "%%FONTPATH%%/"
+	FontPath "%%FONTSDIR%%/"
 
 Users of older versions of X may additionally have to make sure that
 the freetype module is loaded.  Check /var/log/Xorg.0.log for error