From 6ae3bc71b46f9a3084dec85775736554a213558b Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Wed, 25 Sep 2013 13:57:30 +0000 Subject: [PATCH] Support stage. --- arabic/ae_fonts_mono/Makefile | 10 ++-------- arabic/ae_fonts_ttf/Makefile | 10 ++-------- arabic/kacst_fonts/Makefile | 10 ++-------- arabic/khotot/Makefile | 6 ------ 4 files changed, 6 insertions(+), 30 deletions(-) diff --git a/arabic/ae_fonts_mono/Makefile b/arabic/ae_fonts_mono/Makefile index 1a0ac07cbbc6..a740e60f1210 100644 --- a/arabic/ae_fonts_mono/Makefile +++ b/arabic/ae_fonts_mono/Makefile @@ -15,7 +15,6 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -NO_STAGE= yes USE_XORG= x11 USE_BZIP2= yes SUB_FILES= pkg-message @@ -24,13 +23,8 @@ do-build: @mkfontdir ${WRKSRC} do-install: - @${MKDIR} ${PREFIX}/lib/X11/fonts/ae_fonts_mono + @${MKDIR} ${STAGEDIR}/${PREFIX}/lib/X11/fonts/ae_fonts_mono ${INSTALL_DATA} ${WRKSRC}/*.pcf ${WRKSRC}/fonts.dir \ - ${PREFIX}/lib/X11/fonts/ae_fonts_mono - -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} + ${STAGEDIR}/${PREFIX}/lib/X11/fonts/ae_fonts_mono .include diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile index b7909671b44f..c30ac1ef6376 100644 --- a/arabic/ae_fonts_ttf/Makefile +++ b/arabic/ae_fonts_ttf/Makefile @@ -15,7 +15,6 @@ LICENSE= GPLv2 BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir -NO_STAGE= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/ae_fonts1-${PORTVERSION} SUB_FILES= pkg-message @@ -52,14 +51,9 @@ do-build: do-install: .for font in ${FONTS} - @${MKDIR} ${PREFIX}/lib/X11/fonts/ae_fonts1/${font} + @${MKDIR} ${STAGEDIR}/${PREFIX}/lib/X11/fonts/ae_fonts1/${font} ${INSTALL_DATA} ${WRKSRC}/${font}/* \ - ${PREFIX}/lib/X11/fonts/ae_fonts1/${font} + ${STAGEDIR}/${PREFIX}/lib/X11/fonts/ae_fonts1/${font} .endfor -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - .include diff --git a/arabic/kacst_fonts/Makefile b/arabic/kacst_fonts/Makefile index e23df7aabdc6..8fce18ba29e0 100644 --- a/arabic/kacst_fonts/Makefile +++ b/arabic/kacst_fonts/Makefile @@ -15,7 +15,6 @@ LICENSE= GPLv2 BUILD_DEPENDS= ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir -NO_STAGE= yes USE_BZIP2= yes WRKSRC= ${WRKDIR}/KacstArabicFonts-${PORTVERSION} @@ -26,13 +25,8 @@ do-build: cd ${WRKDIR} && ttmkfdir -c -d ${WRKSRC} > ${WRKSRC}/fonts.dir do-install: - @${MKDIR} ${PREFIX}/lib/X11/fonts/kacst_fonts + @${MKDIR} ${STAGEDIR}/${PREFIX}/lib/X11/fonts/kacst_fonts ${INSTALL_DATA} ${WRKSRC}/*.ttf ${WRKSRC}/fonts.dir \ - ${PREFIX}/lib/X11/fonts/kacst_fonts - -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} + ${STAGEDIR}/${PREFIX}/lib/X11/fonts/kacst_fonts .include diff --git a/arabic/khotot/Makefile b/arabic/khotot/Makefile index a8eb42c14d51..2e72744f4c1d 100644 --- a/arabic/khotot/Makefile +++ b/arabic/khotot/Makefile @@ -12,7 +12,6 @@ EXTRACT_ONLY= # MAINTAINER= ports@FreeBSD.org COMMENT= Meta-port for popular Arabic font packages -NO_STAGE= yes NO_BUILD= yes NO_INSTALL= yes SUB_FILES= pkg-message @@ -38,9 +37,4 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/ae_fonts1/AAHS/fonts.dir:${PORTSDIR}/ar RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/kacst_fonts/fonts.dir:${PORTSDIR}/arabic/kacst_fonts .endif -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - .include