Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 May 2018 12:26:10 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r469632 - head/databases/mariadb102-client
Message-ID:  <201805111226.w4BCQAVi098970@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Fri May 11 12:26:10 2018
New Revision: 469632
URL: https://svnweb.freebsd.org/changeset/ports/469632

Log:
  databases/mariadb102-client: Fix mariadb_config output
  
   - While here, standardize on -pthread
  
  PR:		226049
  Reported by:	fcharlier ploup net

Modified:
  head/databases/mariadb102-client/Makefile

Modified: head/databases/mariadb102-client/Makefile
==============================================================================
--- head/databases/mariadb102-client/Makefile	Fri May 11 12:02:05 2018	(r469631)
+++ head/databases/mariadb102-client/Makefile	Fri May 11 12:26:10 2018	(r469632)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
+PORTREVISION=	3
 PKGNAMESUFFIX=	102-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -22,7 +23,7 @@ CLIENT_ONLY=	yes
 
 post-configure:
 	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
-		-e 's|(#define LIBS.*)"\\ $$|\1 -L${PREFIX}/lib "\\|' \
+		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
 		${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
 
 post-install:
@@ -33,7 +34,7 @@ post-install:
 		${STAGEDIR}${DATADIR}/policy \
 		${STAGEDIR}${PREFIX}/include/mysql/server
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
-	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config
+	@${REINPLACE_CMD} 's/-l-pthread/-pthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config
 
 post-install-GSSAPI_NONE:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805111226.w4BCQAVi098970>