From owner-svn-ports-all@freebsd.org Fri Mar 16 09:41:40 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29151F5F99B; Fri, 16 Mar 2018 09:41:40 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C986A758EB; Fri, 16 Mar 2018 09:41:39 +0000 (UTC) (envelope-from jhale@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C479A22555; Fri, 16 Mar 2018 09:41:39 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2G9fd1K094941; Fri, 16 Mar 2018 09:41:39 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2G9fdtW094933; Fri, 16 Mar 2018 09:41:39 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201803160941.w2G9fdtW094933@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Fri, 16 Mar 2018 09:41:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464668 - in head: audio/linux-c7-flac devel/linux-c7-devtools print/linux-c7-cups-libs security/linux-c7-cyrus-sasl2 security/linux-c7-libtasn1 sysutils/py-dirsync sysutils/u-boot-tools X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head: audio/linux-c7-flac devel/linux-c7-devtools print/linux-c7-cups-libs security/linux-c7-cyrus-sasl2 security/linux-c7-libtasn1 sysutils/py-dirsync sysutils/u-boot-tools X-SVN-Commit-Revision: 464668 X-SVN-Commit-Repository: ports 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.25 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: Fri, 16 Mar 2018 09:41:40 -0000 Author: jhale Date: Fri Mar 16 09:41:38 2018 New Revision: 464668 URL: https://svnweb.freebsd.org/changeset/ports/464668 Log: Fix typos in CONFLICTS Modified: head/audio/linux-c7-flac/Makefile head/devel/linux-c7-devtools/Makefile head/print/linux-c7-cups-libs/Makefile head/security/linux-c7-cyrus-sasl2/Makefile head/security/linux-c7-libtasn1/Makefile head/sysutils/py-dirsync/Makefile head/sysutils/u-boot-tools/Makefile Modified: head/audio/linux-c7-flac/Makefile ============================================================================== --- head/audio/linux-c7-flac/Makefile Fri Mar 16 09:33:15 2018 (r464667) +++ head/audio/linux-c7-flac/Makefile Fri Mar 16 09:41:38 2018 (r464668) @@ -11,7 +11,7 @@ LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL} MAINTAINER= emulation@FreeBSD.org COMMENT= Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER}) -CONFLICT= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} Modified: head/devel/linux-c7-devtools/Makefile ============================================================================== --- head/devel/linux-c7-devtools/Makefile Fri Mar 16 09:33:15 2018 (r464667) +++ head/devel/linux-c7-devtools/Makefile Fri Mar 16 09:41:38 2018 (r464668) @@ -34,7 +34,7 @@ SRC_DISTFILES= binutils-2.25.1-32.base.el7_4.2${SRC_SU MAINTAINER= emulation@FreeBSD.org COMMENT= Linux compilers and base libraries (CentOS ${LINUX_DIST_VER}) -CONFLICT= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME}-[0-9]* # LICENSE= Various GNU Modified: head/print/linux-c7-cups-libs/Makefile ============================================================================== --- head/print/linux-c7-cups-libs/Makefile Fri Mar 16 09:33:15 2018 (r464667) +++ head/print/linux-c7-cups-libs/Makefile Fri Mar 16 09:41:38 2018 (r464668) @@ -11,7 +11,7 @@ LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL} MAINTAINER= emulation@FreeBSD.org COMMENT= Common UNIX Printing System libraries -CONFLICT= linux-c6-${LINUXNAME}-[0-9]* +CONFLICTS= linux-c6-${LINUXNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} Modified: head/security/linux-c7-cyrus-sasl2/Makefile ============================================================================== --- head/security/linux-c7-cyrus-sasl2/Makefile Fri Mar 16 09:33:15 2018 (r464667) +++ head/security/linux-c7-cyrus-sasl2/Makefile Fri Mar 16 09:41:38 2018 (r464668) @@ -11,7 +11,7 @@ LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL} MAINTAINER= emulation@FreeBSD.org COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER}) -CONFLICT= linux-c6-${LINUXNAME}-[0-9]* +CONFLICTS= linux-c6-${LINUXNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION} Modified: head/security/linux-c7-libtasn1/Makefile ============================================================================== --- head/security/linux-c7-libtasn1/Makefile Fri Mar 16 09:33:15 2018 (r464667) +++ head/security/linux-c7-libtasn1/Makefile Fri Mar 16 09:41:38 2018 (r464668) @@ -10,7 +10,7 @@ COMMENT= ASN.1 structure parser library (Linux CentOS LICENSE= LGPL21+ -CONFLICT= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME}-[0-9]* DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr RPMVERSION= 1.el7 Modified: head/sysutils/py-dirsync/Makefile ============================================================================== --- head/sysutils/py-dirsync/Makefile Fri Mar 16 09:33:15 2018 (r464667) +++ head/sysutils/py-dirsync/Makefile Fri Mar 16 09:41:38 2018 (r464668) @@ -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 Modified: head/sysutils/u-boot-tools/Makefile ============================================================================== --- head/sysutils/u-boot-tools/Makefile Fri Mar 16 09:33:15 2018 (r464667) +++ head/sysutils/u-boot-tools/Makefile Fri Mar 16 09:41:38 2018 (r464668) @@ -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}" \