From owner-svn-ports-all@FreeBSD.ORG  Sun Apr 20 09:29:22 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 1033)
 id 4C7D8CDD; Sun, 20 Apr 2014 09:29:22 +0000 (UTC)
Date: Sun, 20 Apr 2014 09:29:22 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: Adam Weinberger <adamw@adamw.org>
Subject: Re: Commit logs for 2014/04/11
Message-ID: <20140420092922.GA90642@FreeBSD.org>
References: <20140412035900.3C695121E45@apnoea.adamw.org>
 <EA3162FC-904F-4209-81D8-67CDADA357A2@adamw.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="EeQfGwPcQSOJBaQU"
Content-Disposition: inline
In-Reply-To: <EA3162FC-904F-4209-81D8-67CDADA357A2@adamw.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org, Bryan Drewery <bdrewery@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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2014 09:29:22 -0000


--EeQfGwPcQSOJBaQU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sat, Apr 12, 2014 at 10:11:44AM -0400, Adam Weinberger wrote:
> * Please, please don't mandate .sample. Plenty of of ports install

Actually, it's not really ".sample".  It's any six-letter word if I read the
code correctly.

>   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

Why do we need the second argument?  Can't we just use the rightmost
extension?  Proof of concept attached.

./danfe

--EeQfGwPcQSOJBaQU
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="sample.diff"

Index: /usr/ports/Keywords/pkg_install.awk
===================================================================
--- /usr/ports/Keywords/pkg_install.awk	(revision 351320)
+++ /usr/ports/Keywords/pkg_install.awk	(working copy)
@@ -15,9 +15,10 @@
 #  @comment end @sample somefile.conf.sample
 # 
 $1 == "@sample" {
-  sample_file=$2
-  # Take out .sample
-  target_file=substr(sample_file, 0, length(sample_file) - 7)
+  sample_file = $2
+  # Take out the rightmost (last) extension
+  lastsep = match(sample_file, "[-.][^-.]+$")
+  target_file = substr(sample_file, 0, lastsep - 1)
   print "@comment begin " $0
   print "@unexec if cmp -s '%D/" target_file "' '%D/" sample_file "'; then rm -f '%D/" target_file "'; fi"
   print sample_file

--EeQfGwPcQSOJBaQU--