svn commit: r408636 - in head: audio/optimfrog audio/optimfrog-sse2 devel/libdwarf devel/libedit math/why3

[Alex Kozlov]

Author: ak
Date: Wed Feb 10 16:14:34 2016
New Revision: 408636
URL: https://svnweb.freebsd.org/changeset/ports/408636

Log:
  - Fix various typos in CONFLICTS_INSTALL knob
  
  Approved by:	portmgr blanket

Modified:
  head/audio/optimfrog-sse2/Makefile
  head/audio/optimfrog/Makefile
  head/devel/libdwarf/Makefile
  head/devel/libedit/Makefile
  head/math/why3/Makefile

Modified: head/audio/optimfrog-sse2/Makefile
==============================================================================
--- head/audio/optimfrog-sse2/Makefile	Wed Feb 10 16:13:24 2016	(r408635)
+++ head/audio/optimfrog-sse2/Makefile	Wed Feb 10 16:14:34 2016	(r408636)
@@ -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

Modified: head/audio/optimfrog/Makefile
==============================================================================
--- head/audio/optimfrog/Makefile	Wed Feb 10 16:13:24 2016	(r408635)
+++ head/audio/optimfrog/Makefile	Wed Feb 10 16:14:34 2016	(r408636)
@@ -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
 

Modified: head/devel/libdwarf/Makefile
==============================================================================
--- head/devel/libdwarf/Makefile	Wed Feb 10 16:13:24 2016	(r408635)
+++ head/devel/libdwarf/Makefile	Wed Feb 10 16:14:34 2016	(r408636)
@@ -9,7 +9,7 @@ MASTER_SITES=	http://pkgs.fedoraproject.
 MAINTAINER=	joerg at FreeBSD.org
 COMMENT=	Library to analyze DWARF debugging information in ELF files
 
-INSTALL_CONFLICT=	bsdlibdwarf*
+CONFLICTS_INSTALL=	bsdlibdwarf*
 
 MAKE_JOBS_UNSAFE=	yes
 

Modified: head/devel/libedit/Makefile
==============================================================================
--- head/devel/libedit/Makefile	Wed Feb 10 16:13:24 2016	(r408635)
+++ head/devel/libedit/Makefile	Wed Feb 10 16:14:34 2016	(r408636)
@@ -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>

Modified: head/math/why3/Makefile
==============================================================================
--- head/math/why3/Makefile	Wed Feb 10 16:13:24 2016	(r408635)
+++ head/math/why3/Makefile	Wed Feb 10 16:14:34 2016	(r408636)
@@ -14,7 +14,7 @@ COMMENT=	Deductive program verification 
 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 \