From owner-svn-ports-head@FreeBSD.ORG  Fri Jun 14 21:13:42 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 62E33F37;
 Fri, 14 Jun 2013 21:13:42 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 55501194F;
 Fri, 14 Jun 2013 21:13:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ELDgi4078217;
 Fri, 14 Jun 2013 21:13:42 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ELDgnc078215;
 Fri, 14 Jun 2013 21:13:42 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201306142113.r5ELDgnc078215@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 14 Jun 2013 21:13:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320964 - in head/mail: qmail qmail-mysql
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jun 2013 21:13:42 -0000

Author: bdrewery
Date: Fri Jun 14 21:13:41 2013
New Revision: 320964
URL: http://svnweb.freebsd.org/changeset/ports/320964

Log:
  - Fix qmail-mysql build with clang and recent mysql-client
  
  Reported by:	miwi via pointyhat

Modified:
  head/mail/qmail-mysql/Makefile
  head/mail/qmail/Makefile

Modified: head/mail/qmail-mysql/Makefile
==============================================================================
--- head/mail/qmail-mysql/Makefile	Fri Jun 14 21:03:45 2013	(r320963)
+++ head/mail/qmail-mysql/Makefile	Fri Jun 14 21:13:41 2013	(r320964)
@@ -16,7 +16,6 @@ MYSQL_PATCH_VERSION=	1.1.15
 SLAVE_MYSQL=	yes
 
 USE_MYSQL=	yes
-USE_GCC=	any
 
 MASTERDIR=	${.CURDIR}/../qmail
 DESCR=		${.CURDIR}/pkg-descr

Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile	Fri Jun 14 21:03:45 2013	(r320963)
+++ head/mail/qmail/Makefile	Fri Jun 14 21:13:41 2013	(r320964)
@@ -679,7 +679,9 @@ post-patch:
 . endif
 .endif
 .if defined(SLAVE_MYSQL)
-	@${REINPLACE_CMD} 's|/opt/mysql|${LOCALBASE}|' \
+	@${REINPLACE_CMD} \
+	  -e 's|/opt/mysql|${LOCALBASE}|' \
+	  -e "s,MYSQL_LIBS=.*,MYSQL_LIBS=\`${LOCALBASE}/bin/mysql_config --libs\`," \
 		${WRKSRC}/Makefile
 .elif defined(SLAVE_SPAMCONTROL)
 	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail