From owner-svn-ports-all@freebsd.org Sat Nov 18 21:48:12 2017 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 F2A70DDD64A; Sat, 18 Nov 2017 21:48:12 +0000 (UTC) (envelope-from brnrd@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 BC74E7EEA3; Sat, 18 Nov 2017 21:48:12 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAILmBw5048435; Sat, 18 Nov 2017 21:48:11 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAILmB1E048434; Sat, 18 Nov 2017 21:48:11 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201711182148.vAILmB1E048434@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 18 Nov 2017 21:48:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454463 - head/databases/mariadb102-client X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/databases/mariadb102-client X-SVN-Commit-Revision: 454463 X-SVN-Commit-Repository: ports 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.25 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: Sat, 18 Nov 2017 21:48:13 -0000 Author: brnrd Date: Sat Nov 18 21:48:11 2017 New Revision: 454463 URL: https://svnweb.freebsd.org/changeset/ports/454463 Log: databases/mariadb102-client: Fix linking issues in downstream ports - mariadb_config produces incorrect output [1] 1: https://jira.mariadb.org/browse/MDEV-14439 Reported by: Alexandre Modified: head/databases/mariadb102-client/Makefile Modified: head/databases/mariadb102-client/Makefile ============================================================================== --- head/databases/mariadb102-client/Makefile Sat Nov 18 21:27:47 2017 (r454462) +++ head/databases/mariadb102-client/Makefile Sat Nov 18 21:48:11 2017 (r454463) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= mariadb +PORTREVISION= 1 PKGNAMESUFFIX= 102-client COMMENT= Multithreaded SQL database (client) @@ -19,6 +20,11 @@ CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes + +post-configure: + ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ + -e 's|(#define LIBS.*)"\\ $$|\1 -L${PREFIX}/lib "\\|' \ + ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c post-install: ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4