From owner-svn-ports-all@freebsd.org Wed Jun 1 13:14:58 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53C61B60C97; Wed, 1 Jun 2016 13:14:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 12F6B175A; Wed, 1 Jun 2016 13:14:57 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u51DEvlg056474; Wed, 1 Jun 2016 13:14:57 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u51DEuOS056469; Wed, 1 Jun 2016 13:14:56 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201606011314.u51DEuOS056469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 1 Jun 2016 13:14:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416240 - in head: Mk/Uses databases/ateam_mysql_ldap_auth mail/gld multimedia/mythtv www/rnews X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2016 13:14:58 -0000 Author: mat Date: Wed Jun 1 13:14:56 2016 New Revision: 416240 URL: https://svnweb.freebsd.org/changeset/ports/416240 Log: Allow depending on both mysql's client and server 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 Modified: head/Mk/Uses/mysql.mk head/databases/ateam_mysql_ldap_auth/Makefile (contents, props changed) head/mail/gld/Makefile (contents, props changed) head/multimedia/mythtv/Makefile (contents, props changed) head/www/rnews/Makefile (contents, props changed) Modified: head/Mk/Uses/mysql.mk ============================================================================== --- head/Mk/Uses/mysql.mk Wed Jun 1 13:14:54 2016 (r416239) +++ head/Mk/Uses/mysql.mk Wed Jun 1 13:14:56 2016 (r416240) @@ -3,11 +3,12 @@ # Provide support for MySQL # Feature: mysql # Usage: USES=mysql or USES=mysql:args -# Valid ARGS: , server, embedded +# Valid ARGS: , 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/mysql .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 Modified: head/databases/ateam_mysql_ldap_auth/Makefile ============================================================================== --- head/databases/ateam_mysql_ldap_auth/Makefile Wed Jun 1 13:14:54 2016 (r416239) +++ head/databases/ateam_mysql_ldap_auth/Makefile Wed Jun 1 13:14:56 2016 (r416240) @@ -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 Modified: head/mail/gld/Makefile ============================================================================== --- head/mail/gld/Makefile Wed Jun 1 13:14:54 2016 (r416239) +++ head/mail/gld/Makefile Wed Jun 1 13:14:56 2016 (r416240) @@ -28,13 +28,13 @@ LOCAL_DB_SERVER_DESC= RUN_DEPEND also on .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 Modified: head/multimedia/mythtv/Makefile ============================================================================== --- head/multimedia/mythtv/Makefile Wed Jun 1 13:14:54 2016 (r416239) +++ head/multimedia/mythtv/Makefile Wed Jun 1 13:14:56 2016 (r416240) @@ -35,7 +35,6 @@ SHEBANG_FILES= programs/scripts/database 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 Modified: head/www/rnews/Makefile ============================================================================== --- head/www/rnews/Makefile Wed Jun 1 13:14:54 2016 (r416239) +++ head/www/rnews/Makefile Wed Jun 1 13:14:56 2016 (r416240) @@ -23,14 +23,15 @@ MYSQLSERVER_DESC= Use MySQL-Server on lo .include 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