diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2018-03-16 09:41:38 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2018-03-16 09:41:38 +0000 |
| commit | c554ed6536a061c45382e08dd9dcca409e425977 (patch) | |
| tree | 6ea16aaee37a729a13ef9ad34d88d5489d56f680 /sysutils | |
| parent | ec86362b514a63c3b08ca486ccbccd28a831f37e (diff) | |
Notes
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/py-dirsync/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/u-boot-tools/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysutils/py-dirsync/Makefile b/sysutils/py-dirsync/Makefile index 99a6c466db7c..aaff3eb04632 100644 --- a/sysutils/py-dirsync/Makefile +++ b/sysutils/py-dirsync/Makefile @@ -12,7 +12,7 @@ COMMENT= Advanced directory tree synchronisation tool LICENSE= MIT -CONFLICT_INSTALL=p5-File-Dirsync +CONFLICTS_INSTALL= p5-File-Dirsync USES= python zip USE_PYTHON= autoplist distutils diff --git a/sysutils/u-boot-tools/Makefile b/sysutils/u-boot-tools/Makefile index dc1d8fd65109..6ebb7f035e74 100644 --- a/sysutils/u-boot-tools/Makefile +++ b/sysutils/u-boot-tools/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 USES= tar:bzip2 gmake python:2.7,build ssl -CONFLICT= uboot-mkimage +CONFLICTS= uboot-mkimage ALL_TARGET= tools-only MAKE_ARGS= ARCH=sandbox \ CC="${CC}" \ |