svn commit: r441868 - in head: databases/lua-xapian databases/p5-Search-Xapian10 databases/postgis20 databases/py-sqlalchemy11 databases/py-xapian databases/rocksdb databases/xapian-bindings12 data...
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sat May 27 19:42:17 UTC 2017
Author: sunpoet
Date: Sat May 27 19:42:13 2017
New Revision: 441868
URL: https://svnweb.freebsd.org/changeset/ports/441868
Log:
Fix CONFLICTS_INSTALL
PR: 219388
Submitted by: pawel
Modified:
head/databases/lua-xapian/Makefile
head/databases/p5-Search-Xapian10/Makefile
head/databases/postgis20/Makefile
head/databases/py-sqlalchemy11/Makefile
head/databases/py-xapian/Makefile
head/databases/rocksdb/Makefile
head/databases/xapian-bindings12/Makefile
head/databases/xapian-core/Makefile
head/databases/xapian-core10/Makefile
head/databases/xapian-core12/Makefile
head/net/mDNSResponder/Makefile
head/science/libaec/Makefile
head/science/szip/Makefile
head/www/npm/Makefile
head/www/npm2/Makefile
head/www/npm3/Makefile
head/www/rubygem-railties4/Makefile
head/www/rubygem-railties5/Makefile
head/www/rubygem-railties50/Makefile
head/www/xapian-omega/Makefile
head/www/xapian-omega12/Makefile
Modified: head/databases/lua-xapian/Makefile
==============================================================================
--- head/databases/lua-xapian/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/lua-xapian/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= xapian-core>=${PORTVERSION}:databases/xapian-core
LIB_DEPENDS= libxapian.so:databases/xapian-core
-CONFLICTS_INSTALL= xapian-bindings12-
+CONFLICTS_INSTALL= xapian-bindings12
OPTIONS_DEFINE= DOCS
Modified: head/databases/p5-Search-Xapian10/Makefile
==============================================================================
--- head/databases/p5-Search-Xapian10/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/p5-Search-Xapian10/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -18,7 +18,7 @@ LICENSE_COMB= dual
BUILD_DEPENDS= xapian-core10>=1.0.22:databases/xapian-core10
RUN_DEPENDS:= ${BUILD_DEPENDS}
-CONFLICTS_INSTALL= p5-Search-Xapian12-
+CONFLICTS_INSTALL= p5-Search-Xapian12
USES= perl5
USE_PERL5= configure
Modified: head/databases/postgis20/Makefile
==============================================================================
--- head/databases/postgis20/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/postgis20/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -17,7 +17,7 @@ LIB_DEPENDS= libgeos.so:graphics/geos \
libjson-c.so:devel/json-c \
libproj.so:graphics/proj
-CONFLICTS_INSTALL= postgis- postgis22- postgis23-
+CONFLICTS_INSTALL= postgis postgis22 postgis23
OPTIONS_DEFINE= LOADERGUI NLS RASTER TOPOLOGY
OPTIONS_DEFAULT=RASTER TOPOLOGY
Modified: head/databases/py-sqlalchemy11/Makefile
==============================================================================
--- head/databases/py-sqlalchemy11/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/py-sqlalchemy11/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -18,7 +18,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}moc
${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest \
${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist
-CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy0 ${PYTHON_PKGNAMEPREFIX}sqlalchemy10-
+CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy0 ${PYTHON_PKGNAMEPREFIX}sqlalchemy10
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_MULTI= BACKEND
Modified: head/databases/py-xapian/Makefile
==============================================================================
--- head/databases/py-xapian/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/py-xapian/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -21,7 +21,7 @@ LIB_DEPENDS= libxapian.so:databases/xapi
BROKEN_aarch64= fails to build: Fatal Python error: swig_pythreadstate set in XapianSWIG_Python_Thread_Allow ctor
-CONFLICTS_INSTALL= xapian-bindings12-
+CONFLICTS_INSTALL= xapian-bindings12
OPTIONS_DEFINE= DOCS
Modified: head/databases/rocksdb/Makefile
==============================================================================
--- head/databases/rocksdb/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/rocksdb/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -53,7 +53,7 @@ LZ4_LIB_DEPENDS= liblz4.so:archivers/lib
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
.if !defined(LITE)
-CONFLICTS_INSTALL= rocksdb-lite-
+CONFLICTS_INSTALL= rocksdb-lite
PLIST_SUB+= LITE=""
.else
PKGNAMESUFFIX= -lite
Modified: head/databases/xapian-bindings12/Makefile
==============================================================================
--- head/databases/xapian-bindings12/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/xapian-bindings12/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxapian.so:databases/xapian-core12
-CONFLICTS_INSTALL= xapian-bindings-
+CONFLICTS= xapian-bindings
OPTIONS_DEFINE= DOCS LUA PHP PYTHON RUBY
OPTIONS_DEFAULT=PHP PYTHON RUBY
Modified: head/databases/xapian-core/Makefile
==============================================================================
--- head/databases/xapian-core/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/xapian-core/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_powerpc64= fails to configure: A compiler with support for C++11 language features is required
-CONFLICTS_INSTALL= xapian-core10- xapian-core12-
+CONFLICTS_INSTALL= xapian-core10 xapian-core12
OPTIONS_DEFINE= DOCS SSE2
SSE2_DESC= Use SSE2 for floating point
Modified: head/databases/xapian-core10/Makefile
==============================================================================
--- head/databases/xapian-core10/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/xapian-core10/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -17,7 +17,7 @@ BROKEN_armv6= fails to install: quartz_
BROKEN_mips= fails to install: quartz_log.cc:: error: call to 'om_tostring' is ambiguous
BROKEN_mips64= fails to install: quartz_log.cc:: error: call to 'om_tostring' is ambiguous
-CONFLICTS_INSTALL= xapian-core- xapian-core12-
+CONFLICTS_INSTALL= xapian-core xapian-core12
USES= libtool
GNU_CONFIGURE= yes
Modified: head/databases/xapian-core12/Makefile
==============================================================================
--- head/databases/xapian-core12/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/databases/xapian-core12/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -15,7 +15,7 @@ COMMENT= Probabilistic text search datab
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= xapian-core- xapian-core10-
+CONFLICTS_INSTALL= xapian-core xapian-core10
OPTIONS_DEFINE= DOCS SSE2
SSE2_DESC= Use SSE2 for floating point
Modified: head/net/mDNSResponder/Makefile
==============================================================================
--- head/net/mDNSResponder/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/net/mDNSResponder/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -14,7 +14,7 @@ LICENSE= APACHE20 BSD3CLAUSE
LICENSE_COMB= dual
# lib/libdns_sd.so.1 sbin/mdnsd
-CONFLICTS_INSTALL= avahi-libdns- openmdns-
+CONFLICTS_INSTALL= avahi-libdns openmdns
OPTIONS_DEFINE= IPV6
Modified: head/science/libaec/Makefile
==============================================================================
--- head/science/libaec/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/science/libaec/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -13,7 +13,7 @@ COMMENT= Adaptive entropy coding library
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= hdf-szip-
+CONFLICTS_INSTALL= hdf-szip
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
Modified: head/science/szip/Makefile
==============================================================================
--- head/science/szip/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/science/szip/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= sunpoet at FreeBSD.org
COMMENT= Lossless compression library for scientific data
-CONFLICTS_INSTALL= libaec-
+CONFLICTS_INSTALL= libaec
OPTIONS_DEFINE= DOCS
Modified: head/www/npm/Makefile
==============================================================================
--- head/www/npm/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/www/npm/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -14,7 +14,7 @@ LICENSE= MIT
RUN_DEPENDS= gmake:devel/gmake \
node>=0.8.0:www/node
-CONFLICTS_INSTALL= npm2- npm3-
+CONFLICTS_INSTALL= npm2 npm3
NO_ARCH= yes
NO_BUILD= yes
Modified: head/www/npm2/Makefile
==============================================================================
--- head/www/npm2/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/www/npm2/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -14,7 +14,7 @@ LICENSE= MIT
RUN_DEPENDS= gmake:devel/gmake
-CONFLICTS_INSTALL= npm- npm3-
+CONFLICTS_INSTALL= npm npm3
OPTIONS_SINGLE= BACKEND
OPTIONS_SINGLE_BACKEND= NODE NODE4 NODE6
Modified: head/www/npm3/Makefile
==============================================================================
--- head/www/npm3/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/www/npm3/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -15,7 +15,7 @@ LICENSE= MIT
RUN_DEPENDS= gmake:devel/gmake
-CONFLICTS_INSTALL= npm- npm2-
+CONFLICTS_INSTALL= npm npm2
OPTIONS_SINGLE= BACKEND
OPTIONS_SINGLE_BACKEND= NODE NODE6
Modified: head/www/rubygem-railties4/Makefile
==============================================================================
--- head/www/rubygem-railties4/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/www/rubygem-railties4/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -17,7 +17,7 @@ RUN_DEPENDS= rubygem-actionpack4>=${PORT
rubygem-rake>=0.8.7:devel/rubygem-rake \
rubygem-thor>=0.18.1:devel/rubygem-thor
-CONFLICTS_INSTALL= rubygem-railties- rubygem-railties41- rubygem-railties5-
+CONFLICTS_INSTALL= rubygem-railties rubygem-railties41 rubygem-railties5
NO_ARCH= yes
USE_RUBY= yes
Modified: head/www/rubygem-railties5/Makefile
==============================================================================
--- head/www/rubygem-railties5/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/www/rubygem-railties5/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -19,7 +19,7 @@ RUN_DEPENDS= rubygem-actionpack5>=${PORT
rubygem-rake>=0.8.7:devel/rubygem-rake \
rubygem-thor>=0.18.1:devel/rubygem-thor
-CONFLICTS_INSTALL= rubygem-railties- rubygem-railties4- rubygem-railties41-
+CONFLICTS_INSTALL= rubygem-railties rubygem-railties4 rubygem-railties41
NO_ARCH= yes
USE_RUBY= yes
Modified: head/www/rubygem-railties50/Makefile
==============================================================================
--- head/www/rubygem-railties50/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/www/rubygem-railties50/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -19,7 +19,7 @@ RUN_DEPENDS= rubygem-actionpack50>=${POR
rubygem-rake>=0.8.7:devel/rubygem-rake \
rubygem-thor>=0.18.1:devel/rubygem-thor
-CONFLICTS_INSTALL= rubygem-railties- rubygem-railties4- rubygem-railties41-
+CONFLICTS_INSTALL= rubygem-railties rubygem-railties4 rubygem-railties41
PORTSCOUT= limit:^5\.0\.
Modified: head/www/xapian-omega/Makefile
==============================================================================
--- head/www/xapian-omega/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/www/xapian-omega/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -17,7 +17,7 @@ BUILD_DEPENDS= xapian-core>=${PORTVERSIO
LIB_DEPENDS= libpcre.so:devel/pcre \
libxapian.so:databases/xapian-core
-CONFLICTS_INSTALL= xapian-omega12-
+CONFLICTS_INSTALL= xapian-omega12
OPTIONS_DEFINE= DOCS EXAMPLES ICONV
OPTIONS_DEFAULT=ICONV
Modified: head/www/xapian-omega12/Makefile
==============================================================================
--- head/www/xapian-omega12/Makefile Sat May 27 19:40:29 2017 (r441867)
+++ head/www/xapian-omega12/Makefile Sat May 27 19:42:13 2017 (r441868)
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpcre.so:devel/pcre \
libxapian.so:databases/xapian-core12
-CONFLICTS_INSTALL= xapian-omega-
+CONFLICTS_INSTALL= xapian-omega
OPTIONS_DEFINE= DOCS EXAMPLES ICONV
OPTIONS_DEFAULT=ICONV
More information about the svn-ports-all
mailing list