Date: Tue, 4 Nov 2014 16:45:45 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372152 - in head/databases: mysql55-client mysql55-server Message-ID: <201411041645.sA4GjjSW079290@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Tue Nov 4 16:45:45 2014 New Revision: 372152 URL: https://svnweb.freebsd.org/changeset/ports/372152 QAT: https://qat.redports.org/buildarchive/r372152/ Log: Update CONFLICTS. PR: 194810 Submitted by: spil.oss@gmail.com Modified: head/databases/mysql55-client/Makefile head/databases/mysql55-server/Makefile Modified: head/databases/mysql55-client/Makefile ============================================================================== --- head/databases/mysql55-client/Makefile Tue Nov 4 16:44:33 2014 (r372151) +++ head/databases/mysql55-client/Makefile Tue Nov 4 16:45:45 2014 (r372152) @@ -12,7 +12,9 @@ PKGMESSAGE= mustnotexist PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -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-* +CONFLICTS_INSTALL= mysql5[0-46-9]-client-* \ + mariadb*-client-* \ + percona*-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Tue Nov 4 16:44:33 2014 (r372151) +++ head/databases/mysql55-server/Makefile Tue Nov 4 16:45:45 2014 (r372152) @@ -63,7 +63,9 @@ CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 USE_MYSQL= yes WANT_MYSQL_VER= 55 -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-* +CONFLICTS_INSTALL= mysql5[0-46-9]-server-* \ + mariadb*-server-* \ + percona*-server-* USE_RC_SUBR= mysql-server
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411041645.sA4GjjSW079290>