From owner-svn-ports-all@freebsd.org Sun Jul 23 20:20:05 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7231ADAC449; Sun, 23 Jul 2017 20:20:05 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from ainaz.pair.com (ainaz.pair.com [209.68.2.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FF5B6DA2A; Sun, 23 Jul 2017 20:20:04 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from ainaz.pair.com (localhost [127.0.0.1]) by ainaz.pair.com (Postfix) with ESMTP id EBCBF3F60C; Sun, 23 Jul 2017 16:19:57 -0400 (EDT) Received: from anthias (vie-188-118-244-226.dsl.sil.at [188.118.244.226]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ainaz.pair.com (Postfix) with ESMTPSA id D8C7B3F60B; Sun, 23 Jul 2017 16:19:56 -0400 (EDT) Date: Sun, 23 Jul 2017 22:19:54 +0200 (CEST) From: Gerald Pfeifer To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: %%OPTION%% in pkg-plist and Mk/Scripts/check-stagedir.sh (was: svn commit: r446505 - head/emulators/wine-devel) In-Reply-To: <201707231959.v6NJxGQV079454@repo.freebsd.org> Message-ID: References: <201707231959.v6NJxGQV079454@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2017 20:20:05 -0000 On Sun, 23 Jul 2017, Gerald Pfeifer wrote: > Log: > Move some twenty files that originally were part of the Wine Staging > patchset when Wine 2.0 branched and have been integrated into the Wine > development tree since then from being only included in packages / installed > ports when option STAGING is active to the general case (i.e., omit > the leading %%STAGING%% marker from their entries in pkg-plist). > > This points to an unfortunate deficiency in Mk/Scripts/check-stagedir.sh > which we are relying on. [1] > > PR: 220950 [1] If you have any ports that have options (and files guarded by %%OPTION%% in pkg-plist), in particular when some of those files may move from being specific to an %%OPTION%% to the general case over time, you may want to pay close attention -- Mk/Scripts/check-stagedir.sh is letting us down. PR 220950 has a sample script that you may want to adjust and use. Gerald