From owner-svn-ports-all@FreeBSD.ORG Sat Apr 12 18:52:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A02A394 for ; Sat, 12 Apr 2014 18:52:17 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 48A25147E for ; Sat, 12 Apr 2014 18:52:17 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CIqH0H071641 for ; Sat, 12 Apr 2014 18:52:17 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3CIqHSt071638 for svn-ports-all@freebsd.org; Sat, 12 Apr 2014 18:52:17 GMT (envelope-from bdrewery) Received: (qmail 82863 invoked from network); 12 Apr 2014 13:52:14 -0500 Received: from unknown (HELO ?10.112.44.170?) (freebsd@shatow.net@166.137.108.25) by sweb.xzibition.com with ESMTPA; 12 Apr 2014 13:52:14 -0500 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: Commit logs for 2014/04/11 From: Bryan Drewery X-Mailer: iPhone Mail (11D167) In-Reply-To: Date: Sat, 12 Apr 2014 13:52:12 -0500 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20140412035900.3C695121E45@apnoea.adamw.org> To: Adam Weinberger Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 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: Sat, 12 Apr 2014 18:52:17 -0000 On Apr 12, 2014, at 9:11, "Adam Weinberger" wrote: >> From: Bryan Drewery >> Subject: svn commit: r351064 - in head: . Keywords Mk >>=20 >> Author: bdrewery >> Date: Sat Apr 12 03:39:02 2014 >> New Revision: 351064 >> URL: http://svnweb.freebsd.org/changeset/ports/351064 >> QAT: https://qat.redports.org/buildarchive/r351064/ >>=20 >> Log: >> - Add a @sample plist keyword >>=20 >> It accepts a file (must end in .sample, this is not configurable): >>=20 >> @sample file.conf.sample >>=20 >> This will install file.conf.sample and copy it to file.conf. The file.con= f >> will be removed if it matches file.conf.sample on deinstall. >>=20 >> This replaces older patterns of: >>=20 >> @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; the= n rm -f %D/etc/pkgtools.conf; fi >> etc/pkgtools.conf.sample >> @exec [ -f %B/pkgtools.conf ] || cp %B/%f %B/pkgtools.conf >>=20 >> [1] This somewhat obsoletes work in ports/157168 which added CONF_FILES, >> but we have been moving towards more logic in pkg-plist where possibl= e >> and less magical macros. Though this thinking does clash with autopli= st >> ideas. We may still want CONF_FILES, which just drops a list of >> @sample entries into the plist anyway. >> - Add a Keywords/pkg_install.awk and hook it into generate-plist. This is= >> for pkg_install compatibility since it does not know how to read >> Keywords/sample.yaml. >> This file gives us a strategy to implement more keywords before >> pkg_install is EOL. >> Keywords are documented here: >> https://github.com/freebsd/pkg/commit/bffc31420b1fd6146a43c9abcd45109dd90= 1198a >> - This needs to be documented in PH and portlint support added still. >>=20 >> PR: ports/157168 [1] >> Discussed with: bapt >> Reviewed by: bapt >> Requested by: many >> With hat: portmgr >=20 > First of all, thank you a thousand times for this. This, right here, > this is the proof of the power of pkgNG. >=20 > That said, I have a couple requests: >=20 > * Please, please don't mandate .sample. Plenty of of ports install > sample conf files with different extension. "-dist" is very common > for php ports, for example. Let @sample take two arguments. Like > @sample etc/pants.conf-dist pants.conf > It is safe to assume that the target is in the same dir as the > source. I almost mentioned in the log, but pkg keywords don't accept more than 1 arg= ument. So we are stuck with 1 for now. We could potentially change pkg to work with arguments. At the same time hav= ing some consistency would be nice. .sample is very common. I almost did ha= ve support for -dist too, but discussing with Bapt we decided on consistency=