Get away from XORG_CAT= font and welcome USES=fonts

4 files changed, 29 insertions, 36 deletions

diff --git a/x11-fonts/paratype/Makefile b/x11-fonts/paratype/Makefile
index d195cdaef22e..7428e3c3eafe 100644
--- a/x11-fonts/paratype/Makefile
+++ b/x11-fonts/paratype/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	paratype
 PORTVERSION=	2.004
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://paratype.0xdc.ru/
 MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
@@ -14,23 +14,16 @@ COMMENT=	ParaType font collection for the languages of Russia
 
 LICENSE=	OFL11
 
-INSTALLS_TTF=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-USES=		zip
-XORG_CAT=	font
+USES=		fonts zip
 
-FONTDIR=	ParaType
-FONTROOTDIR=	${PREFIX}/lib/X11/fonts
-PLIST_SUB=	FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"
+FONTNAME=	ParaType
+FONTSDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 SUB_FILES=	pkg-message
-SUB_LIST=	FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"
-
-do-configure:
-	@${DO_NADA}
 
 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/paratype/distinfo b/x11-fonts/paratype/distinfo
index b04ad271bdb8..a429930cf716 100644
--- a/x11-fonts/paratype/distinfo
+++ b/x11-fonts/paratype/distinfo
@@ -1,6 +1,6 @@
-SHA256 (xorg/font/PTSansOFL-2.004.zip) = 7105b5e7d9965b5b2fa189b5a84c66a8252b3432c0293f1350c15ad159447ee1
-SIZE (xorg/font/PTSansOFL-2.004.zip) = 1600360
-SHA256 (xorg/font/PTSerifOFL-1.000.zip) = 1bf55f3cf143a5e22501de18e597677ed81aaad9c12019146a9e3735e06543a5
-SIZE (xorg/font/PTSerifOFL-1.000.zip) = 1029464
-SHA256 (xorg/font/PTMonoOFL-1.002_1.zip) = 1903ef8bca290f936bf218e258ac031575ab7da3e5fe4a2fd04eaa86a5599022
-SIZE (xorg/font/PTMonoOFL-1.002_1.zip) = 178983
+SHA256 (PTSansOFL-2.004.zip) = 7105b5e7d9965b5b2fa189b5a84c66a8252b3432c0293f1350c15ad159447ee1
+SIZE (PTSansOFL-2.004.zip) = 1600360
+SHA256 (PTSerifOFL-1.000.zip) = 1bf55f3cf143a5e22501de18e597677ed81aaad9c12019146a9e3735e06543a5
+SIZE (PTSerifOFL-1.000.zip) = 1029464
+SHA256 (PTMonoOFL-1.002_1.zip) = 1903ef8bca290f936bf218e258ac031575ab7da3e5fe4a2fd04eaa86a5599022
+SIZE (PTMonoOFL-1.002_1.zip) = 178983
diff --git a/x11-fonts/paratype/files/pkg-message.in b/x11-fonts/paratype/files/pkg-message.in
index e83334dd1c26..9ce0ab9fbb48 100644
--- a/x11-fonts/paratype/files/pkg-message.in
+++ b/x11-fonts/paratype/files/pkg-message.in
@@ -1,7 +1,7 @@
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
-	FontPath "%%PREFIX%%/%%FONTDIR%%/"
+	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
diff --git a/x11-fonts/paratype/pkg-plist b/x11-fonts/paratype/pkg-plist
index 3c8b8b38cd25..ab424ae50bef 100644
--- a/x11-fonts/paratype/pkg-plist
+++ b/x11-fonts/paratype/pkg-plist
@@ -1,16 +1,16 @@
-%%FONTDIR%%/PTC55F.ttf
-%%FONTDIR%%/PTC75F.ttf
-%%FONTDIR%%/PTF55F.ttf
-%%FONTDIR%%/PTF56F.ttf
-%%FONTDIR%%/PTF75F.ttf
-%%FONTDIR%%/PTF76F.ttf
-%%FONTDIR%%/PTM55F.ttf
-%%FONTDIR%%/PTM75F.ttf
-%%FONTDIR%%/PTN57F.ttf
-%%FONTDIR%%/PTN77F.ttf
-%%FONTDIR%%/PTS55F.ttf
-%%FONTDIR%%/PTS56F.ttf
-%%FONTDIR%%/PTS75F.ttf
-%%FONTDIR%%/PTS76F.ttf
-%%FONTDIR%%/PTZ55F.ttf
-%%FONTDIR%%/PTZ56F.ttf
+%%FONTSDIR%%/PTC55F.ttf
+%%FONTSDIR%%/PTC75F.ttf
+%%FONTSDIR%%/PTF55F.ttf
+%%FONTSDIR%%/PTF56F.ttf
+%%FONTSDIR%%/PTF75F.ttf
+%%FONTSDIR%%/PTF76F.ttf
+%%FONTSDIR%%/PTM55F.ttf
+%%FONTSDIR%%/PTM75F.ttf
+%%FONTSDIR%%/PTN57F.ttf
+%%FONTSDIR%%/PTN77F.ttf
+%%FONTSDIR%%/PTS55F.ttf
+%%FONTSDIR%%/PTS56F.ttf
+%%FONTSDIR%%/PTS75F.ttf
+%%FONTSDIR%%/PTS76F.ttf
+%%FONTSDIR%%/PTZ55F.ttf
+%%FONTSDIR%%/PTZ56F.ttf