diff options
| author | ak <ak@FreeBSD.org> | 2016-02-11 00:14:34 +0800 |
|---|---|---|
| committer | ak <ak@FreeBSD.org> | 2016-02-11 00:14:34 +0800 |
| commit | 38bf063243eea3e2f4d27057311ad86a7b33c800 (patch) | |
| tree | a4de6c11498bc4d479141b67aa3e3b4e7003eec0 | |
| parent | 9766cf35880d9a89aafec159d08daadc3cc1f6c8 (diff) | |
| download | freebsd-ports-gnome-38bf063243eea3e2f4d27057311ad86a7b33c800.tar.gz freebsd-ports-gnome-38bf063243eea3e2f4d27057311ad86a7b33c800.tar.zst freebsd-ports-gnome-38bf063243eea3e2f4d27057311ad86a7b33c800.zip | |
- Fix various typos in CONFLICTS_INSTALL knob
Approved by: portmgr blanket
| -rw-r--r-- | audio/optimfrog-sse2/Makefile | 2 | ||||
| -rw-r--r-- | audio/optimfrog/Makefile | 2 | ||||
| -rw-r--r-- | devel/libdwarf/Makefile | 2 | ||||
| -rw-r--r-- | devel/libedit/Makefile | 2 | ||||
| -rw-r--r-- | math/why3/Makefile | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/audio/optimfrog-sse2/Makefile b/audio/optimfrog-sse2/Makefile index 01c58686ad35..3102f8cb3562 100644 --- a/audio/optimfrog-sse2/Makefile +++ b/audio/optimfrog-sse2/Makefile @@ -5,7 +5,7 @@ PKGNAMESUFFIX= -sse2 MASTERDIR= ${.CURDIR}/../optimfrog COMMENT= Best-ratio lossless audio codec (SSE2 required) -INSTALL_CONFLICTS= optimfrog-[0-9]* +CONFLICTS_INSTALL= optimfrog-[0-9]* ONLY_FOR_ARCHS= i386 OPTIONS_DEFAULT= SSE2 diff --git a/audio/optimfrog/Makefile b/audio/optimfrog/Makefile index 8bc08abdf67d..67807ef047b6 100644 --- a/audio/optimfrog/Makefile +++ b/audio/optimfrog/Makefile @@ -14,7 +14,7 @@ LICENSE_NAME= OptimFROG - License LICENSE_FILE= ${WRKSRC}/license.html #only available as html file LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -INSTALL_CONFLICTS?= optimfrog-sse2-[0-9]* +CONFLICTS_INSTALL?= optimfrog-sse2-[0-9]* ONLY_FOR_ARCHS?= amd64 i386 diff --git a/devel/libdwarf/Makefile b/devel/libdwarf/Makefile index e2b90a74fa3c..34e8ef4c12cf 100644 --- a/devel/libdwarf/Makefile +++ b/devel/libdwarf/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/libdwarf/libdwarf-20130207 MAINTAINER= joerg@FreeBSD.org COMMENT= Library to analyze DWARF debugging information in ELF files -INSTALL_CONFLICT= bsdlibdwarf* +CONFLICTS_INSTALL= bsdlibdwarf* MAKE_JOBS_UNSAFE= yes diff --git a/devel/libedit/Makefile b/devel/libedit/Makefile index d4676d41133d..096e2c885363 100644 --- a/devel/libedit/Makefile +++ b/devel/libedit/Makefile @@ -24,6 +24,6 @@ CONFIGURE_ARGS= --enable-widec MAKE_ENV= LC_ALL=C LDFLAGS+= -L${LOCALBASE}/lib -CONFLICT_INSTALL= editline-* +CONFLICTS_INSTALL= editline-* .include <bsd.port.mk> diff --git a/math/why3/Makefile b/math/why3/Makefile index 3a0aa5cfbd6a..453515dbb17e 100644 --- a/math/why3/Makefile +++ b/math/why3/Makefile @@ -14,7 +14,7 @@ COMMENT= Deductive program verification platform LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICT_INSTALL= why3-gpl-* +CONFLICTS_INSTALL= why3-gpl-* BUILD_DEPENDS= ocaml-zarith>1.2:${PORTSDIR}/math/ocaml-zarith \ lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ |