FreeBSD/freebsd-ports
Fork 14
Code Releases Activity

*/*: Remove redundant '-*' from CONFLICTS definitions

Browse source 
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").

Approved by: portmgr (blanket)
This commit is contained in:
Stefan Eßer 2021-11-25 22:40:11 +01:00
commit 04b9da4140
188 changed files with 279 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

2
archivers/arc/Makefile
View file

@ -10,7 +10,7 @@ COMMENT= Create & extract files from DOS .ARC files
LICENSE= GPLv2
CONFLICTS= php5-arcanist-*
CONFLICTS= php5-arcanist
OPTIONS_DEFINE= DOCS

2
archivers/rpm2cpio/Makefile
View file

@ -12,7 +12,7 @@ COMMENT= Convert .rpm files to cpio format
LICENSE= BSD2CLAUSE
CONFLICTS_INSTALL= rpm4-*
CONFLICTS_INSTALL= rpm4
NO_BUILD= yes
NO_ARCH= yes

2
audio/festvox-kal16/Makefile
View file

@ -15,7 +15,7 @@ RUN_DEPENDS= \
${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
CONFLICTS= festvox-kal8-*
CONFLICTS= festvox-kal8
NO_BUILD= yes

2
audio/festvox-kal8/Makefile
View file

@ -17,7 +17,7 @@ ${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
WRKSRC= ${WRKDIR}/festival
CONFLICTS= festvox-kal16-*
CONFLICTS= festvox-kal16
NO_BUILD= yes

2
audio/festvox-ked16/Makefile
View file

@ -17,7 +17,7 @@ ${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
WRKSRC= ${WRKDIR}/festival
CONFLICTS= festvox-ked8-*
CONFLICTS= festvox-ked8
NO_BUILD= yes

2
audio/festvox-ked8/Makefile
View file

@ -17,7 +17,7 @@ ${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
WRKSRC= ${WRKDIR}/festival
CONFLICTS= festvox-ked16-*
CONFLICTS= festvox-ked16
NO_BUILD= yes

2
audio/mixxx22/Makefile
View file

@ -42,7 +42,7 @@ USE_QT= buildtools concurrent core dbus gui network opengl script scripttools \
sql sql-sqlite3 svg testlib xml xmlpatterns linguisttools_build \
qmake_build widgets
CONFLICTS= mixxx-*
CONFLICTS= mixxx
MAKE_ARGS= qtdir="${PREFIX}" install_root="${PREFIX}" \
build=release optimize=portable ${GUI} battery=0 vamp=1 modplug=1 mad=1

2
biology/babel/Makefile
View file

@ -10,7 +10,7 @@ MASTER_SITES= http://smog.com/chem/babel/files/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts among various molecular file formats
CONFLICTS_INSTALL= openbabel-*
CONFLICTS_INSTALL= openbabel
USES= tar:Z
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"

2
cad/alliance/Makefile
View file

@ -35,7 +35,7 @@ MAKE_JOBS_UNSAFE= yes
INSTALL_TARGET= install-strip
CFLAGS+= -fcommon
CONFLICTS_INSTALL= fspclient-*
CONFLICTS_INSTALL= fspclient
SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/alliance/src

2
chinese/fireflyttf/Makefile
View file

@ -10,7 +10,7 @@ DISTNAME?= fireflysung-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Combination of two Arphic Sung fonts
CONFLICTS= zh-opendesktop-fonts-*
CONFLICTS= zh-opendesktop-fonts
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${DISTNAME}

2
comms/wsjtz/Makefile
View file

@ -6,7 +6,7 @@ MASTER_SITES= SF/wsjt-z/Source
MAINTAINER= acm@FreeBSD.org
COMMENT= Clone of WSJT-X software with additional features
CONFLICTS= wsjtx-*
CONFLICTS= wsjtx
LICENSE= GPLv3

2
converters/p5-JSON/Makefile
View file

@ -11,7 +11,7 @@ COMMENT= Perl extension to convert to JSON (JavaScript Object Notation)
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
CONFLICTS= p5-JSON-1.* p5-JSON1-*
CONFLICTS= p5-JSON-1.* p5-JSON1
NO_ARCH= yes
USES= perl5
USE_PERL5= configure

2
databases/firebird30-server/Makefile
View file

@ -22,7 +22,7 @@ LICENSE_PERMS_IPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libicuuc.so:devel/icu \
libtommath.so:math/libtommath
CONFLICTS_INSTALL= firebird25-* firebird40-*
CONFLICTS_INSTALL= firebird25 firebird40
USES= cpe gmake pkgconfig localbase:ldflags libedit tar:bzip2
USE_CXXSTD= gnu++03

2
databases/firebird40-server/Makefile
View file

@ -23,7 +23,7 @@ LIB_DEPENDS= libicuuc.so:devel/icu \
libtommath.so:math/libtommath \
libtomcrypt.so:security/libtomcrypt
CONFLICTS_INSTALL= firebird25-* firebird30-*
CONFLICTS_INSTALL= firebird25 firebird30
USES= cpe gmake pkgconfig localbase:ldflags libedit tar:xz
USE_CXXSTD= c++11

8
databases/mariadb-connector-c/Makefile
View file

@ -19,10 +19,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libcurl.so:ftp/curl
CONFLICTS_INSTALL= mariadb[0-9]*-client-* \
mariadb102-server-* \
mysql[0-9]*-client-* \
percona[0-9]*-client-*
CONFLICTS_INSTALL= mariadb[0-9]*-client \
mariadb102-server \
mysql[0-9]*-client \
percona[0-9]*-client
USES= cmake:insource compiler:c++11-lib iconv:translit ssl
USE_LDCONFIG= ${PREFIX}/lib/mariadb

8
databases/mariadb103-server/Makefile
View file

@ -92,10 +92,10 @@ DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \
DATADIR= ${PREFIX}/share/mysql
CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
mysqlwsrep*-server \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
GSSAPI_BASE_USES= gssapi

8
databases/mariadb104-server/Makefile
View file

@ -105,10 +105,10 @@ DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
DATADIR= ${PREFIX}/share/mysql
ETCDIR= ${PREFIX}/etc/mysql
CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
mysqlwsrep*-server \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
GSSAPI_BASE_USES= gssapi

8
databases/mariadb105-server/Makefile
View file

@ -112,10 +112,10 @@ DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
DATADIR= ${PREFIX}/share/mysql
ETCDIR= ${PREFIX}/etc/mysql
CONFLICTS_INSTALL= mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
CONFLICTS_INSTALL= mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
mysqlwsrep*-server \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
GSSAPI_BASE_USES= gssapi

2
databases/mysql-connector-java/Makefile
View file

@ -24,7 +24,7 @@ CPE_PRODUCT= mysql_connector_j
NO_ARCH= yes
NO_BUILD= yes
CONFLICTS_INSTALL= mysql-connector-java51-*
CONFLICTS_INSTALL= mysql-connector-java51
JAVA_VERSION= 1.8+
EXTRADOCS= CHANGES

6
databases/mysql55-client/Makefile
View file

@ -11,9 +11,9 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql5[0-46-9]-client-* \
mariadb*-client-* \
percona*-client-*
CONFLICTS_INSTALL= mysql5[0-46-9]-client \
mariadb*-client \
percona*-client
CMAKE_ARGS+= -DWITHOUT_SERVER=1

8
databases/mysql55-server/Makefile
View file

@ -70,10 +70,10 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
.if !defined(CLIENT_ONLY)
USES+= mysql:55
CONFLICTS_INSTALL= mysql5[0-46-9]-server-* \
mysqlwsrep* \
mariadb*-server-* \
percona*-server-*
CONFLICTS_INSTALL= mysql5[0-46-9]-server \
mysqlwsrep*-server \
mariadb*-server \
percona*-server
USE_RC_SUBR= mysql-server

8
databases/mysql56-client/Makefile
View file

@ -16,10 +16,10 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql5[0-57-9]-client-* \
mysql[0-46-9][0-9]-client-* \
mariadb[0-9][0-9]-client-* \
percona[0-9][0-9]-client-*
CONFLICTS_INSTALL= mysql5[0-57-9]-client \
mysql[0-46-9][0-9]-client \
mariadb[0-9][0-9]-client \
percona[0-9][0-9]-client
CMAKE_ARGS+= -DWITHOUT_SERVER=1

10
databases/mysql56-server/Makefile
View file

@ -80,11 +80,11 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
.if !defined(CLIENT_ONLY)
USES+= mysql:56
CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \
mysql[0-46-9][0-9]-server-* \
mysqlwsrep* \
mariadb[0-9][0-9]-server-* \
percona[0-9][0-9]-server-*
CONFLICTS_INSTALL= mysql5[0-57-9]-server \
mysql[0-46-9][0-9]-server \
mysqlwsrep*-server \
mariadb[0-9][0-9]-server \
percona[0-9][0-9]-server
USE_RC_SUBR= mysql-server

8
databases/mysql57-client/Makefile
View file

@ -14,10 +14,10 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \
mysql[0-46-9][0-9]-client-* \
mariadb[0-9][0-9]-client-* \
percona[0-9][0-9]-client-*
CONFLICTS_INSTALL= mysql5[0-68-9]-client \
mysql[0-46-9][0-9]-client \
mariadb[0-9][0-9]-client \
percona[0-9][0-9]-client
CMAKE_ARGS+= -DWITHOUT_SERVER=1 \
-DWITH_NDBCLUSTER=1

10
databases/mysql57-server/Makefile
View file

@ -87,11 +87,11 @@ OPTIONS_SUB= YES
.if !defined(CLIENT_ONLY)
USES+= mysql:57
CONFLICTS_INSTALL= mysql5[0-68-9]-server-* \
mysql[0-46-9][0-9]-server-* \
mysqlwsrep* \
mariadb[0-9][0-9]-server-* \
percona[0-9][0-9]-server-*
CONFLICTS_INSTALL= mysql5[0-68-9]-server \
mysql[0-46-9][0-9]-server \
mysqlwsrep*-server \
mariadb[0-9][0-9]-server \
percona[0-9][0-9]-server
USE_RC_SUBR= mysql-server

8
databases/mysql80-client/Makefile
View file

@ -14,10 +14,10 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${MASTERDIR}/files
PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql8[1-9]-client-* \
mysql[0-79][0-9]-client-* \
mariadb[0-9][0-9]-client-* \
percona[0-9][0-9]-client-*
CONFLICTS_INSTALL= mysql8[1-9]-client \
mysql[0-79][0-9]-client \
mariadb[0-9][0-9]-client \
percona[0-9][0-9]-client
CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 -DWITH_AUTHENTICATION_FIDO=ON

10
databases/mysql80-server/Makefile
View file

@ -115,11 +115,11 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
.if !defined(CLIENT_ONLY)
USES+= mysql:80
CONFLICTS_INSTALL= mysql8[1-9]-server-* \
mysql[0-79][0-9]-server-* \
mysqlwsrep* \
mariadb[0-9][0-9]-server-* \
percona[0-9][0-9]-server-*
CONFLICTS_INSTALL= mysql8[1-9]-server \
mysql[0-79][0-9]-server \
mysqlwsrep*-server \
mariadb[0-9][0-9]-server \
percona[0-9][0-9]-server
USE_RC_SUBR= mysql-server

10
databases/mysqlwsrep56-server/Makefile
View file

@ -92,11 +92,11 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
MY_TMPDIR=${MY_TMPDIR}
CONFLICTS_INSTALL= mariadb*-server-* \
mysql[0-9]*-server-* \
mysqlwsrep57*-server-* \
mysqlwsrep[1-489]*-server-* \
percona*-server-*
CONFLICTS_INSTALL= mariadb*-server \
mysql[0-9]*-server \
mysqlwsrep57*-server \
mysqlwsrep[1-489]*-server \
percona*-server
USE_RC_SUBR= mysql-server

10
databases/mysqlwsrep57-server/Makefile
View file

@ -84,11 +84,11 @@ PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
MY_TMPDIR=${MY_TMPDIR}
CONFLICTS_INSTALL= mariadb*-server-* \
mysql[0-9]*-server-* \
mysqlwsrep56*-server-* \
mysqlwsrep[1-489]*-server-* \
percona*-server-*
CONFLICTS_INSTALL= mariadb*-server \
mysql[0-9]*-server \
mysqlwsrep56*-server \
mysqlwsrep[1-489]*-server \
percona*-server
USE_RC_SUBR= mysql-server

6
databases/percona56-client/Makefile
View file

@ -13,9 +13,9 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql*-client-* \
mariadb*-client-* \
percona5[0-57-9]-client-*
CONFLICTS_INSTALL= mysql*-client \
mariadb*-client \
percona5[0-57-9]-client
CMAKE_ARGS+= -DWITHOUT_SERVER=1

8
databases/percona56-server/Makefile
View file

@ -71,10 +71,10 @@ USES+= libedit
# MySQL-Server part
USES+=mysql:56p
CONFLICTS_INSTALL= mysql*-server-* \
mysqlwsrep* \
mariadb*-server-* \
percona5[0-57-9]-server-*
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona5[0-57-9]-server
USE_RC_SUBR= mysql-server

6
databases/percona57-client/Makefile
View file

@ -16,9 +16,9 @@ PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
CONFLICTS_INSTALL= mysql*-client-* \
mariadb*-client-* \
percona5[0-68-9]-client-*
CONFLICTS_INSTALL= mysql*-client \
mariadb*-client \
percona5[0-68-9]-client
CMAKE_ARGS+= -DWITHOUT_SERVER=1

8
databases/percona57-server/Makefile
View file

@ -106,10 +106,10 @@ TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb
USES+=mysql:57p
CONFLICTS_INSTALL= mysql*-server-* \
mysqlwsrep* \
mariadb*-server-* \
percona5[0-68-9]-server-*
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona5[0-68-9]-server
USE_RC_SUBR= mysql-server

2
databases/postgresql11-pgtcl/Makefile
View file

@ -1,7 +1,7 @@
PORTREVISION= 0
PKGNAMESUFFIX= -postgresql11
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql10-*
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql10
PGTCL_SLAVE= 11
MASTERDIR= ${.CURDIR}/../pgtcl

2
databases/postgresql12-pgtcl/Makefile
View file

@ -1,7 +1,7 @@
PORTREVISION= 0
PKGNAMESUFFIX= -postgresql12
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[013-9]-*
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[013-9]
PGTCL_SLAVE= 12
MASTERDIR= ${.CURDIR}/../pgtcl

2
databases/postgresql13-pgtcl/Makefile
View file

@ -1,7 +1,7 @@
PORTREVISION= 0
PKGNAMESUFFIX= -postgresql13
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012-49]-*
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012-49]
PGTCL_SLAVE= 13
MASTERDIR= ${.CURDIR}/../pgtcl

2
databases/postgresql14-pgtcl/Makefile
View file

@ -1,7 +1,7 @@
PORTREVISION= 0
PKGNAMESUFFIX= -postgresql14
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[0123-56789]-*
CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[0123-56789]
PGTCL_SLAVE= 14
MASTERDIR= ${.CURDIR}/../pgtcl

2
databases/puppetdb-terminus6/Makefile
View file

@ -12,7 +12,7 @@ LICENSE= APACHE20
BUILD_DEPENDS= puppet6>=0:sysutils/puppet6
CONFLICTS_INSTALL= puppetdb-terminus5-* puppetdb-terminus7-*
CONFLICTS_INSTALL= puppetdb-terminus5 puppetdb-terminus7
USE_RUBY= yes
NO_BUILD= yes
USES= gmake

2
databases/puppetdb-terminus7/Makefile
View file

@ -12,7 +12,7 @@ LICENSE= APACHE20
BUILD_DEPENDS= puppet7>=0:sysutils/puppet7
CONFLICTS_INSTALL= puppetdb-terminus5-* puppetdb-terminus6-*
CONFLICTS_INSTALL= puppetdb-terminus5 puppetdb-terminus6
USE_RUBY= yes
NO_BUILD= yes
USES= gmake

2
databases/puppetdb6/Makefile
View file

@ -13,7 +13,7 @@ RUN_DEPENDS= bash:shells/bash
USE_RC_SUBR= puppetdb
CONFLICTS_INSTALL= puppetdb5-* puppetdb7-*
CONFLICTS_INSTALL= puppetdb5 puppetdb7
USES= cpe shebangfix
CPE_VENDOR= puppet
SHEBANG_FILES= ext/bin/puppetdb \

2
databases/puppetdb7/Makefile
View file

@ -13,7 +13,7 @@ RUN_DEPENDS= bash:shells/bash
USE_RC_SUBR= puppetdb
CONFLICTS_INSTALL= puppetdb5-* puppetdb6-*
CONFLICTS_INSTALL= puppetdb5 puppetdb6
USES= cpe shebangfix
CPE_VENDOR= puppet
SHEBANG_FILES= ext/bin/puppetdb \

2
databases/py-pypuppetdb/Makefile
View file

@ -14,7 +14,7 @@ USES= python:3.6+
USE_GITHUB= yes
USE_PYTHON= autoplist distutils
CONFLICTS_INSTALL= pypuppetdb03-*
CONFLICTS_INSTALL= pypuppetdb03
GH_ACCOUNT= voxpupuli

2
databases/rrdtool/Makefile
View file

@ -12,7 +12,7 @@ COMMENT= Round Robin Database Tools
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS= rrdtool12-*
CONFLICTS= rrdtool12
CONFIGURE_ARGS= --disable-tcl
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2

2
databases/tdb/Makefile
View file

@ -12,7 +12,7 @@ LICENSE= GPLv3
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
CONFLICTS_INSTALL= tdb1-*
#CONFLICTS_INSTALL= tdb1
#FLAVORS= default nopython debug
#nopython_PKGNAMESUFFIX= -nopython

2
devel/android-tools-adb/Makefile
View file

@ -12,7 +12,7 @@ LICENSE= APACHE20
USE_GITHUB= yes
GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL}
CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
CONFLICTS_INSTALL?= ${PORTNAME}-devel
USES= compiler:c++17-lang pkgconfig ssl uidfix
BUILD_WRKSRC= ${WRKSRC}/adb

2
devel/android-tools-fastboot/Makefile
View file

@ -19,7 +19,7 @@ GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL} \
jbeich:platform_system_extras:${DISTVERSIONFULL}:extras/extras \
jbeich:platform_system_tools_mkbootimg:${DISTVERSIONFULL}:mkbootimg/mkbootimg
CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
CONFLICTS_INSTALL?= ${PORTNAME}-devel
USES= compiler:c++17-lang pkgconfig ssl uidfix
BUILD_WRKSRC= ${WRKSRC}/fastboot

2
devel/cloudabi-toolchain/Makefile
View file

@ -16,7 +16,7 @@ RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
lld${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
pkgconf:devel/pkgconf
CONFLICTS= cloudabi-binutils-*
CONFLICTS= cloudabi-binutils
CLOUDABI_ARCHS= aarch64-unknown-cloudabi armv6-unknown-cloudabi-eabihf \
armv7-unknown-cloudabi-eabihf i686-unknown-cloudabi \

2
devel/cmake/Makefile
View file

@ -45,8 +45,6 @@ CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN}
CPACK_USES_OFF= libarchive
# When CPACK is on, uses base libarchive and won't pass stage-qa
CONFLICTS_INSTALL= cmake-modules-*
CXXFLAGS+= -D__BSD_VISIBLE
.include <bsd.port.pre.mk>

2
devel/libedit/Makefile
View file

@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
CONFLICTS_INSTALL= editline-*
CONFLICTS_INSTALL= editline
post-install:
${MV} ${STAGEDIR}${PREFIX}/man/man3/history.3 ${STAGEDIR}${PREFIX}/man/man3/el_history.3

2
devel/llvm-devel/Makefile
View file

@ -165,7 +165,7 @@ LLDB_VARS= _USES_PYTHON=python:3.6+
MLIR_DESC= Multi-Level Intermediate Representation
OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library
OPENMP_PORTDOCS= openmp
OPENMP_CONFLICTS_INSTALL= libiomp5-devel-*
OPENMP_CONFLICTS_INSTALL= libiomp5-devel
OPENMP_USES= perl5
OPENMP_USE= PERL5=build
STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers)

Some files were not shown because too many files have changed in this diff Show more