From owner-svn-ports-head@FreeBSD.ORG  Wed Sep 10 15:05:15 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 2F6173D6;
 Wed, 10 Sep 2014 15:05:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (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 1ACB31F74;
 Wed, 10 Sep 2014 15:05:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AF5Ecr012290;
 Wed, 10 Sep 2014 15:05:14 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8AF5EFG012289;
 Wed, 10 Sep 2014 15:05:14 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201409101505.s8AF5EFG012289@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 10 Sep 2014 15:05:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367859 - head/misc/imerge
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Sep 2014 15:05:15 -0000

Author: antoine
Date: Wed Sep 10 15:05:14 2014
New Revision: 367859
URL: http://svnweb.freebsd.org/changeset/ports/367859
QAT: https://qat.redports.org/buildarchive/r367859/

Log:
  Allow staging as a regular user

Modified:
  head/misc/imerge/Makefile

Modified: head/misc/imerge/Makefile
==============================================================================
--- head/misc/imerge/Makefile	Wed Sep 10 14:59:37 2014	(r367858)
+++ head/misc/imerge/Makefile	Wed Sep 10 15:05:14 2014	(r367859)
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	knu
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Tool to help merge one file to another interactively
 
-USES=	tar:bzip2
+USES=		tar:bzip2 uidfix
 
 MAKE_ARGS=	PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}"
 MAKEFILE=	BSDmakefile