From owner-svn-ports-head@FreeBSD.ORG Tue Jul 15 17:02:31 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5FECD77F; Tue, 15 Jul 2014 17:02:31 +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 1D9192C23; Tue, 15 Jul 2014 17:02:30 +0000 (UTC) Received: from smtp4h.mail.yandex.net (smtp4h.mail.yandex.net [84.201.186.21]) by forward3l.mail.yandex.net (Yandex) with ESMTP id 332A11501025; Tue, 15 Jul 2014 21:02:27 +0400 (MSK) Received: from smtp4h.mail.yandex.net (localhost [127.0.0.1]) by smtp4h.mail.yandex.net (Yandex) with ESMTP id 863192C49C8; Tue, 15 Jul 2014 21:02:26 +0400 (MSK) Received: from 93.91.10.59.tel.ru (93.91.10.59.tel.ru [93.91.10.59]) by smtp4h.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 9UfRQxJuHA-2Q6i5rde; Tue, 15 Jul 2014 21:02:26 +0400 (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client certificate not present) X-Yandex-Uniq: 3d7b03a1-0a38-47e6-8a58-6623d701def6 Message-ID: <53C55EA1.7040001@passap.ru> Date: Tue, 15 Jul 2014 21:02:25 +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: Yen-Ming Lee , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r361958 - head/chinese/opendesktop-fonts References: <201407151545.s6FFjd3m039378@svn.freebsd.org> In-Reply-To: <201407151545.s6FFjd3m039378@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: Tue, 15 Jul 2014 17:02:31 -0000 15.07.2014 19:45, Yen-Ming Lee пишет: > Author: leeym > Date: Tue Jul 15 15:45:39 2014 > New Revision: 361958 > URL: http://svnweb.freebsd.org/changeset/ports/361958 > QAT: https://qat.redports.org/buildarchive/r361958/ > > Log: > - fix improper stage Also was done: . change at CONFLICTS; . change at pkg-plist. I'd say that a PORTREVISION bump is warranted. > Modified: > head/chinese/opendesktop-fonts/Makefile > head/chinese/opendesktop-fonts/pkg-plist > > Modified: head/chinese/opendesktop-fonts/Makefile > ============================================================================== > --- head/chinese/opendesktop-fonts/Makefile Tue Jul 15 15:45:35 2014 (r361957) > +++ head/chinese/opendesktop-fonts/Makefile Tue Jul 15 15:45:39 2014 (r361958) > @@ -11,7 +11,7 @@ MASTER_SITES?= ftp://ftp.opendesktop.org > MAINTAINER= ports@FreeBSD.org > COMMENT= Ming and Kai face of OpenDesktop fonts > > -CONFLICTS= zh-fireflyttf-* > +CONFLICTS= zh-fireflyttf-[0-9]* > DIST_SUBDIR= OpenFonts > NO_BUILD= yes > > @@ -41,7 +41,8 @@ do-install: > .endfor > ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${FONTSDIR} > .if !defined(WITHOUT_X11) > - ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${LOCALBASE}/etc/fonts/local.conf > + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts > + ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${PREFIX}/etc/fonts/local.conf > .endif > > .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" > > Modified: head/chinese/opendesktop-fonts/pkg-plist > ============================================================================== > --- head/chinese/opendesktop-fonts/pkg-plist Tue Jul 15 15:45:35 2014 (r361957) > +++ head/chinese/opendesktop-fonts/pkg-plist Tue Jul 15 15:45:39 2014 (r361958) > @@ -1,3 +1,5 @@ > +etc/fonts/local.conf > %%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi > %%FONTSDIR%%/local.conf-odo > %%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%LOCALBASE%%/etc/fonts/local.conf > +@dirrmtry etc/fonts > -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve