From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 11 13:05:47 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 2CBA78E7;
 Tue, 11 Mar 2014 13:05:47 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 177E524E;
 Tue, 11 Mar 2014 13:05:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BD5k3e088318;
 Tue, 11 Mar 2014 13:05:46 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BD5kLF088316;
 Tue, 11 Mar 2014 13:05:46 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201403111305.s2BD5kLF088316@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 11 Mar 2014 13:05:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347878 - in head/print: papersize-default-a4
 papersize-default-letter
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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: Tue, 11 Mar 2014 13:05:47 -0000

Author: hrs
Date: Tue Mar 11 13:05:46 2014
New Revision: 347878
URL: http://svnweb.freebsd.org/changeset/ports/347878
QAT: https://qat.redports.org/buildarchive/r347878/

Log:
  - STAGEDIR support.
  - s/CONFLICTS/CONFLICTS_INSTALL/.

Modified:
  head/print/papersize-default-a4/Makefile
  head/print/papersize-default-letter/Makefile

Modified: head/print/papersize-default-a4/Makefile
==============================================================================
--- head/print/papersize-default-a4/Makefile	Tue Mar 11 12:59:55 2014	(r347877)
+++ head/print/papersize-default-a4/Makefile	Tue Mar 11 13:05:46 2014	(r347878)
@@ -18,7 +18,7 @@ NO_BUILD=	yes
 DEFAULTPAPERSIZE?=	a4
 .for P in a4 letter
 .if ${DEFAULTPAPERSIZE:L:M${P}} != ${P}
-CONFLICTS+=	papersize-default-${P}-[0-9]*
+CONFLICTS_INSTALL+=	papersize-default-${P}-[0-9]*
 .endif
 .endfor
 

Modified: head/print/papersize-default-letter/Makefile
==============================================================================
--- head/print/papersize-default-letter/Makefile	Tue Mar 11 12:59:55 2014	(r347877)
+++ head/print/papersize-default-letter/Makefile	Tue Mar 11 13:05:46 2014	(r347878)
@@ -4,5 +4,4 @@
 MASTERDIR=	${.CURDIR}/../../print/papersize-default-a4
 DEFAULTPAPERSIZE=	letter
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"