From owner-svn-ports-all@FreeBSD.ORG  Tue Aug  5 16:48:19 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BA5B8B2C;
 Tue,  5 Aug 2014 16:48:19 +0000 (UTC)
Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214])
 by mx1.freebsd.org (Postfix) with ESMTP id 601BA26CD;
 Tue,  5 Aug 2014 16:48:19 +0000 (UTC)
Received: from gromit.timing.com (gromit.timing.com [206.168.13.209])
 by duck.symmetricom.us (8.14.6/8.14.6) with ESMTP id s75GmCTC093799;
 Tue, 5 Aug 2014 10:48:12 -0600 (MDT)
 (envelope-from jhein@microsemi.com)
Received: from gromit.timing.com (localhost [127.0.0.1])
 by gromit.timing.com (8.14.8/8.14.5) with ESMTP id s75Gm5mc017778;
 Tue, 5 Aug 2014 10:48:05 -0600 (MDT)
 (envelope-from jhein@gromit.timing.com)
Received: (from jhein@localhost)
 by gromit.timing.com (8.14.8/8.14.8/Submit) id s75Gm5RR017777;
 Tue, 5 Aug 2014 10:48:05 -0600 (MDT) (envelope-from jhein)
MIME-Version: 1.0
Content-Type: multipart/mixed;
	 boundary="1zo0YjXHBP"
Content-Transfer-Encoding: 7bit
Message-ID: <21473.2756.909416.811107@gromit.timing.com>
Date: Tue, 5 Aug 2014 10:48:04 -0600
From: John Hein <john.hein@microsemi.com>
To: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: fix @fmtutil for pkg_* - (was: svn commit: r362899 - head/Keywords)
In-Reply-To: <201407251344.s6PDiHro052714@svn.freebsd.org>
References: <201407251344.s6PDiHro052714@svn.freebsd.org>
X-Mailer: VM 8.2.0b-trunk-1500 under 24.3.1 (i386-portbld-freebsd8.3)
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.18
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: Tue, 05 Aug 2014 16:48:19 -0000


--1zo0YjXHBP
Content-Type: text/plain; charset=us-ascii
Content-Description: message body text
Content-Transfer-Encoding: 7bit

Baptiste Daroussin wrote at 13:44 +0000 on Jul 25, 2014:
 > Author: bapt
 > Date: Fri Jul 25 13:44:17 2014
 > New Revision: 362899
 > URL: http://svnweb.freebsd.org/changeset/ports/362899
 > QAT: https://qat.redports.org/buildarchive/r362899/
 > 
 > Log:
 >   Add support for @fmtutil for pkg_install
 > 
 > Modified:
 >   head/Keywords/pkg_install.awk
 > 
 > Modified: head/Keywords/pkg_install.awk
 > ==============================================================================
 > --- head/Keywords/pkg_install.awk	Fri Jul 25 13:32:02 2014	(r362898)
 > +++ head/Keywords/pkg_install.awk	Fri Jul 25 13:44:17 2014	(r362899)
 > @@ -96,6 +96,14 @@ $1 == "@dirrmtry" {
 >  	next
 >  }
 >  
 > +$1 == "@fmtutil" {
 > +	print "@comment begin " $0
 > +	print "@exec fmtutil-sys --missing >/dev/null"
 > +	for (i = 2; i <= NF; i++)
 > +		print "@unexec rm -f "$i"; rmdir -p `dirname "$1"` 2>/dev/null"
 > +	print "@comment end " $0
 > +}
 > +
 >  # Print everything else as-is
 >  {
 >    print $0
 > 

This is missing a 'next':

See also
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192124


--1zo0YjXHBP
Content-Type: text/plain;
	 name="patch-pkg_install.awk.fmtutil.diff"
Content-Description: pkg_install.awk fix for @fmtutil
Content-Disposition: inline;
	 filename="patch-pkg_install.awk.fmtutil.diff"
Content-Transfer-Encoding: 7bit

Index: pkg_install.awk
===================================================================
--- pkg_install.awk	(revision 364089)
+++ pkg_install.awk	(working copy)
@@ -102,6 +102,7 @@
 	for (i = 2; i <= NF; i++)
 		print "@unexec rm -f "$i"; rmdir -p `dirname "$1"` 2>/dev/null"
 	print "@comment end " $0
+	next
 }
 
 # Print everything else as-is

--1zo0YjXHBP--