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
Jason E. Hale
jhale at FreeBSD.org
Fri Mar 16 09:41:40 UTC 2018
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 at 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 at 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 at 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 at 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}" \
More information about the svn-ports-head
mailing list