From owner-svn-ports-all@freebsd.org Wed Feb 10 16:14:36 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAE35AA4558; Wed, 10 Feb 2016 16:14:36 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8D52C1CB6; Wed, 10 Feb 2016 16:14:36 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1AGEZhK004048; Wed, 10 Feb 2016 16:14:35 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1AGEZWX004043; Wed, 10 Feb 2016 16:14:35 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201602101614.u1AGEZWX004043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Wed, 10 Feb 2016 16:14:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408636 - in head: audio/optimfrog audio/optimfrog-sse2 devel/libdwarf devel/libedit math/why3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2016 16:14:37 -0000 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@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 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 \