FreeBSD Bugzilla – Attachment 182712 Details for
Bug 219388
Fix CONFLICTS_INSTALL variables not correctly matching
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix CONFLICTS
fix-conflicts.diff (text/plain), 9.06 KB, created by
Pawel Pekala
on 2017-05-18 18:23:11 UTC
(
hide
)
Description:
Fix CONFLICTS
Filename:
MIME Type:
Creator:
Pawel Pekala
Created:
2017-05-18 18:23:11 UTC
Size:
9.06 KB
patch
obsolete
>Index: databases/lua-xapian/Makefile >=================================================================== >--- databases/lua-xapian/Makefile (wersja 441154) >+++ databases/lua-xapian/Makefile (kopia robocza) >@@ -18,7 +18,7 @@ > BUILD_DEPENDS= xapian-core>=${PORTVERSION}:databases/xapian-core > LIB_DEPENDS= libxapian.so:databases/xapian-core > >-CONFLICTS_INSTALL= xapian-bindings12- >+CONFLICTS_INSTALL= xapian-bindings12-[0-9]* > > OPTIONS_DEFINE= DOCS > >Index: databases/p5-Search-Xapian10/Makefile >=================================================================== >--- databases/p5-Search-Xapian10/Makefile (wersja 441154) >+++ databases/p5-Search-Xapian10/Makefile (kopia robocza) >@@ -18,7 +18,7 @@ > BUILD_DEPENDS= xapian-core10>=1.0.22:databases/xapian-core10 > RUN_DEPENDS:= ${BUILD_DEPENDS} > >-CONFLICTS_INSTALL= p5-Search-Xapian12- >+CONFLICTS_INSTALL= p5-Search-Xapian12-[0-9]* > > USES= perl5 > USE_PERL5= configure >Index: databases/postgis20/Makefile >=================================================================== >--- databases/postgis20/Makefile (wersja 441154) >+++ databases/postgis20/Makefile (kopia robocza) >@@ -17,7 +17,7 @@ > libjson-c.so:devel/json-c \ > libproj.so:graphics/proj > >-CONFLICTS_INSTALL= postgis- postgis22- postgis23- >+CONFLICTS_INSTALL= postgis-[0-9]* postgis22-[0-9]* postgis23-[0-9]* > > OPTIONS_DEFINE= LOADERGUI NLS RASTER TOPOLOGY > OPTIONS_DEFAULT=RASTER TOPOLOGY >Index: databases/py-sqlalchemy11/Makefile >=================================================================== >--- databases/py-sqlalchemy11/Makefile (wersja 441154) >+++ databases/py-sqlalchemy11/Makefile (kopia robocza) >@@ -18,7 +18,7 @@ > ${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-[0-9]* > > OPTIONS_DEFINE= DOCS EXAMPLES > OPTIONS_MULTI= BACKEND >Index: databases/py-xapian/Makefile >=================================================================== >--- databases/py-xapian/Makefile (wersja 441154) >+++ databases/py-xapian/Makefile (kopia robocza) >@@ -21,7 +21,7 @@ > > 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-[0-9]* > > OPTIONS_DEFINE= DOCS > >Index: databases/rocksdb/Makefile >=================================================================== >--- databases/rocksdb/Makefile (wersja 441154) >+++ databases/rocksdb/Makefile (kopia robocza) >@@ -53,7 +53,7 @@ > ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd > > .if !defined(LITE) >-CONFLICTS_INSTALL= rocksdb-lite- >+CONFLICTS_INSTALL= rocksdb-lite-[0-9]* > PLIST_SUB+= LITE="" > .else > PKGNAMESUFFIX= -lite >Index: databases/xapian-bindings12/Makefile >=================================================================== >--- databases/xapian-bindings12/Makefile (wersja 441154) >+++ databases/xapian-bindings12/Makefile (kopia robocza) >@@ -16,7 +16,7 @@ > > LIB_DEPENDS= libxapian.so:databases/xapian-core12 > >-CONFLICTS_INSTALL= xapian-bindings- >+CONFLICTS= xapian-bindings-[0-9]* > > OPTIONS_DEFINE= DOCS LUA PHP PYTHON RUBY > OPTIONS_DEFAULT=PHP PYTHON RUBY >Index: databases/xapian-core/Makefile >=================================================================== >--- databases/xapian-core/Makefile (wersja 441154) >+++ databases/xapian-core/Makefile (kopia robocza) >@@ -14,7 +14,7 @@ > LICENSE= GPLv2 > LICENSE_FILE= ${WRKSRC}/COPYING > >-CONFLICTS_INSTALL= xapian-core10- xapian-core12- >+CONFLICTS_INSTALL= xapian-core10-[0-9]* xapian-core12-[0-9]* > > OPTIONS_DEFINE= DOCS SSE2 > SSE2_DESC= Use SSE2 for floating point >Index: databases/xapian-core10/Makefile >=================================================================== >--- databases/xapian-core10/Makefile (wersja 441154) >+++ databases/xapian-core10/Makefile (kopia robocza) >@@ -13,7 +13,7 @@ > > LICENSE= GPLv2 > >-CONFLICTS_INSTALL= xapian-core- xapian-core12- >+CONFLICTS_INSTALL= xapian-core-[0-9]* xapian-core12-[0-9]* > > USES= libtool > GNU_CONFIGURE= yes >Index: databases/xapian-core12/Makefile >=================================================================== >--- databases/xapian-core12/Makefile (wersja 441154) >+++ databases/xapian-core12/Makefile (kopia robocza) >@@ -15,7 +15,7 @@ > LICENSE= GPLv2 > LICENSE_FILE= ${WRKSRC}/COPYING > >-CONFLICTS_INSTALL= xapian-core- xapian-core10- >+CONFLICTS_INSTALL= xapian-core-[0-9]* xapian-core10-[0-9]* > > OPTIONS_DEFINE= DOCS SSE2 > SSE2_DESC= Use SSE2 for floating point >Index: net/mDNSResponder/Makefile >=================================================================== >--- net/mDNSResponder/Makefile (wersja 441154) >+++ net/mDNSResponder/Makefile (kopia robocza) >@@ -14,7 +14,7 @@ > LICENSE_COMB= dual > > # lib/libdns_sd.so.1 sbin/mdnsd >-CONFLICTS_INSTALL= avahi-libdns- openmdns- >+CONFLICTS_INSTALL= avahi-libdns-[0-9]* openmdns-[0-9]* > > OPTIONS_DEFINE= IPV6 > >Index: science/libaec/Makefile >=================================================================== >--- science/libaec/Makefile (wersja 441154) >+++ science/libaec/Makefile (kopia robocza) >@@ -13,7 +13,7 @@ > LICENSE= BSD2CLAUSE > LICENSE_FILE= ${WRKSRC}/COPYING > >-CONFLICTS_INSTALL= hdf-szip- >+CONFLICTS_INSTALL= hdf-szip-[0-9]* > > GNU_CONFIGURE= yes > INSTALL_TARGET= install-strip >Index: science/szip/Makefile >=================================================================== >--- science/szip/Makefile (wersja 441154) >+++ science/szip/Makefile (kopia robocza) >@@ -16,7 +16,7 @@ > MAINTAINER= sunpoet@FreeBSD.org > COMMENT= Lossless compression library for scientific data > >-CONFLICTS_INSTALL= libaec- >+CONFLICTS_INSTALL= libaec-[0-9]* > > OPTIONS_DEFINE= DOCS > >Index: www/npm/Makefile >=================================================================== >--- www/npm/Makefile (wersja 441154) >+++ www/npm/Makefile (kopia robocza) >@@ -14,7 +14,7 @@ > RUN_DEPENDS= gmake:devel/gmake \ > node>=0.8.0:www/node > >-CONFLICTS_INSTALL= npm2- npm3- >+CONFLICTS_INSTALL= npm2-[0-9]* npm3-[0-9]* > > NO_ARCH= yes > NO_BUILD= yes >Index: www/npm2/Makefile >=================================================================== >--- www/npm2/Makefile (wersja 441154) >+++ www/npm2/Makefile (kopia robocza) >@@ -14,7 +14,7 @@ > > RUN_DEPENDS= gmake:devel/gmake > >-CONFLICTS_INSTALL= npm- npm3- >+CONFLICTS_INSTALL= npm-[0-9]* npm3-[0-9]* > > OPTIONS_SINGLE= BACKEND > OPTIONS_SINGLE_BACKEND= NODE NODE4 NODE6 >Index: www/npm3/Makefile >=================================================================== >--- www/npm3/Makefile (wersja 441154) >+++ www/npm3/Makefile (kopia robocza) >@@ -15,7 +15,7 @@ > > RUN_DEPENDS= gmake:devel/gmake > >-CONFLICTS_INSTALL= npm- npm2- >+CONFLICTS_INSTALL= npm-[0-9]* npm2-[0-9]* > > OPTIONS_SINGLE= BACKEND > OPTIONS_SINGLE_BACKEND= NODE NODE6 >Index: www/rubygem-railties4/Makefile >=================================================================== >--- www/rubygem-railties4/Makefile (wersja 441154) >+++ www/rubygem-railties4/Makefile (kopia robocza) >@@ -17,7 +17,7 @@ > 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-[0-9]* rubygem-railties41-[0-9]* rubygem-railties5-[0-9]* > > NO_ARCH= yes > USE_RUBY= yes >Index: www/rubygem-railties5/Makefile >=================================================================== >--- www/rubygem-railties5/Makefile (wersja 441154) >+++ www/rubygem-railties5/Makefile (kopia robocza) >@@ -19,7 +19,7 @@ > 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-[0-9]* rubygem-railties4-[0-9]* rubygem-railties41-[0-9]* > > NO_ARCH= yes > USE_RUBY= yes >Index: www/rubygem-railties50/Makefile >=================================================================== >--- www/rubygem-railties50/Makefile (wersja 441154) >+++ www/rubygem-railties50/Makefile (kopia robocza) >@@ -19,7 +19,7 @@ > 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-[0-9]* rubygem-railties4-[0-9]* rubygem-railties41-[0-9]* > > PORTSCOUT= limit:^5\.0\. > >Index: www/xapian-omega/Makefile >=================================================================== >--- www/xapian-omega/Makefile (wersja 441154) >+++ www/xapian-omega/Makefile (kopia robocza) >@@ -17,7 +17,7 @@ > LIB_DEPENDS= libpcre.so:devel/pcre \ > libxapian.so:databases/xapian-core > >-CONFLICTS_INSTALL= xapian-omega12- >+CONFLICTS_INSTALL= xapian-omega12-[0-9]* > > OPTIONS_DEFINE= DOCS EXAMPLES ICONV > OPTIONS_DEFAULT=ICONV >Index: www/xapian-omega12/Makefile >=================================================================== >--- www/xapian-omega12/Makefile (wersja 441154) >+++ www/xapian-omega12/Makefile (kopia robocza) >@@ -17,7 +17,7 @@ > LIB_DEPENDS= libpcre.so:devel/pcre \ > libxapian.so:databases/xapian-core12 > >-CONFLICTS_INSTALL= xapian-omega- >+CONFLICTS_INSTALL= xapian-omega-[0-9]* > > OPTIONS_DEFINE= DOCS EXAMPLES ICONV > OPTIONS_DEFAULT=ICONV
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 219388
:
182712
|
182957