diff options
| author | hrs <hrs@FreeBSD.org> | 2014-03-11 21:05:46 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2014-03-11 21:05:46 +0800 |
| commit | 55865dfc1efa29c3c2042bc3d057f52d221fc791 (patch) | |
| tree | 0cebc14f1c8d87b75ac5e71eb5c3ca56b5215aa9 /print | |
| parent | 5de93a52164e3048143cbf3c1fcbaac6662d88ec (diff) | |
| download | freebsd-ports-gnome-55865dfc1efa29c3c2042bc3d057f52d221fc791.tar.gz freebsd-ports-gnome-55865dfc1efa29c3c2042bc3d057f52d221fc791.tar.zst freebsd-ports-gnome-55865dfc1efa29c3c2042bc3d057f52d221fc791.zip | |
- STAGEDIR support.
- s/CONFLICTS/CONFLICTS_INSTALL/.
Diffstat (limited to 'print')
| -rw-r--r-- | print/papersize-default-a4/Makefile | 2 | ||||
| -rw-r--r-- | print/papersize-default-letter/Makefile | 1 |
2 files changed, 1 insertions, 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" |