diff options
Diffstat (limited to 'databases')
-rw-r--r-- | databases/akonadi/Makefile | 2 | ||||
-rw-r--r-- | databases/libdrizzle-redux/Makefile | 2 | ||||
-rw-r--r-- | databases/linux-c7-sqlite3/Makefile | 2 | ||||
-rw-r--r-- | databases/pgpool-II-36/Makefile | 2 | ||||
-rw-r--r-- | databases/pgpool-II-37/Makefile | 2 | ||||
-rw-r--r-- | databases/pgpool-II-40/Makefile | 2 | ||||
-rw-r--r-- | databases/pgpool-II-41/Makefile | 2 | ||||
-rw-r--r-- | databases/pgpool-II-42/Makefile | 2 | ||||
-rw-r--r-- | databases/postgresql10-pgtcl/Makefile | 2 | ||||
-rw-r--r-- | databases/postgresql11-pgtcl/Makefile | 2 | ||||
-rw-r--r-- | databases/postgresql12-pgtcl/Makefile | 2 | ||||
-rw-r--r-- | databases/postgresql13-pgtcl/Makefile | 2 | ||||
-rw-r--r-- | databases/postgresql14-pgtcl/Makefile | 2 | ||||
-rw-r--r-- | databases/postgresql96-pgtcl/Makefile | 2 | ||||
-rw-r--r-- | databases/py-mysqlclient/Makefile | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index 50d1ec3f1e0c..5a1cf9e3056c 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -11,7 +11,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs # Let process generate meaningful backtrace on core dump. BUILD_DEPENDS= xsltproc:textproc/libxslt -CONFLICTS= akonadi-[0-9]* akonadi-kf5-git-[0-9]* +CONFLICTS= akonadi akonadi-kf5-git USES= cmake compiler:c++11-lib gettext gnome kde:5 qt:5 \ shared-mime-info tar:xz diff --git a/databases/libdrizzle-redux/Makefile b/databases/libdrizzle-redux/Makefile index d0782d9e465d..625c8bf34896 100644 --- a/databases/libdrizzle-redux/Makefile +++ b/databases/libdrizzle-redux/Makefile @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes USES= gmake libtool ssl USE_LDCONFIG= yes -CONFLICTS= libdrizzle-[0-9]* +CONFLICTS= libdrizzle OPTIONS_DEFINE= DOCS diff --git a/databases/linux-c7-sqlite3/Makefile b/databases/linux-c7-sqlite3/Makefile index 65105ba32a28..e512abdd22df 100644 --- a/databases/linux-c7-sqlite3/Makefile +++ b/databases/linux-c7-sqlite3/Makefile @@ -15,7 +15,7 @@ USES= cpe linux:c7 USE_LDCONFIG= yes USE_LINUX_RPM= yes -CONFLICTS= linux-c6-${PORTNAME}-[0-9]* +CONFLICTS= linux-c6-${PORTNAME} DESCR= ${.CURDIR}/../${PORTNAME}3/pkg-descr OPTIONS_DEFINE= DOCS diff --git a/databases/pgpool-II-36/Makefile b/databases/pgpool-II-36/Makefile index 0a4f58bd1e5b..38ea30060c99 100644 --- a/databases/pgpool-II-36/Makefile +++ b/databases/pgpool-II-36/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= pgpool -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/pgpool-II-37/Makefile b/databases/pgpool-II-37/Makefile index d4d7a12cd957..43b4332202d9 100644 --- a/databases/pgpool-II-37/Makefile +++ b/databases/pgpool-II-37/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= pgpool -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/pgpool-II-40/Makefile b/databases/pgpool-II-40/Makefile index 008f0c4ee1f8..1cda25b3de48 100644 --- a/databases/pgpool-II-40/Makefile +++ b/databases/pgpool-II-40/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= pgpool -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/pgpool-II-41/Makefile b/databases/pgpool-II-41/Makefile index 6a29cd2ee075..0fd9c1d83566 100644 --- a/databases/pgpool-II-41/Makefile +++ b/databases/pgpool-II-41/Makefile @@ -18,7 +18,7 @@ USE_RC_SUBR= pgpool GNU_CONFIGURE= yes -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/pgpool-II-42/Makefile b/databases/pgpool-II-42/Makefile index dbdd86f33c2c..a89611c68d26 100644 --- a/databases/pgpool-II-42/Makefile +++ b/databases/pgpool-II-42/Makefile @@ -18,7 +18,7 @@ USE_RC_SUBR= pgpool GNU_CONFIGURE= yes -CONFLICTS= pgpool-II-[0-9]* +CONFLICTS= pgpool-II PORTDOCS= * diff --git a/databases/postgresql10-pgtcl/Makefile b/databases/postgresql10-pgtcl/Makefile index b825c8936b99..84d8f44575b4 100644 --- a/databases/postgresql10-pgtcl/Makefile +++ b/databases/postgresql10-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql10 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] PGTCL_SLAVE= 10 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql11-pgtcl/Makefile b/databases/postgresql11-pgtcl/Makefile index 9db5b7ceb2c7..712386ca9c64 100644 --- a/databases/postgresql11-pgtcl/Makefile +++ b/databases/postgresql11-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql11 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql10-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql10-* PGTCL_SLAVE= 11 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql12-pgtcl/Makefile b/databases/postgresql12-pgtcl/Makefile index 6bf1cf32f000..082e23aa5423 100644 --- a/databases/postgresql12-pgtcl/Makefile +++ b/databases/postgresql12-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql12 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[013-9]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[013-9]-* PGTCL_SLAVE= 12 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql13-pgtcl/Makefile b/databases/postgresql13-pgtcl/Makefile index 6210c1a524ff..dc8cf9802d62 100644 --- a/databases/postgresql13-pgtcl/Makefile +++ b/databases/postgresql13-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql13 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[012-49]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012-49]-* PGTCL_SLAVE= 13 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql14-pgtcl/Makefile b/databases/postgresql14-pgtcl/Makefile index 3d8c061ea298..850d0f0057c2 100644 --- a/databases/postgresql14-pgtcl/Makefile +++ b/databases/postgresql14-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql14 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[0123-56789]-* +CONFLICTS= pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[0123-56789]-* PGTCL_SLAVE= 14 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/postgresql96-pgtcl/Makefile b/databases/postgresql96-pgtcl/Makefile index 761f1c4a8264..a46a8135d229 100644 --- a/databases/postgresql96-pgtcl/Makefile +++ b/databases/postgresql96-pgtcl/Makefile @@ -1,7 +1,7 @@ PORTREVISION= 0 PKGNAMESUFFIX= -postgresql96 -CONFLICTS= pgtcl-[0-9]* pgtcl-postgresql9[01234]-[0-9]* +CONFLICTS= pgtcl pgtcl-postgresql9[01234] PGTCL_SLAVE= 9.6 MASTERDIR= ${.CURDIR}/../pgtcl diff --git a/databases/py-mysqlclient/Makefile b/databases/py-mysqlclient/Makefile index 17461c0b73d9..864095dfdee6 100644 --- a/databases/py-mysqlclient/Makefile +++ b/databases/py-mysqlclient/Makefile @@ -15,7 +15,7 @@ USE_PYTHON= autoplist concurrent distutils PORTDOCS= * -CONFLICTS= py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]* py*-MySQLdb +CONFLICTS= py*-MySQLdb py*-MySQLdb5[0-9] py*-MySQLdb OPTIONS_DEFINE= DOCS |