svn commit: r347878 - in head/print: papersize-default-a4 papersize-default-letter

[Hiroki Sato]

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"