From owner-svn-src-all@FreeBSD.ORG Fri Dec 12 16:49:12 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00EAC220; Fri, 12 Dec 2014 16:49:11 +0000 (UTC) Received: from smtpout1.timeweb.ru (smtpout1.timeweb.ru [92.53.117.15]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3AFF17B; Fri, 12 Dec 2014 16:49:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=amdmi3.ru; s=dkim; h=Content-Transfer-Encoding:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=J6CSl47MJFpKqFXsyxYACvU2VyBSphrxirqCe4WYvvU=; b=LG/1IPGWZhh+samuYBNbMusDm9rDTPMw/g0KEZQBLIdC6zqG7vjmMpCj4QoluQGE8etLW1iuMIL8hSRMfa8pX7CzpxtDNjI+pQkWhtCiUMbvw2sd3q/Q5wudcE61rSWvKyJJ0UqzXq30GRd2QkqCmZM9RM3WLsKbsz6aDeJQego=; Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1XzTOo-000BmH-1p; Fri, 12 Dec 2014 19:49:02 +0300 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 803969FA; Fri, 12 Dec 2014 19:49:01 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 5A82C2B34D; Fri, 12 Dec 2014 19:49:01 +0300 (MSK) Date: Fri, 12 Dec 2014 19:49:01 +0300 From: Dmitry Marakasov To: Dag-Erling =?utf-8?B?U23DuHJncmF2?= Subject: Re: svn commit: r275659 - head/bin/freebsd-version Message-ID: <20141212164901.GB65403@hades.panopticon> Mail-Followup-To: Dag-Erling =?utf-8?B?U23DuHJncmF2?= , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201412100312.sBA3CNEm081570@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201412100312.sBA3CNEm081570@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2014 16:49:12 -0000 * Dag-Erling Sm=C3=B8rgrav (des@FreeBSD.org) wrote: > Log: > Fix dependency on newvers.sh > =20 > Noticed by: marck > MFC after: 1 week This is wrong. Target uses ${.ALLSRC} to which you've appended ${NEWVERS}= , and now the target appends newvers.sh contents to freebsd-version script. > Modified: > head/bin/freebsd-version/Makefile >=20 > Modified: head/bin/freebsd-version/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/bin/freebsd-version/Makefile Tue Dec 9 23:26:47 2014 (r275658= ) > +++ head/bin/freebsd-version/Makefile Wed Dec 10 03:12:22 2014 (r275659= ) > @@ -5,8 +5,7 @@ MAN =3D freebsd-version.1 > CLEANFILES =3D freebsd-version.sh > NEWVERS =3D ${.CURDIR}/../../sys/conf/newvers.sh > =20 > -freebsd-version.sh.in: ${NEWVERS} > -freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in > +freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS} > eval $$(egrep '^(TYPE|REVISION|BRANCH)=3D' ${NEWVERS}) ; \ > if ! sed -e "\ > s/@@TYPE@@/$${TYPE}/g; \ --=20 Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru