svn commit: r359981 - in head/databases: mariadb-client mariadb55-server mysql51-server mysql55-server mysql56-server percona55-server percona56-server

[Baptiste Daroussin]

Author: bapt
Date: Tue Jul  1 12:22:05 2014
New Revision: 359981
URL: http://svnweb.freebsd.org/changeset/ports/359981
QAT: https://qat.redports.org/buildarchive/r359981/

Log:
  Fix build with readline from ports

Modified:
  head/databases/mariadb-client/Makefile
  head/databases/mariadb55-server/Makefile
  head/databases/mysql51-server/Makefile
  head/databases/mysql55-server/Makefile
  head/databases/mysql56-server/Makefile
  head/databases/percona55-server/Makefile
  head/databases/percona56-server/Makefile

Modified: head/databases/mariadb-client/Makefile
==============================================================================
--- head/databases/mariadb-client/Makefile	Tue Jul  1 12:10:39 2014	(r359980)
+++ head/databases/mariadb-client/Makefile	Tue Jul  1 12:22:05 2014	(r359981)
@@ -10,6 +10,7 @@ COMMENT=	Database client - drop-in repla
 MASTERDIR=	${.CURDIR}/../mariadb-server
 MARIADB_CLIENT_SLAVE=	yes
 
+USES+=		readline
 CONFIGURE_ARGS=	--without-server --with-libevent=no
 
 OPTIONS_DEFINE=		THREADSAFE

Modified: head/databases/mariadb55-server/Makefile
==============================================================================
--- head/databases/mariadb55-server/Makefile	Tue Jul  1 12:10:39 2014	(r359980)
+++ head/databases/mariadb55-server/Makefile	Tue Jul  1 12:22:05 2014	(r359981)
@@ -138,6 +138,8 @@ LIB_DEPENDS+=	libboost_system.so:${PORTS
 .if ${PORT_OPTIONS:MMAXKEY}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my_compare.h
 .endif
+.else
+USES+=		readline
 .endif
 
 post-patch:

Modified: head/databases/mysql51-server/Makefile
==============================================================================
--- head/databases/mysql51-server/Makefile	Tue Jul  1 12:10:39 2014	(r359980)
+++ head/databases/mysql51-server/Makefile	Tue Jul  1 12:22:05 2014	(r359981)
@@ -15,7 +15,7 @@ COMMENT?=	Multithreaded SQL database (se
 SLAVEDIRS=	databases/mysql51-client databases/mysql51-scripts
 GNU_CONFIGURE=	yes
 
-USES=		makeinfo
+USES+=		makeinfo
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
@@ -156,6 +156,7 @@ post-patch:
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
+USES+=			readline
 CONFLICTS_INSTALL=	mysql5.[02-9]-client-* mysql[0-46-9][0-9]-client-*
 
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \

Modified: head/databases/mysql55-server/Makefile
==============================================================================
--- head/databases/mysql55-server/Makefile	Tue Jul  1 12:10:39 2014	(r359980)
+++ head/databases/mysql55-server/Makefile	Tue Jul  1 12:22:05 2014	(r359981)
@@ -77,6 +77,8 @@ MAN1=		my_print_defaults.1 myisam_ftdump
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
+.else
+USES+=		readline
 .endif
 
 post-patch:

Modified: head/databases/mysql56-server/Makefile
==============================================================================
--- head/databases/mysql56-server/Makefile	Tue Jul  1 12:10:39 2014	(r359980)
+++ head/databases/mysql56-server/Makefile	Tue Jul  1 12:22:05 2014	(r359981)
@@ -44,7 +44,6 @@ SHEBANG_FILES=	scripts/*.pl* scripts/*.s
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	56
 
-USES+=		perl5
 USE_PERL5=	run
 
 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-*
@@ -62,6 +61,8 @@ MAN1=		my_print_defaults.1 myisam_ftdump
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
+.else
+USES+=		readline
 .endif
 
 post-patch:

Modified: head/databases/percona55-server/Makefile
==============================================================================
--- head/databases/percona55-server/Makefile	Tue Jul  1 12:10:39 2014	(r359980)
+++ head/databases/percona55-server/Makefile	Tue Jul  1 12:22:05 2014	(r359981)
@@ -80,6 +80,8 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/db/mysql
+.else
+USES+=		readline
 .endif
 
 post-patch:

Modified: head/databases/percona56-server/Makefile
==============================================================================
--- head/databases/percona56-server/Makefile	Tue Jul  1 12:10:39 2014	(r359980)
+++ head/databases/percona56-server/Makefile	Tue Jul  1 12:22:05 2014	(r359981)
@@ -81,6 +81,8 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/db/mysql
 
+.else
+USES+=		readline
 .endif
 
 post-patch: