kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow depending on both mysql's client and server

Browse source 
Fix the few users of both the MySQL client and server.

PR:		209762
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D6575
This commit is contained in:
Mathieu Arnold 2016-06-01 13:14:56 +00:00
parent 34b9a27c65
commit 3c03e67b02
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=416240
5 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Mk/Uses/mysql.mk
View file

@ -3,11 +3,12 @@
# Provide support for MySQL
# Feature: mysql
# Usage: USES=mysql or USES=mysql:args
# Valid ARGS: <version>, server, embedded
# Valid ARGS: <version>, client, server, embedded
#
# version If no version is given (by the maintainer via the port), try to
# find the currently installed version. Fall back to default if
# necessary (MySQL-5.6 = 56).
# client Depends on the libmysqlclient library (default)
# server/embedded
# Depend on the server at run/build time. If none of these is
# set, depends on the client.
@ -40,6 +41,10 @@ _MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver}
_WANT_MYSQL_EMBEDDED= yes
_MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded}
.endif
.if ${_MYSQL_ARGS:Mclient}
_WANT_MYSQL_CLIENT= yes
_MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient}
.endif
# Port requested a version
.if !empty(_MYSQL_ARGS)
@ -126,7 +131,9 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
.if defined(_WANT_MYSQL_EMBEDDED)
BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER}
.endif
.else
.endif
.if defined(_WANT_MYSQL_CLIENT) || \
!(defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED))
LIB_DEPENDS+= libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
.endif
.else

3
databases/ateam_mysql_ldap_auth/Makefile
View file

@ -12,10 +12,9 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libconfig.so:devel/libconfig
RUN_DEPENDS= mysql${MYSQL_VER}-server>5.6:databases/mysql56-server
USE_OPENLDAP= yes
USES= gmake mysql
USES= gmake mysql:client,server
USE_GITHUB= yes
GH_ACCOUNT= ateamsystems

4
mail/gld/Makefile
View file

@ -28,13 +28,13 @@ LOCAL_DB_SERVER_DESC= RUN_DEPEND also on selected DB server
.if ${PORT_OPTIONS:MMYSQL}
CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
USE_MYSQL= yes
. if ${PORT_OPTIONS:MLOCAL_DB_SERVER}
RUN_DEPENDS+= mysql-server>=0:databases/mysql${MYSQL_VER}-server
SUB_LIST+= MYSQL=mysql
SUB_LIST+= PGSQL=
USES+= mysql:client,server
. else
SUB_LIST+= MYSQL=
USES+= mysql
. endif
.endif

4
multimedia/mythtv/Makefile
View file

@ -35,7 +35,6 @@ SHEBANG_FILES= programs/scripts/database/mythconverg_backup.pl \
USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \
moc_build qmake_build rcc_build uic_build imageformats
QT_NONSTANDARD= yes
USE_MYSQL= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/mythtv/filters
REINPLACE_ARGS= -i ""
@ -66,7 +65,8 @@ OPTIONS_SUB= BINDINGS
BINDINGS_DESC= Perl and Python bindings
LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc
MYSQL_RUN_DEPENDS= mysqld_safe:databases/mysql${MYSQL_VER}-server
MYSQL_USES= mysql:client,server
MYSQL_USES_OFF= mysql
VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
VDPAU_CONFIGURE_ENABLE= vdpau

5
www/rnews/Makefile
View file

@ -23,14 +23,15 @@ MYSQLSERVER_DESC= Use MySQL-Server on localhost
.include <bsd.port.options.mk>
USE_PHP= mysql mbstring pcre xml iconv
USE_MYSQL= yes
.if ${PORT_OPTIONS:MGD}
USE_PHP+= gd
.endif
.if ${PORT_OPTIONS:MMYSQLSERVER}
RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:databases/mysql${MYSQL_VER}-server
USES+= mysql:client,server
.else
USES+= mysql
.endif
RUN_DEPENDS+= curl:ftp/curl