From owner-svn-ports-head@FreeBSD.ORG Wed Jul 2 18:27:03 2014 Return-Path: Delivered-To: svn-ports-head@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 64572A81; Wed, 2 Jul 2014 18:27:03 +0000 (UTC) Received: from forward3l.mail.yandex.net (forward3l.mail.yandex.net [IPv6:2a02:6b8:0:1819::3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "forwards.mail.yandex.net", Issuer "Certum Level IV CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B732E2313; Wed, 2 Jul 2014 18:27:02 +0000 (UTC) Received: from smtp12.mail.yandex.net (smtp12.mail.yandex.net [95.108.131.191]) by forward3l.mail.yandex.net (Yandex) with ESMTP id 6451B15011C9; Wed, 2 Jul 2014 22:26:59 +0400 (MSK) Received: from smtp12.mail.yandex.net (localhost [127.0.0.1]) by smtp12.mail.yandex.net (Yandex) with ESMTP id D6AC216A0665; Wed, 2 Jul 2014 22:26:58 +0400 (MSK) Received: from 78.108.206.106.tel.ru (78.108.206.106.tel.ru [78.108.206.106]) by smtp12.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id PHjWY1INK7-QwWuLMCb; Wed, 2 Jul 2014 22:26:58 +0400 (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client certificate not present) X-Yandex-Uniq: 544f1959-9d5d-4202-aabd-25e6b6898f2e Message-ID: <53B44EF1.1070706@passap.ru> Date: Wed, 02 Jul 2014 22:26:57 +0400 From: Boris Samorodov Organization: =?UTF-8?B?0JfQkNCeICLQktCQ0KDQoiI=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Brendan Fabeny , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r360235 - in head/x11-fonts: doulos doulos-compact References: <201407021810.s62IA6Vw003607@svn.freebsd.org> In-Reply-To: <201407021810.s62IA6Vw003607@svn.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 18:27:03 -0000 Hi, Brendan, 02.07.2014 22:10, Brendan Fabeny пишет: > Author: bf > Date: Wed Jul 2 18:10:06 2014 > New Revision: 360235 > URL: http://svnweb.freebsd.org/changeset/ports/360235 > QAT: https://qat.redports.org/buildarchive/r360235/ > > Log: > Use options and staging > > Modified: > head/x11-fonts/doulos-compact/Makefile > head/x11-fonts/doulos/Makefile > > Modified: head/x11-fonts/doulos-compact/Makefile > ============================================================================== > --- head/x11-fonts/doulos-compact/Makefile Wed Jul 2 18:03:51 2014 (r360234) > +++ head/x11-fonts/doulos-compact/Makefile Wed Jul 2 18:10:06 2014 (r360235) > @@ -13,7 +13,7 @@ MASTER_SITES= LOCAL/bf > .endif > MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory > > -MAINTAINER= ports@FreeBSD.org > +MAINTAINER= bf@FreeBSD.org > COMMENT= Doulos SIL TrueType font collection, compact variant > > LICENSE= OFL11 > @@ -26,6 +26,10 @@ INSTALLS_TTF= yes > NO_BUILD= yes > > PLIST_FILES= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf > + > +.include > + > +.if ${PORT_OPTIONS:MDOCS} > PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt feat_set_tuned.xml > > SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}" > @@ -36,8 +40,10 @@ do-configure: > > do-install: > @${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} > - (cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) > + @(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) I'm mostly irrelevant here. However it seems to me that we mostly mute only mkdir, but not other file manipulation. > +.if ${PORT_OPTIONS:MDOCS} While with this I'd say that this is totally redundant (i.e. current ports tree infrastructure does the right thing itself). So ".include " and ".if ${PORT_OPTIONS:MDOCS}" become unneeded over complication. > @${MKDIR} ${STAGEDIR}${DOCSDIR} > - (cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) > + @(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) > +.endif > > .include > > Modified: head/x11-fonts/doulos/Makefile > ============================================================================== > --- head/x11-fonts/doulos/Makefile Wed Jul 2 18:03:51 2014 (r360234) > +++ head/x11-fonts/doulos/Makefile Wed Jul 2 18:10:06 2014 (r360235) > @@ -8,7 +8,7 @@ MASTER_SITES= http://scripts.sil.org/cms > LOCAL/bf > MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory > > -MAINTAINER= ports@FreeBSD.org > +MAINTAINER= bf@FreeBSD.org > COMMENT= Doulos SIL TrueType font collection > > LICENSE= OFL11 > @@ -22,6 +22,10 @@ MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX} > NO_BUILD= yes > > PLIST_FILES= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf > + > +.include > + > +.if ${PORT_OPTIONS:MDOCS} > PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt > > SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}" > @@ -32,8 +36,10 @@ do-configure: > > do-install: > @${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} > - (cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) > + @(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) > +.if ${PORT_OPTIONS:MDOCS} > @${MKDIR} ${STAGEDIR}${DOCSDIR} > - (cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) > + @(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) > +.endif > > .include > -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve