Date: Tue, 10 Jun 2014 00:10:08 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357233 - in head/x11-fonts/geminifonts: . files Message-ID: <201406100010.s5A0A8QL019816@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Tue Jun 10 00:10:07 2014 New Revision: 357233 URL: http://svnweb.freebsd.org/changeset/ports/357233 QAT: https://qat.redports.org/buildarchive/r357233/ Log: 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). Modified: head/x11-fonts/geminifonts/Makefile head/x11-fonts/geminifonts/files/patch-gz Modified: head/x11-fonts/geminifonts/Makefile ============================================================================== --- head/x11-fonts/geminifonts/Makefile Tue Jun 10 00:02:31 2014 (r357232) +++ head/x11-fonts/geminifonts/Makefile Tue Jun 10 00:10:07 2014 (r357233) @@ -18,8 +18,6 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11- 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: Modified: head/x11-fonts/geminifonts/files/patch-gz ============================================================================== --- head/x11-fonts/geminifonts/files/patch-gz Tue Jun 10 00:02:31 2014 (r357232) +++ head/x11-fonts/geminifonts/files/patch-gz Tue Jun 10 00:10:07 2014 (r357233) @@ -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 @@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406100010.s5A0A8QL019816>