svn commit: r320964 - in head/mail: qmail qmail-mysql

[Bryan Drewery]

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