diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-07-01 12:22:05 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-07-01 12:22:05 +0000 |
commit | f85a534244c7b64475bdcc521f303b8b0e22e8a9 (patch) | |
tree | 2d3f624264db6418419b072759ca339b187b555d /databases | |
parent | d05e563a6360473b0b00a96e10b062a7cd75ad5b (diff) |
Notes
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mariadb-client/Makefile | 1 | ||||
-rw-r--r-- | databases/mariadb55-server/Makefile | 2 | ||||
-rw-r--r-- | databases/mysql51-server/Makefile | 3 | ||||
-rw-r--r-- | databases/mysql55-server/Makefile | 2 | ||||
-rw-r--r-- | databases/mysql56-server/Makefile | 3 | ||||
-rw-r--r-- | databases/percona55-server/Makefile | 2 | ||||
-rw-r--r-- | databases/percona56-server/Makefile | 2 |
7 files changed, 13 insertions, 2 deletions
diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile index 221a65d7e74d..8d589fd48825 100644 --- a/databases/mariadb-client/Makefile +++ b/databases/mariadb-client/Makefile @@ -10,6 +10,7 @@ COMMENT= Database client - drop-in replacement for MySQL MASTERDIR= ${.CURDIR}/../mariadb-server MARIADB_CLIENT_SLAVE= yes +USES+= readline CONFIGURE_ARGS= --without-server --with-libevent=no OPTIONS_DEFINE= THREADSAFE diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile index f09ef9396151..d779dcebc8b4 100644 --- a/databases/mariadb55-server/Makefile +++ b/databases/mariadb55-server/Makefile @@ -138,6 +138,8 @@ LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs .if ${PORT_OPTIONS:MMAXKEY} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h .endif +.else +USES+= readline .endif post-patch: diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 76d1bf0fb12e..0265794bfe19 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -15,7 +15,7 @@ COMMENT?= Multithreaded SQL database (server) 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 \ diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 446dc786a7b9..c281460a71f9 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -77,6 +77,8 @@ MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" +.else +USES+= readline .endif post-patch: diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 7b6d3c9a0ecc..96af5588ef01 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -44,7 +44,6 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.sh 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.1 myisamchk.1 myisamlog.1 myisampack.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" +.else +USES+= readline .endif post-patch: diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index a846b38b9efc..7807bf84439e 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -80,6 +80,8 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: @${MKDIR} ${STAGEDIR}/var/db/mysql +.else +USES+= readline .endif post-patch: diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 4694b5917af9..3667e05ec04b 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -81,6 +81,8 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: @${MKDIR} ${STAGEDIR}/var/db/mysql +.else +USES+= readline .endif post-patch: |