Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id CB3C37A26E for ; Mon, 19 Sep 2016 14:58:35 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D370D863A8; Mon, 19 Sep 2016 14:58:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 862458629B for ; Mon, 19 Sep 2016 14:58:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id EzxpXCja8RPt for ; Mon, 19 Sep 2016 14:58:15 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B717C86296 for ; Mon, 19 Sep 2016 12:26:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AA12CFBD1; Mon, 19 Sep 2016 12:26:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147428796832580" MIME-Version: 1.0 Date: Mon, 19 Sep 2016 12:26:08 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/mk/pkgformat/pkg To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20160919122608.AA12CFBD1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_147428796832580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Mon Sep 19 12:26:08 UTC 2016 Modified Files: pkgsrc/mk/pkgformat/pkg: replace.mk Log Message: Omit pkg_tarup during replace in destdir mode In destdir mode (the default), make replace creates the replacement binary package without modifying the installed system, and then installs it via pkg_add -u. Thus, the new package is known to have built and packaged ok before the system is changed, and the risk of trouble is low; thus the benefit of tarring up the installed package is very low, especially since the newly-tarred-up package is removed by "make clean". Using pkg_tarup costs cycles to run and more importantly causes users to have to install it since it is not an automatic dependency. In addition, binary packages are now kept by default when building, so the old version should be accessible in case of trouble. This commit does not change the non-destdir case. Almost no one uses that method, and the relative benefit of tarup is much higher. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/mk/pkgformat/pkg/replace.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_147428796832580 Content-Disposition: inline Content-Length: 701 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/pkgformat/pkg/replace.mk diff -u pkgsrc/mk/pkgformat/pkg/replace.mk:1.3 pkgsrc/mk/pkgformat/pkg/replace.mk:1.4 --- pkgsrc/mk/pkgformat/pkg/replace.mk:1.3 Sun Apr 10 15:58:03 2016 +++ pkgsrc/mk/pkgformat/pkg/replace.mk Mon Sep 19 12:26:08 2016 @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.3 2016/04/10 15:58:03 joerg Exp $ +# $NetBSD: replace.mk,v 1.4 2016/09/19 12:26:08 gdt Exp $ # # _pkgformat-destdir-replace: @@ -22,9 +22,9 @@ _pkgformat-replace: \ replace-fixup-installed-info \ .PHONY +# tarup is omitted for DESTDIR, because the benefits are very small _pkgformat-destdir-replace: \ replace-names \ - replace-tarup \ replace-destdir \ .PHONY --_----------=_147428796832580--