From cec608df974e61be7814c276bed4684784600056 Mon Sep 17 00:00:00 2001 From: Mikhail Teterin Date: Tue, 10 Jun 2014 00:10:07 +0000 Subject: [PATCH] Support staging. The vendor's Makefile uses DESTDIR for its own purposes -- it had to be renamed, because staging uses the same variable (without advertising it). --- x11-fonts/geminifonts/Makefile | 4 +--- x11-fonts/geminifonts/files/patch-gz | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile index 141d0e2b4611..9ae683b66a79 100644 --- a/x11-fonts/geminifonts/Makefile +++ b/x11-fonts/geminifonts/Makefile @@ -18,8 +18,6 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -NO_STAGE= yes - USES= perl5 USE_PERL5= build USE_XORG= x11 @@ -29,7 +27,7 @@ MAKE_ARGS+= -j 2 post-patch: ${REINPLACE_CMD} -e 's/\.Z/.gz/g' \ - -e 's|DESTDIR =.*|DESTDIR=${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \ + -e 's|DESTDIR =.*|MDESTDIR=${STAGEDIR}${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \ ${WRKSRC}/Makefile post-install: diff --git a/x11-fonts/geminifonts/files/patch-gz b/x11-fonts/geminifonts/files/patch-gz index 9ca25d421b66..a5589cd13926 100644 --- a/x11-fonts/geminifonts/files/patch-gz +++ b/x11-fonts/geminifonts/files/patch-gz @@ -8,12 +8,13 @@ src: $(SRC) @@ -63,6 +62,7 @@ install: - -mkdir $(DESTDIR) +- -mkdir $(DESTDIR) ++ -mkdir $(MDESTDIR) - for i in $(ROMAN) $(SLANT) $(BOLD) $(BSLANT) $(FIXED) fonts.dir fonts.alias;\ - do install -c -m 444 $$i $(DESTDIR)/$$i; done + ${BSD_INSTALL_DATA} $(ROMAN) $(SLANT) $(BOLD) $(BSLANT) $(FIXED) \ -+ fonts.alias $(DESTDIR)/ -+ mkfontdir $(DESTDIR) ++ fonts.alias $(MDESTDIR)/ ++ mkfontdir $(MDESTDIR) package: @@ -75 +75 @@