aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflo <flo@FreeBSD.org>2013-10-04 07:18:52 +0800
committerflo <flo@FreeBSD.org>2013-10-04 07:18:52 +0800
commit1b0fac47b33bb506b3becff04884af32192d6093 (patch)
tree58fff617a73e66cf379a0b2845912967eeb351f4
parent2b66e7f7070d8ed3922e10583906431aa7ba9256 (diff)
downloadfreebsd-ports-gnome-1b0fac47b33bb506b3becff04884af32192d6093.tar.gz
freebsd-ports-gnome-1b0fac47b33bb506b3becff04884af32192d6093.tar.zst
freebsd-ports-gnome-1b0fac47b33bb506b3becff04884af32192d6093.zip
- use unique package names
- stop using LATEST_LINK - update CONFLICTS accordingly Approved by: maintainer
Diffstat
-rw-r--r--databases/mariadb-client/Makefile4
-rw-r--r--databases/mariadb-scripts/Makefile4
-rw-r--r--databases/mariadb-server/Makefile4
-rw-r--r--databases/mariadb55-client/Makefile6
-rw-r--r--databases/mariadb55-server/Makefile7
-rw-r--r--databases/mysql51-client/Makefile2
-rw-r--r--databases/mysql51-scripts/Makefile2
-rw-r--r--databases/mysql51-server/Makefile14
-rw-r--r--databases/mysql55-client/Makefile6
-rw-r--r--databases/mysql55-server/Makefile6
-rw-r--r--databases/mysql56-client/Makefile6
-rw-r--r--databases/mysql56-server/Makefile6
-rw-r--r--databases/percona55-client/Makefile6
-rw-r--r--databases/percona55-server/Makefile7
-rw-r--r--databases/percona56-client/Makefile6
-rw-r--r--databases/percona56-server/Makefile7
16 files changed, 32 insertions, 61 deletions
diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile
index 0ed6b2b5088b..f77534f92d4c 100644
--- a/databases/mariadb-client/Makefile
+++ b/databases/mariadb-client/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mariadb
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX= 53-client
UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
@@ -16,7 +16,7 @@ OPTIONS_DEFINE= THREADSAFE
OPTIONS_DEFAULT= THREADSAFE
THREADSAFE_DESC= Build thread-safe client
-CONFLICTS= mysql-client-[0-9]* mariadb-client-5.[0-24-9].* percona-client-5.*
+CONFLICTS= mysql[0-9][0-9]-client-* mariadb5.[0-24-9]-client-* mariadb[0-46-9][0-9]-client-* percona[0-9][0-9]-client-*
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile
index e119c56426b4..9481c6dcefbd 100644
--- a/databases/mariadb-scripts/Makefile
+++ b/databases/mariadb-scripts/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mariadb
-PKGNAMESUFFIX= -scripts
+PKGNAMESUFFIX= 53-scripts
COMMENT= Scripts for mariadb - drop-in replacement for MySQL
@@ -13,7 +13,7 @@ USES= perl5
MASTERDIR= ${.CURDIR}/../mariadb-server
MARIADB_SCRIPTS_SLAVE= yes
-CONFLICTS= mysql-scripts-[0-9]* \
+CONFLICTS= mysql[0-9][0-9]-scripts-* \
mytop-[0-9]*
PATCHDIR= ${.CURDIR}/files
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index 87a1fc4931d8..d8c42a36fa2d 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-t
http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= 53-server
MAINTAINER= dgeo@centrale-marseille.fr
COMMENT= Database server - drop-in replacement for MySQL
@@ -21,7 +21,7 @@ LICENSE= GPLv2
UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-CONFLICTS?= mysql-server-[0-9]* percona-server-[0-9]* mariadb-server-5.[0-24-9].* mariadb-server-[0-46-9].*
+CONFLICTS?= mysql[0-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb5.[0-24-9]-server-* mariadb[0-46-9][0-9]-server-*
GNU_CONFIGURE= yes
diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
index f00336d20026..5aa4f97e960a 100644
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mariadb
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX= 55-client
COMMENT= Multithreaded SQL database (client)
@@ -11,9 +11,7 @@ PKGMESSAGE= mustnotexist
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
-LATEST_LINK= mariadb55-client
-
-CONFLICTS_INSTALL= mysql-client-[345].* mariadb-client-5.3.* percona-client-5.*
+CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* mariadb[0-46-9][0-9]-client-* mariadb5.[0-46-9]-client-* percona[0-9][0-9]-client-*
CMAKE_ARGS+= -DWITHOUT_SERVER=1
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index a7044a3a7311..c593da40677f 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-t
http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= 55-server
MAINTAINER= never@nevermind.kiev.ua
COMMENT?= Multithreaded SQL database (server)
@@ -55,7 +55,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
.endif
DATADIR= ${PREFIX}/share/mysql
-USE_LDCONFIG= ${PREFIX}/lib/mysql
# MySQL-Server options
.if !defined(CLIENT_ONLY)
@@ -103,9 +102,7 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
USE_MYSQL= yes
WANT_MYSQL_VER= 55m
-LATEST_LINK= mariadb55-server
-
-CONFLICTS_INSTALL= mysql-server-[345].* mariadb-server-5.3.* percona-server-5.*
+CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-46-9][0-9]-server-* mariadb5.[0-46-9]-server-* percona[0-9][0-9]-server-*
USE_RC_SUBR= mysql-server
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 41414daecd93..604851f8992d 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX= 51-client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql51-scripts/Makefile b/databases/mysql51-scripts/Makefile
index 6f7ea03a2e2a..9dd789873e95 100644
--- a/databases/mysql51-scripts/Makefile
+++ b/databases/mysql51-scripts/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PKGNAMESUFFIX= -scripts
+PKGNAMESUFFIX= 51-scripts
COMMENT= Multithreaded SQL database (scripts)
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 98222d9e0489..5931823477aa 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -7,7 +7,7 @@ PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= 51-server
MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
@@ -88,9 +88,7 @@ CXXFLAGS+= -fno-exceptions
USE_MYSQL= yes
WANT_MYSQL_VER= 51
-LATEST_LINK= mysql51-server
-
-CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[02-9].* mariadb-server-5.* percona-server-5.*
+CONFLICTS_INSTALL= mysql5.[02-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
USE_RC_SUBR= mysql-server
@@ -163,9 +161,7 @@ post-install:
.else
# MySQL-Client part
.if defined(CLIENT_ONLY)
-LATEST_LINK= mysql51-client
-
-CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[02-9].*
+CONFLICTS_INSTALL= mysql5.[02-9]-client-* mysql[0-46-9][0-9]-client-*
MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
@@ -193,9 +189,7 @@ WANT_MYSQL_VER= 51
RUN_DEPENDS= p5-DBD-mysql51>=0:${PORTSDIR}/databases/p5-DBD-mysql51
-LATEST_LINK= mysql51-scripts
-
-CONFLICTS_INSTALL= mysql-scripts-[34].* mysql-scripts-5.[02-9].*
+CONFLICTS_INSTALL= mysql[0-46-9][0-9]-scripts-* mysql5.[02-9]-scripts-*
MAN1= msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
mysql_fix_extensions.1 mysql_secure_installation.1 \
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 1752bbe0991f..bcc279491574 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX= 55-client
COMMENT= Multithreaded SQL database (client)
@@ -12,9 +12,7 @@ PKGMESSAGE= mustnotexist
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
-LATEST_LINK= mysql55-client
-
-CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-46-9].* mariadb-client-5.* percona-client-5.*
+CONFLICTS_INSTALL= mysql5.[0-46-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
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index b9dec66fccff..9c9b04821327 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -7,7 +7,7 @@ PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.5
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= 55-server
MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
@@ -61,9 +61,7 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
USE_MYSQL= yes
WANT_MYSQL_VER= 55
-LATEST_LINK= mysql55-server
-
-CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[0-46-9].* mariadb-server-5.* percona-server-5.*
+CONFLICTS_INSTALL= mysql5.[0-46-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
USE_RC_SUBR= mysql-server
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
index 5c89d21448ba..14a580157123 100644
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX= 56-client
COMMENT= Multithreaded SQL database (client)
@@ -12,9 +12,7 @@ PKGMESSAGE= mustnotexist
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
-LATEST_LINK= mysql56-client
-
-CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-57-9].* mariadb-client-5.* percona-client-5.*
+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
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index ece172d4d6ff..cb8ac1993a5d 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -7,7 +7,7 @@ PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.6
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= 56-server
MAINTAINER= ale@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
@@ -45,9 +45,7 @@ WANT_MYSQL_VER= 56
USES+= perl5
USE_PERL5= run
-LATEST_LINK= mysql56-server
-
-CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[0-57-9].* mariadb-server-5.* percona-server-5.*
+CONFLICTS_INSTALL= mysql5.[0-57-9]-server-* mysql[0-46-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb[0-9][0-9]-server-*
USE_RC_SUBR= mysql-server
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index ae0bb7d82842..d977742c5a3e 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= percona
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX= 55-client
COMMENT= Multithreaded SQL database (client)
@@ -11,9 +11,7 @@ PKGMESSAGE= mustnotexist
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
-LATEST_LINK= percona55-client
-
-CONFLICTS_INSTALL= mysql-client-[345].* mariadb-client-5.* percona-client-5.[0-46-9].*
+CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona5.[0-46-9]-client-* percona[0-46-9][0-9]-client-*
CMAKE_ARGS+= -DWITHOUT_SERVER=1
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 63ce5241f3d9..470a4976eae4 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -7,7 +7,7 @@ PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/${DISTNAME:S/rel//}/source/
MASTER_SITE_SUBDIR= MySQL-5.5
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= 55-server
MAINTAINER= flo@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
@@ -20,7 +20,6 @@ OPTIONS_DEFAULT= OPENSSL
FASTMTX_DESC= Replace mutexes with spinlocks
DATADIR= ${PREFIX}/share/mysql
-USE_LDCONFIG= ${PREFIX}/lib/mysql
CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
@@ -61,9 +60,7 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
USE_MYSQL= yes
WANT_MYSQL_VER= 55p
-LATEST_LINK= percona55-server
-
-CONFLICTS_INSTALL= mysql-server-[345].* percona-server-5.[0-46-9].* mariadb-server-[0-9].*
+CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-46-9]-server-* percona[0-46-9][0-9]-server-*
USE_RC_SUBR= mysql-server
diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile
index e015a79f7628..5ae3fc7bc013 100644
--- a/databases/percona56-client/Makefile
+++ b/databases/percona56-client/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= percona
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX= 56-client
COMMENT= Multithreaded SQL database (client)
@@ -12,9 +12,7 @@ PKGMESSAGE= mustnotexist
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
-LATEST_LINK= percona56-client
-
-CONFLICTS_INSTALL= mysql-client-[345].* mariadb-client-5.* percona-client-5.[0-57-9].*
+CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona5.[0-57-9]-client-* percona[0-46-9][0-9]-client-*
CMAKE_ARGS+= -DWITHOUT_SERVER=1
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
index df2e718d5138..df78d62583c2 100644
--- a/databases/percona56-server/Makefile
+++ b/databases/percona56-server/Makefile
@@ -6,7 +6,7 @@ DISTVERSION= 5.6.13-rc60.6
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= 56-server
DISTNAME= Percona-Server-5.6.13-rc60.6
MAINTAINER= flo@FreeBSD.org
@@ -20,7 +20,6 @@ OPTIONS_DEFAULT= OPENSSL
FASTMTX_DESC= Replace mutexes with spinlocks
DATADIR= ${PREFIX}/share/mysql
-USE_LDCONFIG= ${PREFIX}/lib/mysql
CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
@@ -60,9 +59,7 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1
USE_MYSQL= yes
WANT_MYSQL_VER= 56p
-LATEST_LINK= percona56-server
-
-CONFLICTS_INSTALL= mysql-server-[345].* percona-server-5.[0-57-9].* mariadb-server-[0-9].*
+CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-57-9]-server-* percona[0-46-9][0-9]-server-*
USE_RC_SUBR= mysql-server
generated by cgit (git 2.34.1) at 2024-12-14 14:45:14 +0800