From owner-svn-ports-head@freebsd.org  Mon May 16 19:22:52 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 A8BBBB3DEC9;
 Mon, 16 May 2016 19:22:52 +0000 (UTC)
 (envelope-from amdmi3@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 79DDA1125;
 Mon, 16 May 2016 19:22:52 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4GJMp6S006637;
 Mon, 16 May 2016 19:22:51 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4GJMpAR006636;
 Mon, 16 May 2016 19:22:51 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201605161922.u4GJMpAR006636@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 16 May 2016 19:22:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415359 - head/databases/luasql-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.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 May 2016 19:22:52 -0000

Author: amdmi3
Date: Mon May 16 19:22:51 2016
New Revision: 415359
URL: https://svnweb.freebsd.org/changeset/ports/415359

Log:
  - Convert to USES=mysql
  - Cosmetic fixes

Modified:
  head/databases/luasql-mysql/Makefile

Modified: head/databases/luasql-mysql/Makefile
==============================================================================
--- head/databases/luasql-mysql/Makefile	Mon May 16 19:10:11 2016	(r415358)
+++ head/databases/luasql-mysql/Makefile	Mon May 16 19:22:51 2016	(r415359)
@@ -21,7 +21,7 @@ ALL_TARGET=	${LUASQL_DRIVER}
 
 LUASQL_DRIVER?=	mysql
 
-MAKE_ARGS+=	LUA_DIR=${LUA_SUBDIR} \
+MAKE_ARGS=	LUA_DIR=${LUA_SUBDIR} \
 		LUA_INC=${LUA_INCDIR} \
 		LUA_LIBDIR=${LUA_LIBDIR} \
 		LUA_VERSION_NUM="${LUA_VER_STR}0" \
@@ -32,11 +32,12 @@ MAKE_ARGS+=	LUA_DIR=${LUA_SUBDIR} \
 USE_CSTD=	gnu89
 CFLAGS+=	-Wno-return-type
 
-PLIST_SUB+=	LUA_MIDLIBDIR=${LUA_MODLIBDIR}
+PLIST_SUB=	LUA_MIDLIBDIR=${LUA_MODLIBDIR} \
+		LUASQL_DRIVER=${LUASQL_DRIVER}
 
 .if ${LUASQL_DRIVER} == "mysql"
 COMMENT=	Lua interface to MySQL
-USE_MYSQL=	yes
+USES+=		mysql
 MAKE_ARGS+=	DRIVER_LIBS_mysql="-L ${LOCALBASE}/lib/mysql -lmysqlclient" \
 		DRIVER_INCS_mysql="-I ${LOCALBASE}/include/mysql"
 .elif ${LUASQL_DRIVER} == "postgres"
@@ -53,10 +54,8 @@ MAKE_ARGS+=	DRIVER_LIBS_sqlite3="-L ${LO
 IGNORE=		unknown or unsupported luasql driver
 .endif
 
-PLIST_SUB+=	LUASQL_DRIVER=${LUASQL_DRIVER}
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}/luasql
-	@${INSTALL_LIB} ${WRKSRC}/src/${LUASQL_DRIVER}.so ${STAGEDIR}${LUA_MODLIBDIR}/luasql
+	${INSTALL_LIB} ${WRKSRC}/src/${LUASQL_DRIVER}.so ${STAGEDIR}${LUA_MODLIBDIR}/luasql
 
 .include <bsd.port.mk>