Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 May 2016 19:22:51 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r415359 - head/databases/luasql-mysql
Message-ID:  <201605161922.u4GJMpAR006636@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



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