From owner-svn-ports-all@FreeBSD.ORG Tue Jun 10 00:10:08 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D75CF5DA; Tue, 10 Jun 2014 00:10:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB0CC2125; Tue, 10 Jun 2014 00:10:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5A0A8e1019957; Tue, 10 Jun 2014 00:10:08 GMT (envelope-from mi@svn.freebsd.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5A0A8QL019816; Tue, 10 Jun 2014 00:10:08 GMT (envelope-from mi@svn.freebsd.org) Message-Id: <201406100010.s5A0A8QL019816@svn.freebsd.org> From: Mikhail Teterin Date: Tue, 10 Jun 2014 00:10:08 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2014 00:10:08 -0000 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 @@