Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 0EF4FA654B for ; Wed, 29 Apr 2015 14:23:28 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3159214A334; Wed, 29 Apr 2015 14:23:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D8F9314A333 for ; Wed, 29 Apr 2015 14:23:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3Lgx0TUudH4Z for ; Wed, 29 Apr 2015 14:23:23 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 6656E14A30C for ; Wed, 29 Apr 2015 14:23:23 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 5A90B98; Wed, 29 Apr 2015 14:23:23 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Wed, 29 Apr 2015 14:23:23 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20150429142323.5A90B98@cvs.netbsd.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk Module Name: pkgsrc Committed By: jperkin Date: Wed Apr 29 14:23:23 UTC 2015 Modified Files: pkgsrc/mk: bsd.pkg.mk bsd.prefs.mk pkgsrc/mk/wrapper: wrapper-defs.mk Log Message: Introduce _USE_CWRAPPERS logic to ensure consistency, USE_CWRAPPERS could differ between a package and user setting, resulting in incorrect WRAPPER_* values being set from wrapper-defs.mk. To generate a diff of this commit: cvs rdiff -u -r1.2012 -r1.2013 pkgsrc/mk/bsd.pkg.mk cvs rdiff -u -r1.363 -r1.364 pkgsrc/mk/bsd.prefs.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/wrapper/wrapper-defs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.