From c0998b8cc4d857333e41ab61a2649b310aa9fc0a Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 11 Mar 2014 13:05:46 +0000
Subject: [PATCH] - STAGEDIR support. - s/CONFLICTS/CONFLICTS_INSTALL/.

---
 print/papersize-default-a4/Makefile     | 2 +-
 print/papersize-default-letter/Makefile | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/print/papersize-default-a4/Makefile b/print/papersize-default-a4/Makefile
index 37eb30493283..8dc540136a0c 100644
--- a/print/papersize-default-a4/Makefile
+++ b/print/papersize-default-a4/Makefile
@@ -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
 
diff --git a/print/papersize-default-letter/Makefile b/print/papersize-default-letter/Makefile
index b6edfeae1050..f26caa770743 100644
--- a/print/papersize-default-letter/Makefile
+++ b/print/papersize-default-letter/Makefile
@@ -4,5 +4,4 @@
 MASTERDIR=	${.CURDIR}/../../print/papersize-default-a4
 DEFAULTPAPERSIZE=	letter
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"