Date: Thu, 3 Oct 2013 23:18:53 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329247 - in head/databases: mariadb-client mariadb-scripts mariadb-server mariadb55-client mariadb55-server mysql51-client mysql51-scripts mysql51-server mysql55-client mysql55-server ... Message-ID: <201310032318.r93NIr0G096260@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Thu Oct 3 23:18:52 2013 New Revision: 329247 URL: http://svnweb.freebsd.org/changeset/ports/329247 Log: - use unique package names - stop using LATEST_LINK - update CONFLICTS accordingly Approved by: maintainer Modified: head/databases/mariadb-client/Makefile head/databases/mariadb-scripts/Makefile head/databases/mariadb-server/Makefile head/databases/mariadb55-client/Makefile head/databases/mariadb55-server/Makefile head/databases/mysql51-client/Makefile head/databases/mysql51-scripts/Makefile head/databases/mysql51-server/Makefile head/databases/mysql55-client/Makefile head/databases/mysql55-server/Makefile head/databases/mysql56-client/Makefile head/databases/mysql56-server/Makefile head/databases/percona55-client/Makefile head/databases/percona55-server/Makefile head/databases/percona56-client/Makefile head/databases/percona56-server/Makefile Modified: head/databases/mariadb-client/Makefile ============================================================================== --- head/databases/mariadb-client/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mariadb-client/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/mariadb-scripts/Makefile ============================================================================== --- head/databases/mariadb-scripts/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mariadb-scripts/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/mariadb-server/Makefile ============================================================================== --- head/databases/mariadb-server/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mariadb-server/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -12,7 +12,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/ 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 Modified: head/databases/mariadb55-client/Makefile ============================================================================== --- head/databases/mariadb55-client/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mariadb55-client/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mariadb55-server/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -13,7 +13,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/ 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 .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 Modified: head/databases/mysql51-client/Makefile ============================================================================== --- head/databases/mysql51-client/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mysql51-client/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PKGNAMESUFFIX= -client +PKGNAMESUFFIX= 51-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mysql51-scripts/Makefile ============================================================================== --- head/databases/mysql51-scripts/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mysql51-scripts/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PKGNAMESUFFIX= -scripts +PKGNAMESUFFIX= 51-scripts COMMENT= Multithreaded SQL database (scripts) Modified: head/databases/mysql51-server/Makefile ============================================================================== --- head/databases/mysql51-server/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mysql51-server/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 \ Modified: head/databases/mysql55-client/Makefile ============================================================================== --- head/databases/mysql55-client/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mysql55-client/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mysql55-server/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/mysql56-client/Makefile ============================================================================== --- head/databases/mysql56-client/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mysql56-client/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/mysql56-server/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/percona55-client/Makefile ============================================================================== --- head/databases/percona55-client/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/percona55-client/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/percona55-server/Makefile ============================================================================== --- head/databases/percona55-server/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/percona55-server/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/percona56-client/Makefile ============================================================================== --- head/databases/percona56-client/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/percona56-client/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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 Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Thu Oct 3 22:38:57 2013 (r329246) +++ head/databases/percona56-server/Makefile Thu Oct 3 23:18:52 2013 (r329247) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310032318.r93NIr0G096260>