- STAGEDIR support.

- s/CONFLICTS/CONFLICTS_INSTALL/.
svn path=/head/; revision=347878
2024-12-22 04:17:44 +00:00 · 2014-03-11 13:05:46 +00:00 · 2014-03-11 13:05:46 +00:00 · c0998b8cc4 · 2021-03-31 03:12:20 +00:00
commit c0998b8cc4
parent 9bcb3dfe4c
2 changed files with 1 additions and 2 deletions
--- 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

--- 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"