Attachment 253870 Details for Bug 270844 – pet portclippy, portfmt

[patch] pet portclippy, portfmt

luadbi.diff (text/plain), 3.74 KB, created by Zsolt Udvari on 2024-09-28 17:48:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2024-09-28 17:48:00 UTC

Size: 3.74 KB

patch

obsolete

>diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile
>index 37413e1749bf..8ae91f20cb10 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.3
> CATEGORIES=	databases
> PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
> 
>@@ -12,46 +11,49 @@ WWW=		https://github.com/mwild1/luadbi
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gmake shebangfix lua:module
>-SHEBANG_FILES=	DBI.lua
>+TEST_DEPENDS=	${LUA_PKGNAMEPREFIX}luarocks>0:devel/lua-luarocks
>+
>+USES=		gmake lua:module shebangfix
> USE_GITHUB=	yes
> GH_ACCOUNT=	mwild1
> 
>-CFLAGS+=	-g -pedantic -Wall -Qunused-arguments -O2 -shared -fPIC -DPIC -std=c99 -I${LOCALBASE}/include
>+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}"
>+
>+MAKE_JOBS_UNSAFE=	yes
>+
>+CFLAGS+=	-g -pedantic -Wall -Qunused-arguments -O2 -shared -fPIC -DPIC \
>+		-std=c99 -I${LOCALBASE}/include
> 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
>-
>-OPTIONS_MULTI=	DATABASE
>-OPTIONS_MULTI_DATABASE=	MYSQL SQLITE3 PGSQL
>-OPTIONS_DEFAULT=	SQLITE3
> 
>-PLIST_FILES=	%%LUA_MODSHAREDIR%%/DBI.lua
>+PLIST_FILES=	${LUA_MODSHAREDIR}/DBI.lua
>+
>+OPTIONS_DEFAULT=	SQLITE3
>+OPTIONS_MULTI=		DATABASE
>+OPTIONS_MULTI_DATABASE=	MYSQL PGSQL SQLITE3
> 
> MYSQL_USES=		mysql
>+MYSQL_MAKE_ENV+=	MYSQL_INC="-I${LOCALBASE}/include/mysql"
> MYSQL_ALL_TARGET=	mysql
>-MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/mysql.so
>+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=""
> 
> PGSQL_USES=		pgsql
>-PGSQL_ALL_TARGET=	psql
>-PGSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/postgresql.so
> PGSQL_MAKE_ENV+=	PSQL_INC="-I${LOCALBASE}/include/postgresql/server"
>+PGSQL_ALL_TARGET=	psql
>+PGSQL_PLIST_FILES=	${LUA_MODLIBDIR}/dbd/postgresql.so
>+
>+SQLITE3_USES=		localbase:ldflags 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 +63,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..0f4613f38f9b 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 = 1727522411
>+SHA256 (mwild1-luadbi-v0.7.3_GH0.tar.gz) = 8370c3e764b695e805124ad5cd95b285f19cb2246e93c0230dcdcd88096b004b
>+SIZE (mwild1-luadbi-v0.7.3_GH0.tar.gz) = 35753

Actions: View | Diff

Attachments on bug 270844: 253867 | 253870 | 254234 | 254984 | 254986