aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-fonts/paratype/Makefile9
-rw-r--r--x11-fonts/profont/Makefile16
2 files changed, 8 insertions, 17 deletions
diff --git a/x11-fonts/paratype/Makefile b/x11-fonts/paratype/Makefile
index 43bbe6b1d0ce..d195cdaef22e 100644
--- a/x11-fonts/paratype/Makefile
+++ b/x11-fonts/paratype/Makefile
@@ -17,7 +17,6 @@ LICENSE= OFL11
INSTALLS_TTF= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_TGZ= yes
USES= zip
XORG_CAT= font
@@ -27,15 +26,11 @@ PLIST_SUB= FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"
SUB_FILES= pkg-message
SUB_LIST= FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"
-NO_STAGE= yes
do-configure:
@${DO_NADA}
do-install:
- @${MKDIR} ${FONTROOTDIR}/${FONTDIR}
- @${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}/
- @${ECHO_MSG}
- @${CAT} ${PKGMESSAGE}
- @${ECHO_MSG}
+ @${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}/
.include <bsd.port.mk>
diff --git a/x11-fonts/profont/Makefile b/x11-fonts/profont/Makefile
index 409661475889..434a1a7752ba 100644
--- a/x11-fonts/profont/Makefile
+++ b/x11-fonts/profont/Makefile
@@ -3,30 +3,26 @@
PORTNAME= profont
PORTVERSION= 400
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.tobiasjung.net/dl/
DISTNAME= ${PORTNAME}-x11
MAINTAINER= ports@FreeBSD.org
-COMMENT= Profont - The ultimate programming font.
+COMMENT= Ultimate programming font
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
FONTDIR= lib/X11/fonts/${PORTNAME}
PLIST_SUB+= FONTDIR=${FONTDIR}
-NO_STAGE= yes
do-build:
${GZIP_CMD} ${WRKSRC}/*.pcf
do-install:
- ${MKDIR} ${LOCALBASE}/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${LOCALBASE}/${FONTDIR}
-
-post-install:
- @cd ${LOCALBASE}/${FONTDIR}; mkfontdir
- @${CP} ${LOCALBASE}/${FONTDIR}/fonts.dir ${LOCALBASE}/${FONTDIR}/fonts.scale || true
- @command fc-cache -f -v ${LOCALBASE}/${FONTDIR} || true
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/${FONTDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${LOCALBASE}/${FONTDIR}
+ (cd ${STAGEDIR}${LOCALBASE}/${FONTDIR}; mkfontdir; mkfontscale)
.include <bsd.port.mk>