aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-fonts/droid-fonts-ttf/Makefile11
-rw-r--r--x11-fonts/droid-fonts-ttf/pkg-plist4
2 files changed, 6 insertions, 9 deletions
diff --git a/x11-fonts/droid-fonts-ttf/Makefile b/x11-fonts/droid-fonts-ttf/Makefile
index e9341f510a4b..26a597083029 100644
--- a/x11-fonts/droid-fonts-ttf/Makefile
+++ b/x11-fonts/droid-fonts-ttf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= droid-fonts-ttf
PORTVERSION= 20131024
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= LOCAL/sunpoet
@@ -11,9 +12,11 @@ COMMENT= The Droid typeface family
LICENSE= APACHE20
-BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+BUILD_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
+ ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+NO_BUILD= yes
USES= tar:xz
FONTDIR= lib/X11/fonts/Droid
@@ -22,13 +25,9 @@ PLIST_SUB= FONTDIR=${FONTDIR}
SUB_FILES= pkg-message
SUB_LIST= FONTDIR=${FONTDIR}
-do-build:
- @cd ${WRKSRC}/ && ${LOCALBASE}/bin/mkfontscale
- @cd ${WRKSRC}/ && ${LOCALBASE}/bin/mkfontdir
-
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}/
- cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf fonts.* ${STAGEDIR}${PREFIX}/${FONTDIR}/
+ cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${PREFIX}/${FONTDIR}/
# maintainer section:
# https://android.googlesource.com/platform/frameworks/base/+/master/data/fonts/
diff --git a/x11-fonts/droid-fonts-ttf/pkg-plist b/x11-fonts/droid-fonts-ttf/pkg-plist
index a9f05cf0d878..d8f92915fc67 100644
--- a/x11-fonts/droid-fonts-ttf/pkg-plist
+++ b/x11-fonts/droid-fonts-ttf/pkg-plist
@@ -21,6 +21,4 @@
%%FONTDIR%%/DroidSerif-BoldItalic.ttf
%%FONTDIR%%/DroidSerif-Italic.ttf
%%FONTDIR%%/DroidSerif-Regular.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@dirrm %%FONTDIR%%
+@fcfontsdir %%FONTDIR%%