Date: Wed, 30 Oct 2024 06:58:21 GMT From: Zsolt Udvari <uzsolt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e0df7012849f - main - databases/luadbi: Update to 0.7.4 Message-ID: <202410300658.49U6wL61074095@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0df7012849fbc8c2b0c96b41891494a04e4f3ff commit e0df7012849fbc8c2b0c96b41891494a04e4f3ff Author: László Károlyi <laszlo-rdr-keethu9thi@karolyi.hu> AuthorDate: 2024-10-30 06:54:35 +0000 Commit: Zsolt Udvari <uzsolt@FreeBSD.org> CommitDate: 2024-10-30 06:57:51 +0000 databases/luadbi: Update to 0.7.4 Works with mysql 8.0 and 8.1. Replace -I${LOCALBASE}/include to USES=localbase. Pet portfmt. Switch to DISTVERSION. PR: 270844 Approved by: maintainer timeout (2 weeks) --- databases/luadbi/Makefile | 63 +++++++++++++++++++++++------------------------ databases/luadbi/distinfo | 6 ++--- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile index 37413e1749bf..ed0527cc398f 100644 --- a/databases/luadbi/Makefile +++ b/databases/luadbi/Makefile @@ -1,7 +1,6 @@ PORTNAME= luadbi -PORTVERSION= 0.7.2 -PORTREVISION= 1 DISTVERSIONPREFIX= v +DISTVERSION= 0.7.4 CATEGORIES= databases PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -12,46 +11,46 @@ WWW= https://github.com/mwild1/luadbi LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake shebangfix lua:module -SHEBANG_FILES= DBI.lua +USES= gmake localbase:ldflags lua:module shebangfix USE_GITHUB= yes GH_ACCOUNT= mwild1 +SHEBANG_FILES= DBI.lua +MAKE_ENV= COMMON_CFLAGS="" \ + COMMON_LDFLAGS="" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + LUA_CDIR="${LUA_MODLIBDIR}" \ + LUA_INC="-I${LUA_INCDIR}" \ + LUA_LDIR="${LUA_MODSHAREDIR}" \ + LUA_V="${LUA_VER}" -CFLAGS+= -g -pedantic -Wall -Qunused-arguments -O2 -shared -fPIC -DPIC -std=c99 -I${LOCALBASE}/include +MAKE_JOBS_UNSAFE= yes + +CFLAGS+= -g -pedantic -Wall -Qunused-arguments -shared -fPIC -DPIC \ + -std=c99 LDFLAGS+= -shared -MAKE_ENV+= COMMON_CFLAGS="" -MAKE_ENV+= COMMON_LDFLAGS="" -MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" -MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" -MAKE_ENV+= LUA_V="${LUA_VER}" -MAKE_ENV+= LUA_LDIR="${LUA_MODSHAREDIR}" -MAKE_ENV+= LUA_CDIR="${LUA_MODLIBDIR}" -MAKE_ENV+= LUA_INC="-I${LUA_INCDIR}" -MAKE_JOBS_UNSAFE=yes +PLIST_FILES= ${LUA_MODSHAREDIR}/DBI.lua -OPTIONS_MULTI= DATABASE -OPTIONS_MULTI_DATABASE= MYSQL SQLITE3 PGSQL OPTIONS_DEFAULT= SQLITE3 - -PLIST_FILES= %%LUA_MODSHAREDIR%%/DBI.lua +OPTIONS_MULTI= DATABASE +OPTIONS_MULTI_DATABASE= MYSQL PGSQL SQLITE3 MYSQL_USES= mysql +MYSQL_MAKE_ENV= MYSQL_INC="-I${LOCALBASE}/include/mysql" \ + MYSQL_LDFLAGS="-L${LOCALBASE}/lib/mysql -lmysqlclient" MYSQL_ALL_TARGET= mysql -MYSQL_PLIST_FILES= %%LUA_MODLIBDIR%%/dbd/mysql.so -MYSQL_MAKE_ENV+= MYSQL_LDFLAGS="-L${LOCALBASE}/lib/mysql -lmysqlclient" -MYSQL_MAKE_ENV+= MYSQL_INC="-I${LOCALBASE}/include/mysql" -MYSQL_VARS= IGNORE_WITH_MYSQL="80 81" - -SQLITE3_USES= localbase:ldflags sqlite:3 -SQLITE3_ALL_TARGET= sqlite3 -SQLITE3_PLIST_FILES= %%LUA_MODLIBDIR%%/dbd/sqlite3.so -SQLITE3_MAKE_ENV+= SQLITE3_INC="" +MYSQL_PLIST_FILES= ${LUA_MODLIBDIR}/dbd/mysql.so PGSQL_USES= pgsql +PGSQL_MAKE_ENV= PSQL_INC="-I${LOCALBASE}/include/postgresql/server" PGSQL_ALL_TARGET= psql -PGSQL_PLIST_FILES= %%LUA_MODLIBDIR%%/dbd/postgresql.so -PGSQL_MAKE_ENV+= PSQL_INC="-I${LOCALBASE}/include/postgresql/server" +PGSQL_PLIST_FILES= ${LUA_MODLIBDIR}/dbd/postgresql.so + +SQLITE3_USES= sqlite:3 +SQLITE3_MAKE_ENV= SQLITE3_INC="" +SQLITE3_ALL_TARGET= sqlite3 +SQLITE3_PLIST_FILES= ${LUA_MODLIBDIR}/dbd/sqlite3.so do-install: @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}/dbd @@ -61,10 +60,10 @@ do-install: do-install-MYSQL-on: ${INSTALL_PROGRAM} ${WRKSRC}/dbd/mysql.so ${STAGEDIR}${LUA_MODLIBDIR}/dbd -do-install-SQLITE3-on: - ${INSTALL_PROGRAM} ${WRKSRC}/dbd/sqlite3.so ${STAGEDIR}${LUA_MODLIBDIR}/dbd - do-install-PGSQL-on: ${INSTALL_PROGRAM} ${WRKSRC}/dbd/postgresql.so ${STAGEDIR}${LUA_MODLIBDIR}/dbd +do-install-SQLITE3-on: + ${INSTALL_PROGRAM} ${WRKSRC}/dbd/sqlite3.so ${STAGEDIR}${LUA_MODLIBDIR}/dbd + .include <bsd.port.mk> diff --git a/databases/luadbi/distinfo b/databases/luadbi/distinfo index 46ef632c3bcf..df5fa2576974 100644 --- a/databases/luadbi/distinfo +++ b/databases/luadbi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547458757 -SHA256 (mwild1-luadbi-v0.7.2_GH0.tar.gz) = 05a7d02d0cae3970af24f72f39edfe717e39424927d07fbbc09ebe96ea02f5a6 -SIZE (mwild1-luadbi-v0.7.2_GH0.tar.gz) = 36462 +TIMESTAMP = 1728944098 +SHA256 (mwild1-luadbi-v0.7.4_GH0.tar.gz) = f22ec8ec3bdc297eb3e3d37f21f839e3ac1d71c968853ed84b4fe5dcad4e54df +SIZE (mwild1-luadbi-v0.7.4_GH0.tar.gz) = 39077
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410300658.49U6wL61074095>